--- a/ChangeLog Fri Jul 13 09:56:17 2007 +0000
+++ b/ChangeLog Sat Jul 14 12:48:15 2007 +0000
@@ -1,3 +1,24 @@
+2007-07-14 Doug Scott <[email protected]>
+
+ * SFEffmpeg.spec: Build shared library
+ * SFEmplayer.spec: Added some dependancies
+ * SFEdirac.spec: *new* dirac video codec
+ * SFEvlc.spec: changed to g++ build
+ * SFEwxwidgets-gnu.spec: /usr/gnu g++ build of SFEwxwidgets
+ * SFElibid3tag-gnu.spec: /usr/gnu g++ build of SFElibid3tag
+ * SFEvcdimager.spec: *new* VCD authoring tool
+ * SFEwine.spec: bumped to 0.9.41
+ * SFElibmpeg2.spec: *new* mpeg2 library
+ * SFEsdl.spec: disabled nasm
+ * SFElibcddb.spec: *new* library to access data on a CDDB server
+ * patches/ffmpeg-02-configure.diff: shared library build fixes
+ * patches/vlc-02-solaris.diff: updated
+ * patches/vlc-04-solaris_specific.diff: header does not exist
+ * patches/vlc-03-oss.diff: include <sys/file.h>
+ * patches/dirac-01-mmx.spec: mmx option for sun studio
+ * patches/vlc-05-solaris-cmds.diff: solaris xpg4 commands
+ * patches/vlc-06-intl.diff: gettext patch
+
2007-07-13 Doug Scott <[email protected]>
* SFEvim.spec: Fixed cscope requirement clash
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEdirac.spec Sat Jul 14 12:48:15 2007 +0000
@@ -0,0 +1,80 @@
+#
+# spec file for package SFEdirac.spec
+#
+# includes module(s): dirac
+#
+%include Solaris.inc
+
+%define src_name dirac
+%define src_url http://nchc.dl.sourceforge.net/sourceforge/dirac
+
+Name: SFEdirac
+Summary: Dirac video codec
+Version: 0.7.0
+Source: %{src_url}/%{src_name}-%{version}.tar.gz
+Patch1: dirac-01-mmx.spec
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_prefix}
+%include default-depend.inc
+
+%prep
+%setup -q -n %{src_name}-%{version}
+%patch1 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+libtoolize --force --copy
+aclocal
+automake --add-missing
+autoconf --force
+
+export MMX="--disable-mmx"
+
+export CXX=/usr/sfw/bin/g++
+export CXXOPTFLAGS="-O3 -fno-omit-frame-pointer"
+export LDFLAGS="%_ldflags"
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --datadir=%{_datadir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --enable-shared \
+ $MMX
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%dir %attr (0755,root,bin) %{_libdir}
+%{_libdir}/lib*.so*
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+%dir %attr (0755,root,bin) %{_libdir}
+%dir %attr (0755,root,other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+
+%changelog
+* Sat Jul 14 2007 - [email protected]
+- Initial version
--- a/SFEffmpeg.spec Fri Jul 13 09:56:17 2007 +0000
+++ b/SFEffmpeg.spec Sat Jul 14 12:48:15 2007 +0000
@@ -13,6 +13,7 @@
Version: %{year}.%{month}.%{day}
Source: http://pkgbuild.sf.net/spec-files-extra/tarballs/ffmpeg-export-%{year}-%{month}-%{day}.tar.bz2
Patch1: ffmpeg-01-BE_16.diff
+Patch2: ffmpeg-02-configure.diff
SUNW_BaseDir: %{_basedir}
URL: http://ffmpeg.mplayerhq.hu/index.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -32,6 +33,7 @@
%prep
%setup -q -n ffmpeg-export-%{year}-%{month}-%{day}
%patch1 -p1
+%patch2 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -39,11 +41,14 @@
CPUS=1
fi
export CFLAGS="-O4"
-export LDFLAGS="%_ldflags"
-./configure \
+export LDFLAGS="%_ldflags -lm"
+bash ./configure \
--prefix=%{_prefix} \
- --enable-sunmlib \
- --cc=gcc
+ --enable-sunmlib \
+ --cc=gcc \
+ --disable-static \
+ --enable-shared
+
make -j $CPUS
cd libpostproc
make -j $CPUS
@@ -65,12 +70,12 @@
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
%files devel
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_libdir}
-# could not build this project as a shared lib
-%{_libdir}/lib*.a
%dir %attr (0755, root, other) %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/*
%{_libdir}/vhook
@@ -79,6 +84,8 @@
%{_includedir}/postproc
%changelog
+* Sat Jul 14 2007 - [email protected]
+- Build shared library
* Sun Jan 21 2007 - [email protected]
- fix devel pkg default attributes
* Wed Jan 10 2007 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibcddb.spec Sat Jul 14 12:48:15 2007 +0000
@@ -0,0 +1,76 @@
+#
+# spec file for package SFElibcddb
+#
+# includes module(s): libcddb
+#
+%include Solaris.inc
+
+%define src_name libcddb
+%define src_url http://jaist.dl.sourceforge.net/sourceforge/%{src_name}
+
+Name: SFElibcddb
+Summary: C library to access data on a CDDB server
+Version: 1.3.0
+Source: %{src_url}/%{src_name}-%{version}.tar.bz2
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_prefix}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n %{src_name}-%version
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+libtoolize --copy --force
+aclocal -I .
+autoheader
+automake -a -f
+autoconf -f
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} \
+ --disable-static \
+ --enable-shared
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%{_bindir}
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+
+%changelog
+* Sat Jul 14 2007 - [email protected]
+- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibid3tag-gnu.spec Sat Jul 14 12:48:15 2007 +0000
@@ -0,0 +1,90 @@
+#
+# spec file for package SFElibid3tag-gnu
+#
+# includes module(s): libid3tag
+#
+
+%include Solaris.inc
+%include usr-gnu.inc
+
+Name: SFElibid3tag-gnu
+Summary: libid3tag
+License: GPL
+Group: System/GUI/GNOME
+Version: 0.15.1.1
+%define tarball_version 0.15.1b
+Release: 1
+Source: http://umn.dl.sourceforge.net/sourceforge/mad/libid3tag-%{tarball_version}.tar.gz
+URL: http://www.underbit.com/products/mad/
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%name-%{version}-build
+%include default-depend.inc
+Requires: SUNWzlib
+
+%description
+ID3 tag manipulation library a wide range of multimedia formats
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: SUNWgnome-libs
+
+%prep
+%setup -q -n libid3tag-%{tarball_version}
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export CXX=g++
+export CXXFLAGS="-O3 -fno-omit-frame-pointer"
+export LDFLAGS="%{_ldflags}"
+export LD_OPTIONS="-i -L%{_libdir} -R%{_libdir}"
+
+touch NEWS
+touch AUTHORS
+touch ChangeLog
+libtoolize --force
+aclocal $ACLOCAL_FLAGS
+autoheader
+automake -a -c -f
+autoconf
+
+./configure \
+ --prefix=%{_prefix} \
+ --sysconfdir=%{_sysconfdir} \
+ --libdir=%{_libdir} \
+ --bindir=%{_bindir} \
+ --libexecdir=%{_libexecdir} \
+ --mandir=%{_mandir} \
+ --localstatedir=/var/lib
+make -j $CPUS
+
+%install
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make -i install DESTDIR=$RPM_BUILD_ROOT
+
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*a
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{tarball_version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):unsupported" $RPM_BUILD_ROOT}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+
+%changelog
+* Sat Jul 14 2007 - [email protected]
+- Converted from SFElibid3tag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibmpeg2.spec Sat Jul 14 12:48:15 2007 +0000
@@ -0,0 +1,79 @@
+#
+# spec file for package SFElibmpeg2
+#
+# includes module(s): libmpeg2
+#
+%include Solaris.inc
+
+%define src_name mpeg2dec
+%define src_url http://libmpeg2.sourceforge.net/files
+
+Name: SFElibmpeg2
+Summary: MPEG2 Decoder library
+Version: 0.4.1
+Source: %{src_url}/%{src_name}-%{version}.tar.gz
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_prefix}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n %{src_name}-%{version}
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+export CC=gcc
+export CPPFLAGS="-I/usr/X11/include"
+export CFLAGS="-O4 -fPIC -DPIC -Xlinker -i -fno-omit-frame-pointer"
+export LDFLAGS="%_ldflags -L/usr/X11/lib -R/usr/X11/lib"
+
+libtoolize --copy --force
+aclocal
+autoheader
+autoconf -f
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} \
+ --disable-static \
+ --enable-shared
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_bindir}
+%{_mandir}
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+
+%changelog
+* Sat Jul 14 2007 - [email protected]
+- Initial spec
--- a/SFEmplayer.spec Fri Jul 13 09:56:17 2007 +0000
+++ b/SFEmplayer.spec Sat Jul 14 12:48:15 2007 +0000
@@ -16,6 +16,7 @@
Patch2: mplayer-02-makefile-libfame-dep.diff
Patch3: mplayer-03-asmrules_20061231.diff
Patch4: mplayer-04-cabac-asm.diff
+Patch5: mplayer-05-dirac.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
@@ -50,6 +51,14 @@
Requires: SUNWlibcdio
Requires: SUNWgnome-base-libs
Requires: SUNWsmbau
+Requires: SFElibfribidi
+BuildRequires: SFElibfribidi-devel
+Requires: SFEladspa
+BuildRequires: SFEladspa-devel
+Requires: SFEdirac
+BuildRequires: SFEdirac-devel
+Requires: SFEopenal
+BuildRequires: SFEopenal-devel
BuildRequires: SFElibsndfile-devel
BuildRequires: SFElibfame-devel
BuildRequires: SFElibdvdplay-devel
@@ -74,6 +83,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+#%patch5 -p1
unzip %SOURCE7
unzip 26104-610_ANSI_C_source_code.zip
@@ -108,6 +118,7 @@
--with-livelibdir=/usr/lib/live \
--enable-rpath \
--enable-largefiles \
+ --enable-crash-debug \
--disable-directfb
make -j$CPUS
@@ -150,6 +161,9 @@
%{_datadir}/pixmaps/*
%changelog
+* Sat Jul 14 2007 - [email protected]
+- Added dirac codec patch
+- Added SFEladspa,SFElibfribidi requirement
* Tue May 1 2007 - [email protected]
- Removed SFEsdl from the Required. Conflicts with SUNWlibsdl
* Sun Apr 22 2007 - [email protected]
--- a/SFEsdl.spec Fri Jul 13 09:56:17 2007 +0000
+++ b/SFEsdl.spec Sat Jul 14 12:48:15 2007 +0000
@@ -13,7 +13,7 @@
%if %arch_sse2
%include x86_sse2.inc
-%define nasm_option --enable-nasm
+%define nasm_option --disable-nasm
%use sdl_sse2 = libsdl.spec
%endif
@@ -124,6 +124,8 @@
%endif
%changelog
+* Sat Jul 14 2007 - [email protected]
+- disable nasm
* Tue Jun 5 2007 - [email protected]
- Update to isabuild
* Thu Apr 26 2007 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEvcdimager.spec Sat Jul 14 12:48:15 2007 +0000
@@ -0,0 +1,99 @@
+#
+# spec file for package SFEvcdimager
+#
+# includes module(s): mpeg2decvcdimager
+#
+%include Solaris.inc
+
+%define src_url ftp://mirrors.kernel.org/gnu/vcdimager
+
+Name: SFEvcdimager
+Summary: VCD mastering suite
+Version: 0.7.23
+Source: %{src_url}/vcdimager-%{version}.tar.gz
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_prefix}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n vcdimager-%version
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+libtoolize --copy --force
+aclocal -I .
+autoheader
+automake -a -f
+autoconf -f
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} \
+ --disable-static \
+ --enable-shared
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
+rm $RPM_BUILD_ROOT/%{_datadir}/info/dir
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ;
+ echo 'infos="';
+ echo 'vcd-info.info vcdimager.info vcdxrip.info' ;
+ echo '"';
+ echo 'retval=0';
+ echo 'for info in $infos; do';
+ echo ' install-info --info-dir=%{_infodir} %{_infodir}/$info || retval=1';
+ echo 'done';
+ echo 'exit $retval' ) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE
+
+%preun
+( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ;
+ echo 'infos="';
+ echo 'vcd-info.info vcdimager.info vcdxrip.info' ;
+ echo '"';
+ echo 'for info in $infos; do';
+ echo ' install-info --info-dir=%{_infodir} --delete %{_infodir}/$info';
+ echo 'done';
+ echo 'exit 0' ) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_bindir}
+%{_mandir}
+%{_datadir}/info/*
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+
+%changelog
+* Sat Jul 14 2007 - [email protected]
+- Initial spec
--- a/SFEvlc.spec Fri Jul 13 09:56:17 2007 +0000
+++ b/SFEvlc.spec Sat Jul 14 12:48:15 2007 +0000
@@ -5,48 +5,96 @@
#
%include Solaris.inc
-Name: SFEvlc
-Summary: vlc - the cross-platform media player and streaming server
-Version: 0.8.6a
-Source: http://download.videolan.org/pub/videolan/vlc/0.8.6a/vlc-%{version}.tar.bz2
-Patch1: vlc-01-configure-no-pipe.diff
-Patch2: vlc-02-solaris.diff
-SUNW_BaseDir: %{_basedir}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%define SUNWlibsdl %(/usr/bin/pkginfo -q SUNWlibsdl && echo 1 || echo 0)
+
+%define src_name vlc
+%define src_url http://download.videolan.org/pub/videolan/vlc
+
+Name: SFEvlc
+Summary: vlc - the cross-platform media player and streaming server
+Version: 0.8.6c
+Source: %{src_url}/%{version}/%{src_name}-%{version}.tar.bz2
+Patch1: vlc-01-configure-no-pipe.diff
+Patch2: vlc-02-solaris.diff
+Patch3: vlc-03-oss.diff
+Patch4: vlc-04-solaris_specific.diff
+Patch5: vlc-05-solaris-cmds.diff
+Patch6: vlc-06-intl.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
-Requires: SUNWhal
-Requires: SUNWdbus
-Requires: SFElibdvbpsi
-Requires: SUNWlibcdio
-Requires: SFElibmad
-Requires: SFEffmpeg
-Requires: SFEliba52
-Requires: SFElibdts
-Requires: SFEwxwidgets
-BuildRequires: SUNWdbus-devel
-BuildRequires: SFElibdvbpsi-devel
-BuildRequires: SUNWlibcdio-devel
-BuildRequires: SFElibmad-devel
-BuildRequires: SFEffmpeg-devel
-BuildRequires: SFEliba52-devel
-BuildRequires: SFElibdts-devel
-BuildRequires: SFEwxwidgets-devel
-
+%if %SUNWlibsdl
+BuildRequires: SUNWlibsdl-devel
+Requires: SUNWlibsdl
+%else
+BuildRequires: SFEsdl-devel
+Requires: SFEsdl
+%endif
+BuildRequires: SFEsdl-image-devel
+Requires: SFEsdl-image
+Requires: SUNWhal
+BuildRequires: SUNWdbus-devel
+Requires: SUNWdbus
+Requires: SUNWxorg-clientlibs
+BuildRequires: SUNWsmbau
+BuildRequires: SFElibfribidi-devel
+Requires: SFElibfribidi
+BuildRequires: SFEfreetype-devel
+Requires: SFEfreetype
+BuildRequires: SFEliba52-devel
+Requires: SFEliba52
+BuildRequires: SFEffmpeg-devel
+Requires: SFEffmpeg
+BuildRequires: SFElibmad-devel
+Requires: SFElibmad
+BuildRequires: SFElibmpcdec-devel
+Requires: SFElibmpcdec
+BuildRequires: SFElibmatroska-devel
+Requires: SFElibmatroska
+BuildRequires: SUNWogg-vorbis-devel
+Requires: SUNWogg-vorbis
+BuildRequires: SFElibdvbpsi-devel
+Requires: SFElibdvbpsi
+BuildRequires: SFElibdvdread-devel
+Requires: SFElibdvdread
+BuildRequires: SFElibdvdread-devel
+Requires: SFElibdvdread
+BuildRequires: SFElibdts-devel
+BuildRequires: SFElibcddb-devel
+Requires: SFElibcddb
+BuildRequires: SFElibmpeg2-devel
+Requires: SFElibmpeg2
+BuildRequires: SFEvcdimager-devel
+Requires: SFEvcdimager
%prep
%setup -q -n vlc-%version
-%patch1 -p1
+#%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
if test "x$CPUS" = "x" -o $CPUS = 0; then
CPUS=1
fi
-export CFLAGS="%optflags -D_XOPEN_SOURCE=500 -D__EXTENSIONS__"
+# ffmpeg is build with g++, therefore we need to build with g++
+
+X11LIB="-L/usr/X11/lib -R/usr/X11/lib"
+GNULIB="-L/usr/gnu/lib -R/usr/gnu/lib"
+
+export PATH=/usr/gnu/bin:$PATH
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export MSGFMT="/usr/bin/msgfmt"
+export CC=gcc
+export CXX=g++
+export CPPFLAGS="-D_XOPEN_SOURCE=500 -D__EXTENSIONS__ -I/usr/X11/include -I/usr/gnu/include"
+export CFLAGS="-O4"
+export LDFLAGS="$X11LIB $GNULIB"
# See: http://forum.videolan.org/viewtopic.php?t=15444
# Uses configure options:
@@ -59,29 +107,54 @@
# --disable-qt --enable-wxwindows --enable-ncurses --enable-release
# --with-a52-tree=/export/home/barts/liba52/a52dec-0.7.4
-autoconf
-./configure --prefix=%{_prefix} --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --libexecdir=%{_libexecdir} \
- --sysconfdir=%{_sysconfdir} --disable-libmpeg2
+rm ./configure
+./bootstrap
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --enable-shared \
+ --disable-static
+
# Disable libmpeg2 to get past configure.
+printf '%%%s/\/intl\/libintl.a/-lintl/\nwq\n' | ex - vlc-config
+
make -j$CPUS
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
+#rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/charset.alias
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/vlc
+%dir %attr (0755, root, other) %{_datadir}/applications
+%{_datadir}/applications/*
+%dir %attr (0755, root, other) %{_datadir}/doc
+%{_datadir}/doc/*
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/lib*.so*
+%{_libdir}/lib*.a
+%{_libdir}/vlc
+%defattr (-, root, other)
+%{_datadir}/locale
%changelog
+* Sat Jul 14 2007 - [email protected]
+- Build with gcc
* Fri Mar 23 2007 - [email protected]
- Add two patches, 01-configure-no-pipe and 02-solaris. Add multiple
dependencies. Getting closer but not quite building yet.
--- a/SFEwine.spec Fri Jul 13 09:56:17 2007 +0000
+++ b/SFEwine.spec Sat Jul 14 12:48:15 2007 +0000
@@ -10,7 +10,7 @@
Name: SFEwine
Summary: Windows Emulator
-Version: 0.9.40
+Version: 0.9.41
Source: %{src_url}/%{src_name}-%{version}.tar.bz2
Patch1: wine-01-nameconfict.diff
Patch2: wine-02-configure.diff
@@ -115,6 +115,8 @@
%{_datadir}/aclocal/*
%changelog
+* Sat Jul 14 2007 - [email protected]
+- bump to 0.9.41
* Mon Jul 10 2007 - [email protected]
- bump to 0.9.40
* Mon Apr 30 2007 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEwxwidgets-gnu.spec Sat Jul 14 12:48:15 2007 +0000
@@ -0,0 +1,132 @@
+#
+# spec file for package SFEwxwidgets-spp
+#
+# includes module(s): wxWidgets
+#
+
+%include Solaris.inc
+%include usr-gnu.inc
+
+Name: SFEwxwidgets-gnu
+Summary: wxWidgets - Cross-Platform GUI Library (g++)
+URL: http://wxwidgets.org/
+Version: 2.6.3
+%define tarball_version 2.6.3
+Source: http://easynews.dl.sourceforge.net/sourceforge/wxwindows/wxWidgets-%{tarball_version}.tar.bz2
+Patch1: wxwidgets-01-msgfmt.diff
+Patch2: wxwidgets-02-sqrt.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: SUNWgnome-libs
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%if %build_l10n
+%package l10n
+Summary: %{summary} - l10n files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %{name}
+%endif
+
+%prep
+rm -rf %name-%version
+%setup -q -n wxWidgets-%tarball_version
+%patch1 -p1
+%patch2 -p1
+ex - configure << EOM
+/CWARNINGS/d
+/-mt \$THREAD_OPTS
+-1d
+%s/KPIC/fPIC/g
+w
+q
+EOM
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+export CPPFLAGS="-I/usr/X11/include"
+export CFLAGS="%optflags"
+export CXX=g++
+export CXXFLAGS="-O3 -fno-omit-frame-pointer"
+export LDFLAGS="%{_ldflags} -lm"
+export LD_OPTIONS="-i -L%{_libdir} -L/usr/X11/lib -R%{_libdir}:/usr/X11/lib"
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --includedir=%{_includedir} \
+ --libdir=%{_libdir} \
+ --with-gtk \
+ --enable-gtk2 \
+ --enable-unicode \
+ --enable-mimetype \
+ --with-sdl \
+ --without-expat \
+ --with-gnomeprint
+
+make -j$CPUS
+cd contrib
+make -j$CPUS
+cd ..
+cd locale
+make allmo
+cd ..
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+cd contrib
+make install DESTDIR=$RPM_BUILD_ROOT
+cd ..
+
+cd $RPM_BUILD_ROOT%{_bindir}
+rm -f wx-config
+ln -s ../lib/wx/config/gtk2-unicode-release-* wx-config
+
+%if %build_l10n
+# Rename zh dir to zh_CN as zh is a symlink to zh_CN and causing installation
+# problems as a dir.
+cd $RPM_BUILD_ROOT%{_datadir}/locale
+mv zh zh_CN
+%else
+# REMOVE l10n FILES
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+%dir %attr(0755, root, sys) %{_datadir}
+%dir %attr(0755, root, sys) %{_datadir}/bakefile
+%dir %attr(0755, root, other) %{_datadir}/aclocal
+%{_datadir}/aclocal/*
+%{_datadir}/bakefile/*
+
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%endif
+
+%changelog
+* Sat Jul 14 2007 - [email protected]
+- Converted from SFEwxwidgets.spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/dirac-01-mmx.spec Sat Jul 14 12:48:15 2007 +0000
@@ -0,0 +1,17 @@
+--- dirac-0.7.0/configure.ac.orig 2007-07-13 19:15:23.996374023 +0700
++++ dirac-0.7.0/configure.ac 2007-07-13 19:16:22.467662141 +0700
+@@ -346,7 +346,13 @@
+ AC_ARG_ENABLE(mmx, AC_HELP_STRING([--enable-mmx], [enable MMX optimization (default=yes)]), [enable_mmx="${enableval}"], [enable_mmx="yes"])
+
+ if test x"${enable_mmx}" = x"yes" ; then
+- case "$CXX" in
++ case "$( basename $CXX )" in
++ CC*)
++ AC_LANG_PUSH(C++)
++ TRY_CFLAGS="-xarch=sse"
++ AC_TRY_CXXFLAGS([#include <mmintrin.h>],[], [$TRY_CFLAGS $CXXFLAGS],[CXXFLAGS="$CXXFLAGS $TRY_CFLAGS -DHAVE_MMX"])
++ AC_LANG_POP(C++)
++ ;;
+ g++*)
+ AC_LANG_PUSH(C++)
+ TRY_CFLAGS="-mmmx"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ffmpeg-02-configure.diff Sat Jul 14 12:48:15 2007 +0000
@@ -0,0 +1,56 @@
+--- ffmpeg-export-2007-01-10/configure.orig 2007-07-14 10:32:07.913109403 +0700
++++ ffmpeg-export-2007-01-10/configure 2007-07-14 10:36:35.029722499 +0700
+@@ -623,7 +623,7 @@
+ dlfcn_h="no"
+ dlopen="no"
+ mpegaudio_hp="yes"
+-SHFLAGS='-shared -Wl,-soname,$@'
++SHFLAGS='-Wl,-G -Wl,-soname,$@'
+ VHOOKSHFLAGS='$(SHFLAGS)'
+ beos_netserver="no"
+ protocols="yes"
+@@ -702,7 +702,7 @@
+ make="gmake"
+ FFLDFLAGS=""
+ FFSERVERLDFLAGS=""
+-SHFLAGS="-shared -Wl,-h,\$@"
++SHFLAGS="-Wl,-G -Wl,-h,\$@"
+ add_extralibs "-lsocket -lnsl"
+ ;;
+ NetBSD)
+@@ -724,7 +724,7 @@
+ make="gmake"
+ LIBOBJFLAGS="\$(PIC)"
+ LDCONFIG="ldconfig -m \$(shlibdir)"
+-SHFLAGS='-shared'
++SHFLAGS='-Wl,-G'
+ SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
+ SLIBNAME_WITH_VERSION='$(SLIBNAME)'
+ SLIBNAME_WITH_MAJOR='$(SLIBNAME)'
+@@ -789,7 +789,7 @@
+ video4linux2="no"
+ audio_oss="yes"
+ dv1394="no"
+-VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
++VHOOKSHFLAGS='-Wl,-G -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
+ VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
+ extralibs=""
+ EXESUF=".exe"
+@@ -1579,15 +1579,12 @@
+ echo
+ fi
+
+-if enabled vhook; then
+- check_ldflags -rdynamic
+- check_ldflags -export-dynamic
+-fi
+-
+ if enabled audio_beos; then
+ add_extralibs "-lmedia -lbe"
+ fi
+
++add_extralibs "-lm"
++
+ ##########################################
+ # imlib check
+
--- a/patches/vlc-02-solaris.diff Fri Jul 13 09:56:17 2007 +0000
+++ b/patches/vlc-02-solaris.diff Sat Jul 14 12:48:15 2007 +0000
@@ -1,17 +1,19 @@
---- vlc-0.8.6a/src/stream_output/sap.c.orig 2007-03-23 15:58:05.898730720 +0000
-+++ vlc-0.8.6a/src/stream_output/sap.c 2007-03-23 15:59:55.655857471 +0000
-@@ -649,7 +649,7 @@
- ipv, p_addr->psz_machine,
- psz_name, ipv, psz_uri,
- /* FIXME: 1 is IPv4 default TTL, not that of IPv6 */
-- p_session->i_ttl ?: (config_GetInt( p_sap, "ttl" ) ?: 1),
-+ p_session->i_ttl ? p_session->i_ttl : (config_GetInt( p_sap, "ttl" ) ? config_GetInt( p_sap, "ttl" ) : 1),
- (sfilter != NULL) ? sfilter : "",
- p_session->i_port,
- p_session->b_rtp ? "RTP/AVP" : "udp",
---- vlc-0.8.6a/src/network/rootwrap.c.orig 2007-03-23 16:44:41.013175432 +0000
-+++ vlc-0.8.6a/src/network/rootwrap.c 2007-03-23 16:44:53.200380013 +0000
-@@ -273,7 +273,7 @@
+diff -ur vlc-0.8.6c-orig/src/network/rootwrap.c vlc-0.8.6c/src/network/rootwrap.c
+--- vlc-0.8.6c-orig/src/network/rootwrap.c 2007-06-16 21:25:04.000000000 +0700
++++ vlc-0.8.6c/src/network/rootwrap.c 2007-07-14 11:52:43.414971354 +0700
+@@ -38,6 +38,11 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#ifdef sun
++#define _XPG4_2
++#define __EXTENSIONS__
++#include <inttypes.h>
++#endif
+ #include <sys/socket.h>
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+@@ -273,7 +278,7 @@
initgroups (pw->pw_name, pw->pw_gid);
setgid (pw->pw_gid);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vlc-03-oss.diff Sat Jul 14 12:48:15 2007 +0000
@@ -0,0 +1,13 @@
+diff -ur vlc-0.8.6c-orig/modules/audio_output/oss.c vlc-0.8.6c/modules/audio_output/oss.c
+--- vlc-0.8.6c-orig/modules/audio_output/oss.c 2007-06-16 21:25:07.000000000 +0700
++++ vlc-0.8.6c/modules/audio_output/oss.c 2007-07-14 12:21:35.602242799 +0700
+@@ -28,6 +28,9 @@
+ *****************************************************************************/
+ #include <errno.h> /* ENOMEM */
+ #include <fcntl.h> /* open(), O_WRONLY */
++#ifdef sun
++#include <sys/file.h>
++#endif
+ #include <sys/ioctl.h> /* ioctl() */
+ #include <string.h> /* strerror() */
+ #include <unistd.h> /* write(), close() */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vlc-04-solaris_specific.diff Sat Jul 14 12:48:15 2007 +0000
@@ -0,0 +1,26 @@
+diff -ur vlc-0.8.6c-orig/modules/gui/skins2/controls/ctrl_list.cpp vlc-0.8.6c/modules/gui/skins2/controls/ctrl_list.cpp
+--- vlc-0.8.6c-orig/modules/gui/skins2/controls/ctrl_list.cpp 2007-06-16 21:25:10.000000000 +0700
++++ vlc-0.8.6c/modules/gui/skins2/controls/ctrl_list.cpp 2007-07-14 12:45:10.726105729 +0700
+@@ -35,9 +35,6 @@
+ #include "../events/evt_mouse.hpp"
+ #include "../events/evt_scroll.hpp"
+ #include "vlc_keys.h"
+-#ifdef sun
+-# include "solaris_specific.h" // for lrint
+-#endif
+
+ #define SCROLL_STEP 0.05f
+ #define LINE_INTERVAL 1 // Number of pixels inserted between 2 lines
+diff -ur vlc-0.8.6c-orig/modules/gui/skins2/controls/ctrl_tree.cpp vlc-0.8.6c/modules/gui/skins2/controls/ctrl_tree.cpp
+--- vlc-0.8.6c-orig/modules/gui/skins2/controls/ctrl_tree.cpp 2007-06-16 21:25:10.000000000 +0700
++++ vlc-0.8.6c/modules/gui/skins2/controls/ctrl_tree.cpp 2007-07-14 12:44:56.469840131 +0700
+@@ -35,9 +35,6 @@
+ #include "../events/evt_mouse.hpp"
+ #include "../events/evt_scroll.hpp"
+ #include "vlc_keys.h"
+-#ifdef sun
+-# include "solaris_specific.h" // for lrint
+-#endif
+
+ #define SCROLL_STEP 0.05
+ #define LINE_INTERVAL 1 // Number of pixels inserted between 2 lines
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vlc-05-solaris-cmds.diff Sat Jul 14 12:48:15 2007 +0000
@@ -0,0 +1,40 @@
+diff -ur vlc-0.8.6c-orig/configure.ac vlc-0.8.6c/configure.ac
+--- vlc-0.8.6c-orig/configure.ac 2007-06-16 21:25:19.000000000 +0700
++++ vlc-0.8.6c/configure.ac 2007-07-14 14:05:58.420120423 +0700
+@@ -5491,10 +5491,10 @@
+ AC_SUBST(VERSION_MAJOR)
+ AC_SUBST(VERSION_MINOR)
+ AC_SUBST(VERSION_REVISION)
+-AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
++AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`/usr/xpg4/bin/id -un`", [user who ran configure])
+ AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure])
+ AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure])
+-AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
++AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | /usr/xpg4/bin/tail -n 1`", [compiler])
+
+ dnl Old definitions for version-dependant plugins
+ dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
+diff -ur vlc-0.8.6c-orig/share/Makefile.am vlc-0.8.6c/share/Makefile.am
+--- vlc-0.8.6c-orig/share/Makefile.am 2007-06-16 21:25:05.000000000 +0700
++++ vlc-0.8.6c/share/Makefile.am 2007-07-14 14:04:57.601168308 +0700
+@@ -258,7 +258,7 @@
+
+ skins2/default.vlt:
+ mkdir -p skins2
+- tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
++ gtar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
+
+ .PHONY: $(nobase_pkgdata_DATA)
+
+diff -ur vlc-0.8.6c-orig/share/Makefile.in vlc-0.8.6c/share/Makefile.in
+--- vlc-0.8.6c-orig/share/Makefile.in 2007-06-16 21:26:33.000000000 +0700
++++ vlc-0.8.6c/share/Makefile.in 2007-07-14 14:05:15.937804684 +0700
+@@ -813,7 +813,7 @@
+
+ skins2/default.vlt:
+ mkdir -p skins2
+- tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
++ gtar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
+
+ .PHONY: $(nobase_pkgdata_DATA)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vlc-06-intl.diff Sat Jul 14 12:48:15 2007 +0000
@@ -0,0 +1,26 @@
+diff -ur vlc-0.8.6c-orig/configure.ac vlc-0.8.6c/configure.ac
+--- vlc-0.8.6c-orig/configure.ac 2007-06-16 21:25:19.000000000 +0700
++++ vlc-0.8.6c/configure.ac 2007-07-14 15:01:52.299965406 +0700
+@@ -5511,7 +5511,7 @@
+ dnl
+ dnl Handle substvars that use $(top_srcdir)
+ dnl
+-VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
++VLC_CONFIG="top_builddir=\"\$(top_srcdir)\" \$(top_builddir)/vlc-config"
+ AC_SUBST(VLC_CONFIG)
+ CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include"
+
+diff -ur vlc-0.8.6c-orig/m4/gettext.m4 vlc-0.8.6c/m4/gettext.m4
+--- vlc-0.8.6c-orig/m4/gettext.m4 2007-06-16 21:25:04.000000000 +0700
++++ vlc-0.8.6c/m4/gettext.m4 2007-07-14 14:20:15.570928062 +0700
+@@ -238,8 +238,8 @@
+ INTLOBJS="\$(GETTOBJS)"
+ BUILD_INCLUDED_LIBINTL=yes
+ USE_INCLUDED_LIBINTL=yes
+- LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
+- LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
++ LIBINTL="-lintl $LIBICONV"
++ LTLIBINTL="-lintl $LTLIBICONV"
+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+ fi
+