--- a/ChangeLog Sun Nov 04 23:18:03 2007 +0000
+++ b/ChangeLog Mon Nov 05 02:21:29 2007 +0000
@@ -1,3 +1,41 @@
+2007-11-5 Mark Wright <[email protected]>
+
+ * SFEgawk.spec: Bump to 3.1.6.
+ * SFElibcdio.spec: Bump to 0.79. Add libcdio-02-stdint.diff.
+ * base-specs/libcdio.spec: Bump to 0.79.
+ * patches/libcdio-02-stdint.diff. Integer typedefs.
+ * SFElibmng.spec: Bump to 1.1.10
+ * SFEliveMedia.spec: Bump to 2007.11.01. Add patch2 to use
+ /usr/gnu/bin/ld.
+ * patches/liveMedia-02-config.diff: Use /usr/gnu/bin/ld and build
+ shared libraries instead of static.
+ * SFElsof.spec: Bump to 4.78.
+ * SFEncurses.spec: Bump to 5.6. Set LDFLAGS=-m64 for 64 bit build.
+ * base-specs/ncurses.spec: ditto
+ * SFExine-ui.spec: Bump to 0.99.5. Use SFEgcc.
+ Commented patch1, patch2 and patch3. Add patch4 for INADDR_NONE.
+ * patches/xine-ui-04-configure.diff: INADDR_NONE.
+ * encumbered/SFEfaad2.spec: Bump to 2.6.1. Bump patch2 and
+ patch4. Comment patch1, patch3 and patch5.
+ * patches/faad-02-inline.diff: Bump.
+ * patches/faad-04-wall.diff: Bump.
+ * encumbered/SFElibmpcdec.spec: Bump to 1.2.6.
+ * encumbered/SFEmplayer-codecs.spec: Bump to 20071007.
+ * encumbered/SFEmplayer.spec: Bump to 1.0rc2.
+ Change SUNWlibcdio to SFElibcdio. Remove SFElibfame.
+ Comment mplayer-02-makefile-libfame-dep.diff (libfame removed).
+ Bump patch1. Comment patch3 (already applied). Add BuildRequires:
+ SFEgawk.
+ * patches/mplayer-01-cddb.diff: Bump.
+ * patches/mplayer-05-configure.diff: SFEgcc 4.2.2 does not support
+ -rdynamic.
+ * encumbered/SFEtwolame.spec: Bump to 0.3.10. Bump patch1 and patch2.
+ * patches/twolame-01-configure.diff: Bump.
+ * patches/twolame-02-crossfile_inline.diff: Bump.
+ * encumbered/SFExine-lib.spec: Bump to 1.1.8. SUNWhal conditional
+ dependency for Solaris 10. Comment patch1, patch5 and patch6
+ (already applied). Requires SFEgcc 4.2.2
+
2007-11-04 Erwann Chenede - <[email protected]>
* SFEcompiz.spec: remove unneeded X bits, lighter version of
--- a/SFEgawk.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/SFEgawk.spec Mon Nov 05 02:21:29 2007 +0000
@@ -7,7 +7,7 @@
Name: SFEgawk
Summary: GNU awk - pattern scanning and processing filter
-Version: 3.1.5
+Version: 3.1.6
Source: http://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -89,6 +89,8 @@
%{_mandir}/*/*
%changelog
+* Sun Nov 4 2007 - [email protected]
+- Bump to 3.1.6.
* Wed Oct 11 2006 - [email protected]
- add postrun scripts for updating the info dir file
* Sun Jan 18 2006 - [email protected]
--- a/SFElibcdio.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/SFElibcdio.spec Mon Nov 05 02:21:29 2007 +0000
@@ -23,6 +23,7 @@
Summary: GNU libcdio
Version: %{libcdio.version}
Patch1: libcdio-01-usehal.diff
+Patch2: libcdio-02-stdint.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -50,10 +51,11 @@
mkdir %name-%version
%libcdio.prep -d %name-%version
+cd %{_builddir}/%name-%version/libcdio-%{libcdio.version}
%if %with_hal
-cd %{_builddir}/%name-%version/libcdio-%{libcdio.version}
%patch1 -p1
%endif
+%patch2 -p1
# Note, we have to build this with gcc, because Forte cannot handle
# the flexible arrays used in libcdio. We should move to using Forte
@@ -98,6 +100,8 @@
%{_includedir}/cdio
%changelog
+* Sun Nov 4 2007 - [email protected]
+- Bump to 0.79. Add libcdio-02-stdint.diff.
* Thu Oct 18 2007 - [email protected]
- use gcc specific compiler/linker flags
* Mon Jun 23 - [email protected]
--- a/SFElibmng.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/SFElibmng.spec Mon Nov 05 02:21:29 2007 +0000
@@ -7,7 +7,7 @@
Name: SFElibmng
Summary: libmng - the MNG reference library
-Version: 1.0.9
+Version: 1.0.10
Source: http://%{sf_mirror}/sourceforge/libmng/libmng-%{version}.tar.gz
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,6 +74,8 @@
%{_mandir}/man3/*
%changelog
+* Sun Nov 4 2007 - [email protected]
+- Bump to 1.1.10
* Fri Mar 30 2007 - [email protected]
- Change source URL to one working sourceforge mirror
--- a/SFEliveMedia.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/SFEliveMedia.spec Mon Nov 05 02:21:29 2007 +0000
@@ -7,9 +7,10 @@
Name: SFEliveMedia
Summary: liveMedia - live555 Streaming Media
-Version: 2007.08.03a
+Version: 2007.11.01
Source: http://www.live555.com/liveMedia/public/live.%{version}.tar.gz
Patch1: liveMedia-01-SOLARIS-macro.diff
+Patch2: liveMedia-02-config.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -17,6 +18,7 @@
%prep
%setup -q -n live
%patch1 -p1
+%patch2 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -30,7 +32,7 @@
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/lib/live
-gtar fcp - liveMedia/include groupsock/include UsageEnvironment/include BasicUsageEnvironment/include liveMedia/libliveMedia.a groupsock/libgroupsock.a UsageEnvironment/libUsageEnvironment.a BasicUsageEnvironment/libBasicUsageEnvironment.a | gtar -x -v -C $RPM_BUILD_ROOT/usr/lib/live -f -
+gtar fcp - liveMedia/include groupsock/include UsageEnvironment/include BasicUsageEnvironment/include liveMedia/libliveMedia.so groupsock/libgroupsock.so UsageEnvironment/libUsageEnvironment.so BasicUsageEnvironment/libBasicUsageEnvironment.so | gtar -x -v -C $RPM_BUILD_ROOT/usr/lib/live -f -
%clean
rm -rf $RPM_BUILD_ROOT
@@ -41,6 +43,9 @@
%{_libdir}/*
%changelog
+* Mon Nov 5 2007 - [email protected]
+- Bump to 2007.11.01. Add patch2 to use /usr/gnu/bin/ld and build
+- shared libraries instead of static.
* Tue Sep 04 2007 - [email protected]
- Bump to 2007.08.03a
* Wed Jul 25 2007 - [email protected]
--- a/SFElsof.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/SFElsof.spec Mon Nov 05 02:21:29 2007 +0000
@@ -11,7 +11,7 @@
Name: SFElsof
Summary: List open files
-Version: 4.77
+Version: 4.78
Source: ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/lsof_%{version}.tar.gz
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -30,8 +30,8 @@
export CFLAGS="%optflags"
export LDFLAGS="%_ldflags"
-tar -xf lsof_4.77_src.tar
-cd lsof_4.77_src
+tar -xf lsof_4.78_src.tar
+cd lsof_4.78_src
export LSOF_VSTR=5.10
./Configure -n solariscc
@@ -39,7 +39,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-cd lsof_4.77_src
+cd lsof_4.78_src
install -D lsof $RPM_BUILD_ROOT%{_bindir}/lsof
install -D lsof.8 $RPM_BUILD_ROOT%{_mandir}/man8/lsof.8
@@ -56,6 +56,7 @@
%{_mandir}/man8/lsof.8
%changelog
-*
+* Mon Nov 5 2007 - [email protected]
+- Bump to 4.78.
* Sun Mar 18 2007 - Eric Boutilier
- Initial spec
--- a/SFEncurses.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/SFEncurses.spec Mon Nov 05 02:21:29 2007 +0000
@@ -16,7 +16,7 @@
Name: SFEncurses
Summary: Emulation of SVR4 curses
-Version: 5.5
+Version: 5.6
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -41,9 +41,11 @@
%build
%ifarch amd64 sparcv9
+export LDFLAGS=-m64
%ncurses_64.build -d %name-%version/%_arch64
%endif
+export LDFLAGS=
%ncurses.build -d %name-%version/%{base_arch}
%install
@@ -87,6 +89,8 @@
%{_includedir}/*
%changelog
+* Sun Nov 4 2007 - [email protected]
+- Bump to 5.6. Set LDFLAGS=-m64 for 64 bit build.
* Tue Mar 20 2007 - [email protected]
- Move build to a base spec. Added 64bit build
* Wed Nov 08 2006 - Eric Boutilier
--- a/SFExine-ui.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/SFExine-ui.spec Mon Nov 05 02:21:29 2007 +0000
@@ -9,12 +9,13 @@
Name: SFExine-ui
License: GPL
Group: System/Libraries
-Version: 0.99.4
+Version: 0.99.5
Summary: xine-ui - Xlib based skinned front end for the xine video player
Source: http://prdownloads.sourceforge.net/xine/xine-ui-%{version}.tar.gz
-Patch1: xine-ui-01-gettext.diff
-Patch2: xine-ui-02-glib-gettext-Makefile.diff
-Patch3: xine-ui-03-glibc-compat.diff
+#Patch1: xine-ui-01-gettext.diff
+#Patch2: xine-ui-02-glib-gettext-Makefile.diff
+#Patch3: xine-ui-03-glibc-compat.diff
+Patch4: xine-ui-04-configure.diff
URL: http://xinehq.de/index.php/home
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -33,8 +34,9 @@
%prep
%setup -q -n xine-ui-%version
-%patch1 -p1 -b .patch01
-%patch3 -p1 -b .patch03
+#%patch1 -p1 -b .patch01
+#%patch3 -p1 -b .patch03
+%patch4 -p1 -b .patch04
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -43,15 +45,18 @@
fi
glib-gettextize --force
-( cd po; gpatch -p1 < %{P:2} )
-cp po/Makefile.in.in src/xitk/xine-toolkit/po
+#( cd po; gpatch -p1 < %{P:2} )
+#cp po/Makefile.in.in src/xitk/xine-toolkit/po
+export CXX=/usr/gnu/bin/gcc
+export CC=/usr/gnu/bin/gcc
+export LD=/usr/gnu/bin/ld
libtoolize --copy --force
aclocal $ACLOCAL_FLAGS -I m4
autoheader
automake -a -c -f
autoconf
-export CFLAGS="%{optflags} -I/usr/X11/include -I/usr/sfw/include"
-export LDFLAGS="%{_ldflags} -L/usr/X11/lib -R/usr/X11/lib -L/usr/sfw/lib -R/usr/sfw/lib"
+export CFLAGS="-O4 -fPIC -DPIC -I/usr/X11/include -I/usr/openwin/include -D_LARGEFILE64_SOURCE -I/usr/gnu/include -mcpu=pentiumpro -mtune=pentiumpro -msse2 -mfpmath=sse "
+export LDFLAGS="%{gcc_ldflags} -L/usr/X11/lib -R/usr/X11/lib -L/usr/gnu/lib -R/usr/gnu/lib -L/usr/lib"
./configure --prefix=%{_prefix} \
--libdir=%{_libdir}
@@ -91,6 +96,20 @@
%{_datadir}/xine/visuals
%{_datadir}/xine/skins
%{_datadir}/xine/oxine
+%dir %attr (-, root, other) %{_datadir}/icons
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16/apps
+%{_datadir}/icons/hicolor/16x16/apps/*.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22/apps
+%{_datadir}/icons/hicolor/22x22/apps/*.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32/apps
+%{_datadir}/icons/hicolor/32x32/apps/*.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48/apps
+%{_datadir}/icons/hicolor/48x48/apps/*.png
%dir %attr (0755, root, other) %{_datadir}/pixmaps
%{_datadir}/pixmaps/*
@@ -103,5 +122,8 @@
%endif
%changelog
+* Mon Nov 5 2007 - [email protected]
+- Bump to 0.99.5. Change to use SFEgcc 4.2.2 as now used for SFExine-lib.
+- Commented patch1, patch2 and patch3. Add patch4 for INADDR_NONE.
* Sun Jan 7 2007 - [email protected]
- create
--- a/base-specs/libcdio.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/base-specs/libcdio.spec Mon Nov 05 02:21:29 2007 +0000
@@ -10,7 +10,7 @@
Name: libcdio
License: LGPL
Group: System Environment/Libraries
-Version: 0.78.2
+Version: 0.79
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -81,6 +81,8 @@
%{_libdir}/*.so
%changelog
+* Sat Nov 3 2007 - [email protected]
+- Bump to 0.79. Add libcdio-02-stdint.diff.
* Thu Oct 18 2007 - [email protected]
- force using automake-1.9
* Wed Nov 01 2006 - [email protected]
--- a/base-specs/ncurses.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/base-specs/ncurses.spec Mon Nov 05 02:21:29 2007 +0000
@@ -7,7 +7,7 @@
Name: ncurses
Summary: Emulation of SVR4 curses
-Version: 5.5
+Version: 5.6
Source: http://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.gz
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -24,7 +24,7 @@
export CFLAGS="%optflags"
export CXXFLAGS="%cxx_optflags"
-export LDFLAGS="%{_ldflags} -L%{_libdir} -R%{_libdir}"
+export LDFLAGS="%{_ldflags} -L%{_libdir} -R%{_libdir} $LDFLAGS"
./configure --prefix=%{_prefix} \
--bindir=%{_bindir} \
@@ -52,6 +52,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Nov 3 2007 - [email protected]
+- Bump to 5.6. Set LDFLAGS=-m64 for 64 bit build.
* Tue Mar 20 2007 - [email protected]
- Changed to be a base spec
* Wed Nov 08 2006 - Eric Boutilier
--- a/encumbered/SFEfaad2.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/encumbered/SFEfaad2.spec Mon Nov 05 02:21:29 2007 +0000
@@ -8,14 +8,14 @@
Name: SFEfaad2
Summary: faad2 - a high-quality MPEG audio decoder
Group: libraries/multimedia
-Version: 2.0
+Version: 2.6.1
Source: http://easynews.dl.sourceforge.net/sourceforge/faac/faad2-%{version}.tar.gz
URL: http://www.audiocoding.com/
-Patch1: faad-01-makefile.diff
+#Patch1: faad-01-makefile.diff
Patch2: faad-02-inline.diff
-Patch3: faad-03-largefiles.diff
+#Patch3: faad-03-largefiles.diff
Patch4: faad-04-wall.diff
-Patch5: faad-05-strchr.diff
+#Patch5: faad-05-strchr.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -30,11 +30,11 @@
%prep
%setup -q -n faad2
-%patch1 -p1
+#%patch1 -p1
%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
%patch4 -p1
-%patch5 -p1
+#%patch5 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -87,6 +87,8 @@
%{_includedir}/*
%changelog
+* Mon Nov 5 2007 - [email protected]
+- Bump to 2.6.1. Bump patch2 and patch4. Comment patch1, patch3 and patch5.
* Fri Jun 23 2005 - [email protected]
- rename to SFEfaad2
- update file attributes
--- a/encumbered/SFElibmpcdec.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/encumbered/SFElibmpcdec.spec Mon Nov 05 02:21:29 2007 +0000
@@ -7,7 +7,7 @@
Name: SFElibmpcdec
Summary: libmpcdec - Portable Musepack decoder library
-Version: 1.2.5
+Version: 1.2.6
Source: http://files2.musepack.net/source/libmpcdec-%{version}.tar.bz2
Patch1: libmpcdec-01-configure.diff
SUNW_BaseDir: %{_basedir}
@@ -61,6 +61,8 @@
%{_includedir}/*
%changelog
+* Sun Nov 4 2007 - [email protected]
+- Bump to 1.2.6
* Thu Apr 05 2007 - Thomas Wagner
- bump to 1.2.5
- refresh patch/libmpcdec-01-configure.diff
--- a/encumbered/SFEmplayer-codecs.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/encumbered/SFEmplayer-codecs.spec Mon Nov 05 02:21:29 2007 +0000
@@ -13,9 +13,9 @@
Name: SFEmplayer-codecs
Summary: binary codecs for the mplayer movie player
-%define year 2006
+%define year 2007
%define month 10
-%define day 22
+%define day 07
Version: %{year}.%{month}.%{day}
Source: http://www1.mplayerhq.hu/MPlayer/releases/codecs/essential-%{year}%{month}%{day}.tar.bz2
URL: http://www.mplayerhq.hu/design7/dload.html
@@ -41,5 +41,7 @@
%{mplayer.codecdir}
%changelog
+* Sun Nov 4 2007 - [email protected]
+- Bump to 20071007
* Sun Jan 7 2007 - [email protected]
- separate from the rest of mplayer
--- a/encumbered/SFEmplayer.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/encumbered/SFEmplayer.spec Mon Nov 05 02:21:29 2007 +0000
@@ -10,12 +10,13 @@
Name: SFEmplayer
Summary: mplayer - The Movie Player
Version: 1.0
-%define tarball_version 1.0rc1
+%define tarball_version 1.0rc2
Source: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{tarball_version}.tar.bz2
Patch1: mplayer-01-cddb.diff
-Patch2: mplayer-02-makefile-libfame-dep.diff
-Patch3: mplayer-03-asmrules_20061231.diff
+#Patch2: mplayer-02-makefile-libfame-dep.diff
+#Patch3: mplayer-03-asmrules_20061231.diff
Patch4: mplayer-04-cabac-asm.diff
+Patch5: mplayer-05-configure.diff
Source3: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
Source4: http://www.mplayerhq.hu/MPlayer/skins/Abyss-1.6.tar.bz2
Source5: http://www.mplayerhq.hu/MPlayer/skins/neutron-1.5.tar.bz2
@@ -26,7 +27,6 @@
BuildRoot: %{_tmppath}/%{name}-%{tarball_version}-build
%include default-depend.inc
Requires: SFElibsndfile
-Requires: SFElibfame
Requires: SFElibdvdplay
Requires: SFElibmad
Requires: SFEliba52
@@ -47,7 +47,7 @@
Requires: SUNWogg-vorbis
Requires: SUNWlibtheora
Requires: SUNWgccruntime
-Requires: SUNWlibcdio
+Requires: SFElibcdio
Requires: SUNWgnome-base-libs
Requires: SUNWsmbau
Requires: SFElibfribidi
@@ -58,7 +58,6 @@
Requires: SFEopenal
BuildRequires: SFEopenal-devel
BuildRequires: SFElibsndfile-devel
-BuildRequires: SFElibfame-devel
BuildRequires: SFElibdvdplay-devel
BuildRequires: SFElibmad-devel
BuildRequires: SFEliba52-devel
@@ -68,6 +67,7 @@
BuildRequires: SFEfaad2-devel
BuildRequires: SFElibmpcdec-devel
#BuildRequires: SFEsdl-devel
+BuildRequires: SFEgawk
BuildRequires: SUNWgnome-audio-devel
%define x11 /usr/openwin
@@ -78,9 +78,10 @@
%prep
%setup -q -n MPlayer-%tarball_version
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#%patch2 -p1
+#%patch3 -p1
%patch4 -p1
+%patch5 -p1
unzip %SOURCE7
unzip 26104-610_ANSI_C_source_code.zip
@@ -107,6 +108,10 @@
export LDFLAGS="-L%{x11}/lib -L/usr/gnu/lib -R/usr/gnu/lib -L/usr/sfw/lib -R/usr/sfw/lib"
export CC=gcc
+rm -rf ./grep
+ln -s /usr/sfw/bin/ggrep ./grep
+PATH="`pwd`:$PATH"
+echo "`type grep`"
bash ./configure \
--prefix=%{_prefix} \
@@ -115,15 +120,13 @@
--confdir=%{_sysconfdir} \
--enable-gui \
--enable-menu \
- --with-extraincdir=%{x11}/include \
- --with-x11libdir=%{x11}/lib \
- --with-extraincdir=/usr/sfw/include \
- --with-extralibdir=/usr/sfw/lib \
- --with-codecsdir=%{codecdir} \
- --enable-libfame \
+ --with-extraincdir=/usr/lib/live/liveMedia/include:/usr/lib/live/groupsock/include:/usr/lib/live/UsageEnvironment/include:/usr/lib/live/BasicUsageEnvironment/include:%{x11}/include:/usr/sfw/include \
+ --with-extralibdir=/usr/lib/live/liveMedia:/usr/lib/live/groupsock:/usr/lib/live/UsageEnvironment:/usr/lib/live/BasicUsageEnvironment:%{x11}/lib:/usr/sfw/lib \
+ --extra-libs='-lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia' \
+ --codecsdir=%{codecdir} \
--enable-faad-external \
--enable-live \
- --with-livelibdir=/usr/lib/live \
+ --enable-network \
--enable-rpath \
--enable-largefiles \
--enable-crash-debug \
@@ -170,6 +173,11 @@
%{_datadir}/pixmaps/*
%changelog
+* Mon Nov 5 2007 - [email protected]
+- Bump to 1.0rc2. Change SUNWlibcdio to SFElibcdio. Remove SFElibfame.
+- Comment mplayer-02-makefile-libfame-dep.diff (libfame removed). Bump patch1.
+- Comment patch3 (already applied). Add BuildRequires: SFEgawk. Add patch5
+- as SFEgcc 4.2.2 does not understand -rdynamic.
* Fri Oct 19 2007 - [email protected]
- Fixed 3gpp urls
* Tue Aug 28 2007 - [email protected]
--- a/encumbered/SFEtwolame.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/encumbered/SFEtwolame.spec Mon Nov 05 02:21:29 2007 +0000
@@ -7,10 +7,10 @@
Name: SFEtwolame
Summary: twolame - MP3 Encoder
-Version: 0.3.7
+Version: 0.3.10
Source: http://www.ecs.soton.ac.uk/~njh/twolame/twolame-%{version}.tar.gz
Patch1: twolame-01-configure.diff
-Patch2: twolame-02-crossfile_inline.diff
+Patch2: twolame-02-crossfile_inline.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -75,6 +75,8 @@
%{_libdir}/pkgconfig/*
%changelog
+* Sun Nov 4 2007 - [email protected]
+- Bump to 0.3.10. Bump patch1 and patch2.
* Fri Jun 23 2006 - [email protected]
- rename to SFEtwolame
- delete -share subpkg
--- a/encumbered/SFExine-lib.spec Sun Nov 04 23:18:03 2007 +0000
+++ b/encumbered/SFExine-lib.spec Mon Nov 05 02:21:29 2007 +0000
@@ -5,20 +5,23 @@
#
%include Solaris.inc
+
+%define with_hal %(pkginfo -q SUNWhal && echo 1 || echo 0)
+
%use mplayer = SFEmplayer.spec
Name: SFExine-lib
License: GPL
Group: System/Libraries
-Version: 1.1.4
+Version: 1.1.8
Summary: xine-lib - the core engine of the xine video player
-Source: http://easynews.dl.sourceforge.net/sourceforge/xine/xine-lib-%{version}.tar.gz
-Patch1: xine-lib-01-sysi86.diff
+Source: http://easynews.dl.sourceforge.net/sourceforge/xine/xine-lib-%{version}.tar.bz2
+#Patch1: xine-lib-01-sysi86.diff
Patch2: xine-lib-02-asm-pic.diff
Patch3: xine-lib-03-gettext.diff
Patch4: xine-lib-04-hal-support.diff
-Patch5: xine-lib-05-buildfix.diff
-Patch6: xine-lib-06-oss.diff
+#Patch5: xine-lib-05-buildfix.diff
+#Patch6: xine-lib-06-oss.diff
URL: http://xinehq.de/index.php/home
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -47,7 +50,11 @@
Requires: SFElibdvdnav
BuildRequires: SFElibmad-devel
Requires: SFElibmad
+BuildRequires: SFEgcc-devel
+Requires: SFEgcc
+%if %with_hal
Requires: SUNWhal
+%endif
%package devel
Summary: %{summary} - development files
@@ -65,12 +72,14 @@
%prep
%setup -q -n xine-lib-%version
-%patch1 -p1
+#%patch1 -p1
%patch2 -p1
%patch3 -p1
+%if %with_hal
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%endif
+#%patch5 -p1
+#%patch6 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -79,15 +88,16 @@
fi
glib-gettextize --force
+export CXX=/usr/gnu/bin/gcc
+export CC=/usr/gnu/bin/gcc
+export LD=/usr/gnu/bin/ld
libtoolize --copy --force
aclocal $ACLOCAL_FLAGS -I m4
autoheader
automake -a -c -f
autoconf
-export CXX=/usr/sfw/bin/gcc
-export CC=/usr/sfw/bin/gcc
-export CFLAGS="-O4 -fPIC -DPIC -I/usr/X11/include -I/usr/openwin/include -D_LARGEFILE64_SOURCE -I/usr/sfw/include -mcpu=pentiumpro -mtune=pentiumpro -msse2 -mfpmath=sse "
-export LDFLAGS="%{_ldflags} -L/usr/X11/lib -R/usr/X11/lib -L/usr/sfw/lib -R/usr/sfw/lib"
+export CFLAGS="-O4 -fPIC -DPIC -I/usr/X11/include -I/usr/openwin/include -D_LARGEFILE64_SOURCE -I/usr/gnu/include -mcpu=pentiumpro -mtune=pentiumpro -msse2 -mfpmath=sse "
+export LDFLAGS="%{gcc_ldflags} -Wl,-export-dynamic -L/usr/X11/lib -R/usr/X11/lib -L/usr/gnu/lib -R/usr/gnu/lib"
./configure --prefix=%{_prefix} \
--with-w32-path=%{mplayer.codecdir} \
--with-external-libmad \
@@ -168,6 +178,10 @@
%endif
%changelog
+* Sun Nov 4 2007 - [email protected]
+- Bump to 1.1.8. SUNWhal conditional dependency for Solaris 10.
+- Comment patch1, patch5 and patch6 (already applied). Requires SFEgcc 4.2.2
+- http://sourceforge.net/tracker/index.php?func=detail&aid=1812753&group_id=9655&atid=109655
* Mon Feb 26 2007 - [email protected]
- fix xine-lib-04-hal-support
xineplug_inp_dvd.so needs to link LIBHAL_LIBS
--- a/patches/faad-02-inline.diff Sun Nov 04 23:18:03 2007 +0000
+++ b/patches/faad-02-inline.diff Mon Nov 05 02:21:29 2007 +0000
@@ -1,13 +1,19 @@
-diff -ur faad2-orig/libfaad/common.h faad2/libfaad/common.h
---- faad2-orig/libfaad/common.h 2004-02-06 19:55:24.000000000 +0700
-+++ faad2/libfaad/common.h 2006-05-08 23:31:21.782089394 +0700
-@@ -32,7 +32,8 @@
- extern "C" {
+--- faad2-orig/libfaad/common.h 2007-11-01 12:33:30.000000000 +0000
++++ faad2/libfaad/common.h 2007-11-03 04:45:18.044003192 +0000
+@@ -39,11 +39,15 @@
+ # include "../config.h"
#endif
--#define INLINE __inline
-+
+-#if 1
++#if (defined(sun) && defined(__SVR4))
+#define INLINE
- #if defined(_WIN32) && !defined(_WIN32_WCE)
++#else
++#if 0
+ #define INLINE __inline
+ #else
+ #define INLINE inline
+ #endif
++#endif
+
+ #if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
#define ALIGN __declspec(align(16))
- #else
--- a/patches/faad-04-wall.diff Sun Nov 04 23:18:03 2007 +0000
+++ b/patches/faad-04-wall.diff Mon Nov 05 02:21:29 2007 +0000
@@ -1,23 +1,14 @@
-diff -ur faad2-orig/common/mp4v2/Makefile.am faad2/common/mp4v2/Makefile.am
---- faad2-orig/common/mp4v2/Makefile.am 2004-02-06 19:47:04.000000000 +0700
-+++ faad2/common/mp4v2/Makefile.am 2006-05-09 00:21:55.042621002 +0700
-@@ -1,6 +1,6 @@
- INCLUDES = -I$(top_srcdir)/include
-
--AM_CXXFLAGS = -Wall
-+AM_CXXFLAGS =
-
- lib_LTLIBRARIES = libmp4v2.la
-
-diff -ur faad2-orig/plugins/xmms/src/Makefile.am faad2/plugins/xmms/src/Makefile.am
---- faad2-orig/plugins/xmms/src/Makefile.am 2004-02-06 23:05:07.000000000 +0700
-+++ faad2/plugins/xmms/src/Makefile.am 2006-05-09 00:22:16.301838175 +0700
-@@ -1,7 +1,7 @@
+--- faad2-orig/plugins/xmms/src/Makefile.am 2006-09-25 19:52:53.000000000 +0000
++++ faad2/plugins/xmms/src/Makefile.am 2007-11-03 04:50:08.654764130 +0000
+@@ -1,9 +1,9 @@
+-local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
++local_CFLAGS=`$(XMMS_CONFIG) --cflags`
+ local_LDFLAGS=`$(XMMS_CONFIG) --libs`
libdir = `$(XMMS_CONFIG) --input-plugin-dir`
lib_LTLIBRARIES = libmp4.la
--libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall \
-+libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` \
- `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
- -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
+-libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
++libmp4_la_CFLAGS = $(local_CFLAGS) \
+ -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
+ libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libcdio-02-stdint.diff Mon Nov 05 02:21:29 2007 +0000
@@ -0,0 +1,18 @@
+--- libcdio-0.79-orig/include/cdio/types.h 2006-06-02 23:38:48.000000000 +0000
++++ libcdio-0.79/include/cdio/types.h 2007-11-03 05:54:44.168557377 +0000
+@@ -60,7 +60,14 @@
+ /* warning ISO/IEC 9899:1999 <stdint.h> was missing and even <inttypes.h> */
+ /* fixme */
+ #endif /* HAVE_STDINT_H */
+-
++
++#if (defined(sun) && defined(__SVR4))
++ typedef uint8_t u_int8_t;
++ typedef uint16_t u_int16_t;
++ typedef uint32_t u_int32_t;
++ typedef uint64_t u_int64_t;
++#endif
++
+ typedef uint8_t ubyte;
+
+ /* default HP/UX macros are broken */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/liveMedia-02-config.diff Mon Nov 05 02:21:29 2007 +0000
@@ -0,0 +1,25 @@
+--- live-orig/config.solaris 2007-11-01 02:29:35.000000000 +0000
++++ live/config.solaris 2007-11-03 11:54:36.210784799 +0000
+@@ -1,4 +1,4 @@
+-COMPILE_OPTS = $(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t
++COMPILE_OPTS = $(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t -fPIC -DPIC
+ C = c
+ C_COMPILER = cc
+ C_FLAGS = $(COMPILE_OPTS)
+@@ -7,11 +7,12 @@
+ CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall
+ OBJ = o
+ LINK = c++ -o
+-LINK_OPTS = -L.
++LINK_OPTS = -shared -shared-libgcc $(CPLUSPLUS_FLAGS) -Wl,-zignore -Wl,-zcombreloc -L. -L/usr/gnu/lib -R/usr/gnu/lib -R/usr/lib/live/BasicUsageEnvironment -R/usr/lib/live/UsageEnvironment -R/usr/lib/live/groupsock -R/usr/lib/live/liveMedia
+ CONSOLE_LINK_OPTS = $(LINK_OPTS)
+-LIBRARY_LINK = ld -o
+-LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -dn
+-LIB_SUFFIX = a
++LIBRARY_LINK = g++ -o
++LIBRARY_LINK_OPTS = $(LINK_OPTS)
++LIB_SUFFIX = so
+ LIBS_FOR_CONSOLE_APPLICATION = -lsocket -lnsl
+ LIBS_FOR_GUI_APPLICATION = $(LIBS_FOR_CONSOLE_APPLICATION)
+ EXE =
++
--- a/patches/mplayer-01-cddb.diff Sun Nov 04 23:18:03 2007 +0000
+++ b/patches/mplayer-01-cddb.diff Mon Nov 05 02:21:29 2007 +0000
@@ -1,22 +1,20 @@
---- MPlayer-1.0rc1/stream/stream_cddb.c.orig 2007-01-03 13:34:17.708540000 -0500
-+++ MPlayer-1.0rc1/stream/stream_cddb.c 2007-01-03 13:35:36.578649000 -0500
+--- MPlayer-1.0rc2-orig/stream/stream_cddb.c 2007-10-07 19:49:26.000000000 +0000
++++ MPlayer-1.0rc2/stream/stream_cddb.c 2007-11-03 06:25:48.868519517 +0000
@@ -41,7 +41,7 @@
#if defined(__linux__)
#include <linux/cdrom.h>
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || (defined(__sun) && defined(__SVR4))
+-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || (defined(__sun) && defined(__SVR4))
#include <sys/cdio.h>
#elif defined(WIN32)
#include <ddk/ntddcdrm.h>
-@@ -62,7 +62,7 @@
- static cd_toc_t cdtoc[100];
- static int cdtoc_last_track;
-
+@@ -95,7 +95,7 @@
+ return drive;
+ }
+
-#if defined(__linux__) || defined(__bsdi__)
+#if defined(__linux__) || defined(__bsdi__) || (defined (__sun) && defined (__SVR4))
- int
- read_toc(const char *dev) {
- int drive;
-
-
+ {
+ struct cdrom_tochdr tochdr;
+ ioctl(drive, CDROMREADTOCHDR, &tochdr);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/mplayer-05-configure.diff Mon Nov 05 02:21:29 2007 +0000
@@ -0,0 +1,10 @@
+--- MPlayer-1.0rc2-orig/configure 2007-10-07 19:49:33.000000000 +0000
++++ MPlayer-1.0rc2/configure 2007-11-03 08:05:21.986253976 +0000
+@@ -7327,6 +7327,7 @@
+ if test "$_real" = yes || test "$_xanim" = yes && not win32 && not qnx && not darwin ; then
+ _ld_dl_dynamic='-rdynamic'
+ fi
++sunos && _ld_dl_dynamic='-dynamic'
+
+ _ld_extra="$_ld_extra $_ld_pthread $_ld_dl $_ld_dl_dynamic"
+ bsdos && _ld_extra="$_ld_extra -ldvd"
--- a/patches/twolame-01-configure.diff Sun Nov 04 23:18:03 2007 +0000
+++ b/patches/twolame-01-configure.diff Mon Nov 05 02:21:29 2007 +0000
@@ -1,34 +1,20 @@
-diff -urN twolame-0.3.7-orig/configure twolame-0.3.7/configure
---- twolame-0.3.7-orig/configure 2006-05-08 20:15:56.000000000 +0700
-+++ twolame-0.3.7/configure 2006-06-13 18:42:38.827635939 +0700
-@@ -20568,11 +20568,10 @@
+--- twolame-0.3.10-orig/configure.ac 2007-03-21 00:01:01.000000000 +0000
++++ twolame-0.3.10/configure.ac 2007-11-03 03:48:59.052484589 +0000
+@@ -113,15 +113,13 @@
+
+ dnl ############## Compiler and Linker Flags
+-CFLAGS="$CFLAGS -std=c99 -Wunused -Wall"
+ LDFLAGS="$LDFLAGS"
+
+ # If debugging is enabled then make warnings errors
if test "$Debugging" = "Enabled"; then
- # If debugging is enabled then make warnings errors
-- CFLAGS="$CFLAGS -std=c99 -g -Wunused -Wall -Werror -pedantic"
-+ CFLAGS="$CFLAGS -xc99 -features=no%extinl -g"
- LDFLAGS="$LDFLAGS"
+- CFLAGS="$CFLAGS -g -Werror -pedantic"
++ CFLAGS="$CFLAGS -xc99=all -features=no%extinl -g"
else
- # Optimize flag. 3 is about as high as you can sanely go with GCC3.2.
-- CFLAGS="$CFLAGS -O3 -std=c99"
+- CFLAGS="$CFLAGS -O3"
+ CFLAGS="$CFLAGS -xc99=all -features=no%extinl"
- LDFLAGS="$LDFLAGS"
fi
-diff -urN twolame-0.3.7-orig/configure.in twolame-0.3.7/configure.in
---- twolame-0.3.7-orig/configure.in 2006-05-08 19:48:21.000000000 +0700
-+++ twolame-0.3.7/configure.in 2006-06-13 18:43:17.367654943 +0700
-@@ -106,11 +106,10 @@
- if test "$Debugging" = "Enabled"; then
- # If debugging is enabled then make warnings errors
-- CFLAGS="$CFLAGS -std=c99 -g -Wunused -Wall -Werror -pedantic"
-+ CFLAGS="$CFLAGS -xc99=all -features=no%extinl -g"
- LDFLAGS="$LDFLAGS"
- else
-- # Optimize flag. 3 is about as high as you can sanely go with GCC3.2.
-- CFLAGS="$CFLAGS -O3 -std=c99"
-+ CFLAGS="$CFLAGS -xc99=all -features=no%extinl"
- LDFLAGS="$LDFLAGS"
- fi
-
--- a/patches/twolame-02-crossfile_inline.diff Sun Nov 04 23:18:03 2007 +0000
+++ b/patches/twolame-02-crossfile_inline.diff Mon Nov 05 02:21:29 2007 +0000
@@ -1,24 +1,13 @@
-diff -urN twolame-0.3.7-orig/libtwolame/bitbuffer.c twolame-0.3.7/libtwolame/bitbuffer.c
---- twolame-0.3.7-orig/libtwolame/bitbuffer.c 2005-10-27 03:33:37.000000000 +0700
-+++ twolame-0.3.7/libtwolame/bitbuffer.c 2006-06-13 18:57:58.923576991 +0700
-@@ -73,7 +73,7 @@
- }
-
- /*write N bits into the bit stream */
--inline void buffer_putbits (bit_stream * bs, unsigned int val, int N)
-+void buffer_putbits (bit_stream * bs, unsigned int val, int N)
- {
- static const int putmask[9] = { 0x0, 0x1, 0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff };
- register int j = N;
-diff -urN twolame-0.3.7-orig/libtwolame/bitbuffer.h twolame-0.3.7/libtwolame/bitbuffer.h
---- twolame-0.3.7-orig/libtwolame/bitbuffer.h 2005-10-27 03:33:37.000000000 +0700
-+++ twolame-0.3.7/libtwolame/bitbuffer.h 2006-06-13 19:05:00.188710052 +0700
-@@ -40,7 +40,7 @@
- void buffer_deinit( bit_stream ** bs );
-
- void buffer_put1bit (bit_stream *, int);
--inline void buffer_putbits (bit_stream *, unsigned int, int);
-+void buffer_putbits (bit_stream *, unsigned int, int);
- unsigned long buffer_sstell (bit_stream *);
-
- #endif
+--- twolame-0.3.10-orig/libtwolame/common.h 2007-03-21 00:01:01.000000000 +0000
++++ twolame-0.3.10/libtwolame/common.h 2007-11-03 03:54:56.021178702 +0000
+@@ -35,8 +35,8 @@
+ # define NO_DLL_INLINE
+ #else
+ # include "config.h"
+-# ifdef __APPLE__
+-/* Same problem under Mac OS X */
++# if defined(__APPLE__) || (defined(sun) && defined(__SVR4))
++/* Same problem under Mac OS X and Solaris */
+ # define NO_DLL_INLINE
+ # else
+ # define NO_DLL_INLINE inline
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/xine-ui-04-configure.diff Mon Nov 05 02:21:29 2007 +0000
@@ -0,0 +1,22 @@
+--- xine-ui-0.99.5-orig/configure.ac 2007-04-15 16:05:21.000000000 +0000
++++ xine-ui-0.99.5/configure.ac 2007-11-04 14:39:05.722915057 +0000
+@@ -341,6 +341,19 @@
+ AC_SUBST(NET_LIBS)
+
+ dnl
++dnl Solaris is missing INADDR_NONE, so define INADDR_NONE to -1 for Solaris.
++dnl
++AC_CHECK_DECL(
++ INADDR_NONE,
++ [],
++ [AC_DEFINE(INADDR_NONE,-1,[This is the value, which is returned from inet_addr(), in case of an error])],
++ [
++ #include <sys/types.h>
++ #include <sys/socket.h>
++ #include <netinet/in.h>]
++)
++
++dnl
+ dnl check for ascii-art library
+ dnl
+ AC_ARG_WITH([aalib],