--- a/ChangeLog Thu Aug 02 06:06:42 2007 +0000
+++ b/ChangeLog Fri Aug 03 14:12:14 2007 +0000
@@ -1,3 +1,47 @@
+2007-08-30 Doug Scott <[email protected]>
+
+ * SFEffmpeg.spec: Bumped export version
+ Added codecs
+ Created ffmpeg.pc
+ * SFEamrnb.spec: *NEW* 3GPP AMR-NB Floating-point Speech Codec
+ * SFEamrwb.spec: *NEW* 3GPP AMR-WB Floating-point Speech Codec
+ * SFElibx264.spec: *NEW* H264 encoder library
+ * SFExvid.spec: *NEW* ISO MPEG-4 compliant video codec
+ * SFElibdts.spec: Build a shared library
+ * SFEvlc.spec: Added devel and l10n
+ Added options to better find codecs
+ Added icons for app
+ * SFEfoomatic-db-engine.spec: *NEW* Foomatic database Engine
+ * SFEircii.spec: *NEW* irc client
+ * SFElibgsm.spec: *NEW* GSM audio encoding/decoding library
+ * SFElibmspack.spec: *NEW* library for Microsoft compression formats
+ * SFEwine.spec: *NEW* bump to 0.9.42
+ * SFEnas.spec: *NEW* Network Audio System
+ * SFEgutenprint.spec: *NEW* Guten Print
+ * SFEcups.spec: *NEW* CUPS
+ * SFEfoomatic-db.spec: *NEW* Foomatic database
+ * patches/ffmpeg-02-configure.diff: Updated for new export
+ * patches/cups-01-gss.diff: Fix gss configure for Solaris
+ * patches/amrnb-01-patch.diff: Changed patch to gpatch
+ * patches/libdts-02-shared.diff: Shared Library Build
+ * patches/ffmpeg-01-BE_16.diff: Updated for new export
+ * patches/vlc-07-live.diff: live555 patch
+ * patches/vlc-10-real_codecs_path.diff: real codec path
+ * patches/libmspack-01-wall.diff: remove -Wall
+ * patches/foomatic-db-engine-01-perl.diff: Hack to find perl
+ * patches/gutenprint-01-cups-version.diff: Hack to find cups 1.3rc3
+ * patches/ircii-01-config.diff: Config path patch
+ * patches/libdts-03-opt.diff: Remove hardcoded opt flags
+ * patches/vlc-08-osdmenu_path.diff: path patch
+ * patches/amrwb-01-patch.diff: Changed patch to gpatch
+ * patches/gutenprint-02-isfinite.diff: (double)
+ * patches/wine-01-nameconfict.diff: Variable conflict
+ * patches/ircii-02.cast.diff: Fix cast
+ * patches/vlc-09-pic-mmx.diff: Added defined(__PIC__)
+ * patches/foomatic-db-engine-02-null.diff: null check
+ * patches/libgsm-01-makefile.diff: Solaris makefile patch
+ * patches/xvid-01-solaris.diff: Solaris Patch
+
2007-08-02 Brian Cameron <[email protected]>
* SFExchat.spec, patches/xchat-01-gettext.diff: Updated to 2.8.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEamrnb.spec Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,80 @@
+#
+# spec file for package SFEamrnb
+#
+# includes module(s): amrnb
+#
+%include Solaris.inc
+
+%define src_ver 6.1.0.4
+%define src_name amrnb
+%define src_url http://ftp.penguin.cz/pub/users/utx/amr
+
+Name: SFEamrnb
+Summary: 3GPP AMR-NB Floating-point Speech Codec
+Version: %{src_ver}
+Source: %{src_url}/%{src_name}-%{version}.tar.bz2
+Source1: http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-610.zip
+Patch1: amrnb-01-patch.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%description
+3GPP AMR-NB Floating-point Speech Codec.
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n %{src_name}-%version
+cp %{SOURCE1} .
+%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
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+libtoolize --copy --force
+aclocal
+autoconf -f
+automake -a -f
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} \
+ --disable-static \
+ --enable-shared \
+ --disable-debug
+
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $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}
+
+%changelog
+* Fri Aug 3 2007 - [email protected]
+- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEamrwb.spec Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,80 @@
+#
+# spec file for package SFEamrwb
+#
+# includes module(s): amrwb
+#
+%include Solaris.inc
+
+%define src_ver 7.0.0.1
+%define src_name amrwb
+%define src_url http://ftp.penguin.cz/pub/users/utx/amr
+
+Name: SFEamrwb
+Summary: 3GPP AMR-WB Floating-point Speech Codec
+Version: %{src_ver}
+Source: %{src_url}/%{src_name}-%{version}.tar.bz2
+Source1: http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-700.zip
+Patch1: amrwb-01-patch.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%description
+3GPP AMR-WB Floating-point Speech Codec
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n %{src_name}-%version
+cp %{SOURCE1} .
+%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
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+libtoolize --copy --force
+aclocal
+autoconf -f
+automake -a -f
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} \
+ --disable-static \
+ --enable-shared \
+ --disable-debug
+
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $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}
+
+%changelog
+* Fri Aug 3 2007 - [email protected]
+- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEcups.spec Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,167 @@
+#
+# spec file for package SFEcups
+#
+# includes module(s): cups
+#
+%include Solaris.inc
+
+%define src_ver 1.3rc2
+%define src_name cups
+%define src_url http://ftp.easysw.com/pub/cups/test
+
+%define cups_user lp
+%define cups_group lp
+%define cupsdir /usr/cups
+%define cupsbin %{cupsdir}/bin
+%define cupssbin %{cupsdir}/sbin
+%define cupsdata %{cupsdir}/share
+%define cupsman %{cupsdir}/man
+
+Name: SFEcups
+Summary: Common Unix Printing System
+Version: %{src_ver}
+License: GPL/LGPL
+Source: %{src_url}/%{src_name}-%{version}-source.tar.bz2
+Patch1: cups-01-gss.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%description
+CUPS provides a portable printing layer for UNIX-based operating
+systems. It has been developed by Easy Software Products to promote a
+standard printing solution for all UNIX vendors and users. CUPS
+provides the System V and Berkeley command-line interfaces. CUPS uses
+the Internet Printing Protocol ("IPP") as the basis for managing print
+jobs and queues. The Line Printer Daemon ("LPD") Server Message Block
+("SMB"), and AppSocket (a.k.a. JetDirect) protocols are also supported
+with reduced functionality. CUPS adds network printer browsing and
+PostScript Printer Description ("PPD") based printing options to
+support real-world printing under UNIX.
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%package root
+Summary: %{summary} - / filesystem
+SUNW_BaseDir: /
+%include default-depend.inc
+
+%package doc
+Summary: %{summary} - Documentation
+SUNW_BaseDir: %{_prefix}
+%include default-depend.inc
+Requires: %name
+
+%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
+
+export CPPFLAGS="-I/usr/X11/include"
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags -lX11"
+
+glib-gettextize --force
+libtoolize --force --copy
+aclocal
+autoconf -f
+./configure --prefix=%{_prefix} \
+ --bindir=%{cupsbin} \
+ --sbindir=%{cupssbin} \
+ --libdir=%{_libdir} \
+ --mandir=%{_mandir} \
+ --datadir=%{_datadir} \
+ --sysconfdir=%{_sysconfdir} \
+ --localstatedir=%{_localstatedir} \
+ --enable-openssl \
+ --enable-gnutls \
+ --with-cups-user=%{cups_user} \
+ --with-cups-group=%{cups_group} \
+ --localedir=%{_datadir}/locale \
+ --with-openssl-libs=/usr/sfw/lib \
+ --with-openssl-includes=/usr/sfw/include \
+ --disable-static \
+ --enable-shared
+
+make
+
+%install
+
+rm -rf $RPM_BUILD_ROOT
+make install BUILDROOT=$RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/rc*.d
+mkdir -p $RPM_BUILD_ROOT%{cupsdata}
+mv $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT%{cupsdata}
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+(
+ cd $RPM_BUILD_ROOT%{_bindir}
+ ln -s ../cups/bin/cups-config
+ for i in cancel lp lpr lpq lprm lpstat ; do
+ ln -s ../cups/bin/${i} ${i}-cups
+ done
+ cd $RPM_BUILD_ROOT%{_sindir}
+ for i in accept lpc lpmove lpadmin lpinfo reject ; do
+ ln -s ../cups/sbin/${i} ${i}-cups
+ done
+ ln -s ../cups/sbin/cupsenable enable-cups
+ ln -s ../cups/sbin/cupsdisable disable-cups
+)
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{cupsdir}
+%{cupsbin}
+%{cupssbin}
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/cups
+%{_libdir}/locale
+%{_libdir}/lib*.so*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, sys) %{cupsdata}
+%{cupsdata}/man
+%{_datadir}/cups
+%defattr (-, root, other)
+%{_datadir}/applications
+%{_datadir}/icons
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+
+%files root
+%defattr (-, root, sys)
+%{_sysconfdir}
+%dir %attr (0755, root, sys) %{_localstatedir}
+%dir %attr (0755, root, bin) %{_localstatedir}/spool
+%dir %attr (0644, %{cups_user}, %{cups_group}) %{_localstatedir}/spool/cups
+%dir %attr (0644, %{cups_user}, %{cups_group}) %{_localstatedir}/spool/cups/tmp
+%dir %attr (0755, root, sys) %{_localstatedir}/run
+%dir %attr (0644, %{cups_user}, %{cups_group}) %{_localstatedir}/run/cups
+%dir %attr (0644, %{cups_user}, %{cups_group}) %{_localstatedir}/run/cups/certs
+%dir %attr (0755, root, sys) %{_localstatedir}/log
+%dir %attr (0644, %{cups_user}, %{cups_group}) %{_localstatedir}/log/cups
+%dir %attr (0644, %{cups_user}, %{cups_group}) %{_localstatedir}/cache
+%dir %attr (0644, %{cups_user}, %{cups_group}) %{_localstatedir}/cache/cups/rss
+
+%files doc
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/doc
+%{_datadir}/doc/*
+
+%changelog
+* Fri Aug 3 2007 - [email protected]
+- Initial spec
--- a/SFEffmpeg.spec Thu Aug 02 06:06:42 2007 +0000
+++ b/SFEffmpeg.spec Fri Aug 03 14:12:14 2007 +0000
@@ -10,9 +10,11 @@
Name: SFEffmpeg
Summary: FFmpeg - a very fast video and audio converter
+
%define year 2007
-%define month 01
-%define day 10
+%define month 07
+%define day 31
+
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
@@ -31,6 +33,30 @@
BuildRequires: SFEsdl-devel
Requires: SFEsdl
%endif
+BuildRequires: SFElibdts-devel
+Requires: SFElibdts
+BuildRequires: SFElibgsm-devel
+Requires: SFElibgsm
+BuildRequires: SFEliba52-devel
+Requires: SFEliba52
+BuildRequires: SFEliba52-devel
+Requires: SFEliba52
+BuildRequires: SFExvid-devel
+Requires: SFExvid
+BuildRequires: SFElibx264-devel
+Requires: SFElibx264
+BuildRequires: SFEfaad2-devel
+Requires: SFEfaad2
+BuildRequires: SFEamrnb-devel
+Requires: SFEamrnb
+BuildRequires: SFEamrwb-devel
+Requires: SFEamrwb
+BuildRequires: SFElame-devel
+Requires: SFElame
+BuildRequires: SUNWogg-vorbis-devel
+Requires: SUNWogg-vorbis
+BuildRequires: SUNWlibtheora-devel
+Requires: SUNWlibtheora
%package devel
Summary: %{summary} - development files
@@ -50,11 +76,27 @@
fi
export CFLAGS="-O4"
export LDFLAGS="%_ldflags -lm"
-bash ./configure \
+bash ./configure \
--prefix=%{_prefix} \
--enable-sunmlib \
--cc=gcc \
- --disable-static \
+ --enable-libgsm \
+ --enable-libxvid \
+ --enable-libx264 \
+ --enable-gpl \
+ --enable-pp \
+ --enable-liba52 \
+ --enable-liba52bin \
+ --enable-libfaad \
+ --enable-libfaadbin \
+ --enable-libogg \
+ --enable-libtheora \
+ --enable-libmp3lame \
+ --enable-pthreads \
+ --enable-libvorbis \
+ --enable-libamr-nb \
+ --enable-libamr-wb \
+ --enable-static \
--enable-shared
make -j $CPUS
@@ -64,12 +106,27 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-# workaround for a bug in the 2007-01-10 snapshot: make install is
-# looking for libpostproc.pc which doesn't exist
-touch libpostproc.pc
+
+mkdir $RPM_BUILD_ROOT%{_libdir}/ffmpeg
+cp config.mak $RPM_BUILD_ROOT%{_libdir}/ffmpeg
+
cd libpostproc
make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libpostproc.pc
+
+# Create a ffmpeg.pc - Some apps need it
+cat > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ffmpeg.pc << EOM
+Name: ffmpeg
+prefix=%{_prefix}
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+Description: FFmpeg codec library
+Version: 51.40.4
+Requires: libavcodec libpostproc libavutil libavformat libswscale x264 ogg theora vorbisenc vorbis dts
+Conflicts:
+EOM
+
+mv $RPM_BUILD_ROOT%{_libdir}/lib*.*a $RPM_BUILD_ROOT%{_libdir}/ffmpeg
%clean
rm -rf $RPM_BUILD_ROOT
@@ -87,11 +144,16 @@
%dir %attr (0755, root, other) %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/*
%{_libdir}/vhook
+%{_libdir}/ffmpeg
%dir %attr (0755, root, bin) %{_includedir}
%{_includedir}/ffmpeg
%{_includedir}/postproc
%changelog
+* Wed Aug 3 2007 - [email protected]
+- Bumped export version
+- Added codecs
+- Created ffmpeg.pc
* Tue Jul 31 2007 - [email protected]
- Added SUNWlibsdl test. Otherwise require SFEsdl
* Sat Jul 14 2007 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEfoomatic-db-engine.spec Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,87 @@
+#
+# spec file for package SFEfoomatic-db-engine
+#
+# includes module(s): foomatic-db-engine
+#
+%include Solaris.inc
+
+%define src_ver 3.0.2
+%define src_name foomatic-db-engine
+%define src_url http://www.linuxprinting.org/download/foomatic
+
+Name: SFEfoomatic-db-engine
+Summary: Foomatic database Engine
+Version: %{src_ver}
+License: GPL
+Source: %{src_url}/%{src_name}-%{version}.tar.gz
+Patch1: foomatic-db-engine-01-perl.diff
+Patch2: foomatic-db-engine-02-null.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%description
+Foomatic is a system for using free software printer drivers with
+common spoolers on Unix. It supports LPD, PDQ, CUPS, the VA Linux LPD,
+LPRng, PPR, and direct spooler-less printing and any free software
+driver for which execution data has been entered in the database.
+
+%prep
+%setup -q -n %{src_name}-%version
+%patch1 -p1
+%patch2 -p1
+
+%package root
+Summary: %{summary} - / filesystem
+SUNW_BaseDir: /
+%include default-depend.inc
+
+%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 PATH=$PATH:/usr/sfw/bin
+export CPPFLAGS="-I/usr/sfw/include"
+export CFLAGS="-g %optflags"
+export CFLAGS="-g"
+export LDFLAGS="%_ldflags -lX11"
+export LD_OPTIONS="-L/usr/sfw/lib -R/usr/sfw/lib"
+export FILEUTIL=/usr/gnu/bin
+
+bash make_configure
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} \
+ --disable-static \
+ --enable-shared \
+ --enable-debug
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+( cd lib && /usr/bin/perl Makefile.PL verbose INSTALLDIRS=vendor )
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%{_sbindir}
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/foomatic
+%{_mandir}
+%{_prefix}/perl5
+
+%files root
+%defattr (-, root, sys)
+%{_sysconfdir}
+
+%changelog
+* Fri Aug 3 2007 - [email protected]
+- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEfoomatic-db.spec Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,64 @@
+#
+# spec file for package SFEfoomatic-db
+#
+# includes module(s): foomatic-db
+#
+%include Solaris.inc
+
+%define src_ver 3.0
+%define src_name foomatic-db
+%define src_url http://www.linuxprinting.org/download/foomatic
+
+Name: SFEfoomatic-db
+Summary: Foomatic database
+Version: 20070710
+License: GPL
+Source: %{src_url}/%{src_name}-%{src_ver}-%{version}.tar.gz
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%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 PATH=$PATH:/usr/sfw/bin
+export CPPFLAGS="-I/usr/sfw/include"
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags -lX11"
+export LD_OPTIONS="-L/usr/sfw/lib -R/usr/sfw/lib"
+export FILEUTIL=/usr/gnu/bin
+
+aclocal
+autoconf -f
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} \
+ --disable-static \
+ --enable-shared \
+ --disable-debug
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/foomatic
+%{_datadir}/cups
+
+%changelog
+* Fri Aug 3 2007 - [email protected]
+- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEgutenprint.spec Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,112 @@
+#
+# spec file for package SFEgutenprint
+#
+# includes module(s): gutenprint
+#
+%include Solaris.inc
+
+%define src_ver 5.1.3
+%define src_name gutenprint
+%define src_url http://nchc.dl.sourceforge.net/sourceforge/gimp-print
+
+Name: SFEgutenprint
+Summary: Collection of high-quality printer drivers
+Version: %{src_ver}
+Source: %{src_url}/%{src_name}-%{version}.tar.bz2
+Patch1: gutenprint-01-cups-version.diff
+Patch2: gutenprint-02-isfinite.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: SFEcups
+
+%description
+Gutenprint is a collection of very high quality printer drivers for
+UNIX/Linux. The goal of this project is uncompromising print quality
+and robustness. Included with this package is the Print plugin for the
+GIMP (hence the name), a CUPS driver, and a driver for Ghostscript
+that may be compiled into that package. This driver package is
+Foomatic-compatible to enable plug and play with many print spoolers.
+In addition, various printer maintenance utilities are included. Many
+users report that the quality of Gutenprint on high end Epson Stylus
+printers matches or exceeds the quality of the drivers supplied for
+Windows and Macintosh.
+
+This package was previously named gimp-print.
+
+%package root
+Summary: %{summary} - / filesystem
+SUNW_BaseDir: /
+%include default-depend.inc
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n %{src_name}-%version
+%patch1 -p1
+%patch2 -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 CPPFLAGS="-I/usr/gnu/include -I/usr/sfw/include -I/usr/sfw/include/ijs"
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+export LD_OPTIONS="-L/usr/gnu/lib -L/usr/sfw/lib -R/usr/gnu/lib:/usr/sfw/lib"
+
+bash autogen.sh --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} \
+ --disable-static \
+ --enable-shared \
+ --disable-debug
+
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/gimp
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%{_sbindir}
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%{_libdir}/cups
+%{_libdir}/gutenprint
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/gutenprint
+%{_datadir}/foomatic
+%{_datadir}/cups
+%{_mandir}
+
+%files root
+%defattr (-, root, sys)
+%{_sysconfdir}
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+
+
+%changelog
+* Fri Aug 3 2007 - [email protected]
+- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEircii.spec Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,67 @@
+#
+# spec file for package SFEircii
+#
+# includes module(s): ircii
+#
+%include Solaris.inc
+
+%define src_ver 20060725
+%define src_name ircii
+%define src_url ftp://ircii.warped.com/pub/ircII
+
+Name: SFEircii
+Summary: Popular Unix Irc client
+Version: %{src_ver}
+License: BSD
+Source: %{src_url}/%{src_name}-%{version}.tar.bz2
+Patch1: ircii-01-config.diff
+Patch2: ircii-02.cast.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%description
+This is a popular Internet Relay Chat (IRC) client. It is a program
+used to connect to IRC servers around the globe so that the user can
+``chat'' with others.
+
+%prep
+%setup -q -n %{src_name}-%version
+%patch1 -p1
+%patch2 -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"
+export LDFLAGS="%_ldflags"
+
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} \
+ --disable-static \
+ --enable-shared \
+ --with-default-server="irc.freenode.net"
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/ircii
+
+%changelog
+* Fri Aug 3 2007 - [email protected]
+- Initial spec
--- a/SFElibdts.spec Thu Aug 02 06:06:42 2007 +0000
+++ b/SFElibdts.spec Fri Aug 03 14:12:14 2007 +0000
@@ -10,7 +10,9 @@
Version: 0.0.2
Source: http://download.videolan.org/pub/videolan/libdca/%{version}/libdca-%{version}.tar.gz
Patch1: libdts-01-sigtype.diff
-Patch2: libdts-02-picflags.diff
+#Patch2: libdts-02-picflags.diff
+Patch2: libdts-02-shared.diff
+Patch3: libdts-03-opt.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -25,14 +27,16 @@
%prep
%setup -q -n libdts-%version
%patch1 -p1
-%patch2 -p1 -b .pic
+#%patch2 -p1 -b .pic
+%patch2 -p1
+%patch3 -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"
+export CFLAGS="%optflags -KPIC"
aclocal $ACLOCAL_FLAGS
libtoolize --force
@@ -51,6 +55,7 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
%clean
rm -rf $RPM_BUILD_ROOT
@@ -63,6 +68,8 @@
%dir %attr (0755, root, bin) %{_mandir}
%dir %attr (0755, root, bin) %{_mandir}/man1
%{_mandir}/man1/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
%files devel
%defattr (-, root, bin)
@@ -71,9 +78,10 @@
%dir %attr (0755, root, bin) %{_libdir}
%dir %attr (0755, root, other) %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/*
-%{_libdir}/lib*.a
%changelog
+* Fri Aug 3 2007 - [email protected]
+- Build a shared library
* Sun Jan 21 2007 - [email protected]
- add patch picflags.diff
* Mon Jun 12 2006 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibgsm.spec Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,78 @@
+#
+# spec file for package SFElibgsm
+#
+# includes module(s): libgsm
+#
+%include Solaris.inc
+
+%define src_ver 1.0.12
+%define src_name libgsm
+%define src_url http://kbs.cs.tu-berlin.de/~jutta/gsm/gsm-%{version}.tar.gz
+
+Name: SFElibgsm
+Summary: GSM audio encoding/decoding library
+Version: %{src_ver}
+License: Free (Copyright (C) Technische Universitaet Berlin)
+Source: %{src_url}/%{src_name}-%{version}.tar.gz
+Patch1: libgsm-01-makefile.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%description
+This is a free and public implementation of GSM audio encoding and
+decoding. The gsm library is used in many free software projects
+including 'rplay', but has never been packaged as a stand-alone shared
+library. GSM encoding has specific uses in transmission of packetized
+audio over the Internet.
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n gsm-1.0-pl12
+%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
+
+rm -f bin/* lib/* shared/* src/*.o test/*.o
+
+export PICFLAG="-KPIC"
+export OPTFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man{1,3},%{_includedir},%{_libdir}}
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL_ROOT=%{_prefix}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, bin) %{_mandir}
+%{_mandir}/man1
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, bin) %{_mandir}
+%{_mandir}/man3
+
+%changelog
+* Fri Aug 3 2007 - [email protected]
+- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFElibmspack.spec Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,83 @@
+#
+# spec file for package SFElibmspack
+#
+# includes module(s): libmspack
+#
+%include Solaris.inc
+
+%define src_ver 0.0.20060920alpha
+%define src_name libmspack
+%define src_url http://www.kyz.uklinux.net/downloads
+
+Name: SFElibmspack
+Summary: A library for Microsoft compression formats
+Version: %{src_ver}
+License: GPL v2
+Source: %{src_url}/%{src_name}-%{version}.tar.gz
+Patch1: libmspack-01-wall.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%description
+The purpose of libmspack is to provide compressors and decompressors,
+archivers and dearchivers for Microsoft compression formats: CAB, CHM,
+HLP, KWAJ, LIT and SZDD. It is also designed to be easily embeddable,
+stable, robust and resource-efficient.
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%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
+
+export CPPFLAGS="-D__FUNCTION__=__func__"
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+libtoolize --copy --force
+aclocal
+autoconf -f
+autoheader
+automake -a -f
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} \
+ --disable-static \
+ --enable-shared \
+ --disable-debug
+
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $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*
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+
+%changelog
+* Fri Aug 3 2007 - [email protected]
+- Initial spec
--- a/SFElibx264.spec Thu Aug 02 06:06:42 2007 +0000
+++ b/SFElibx264.spec Fri Aug 03 14:12:14 2007 +0000
@@ -11,7 +11,7 @@
%define src_name x264-snapshot
%define src_url ftp://ftp.videolan.org/pub/videolan/x264/snapshots
-Name: SFEx264
+Name: SFElibx264
Summary: H264 encoder library
Version: 20070728
Source: %{src_url}/%{src_name}-%{snap}-%{snaph}.tar.bz2
@@ -101,5 +101,5 @@
%endif
%changelog
-* Mon Jul 30 2007 - [email protected]
-- initial
+* Fri Aug 3 2007 - [email protected]
+- initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEnas.spec Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,101 @@
+#
+# spec file for package SFEnas
+#
+# includes module(s): nas
+#
+%include Solaris.inc
+
+%define src_ver 1.9
+%define src_name nas
+%define src_url http://nas.codebrilliance.com/nas
+
+%define openwin /usr/openwin
+%define openwinlib %{openwin}/lib
+%define openwinbin %{openwin}/bin
+%define openwindata %{openwin}/share
+%define openwininclude %{openwin}/include
+
+Name: SFEnas
+Summary: Network Audio System
+Version: %{src_ver}
+License: Free
+Source: %{src_url}/%{src_name}-%{version}.src.tar.gz
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%description
+This package contains a network-transparent, client/server audio
+system, with a library. Key features of the Network Audio System
+include:
+ - Device-independent audio over the network
+ - Lots of audio file and data formats
+ - Can store sounds in server for rapid replay
+ - Extensive mixing, separating, and manipulation of audio data
+ - Simultaneous use of audio devices by multiple applications
+ - Use by a growing number of ISVs
+ - Small size
+ - Free! No obnoxious licensing terms.
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%package root
+Summary: %{summary} - / filesystem
+SUNW_BaseDir: /
+%include default-depend.inc
+
+%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 CPPFLAGS="-I/usr/X11/include"
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags -lX11"
+
+xmkmf
+make World
+
+%install
+
+rm -rf $RPM_BUILD_ROOT
+make install install.man \
+ DESTDIR=$RPM_BUILD_ROOT
+
+rm $RPM_BUILD_ROOT%{openwinlib}/lib*.*a
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT%{openwinlib}/lib*.so* $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT%{openwinbin} $RPM_BUILD_ROOT%{_bindir}
+mv $RPM_BUILD_ROOT%{openwininclude} $RPM_BUILD_ROOT%{_includedir}
+mv $RPM_BUILD_ROOT%{openwindata} $RPM_BUILD_ROOT%{_datadir}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%{openwin}
+%dir %attr (0755, root, sys) %{_datadir}
+%{_mandir}
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+
+%files root
+%defattr (-, root, sys)
+%{_sysconfdir}
+
+%changelog
+* Fri Aug 3 2007 - [email protected]
+- Initial spec
--- a/SFEvlc.spec Thu Aug 02 06:06:42 2007 +0000
+++ b/SFEvlc.spec Fri Aug 03 14:12:14 2007 +0000
@@ -20,6 +20,11 @@
Patch4: vlc-04-solaris_specific.diff
Patch5: vlc-05-solaris-cmds.diff
Patch6: vlc-06-intl.diff
+Patch7: vlc-07-live.diff
+Patch8: vlc-08-osdmenu_path.diff
+Patch9: vlc-09-pic-mmx.diff
+Patch10: vlc-10-real_codecs_path.diff
+SUNW_BaseDir: %{_basedir}
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
@@ -71,6 +76,22 @@
Requires: SFEvcdimager
BuildRequires: SFElibx264-devel
Requires: SFElibx264
+BuildRequires: SFElibtar-devel
+Requires: SFElibtar
+
+%if %build_l10n
+%package l10n
+Summary: %{summary} - l10n files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %{name}
+%endif
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %{name}
%prep
%setup -q -n vlc-%version
@@ -80,6 +101,10 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -88,6 +113,12 @@
fi
# ffmpeg is build with g++, therefore we need to build with g++
+%if %build_l10n
+nlsopt=-enable-nls
+%else
+nlsopt=-disable-nls
+%endif
+
X11LIB="-L/usr/X11/lib -R/usr/X11/lib"
GNULIB="-L/usr/gnu/lib -R/usr/gnu/lib"
@@ -103,17 +134,6 @@
%endif
export LDFLAGS="$X11LIB $GNULIB"
-# See: http://forum.videolan.org/viewtopic.php?t=15444
-# Uses configure options:
-# ./configure --enable-x11 --enable-opengl --enable-xvideo --disable-gtk
-# --enable-sdl --enable-ffmpeg --with-ffmpeg-mp3lame --enable-mad
-# --enable-libdvbpsi --enable-a52 --enable-dts --enable-libmpeg2
-# --enable-dvdnav --enable-faad --enable-vorbis --enable-ogg --enable-theora
-# --enable-faac --enable-mkv --enable-freetype --enable-fribidi --enable-speex
-# --enable-flac --enable-caca --enable-skins --disable-skins2 --disable-kde
-# --disable-qt --enable-wxwindows --enable-ncurses --enable-release
-# --with-a52-tree=/export/home/barts/liba52/a52dec-0.7.4
-
rm ./configure
./bootstrap
./configure --prefix=%{_prefix} \
@@ -124,14 +144,23 @@
--sysconfdir=%{_sysconfdir} \
--enable-shared \
--disable-rpath \
+ --enable-mkv \
+ --enable-live555 \
+ --enable-ffmpeg \
+ --enable-xvid \
+ --enable-real \
+ --enable-realrtsp \
%if %debug_build
--enable-debug=yes \
%endif
- --disable-static
+ --disable-static \
+ $nlsopt
# Disable libmpeg2 to get past configure.
+%if %build_l10n
printf '%%%s/\/intl\/libintl.a/-lintl/\nwq\n' | ex - vlc-config
+%endif
make -j$CPUS
@@ -140,11 +169,49 @@
make install DESTDIR=$RPM_BUILD_ROOT
#rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
rm -f $RPM_BUILD_ROOT%{_libdir}/charset.alias
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+cp $RPM_BUILD_ROOT%{_datadir}/vlc/vlc48x48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/vlc.png
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+cp $RPM_BUILD_ROOT%{_datadir}/vlc/vlc32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/vlc.png
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
+cp $RPM_BUILD_ROOT%{_datadir}/vlc/vlc16x16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/vlc.png
+%if %build_l10n
+%else
+# REMOVE l10n FILES
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+( echo 'test -x /usr/bin/update-desktop-database || exit 0';
+ echo '/usr/bin/update-desktop-database'
+) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+( echo 'test -x %{_bindir}/update-mime-database || exit 0';
+ echo '%{_bindir}/update-mime-database %{_datadir}/mime'
+) | $BASEDIR/lib/postrun -b -u -c JDS_wait
+( touch %{_datadir}/icons/hicolor || :
+ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+ fi
+) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u
+
+%postun
+test -x $BASEDIR/lib/postrun || exit 0
+( echo 'test -x /usr/bin/update-desktop-database || exit 0';
+ echo '/usr/bin/update-desktop-database'
+) | $BASEDIR/lib/postrun -b -u -c JDS
+( echo 'test -x %{_bindir}/update-mime-database || exit 0';
+ echo '%{_bindir}/update-mime-database %{_datadir}/mime'
+) | $BASEDIR/lib/postrun -b -u -c JDS
+( touch %{_datadir}/icons/hicolor || :
+ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+ fi
+) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u
+
%files
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_bindir}
@@ -155,15 +222,38 @@
%{_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}/vlc
+%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
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32/apps
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48/apps
+%{_datadir}/icons/hicolor/16x16/apps/*.png
+%{_datadir}/icons/hicolor/32x32/apps/*.png
+%{_datadir}/icons/hicolor/48x48/apps/*.png
+
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%endif
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/lib*.a
-%{_libdir}/vlc
-%defattr (-, root, other)
-%{_datadir}/locale
%changelog
+* Fri Aug 3 2007 - [email protected]
+- Added devel and l10n
+- Added options to better find codecs
+- Added icons for app
* Tue Jul 31 2007 - [email protected]
- added --disable-rpath option
- added SFElibx264 to the requirements
--- a/SFEwine.spec Thu Aug 02 06:06:42 2007 +0000
+++ b/SFEwine.spec Fri Aug 03 14:12:14 2007 +0000
@@ -10,7 +10,7 @@
Name: SFEwine
Summary: Windows Emulator
-Version: 0.9.41
+Version: 0.9.42
Source: %{src_url}/%{src_name}-%{version}.tar.bz2
Patch1: wine-01-nameconfict.diff
Patch2: wine-02-configure.diff
@@ -51,9 +51,9 @@
SFWLIB="-L/usr/SFW/lib -R/usr/SFW/lib"
GNULIB="-L/usr/gnu/lib -R/usr/gnu/lib"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export CC=/usr/sfw/bin/gcc
+export CC=gcc
export CPPFLAGS="-I/usr/X11/include -I/usr/gnu/include -I/usr/sfw/include"
-export CFLAGS="-O3 -fno-omit-frame-pointer -fpic -Dpic"
+export CFLAGS="-O4 -fno-omit-frame-pointer -fpic -Dpic"
export LDFLAGS="$X11LIB $GNULIB $SFWLIB"
export LD=/usr/ccs/bin/ld
./configure --prefix=%{_prefix} \
@@ -115,6 +115,8 @@
%{_datadir}/aclocal/*
%changelog
+* Fri Aug 03 2007 - [email protected]
+- bump to 0.9.42
* Sat Jul 14 2007 - [email protected]
- bump to 0.9.41
* Mon Jul 10 2007 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFExvid.spec Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,81 @@
+#
+# spec file for package SFExvid
+#
+# includes module(s): xvid
+#
+%include Solaris.inc
+
+%define src_ver 1.1.3
+%define src_name xvidcore
+%define src_url http://downloads.xvid.org/downloads
+
+Name: SFExvid
+Summary: ISO MPEG-4 compliant video codec
+Version: %{src_ver}
+License: GPL
+Source: %{src_url}/%{src_name}-%{version}.tar.bz2
+Patch1: xvid-01-solaris.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildConflicts: SFEyasm
+%ifarch i386 amd64
+BuildRequires: SFEnasm
+%endif
+
+%description
+ISO MPEG-4 compliant video codec. You can play OpenDivX and DivX4 videos
+with it, too.
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%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
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+export CC=gcc
+export CFLAGS="-O4"
+
+cd build/generic
+bash ./bootstrap.sh
+./configure --prefix=%{_prefix} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir}
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+cd build/generic
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+(
+ cd $RPM_BUILD_ROOT%{_libdir}
+ ln -s libxvidcore.so.4.1 libxvidcore.so.4
+ ln -s libxvidcore.so.4.1 libxvidcore.so
+)
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%{_libdir}
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+
+%changelog
+* Fri Aug 3 2007 - [email protected]
+- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/amrnb-01-patch.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,15 @@
+--- amrnb-6.1.0.4/prepare_sources.sh.orig 2007-08-01 14:28:35.797179645 +0700
++++ amrnb-6.1.0.4/prepare_sources.sh 2007-08-01 14:27:14.657711599 +0700
+@@ -19,9 +19,9 @@
+
+ rm -r c-code
+
+-patch <amrnb-intsizes.patch
+-patch <amrnb-strict-aliasing.patch
+-patch <amrnb-any-cflags.patch
++gpatch <amrnb-intsizes.patch
++gpatch <amrnb-strict-aliasing.patch
++gpatch <amrnb-any-cflags.patch
+
+ for FILE in interf_{dec,enc}.{c,h} ; do
+ echo "modifying file $FILE"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/amrwb-01-patch.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,15 @@
+--- amrwb-7.0.0.1/prepare_sources.sh.orig 2007-08-01 14:42:14.288391298 +0700
++++ amrwb-7.0.0.1/prepare_sources.sh 2007-08-01 14:42:29.909685933 +0700
+@@ -20,9 +20,9 @@
+
+ rm -r c-code
+
+-patch <amrwb-intsizes.patch
+-patch <amrwb-any-cflags.patch
+-patch <amrwb-dhf-declaration.patch
++gpatch <amrwb-intsizes.patch
++gpatch <amrwb-any-cflags.patch
++gpatch <amrwb-dhf-declaration.patch
+
+ for FILE in {dec,enc}_if.{c,h} ; do
+ echo "modifying file $FILE"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cups-01-gss.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,47 @@
+--- cups-1.3rc2/scheduler/ipp.c.orig 2007-08-02 16:38:58.508837513 +0700
++++ cups-1.3rc2/scheduler/ipp.c 2007-08-02 16:39:37.961629318 +0700
+@@ -8303,6 +8303,7 @@
+ return;
+ }
+
++#ifndef sun
+ major_status = gss_krb5_copy_ccache(&minor_status, con->gss_delegated_cred,
+ ccache);
+
+@@ -8314,6 +8315,8 @@
+ return;
+ }
+
++#endif
++
+ cupsdSetStringf(&(job->ccname), "KRB5CCNAME=FILE:%s",
+ krb5_cc_get_name(krb_context, ccache));
+
+--- cups-1.3rc2/config-scripts/cups-gssapi.m4.orig 2007-08-02 16:24:57.637966009 +0700
++++ cups-1.3rc2/config-scripts/cups-gssapi.m4 2007-08-02 16:34:58.607392120 +0700
+@@ -23,14 +23,22 @@
+ if test x$enable_gssapi != xno; then
+ AC_PATH_PROG(KRB5CONFIG, krb5-config)
+ if test "x$KRB5CONFIG" != x; then
+- if test "x$uname" = "xDarwin"; then
++ case "$uname" in
++ Darwin)
+ # Mac OS X weak-links to the Kerberos framework...
+ LIBGSSAPI="-weak_framework Kerberos"
+- else
++ ;;
++ SunOS*)
++ CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS"
++ CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS"
++ LIBGSSAPI="`$KRB5CONFIG --libs` -lgss"
++ ;;
++ *)
+ CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"
+ CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"
+ LIBGSSAPI="`$KRB5CONFIG --libs gssapi`"
+- fi
++ ;;
++ esac
+ AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
+ else
+ # Check for vendor-specific implementations...
--- a/patches/ffmpeg-01-BE_16.diff Thu Aug 02 06:06:42 2007 +0000
+++ b/patches/ffmpeg-01-BE_16.diff Fri Aug 03 14:12:14 2007 +0000
@@ -1,6 +1,7 @@
---- ffmpeg-export-2007-01-10.orig/libavformat/rtp.c 2006-11-09 06:37:30.000000000 -0500
-+++ ffmpeg-export-2007-01-10/libavformat/rtp.c 2007-01-10 22:53:33.767142000 -0500
-@@ -38,6 +38,7 @@
+diff -ur ffmpeg-export-2007-07-31-orig/libavformat/rtp.c ffmpeg-export-2007-07-31/libavformat/rtp.c
+--- ffmpeg-export-2007-07-31-orig/libavformat/rtp.c 2007-07-31 13:16:43.000000000 +0700
++++ ffmpeg-export-2007-07-31/libavformat/rtp.c 2007-07-31 13:27:32.036401201 +0700
+@@ -30,6 +30,7 @@
//#define DEBUG
@@ -8,14 +9,17 @@
/* TODO: - add RTCP statistics reporting (should be optional).
---- ffmpeg-export-2007-01-10.orig/libavformat/rtp_h264.c 2006-11-07 17:10:07.000000000 -0500
-+++ ffmpeg-export-2007-01-10/libavformat/rtp_h264.c 2007-01-10 22:56:23.123089000 -0500
-@@ -56,6 +56,8 @@
- #include "rtp_h264.h"
+Only in ffmpeg-export-2007-07-31/libavformat: rtp.c~
+diff -ur ffmpeg-export-2007-07-31-orig/libavformat/rtp_h264.c ffmpeg-export-2007-07-31/libavformat/rtp_h264.c
+--- ffmpeg-export-2007-07-31-orig/libavformat/rtp_h264.c 2007-07-31 13:16:43.000000000 +0700
++++ ffmpeg-export-2007-07-31/libavformat/rtp_h264.c 2007-07-31 13:27:32.036904445 +0700
+@@ -49,6 +49,8 @@
#include "base64.h"
+ #include "avstring.h"
+#define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
+
/**
RTP/H264 specific private data.
*/
+Only in ffmpeg-export-2007-07-31/libavformat: rtp_h264.c~
--- a/patches/ffmpeg-02-configure.diff Thu Aug 02 06:06:42 2007 +0000
+++ b/patches/ffmpeg-02-configure.diff Fri Aug 03 14:12:14 2007 +0000
@@ -1,56 +1,122 @@
---- 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 @@
+diff -ur ffmpeg-export-2007-07-31-orig/configure ffmpeg-export-2007-07-31/configure
+--- ffmpeg-export-2007-07-31-orig/configure 2007-07-31 13:16:43.000000000 +0700
++++ ffmpeg-export-2007-07-31/configure 2007-07-31 13:49:03.874662846 +0700
+@@ -889,7 +889,7 @@
+ source_path_used="no"
+ else
+ source_path="`cd \"$source_path\"; pwd`"
+- echo "$source_path" | grep -q '[[:blank:]]' &&
++ echo "$source_path" | ggrep -q '[[:blank:]]' &&
+ die "Out of tree builds are impossible with whitespace in source path."
+ fi
+
+@@ -993,7 +993,7 @@
+ ;;
+ --enable-?*|--disable-?*)
+ eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
+- echo "$CMDLINE_SELECT" | grep -q "^ *$option\$" || die_unknown $opt
++ echo "$CMDLINE_SELECT" | ggrep -q "^ *$option\$" || die_unknown $opt
+ $action $option
+ ;;
+ --list-*)
+@@ -1019,7 +1019,7 @@
+ enable fast_unaligned
+ canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
+ if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
+- if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then
++ if [ -z "`echo $CFLAGS | ggrep -- -m32`" ]; then
+ arch="x86_64"
+ enable fast_64bit
+ fi
+@@ -1090,7 +1090,7 @@
+ # helps building libavcodec
+ add_cflags "-DPIC -fomit-frame-pointer"
+ # 3 gcc releases known for BeOS, each with ugly bugs
+- gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`"
++ gcc_version="`$cc -v 2>&1 | ggrep version | cut -d ' ' -f3-`"
+ case "$gcc_version" in
+ 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
+ mmx="no"
+@@ -1108,7 +1108,7 @@
+ # no need for libm, but the inet stuff
+ # Check for BONE
+ # XXX: actually should check for NOT net_server
+- if (echo $BEINCLUDES|grep 'headers/be/bone' >/dev/null); then
++ if (echo $BEINCLUDES|ggrep 'headers/be/bone' >/dev/null); then
+ osextralibs="-lbind -lsocket"
+ else
+ beos_netserver="yes"
+@@ -1118,8 +1118,9 @@
+ dv1394="no"
+ FFLDFLAGS=""
+ FFSERVERLDFLAGS=""
+- SHFLAGS="-shared -Wl,-h,\$@"
+- add_extralibs "-lsocket -lnsl"
++ SHFLAGS="-Wl,-G -Wl,-h,\$@"
++ VHOOKSHFLAGS='$(SHFLAGS)'
++ add_extralibs "-lsocket -lnsl -lm"
+ ;;
+ netbsd)
+ dv1394="no"
+@@ -1284,7 +1285,7 @@
+ #Darwin CC versions
+ needmdynamicnopic="no"
+ if test $targetos = darwin; then
+- if test -n "`$cc -v 2>&1 | grep xlc`"; then
++ if test -n "`$cc -v 2>&1 | ggrep xlc`"; then
+ add_cflags "-qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto"
+ else
+ add_cflags "-no-cpp-precomp -pipe"
+@@ -1368,7 +1369,7 @@
+ fi
+
+ gnu_make(){
+- $1 --version 2>&1 | grep -q GNU
++ $1 --version 2>&1 | ggrep -q GNU
+ }
+
+ if ! gnu_make $make; then
+@@ -1450,7 +1451,7 @@
+
+ # AltiVec flags: The FSF version of GCC differs from the Apple version
+ if enabled altivec; then
+- if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
++ if test -n "`$cc -v 2>&1 | ggrep version | ggrep Apple`"; then
+ add_cflags "-faltivec"
+ else
+ add_cflags "-maltivec -mabi=altivec"
+@@ -1634,7 +1635,7 @@
echo
fi
-if enabled vhook; then
-- check_ldflags -rdynamic
-- check_ldflags -export-dynamic
--fi
--
- if enabled audio_beos; then
- add_extralibs "-lmedia -lbe"
++if test "$targetos" != sunos -a enabled vhook; then
+ check_ldflags -rdynamic
+ check_ldflags -export-dynamic
+ fi
+@@ -1743,7 +1744,7 @@
+ check_cflags -Os # not all compilers support -Os
+ optimize="small"
+ elif enabled optimize; then
+- if test -n "`$cc -v 2>&1 | grep xlc`"; then
++ if test -n "`$cc -v 2>&1 | ggrep xlc`"; then
+ add_cflags "-O5"
+ add_ldflags "-O5"
+ else
+@@ -1925,11 +1926,11 @@
+ echo "BUILD_DOC=yes" >> config.mak
fi
-+add_extralibs "-lm"
-+
- ##########################################
- # imlib check
+-sws_version=`grep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.h" | sed 's/[^0-9\.]//g'`
+-pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libpostproc/postprocess.h" | sed 's/[^0-9\.]//g'`
+-lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]//g'`
+-lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'`
+-lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'`
++sws_version=`ggrep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.h" | sed 's/[^0-9\.]//g'`
++pp_version=`ggrep '#define LIBPOSTPROC_VERSION ' "$source_path/libpostproc/postprocess.h" | sed 's/[^0-9\.]//g'`
++lavc_version=`ggrep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]//g'`
++lavf_version=`ggrep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'`
++lavu_version=`ggrep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'`
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/foomatic-db-engine-01-perl.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,26 @@
+--- foomatic-db-engine-3.0.2/configure.in.orig 2007-08-03 13:07:30.695063810 +0700
++++ foomatic-db-engine-3.0.2/configure.in 2007-08-03 13:09:43.486983615 +0700
+@@ -183,7 +183,7 @@
+ PREFIX=$prefix
+ fi
+ echo -n Checking whether Perl will find libraries installed under $PREFIX...
+-if ( $PERL -V | egrep "^ *$PREFIX/lib(/perl[[0-9]]?|)(/site_perl|)/[[0-9]]" > /dev/null); then
++if ( $PERL -V | egrep "^ *$PREFIX/perl[[0-9]]/vendor_perl/[[0-9]]" > /dev/null); then
+ PERLPREFIX=$PREFIX
+ echo " yes"
+ else
+@@ -204,11 +204,11 @@
+ dnl Perl installation directories
+
+ dnl This works only with autoconf 2.52 or newer
+-dnl PERL_INSTALLDIRS=site
+-dnl AC_ARG_VAR(PERL_INSTALLDIRS, [Where should the Perl libraries be installed (Default: site, Choices: perl, site)?])
++dnl PERL_INSTALLDIRS=vendor
++dnl AC_ARG_VAR(PERL_INSTALLDIRS, [Where should the Perl libraries be installed (Default: vendor, Choices: perl, vendor)?])
+
+ dnl This works also with autoconf 2.13
+-PERL_INSTALLDIRS=site
++PERL_INSTALLDIRS=vendor
+ AC_SUBST(PERL_INSTALLDIRS)
+
+ dnl Check for bourne shell
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/foomatic-db-engine-02-null.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,15 @@
+--- foomatic-db-engine-3.0.2/foomatic-perl-data.c.orig 2007-08-03 15:59:26.820380517 +0700
++++ foomatic-db-engine-3.0.2/foomatic-perl-data.c 2007-08-03 16:09:08.886358877 +0700
+@@ -2809,7 +2809,11 @@
+ } else {
+ printf(" 'pcdriver' => undef,\n");
+ }
+- printf(" 'type' => '%s',\n", combo->driver_type);
++ if (combo->driver_type) {
++ printf(" 'type' => '%s',\n", combo->driver_type);
++ } else {
++ printf(" 'type' => 'undef',\n");
++ }
+ if (combo->driver_comment) {
+ printf(" 'comment' => '%s',\n", combo->driver_comment);
+ } else {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gutenprint-01-cups-version.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,11 @@
+--- gutenprint-5.1.3/configure.ac.orig 2007-08-03 11:25:39.282896101 +0700
++++ gutenprint-5.1.3/configure.ac 2007-06-17 21:24:53.000000000 +0700
+@@ -211,7 +211,7 @@
+ BUILD_TRANSLATED_CUPS_PPDS="${BUILD_CUPS}"
+ BUILD_CUPS_1_2="no"
+ if test -n "${CUPS_CONFIG}" -a "${BUILD_CUPS}" = "yes" ; then
+- cups_version=`${CUPS_CONFIG} --version`
++ cups_version=`${CUPS_CONFIG} --version|sed s'/rc.*$/.0/'`
+ dnl Quote to protect sed regexes
+ [cups_major=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\1/'`]
+ [cups_minor=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\2/'`]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gutenprint-02-isfinite.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,11 @@
+--- gutenprint-5.1.3/src/main/sequence.c.orig 2007-08-03 11:49:28.786022777 +0700
++++ gutenprint-5.1.3/src/main/sequence.c 2007-08-03 11:50:00.559934496 +0700
+@@ -484,7 +484,7 @@
+ \
+ /* Validate the data before we commit to it. */ \
+ for (i = 0; i < count; i++) \
+- if (! isfinite(data[i]) || \
++ if (! isfinite((double)data[i]) || \
+ data[i] < sequence->blo || \
+ data[i] > sequence->bhi) \
+ return 0; \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ircii-01-config.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,74 @@
+diff -uNr ircii-4.4X/Makefile.in ircii-4.4X.new/Makefile.in
+--- ircii-4.4X/Makefile.in Sat Apr 15 18:04:02 2000
++++ ircii-4.4X.new/Makefile.in Wed Aug 23 00:47:34 2000
+@@ -135,16 +135,16 @@
+
+ # Set the next line to the full path for installation of the ircio program
+ # if you wish to use it.
+-INSTALL_IRCIO = $(bindir)/ircio
++INSTALL_IRCIO = $(bindir)/ircio-ircii
+
+ # This little program is necessary to have an interactive shell
+ # in a window of ircII. The 'shell' script uses it, so also update
+ # the path in there, if you want to enable this.
+-INSTALL_IRCFLUSH = $(bindir)/ircflush
++INSTALL_IRCFLUSH = $(bindir)/ircflush-ircii
+
+ # This program allows you to use screen/xterm's to put new irc windows
+ # on new screen/xterm windows.
+-INSTALL_WSERV = $(bindir)/wserv
++INSTALL_WSERV = $(bindir)/wserv-ircii
+
+ # This command will be used to install the irc help files. If you don't
+ # want to install them, replace with the following:
+@@ -178,7 +178,7 @@
+
+ installirc: irc installdirs
+ $(INSTALL) irc $(INSTALL_IRC)-$(VERSION)
+- $(INSTALL) ircbug $(bindir)/ircbug
++ $(INSTALL) ircbug $(bindir)/ircbug-ircii
+ @if test -f $(INSTALL_IRC).old; then $(RM) $(INSTALL_IRC).old; fi
+ @if test -f $(INSTALL_IRC); then $(MV) $(INSTALL_IRC) $(INSTALL_IRC).old; fi
+ $(RM) $(INSTALL_IRC)
+diff -uNr ircii-4.4X/configure.in ircii-4.4X.new/configure.in
+--- ircii-4.4X/configure.in Wed Aug 23 00:44:23 2000
++++ ircii-4.4X.new/configure.in Wed Aug 23 00:48:22 2000
+@@ -696,7 +696,7 @@
+
+ if test ! -n "$IRCLIB";
+ then
+- IRCLIB=\${datadir}/irc
++ IRCLIB=\${datadir}/ircii
+ fi
+ AC_SUBST(IRCLIB)
+
+diff -uNr ircii-4.4X/include/config.h.dist ircii-4.4X.new/include/config.h.dist
+--- ircii-4.4X/include/config.h.dist Sun Jun 11 09:30:54 2000
++++ ircii-4.4X.new/include/config.h.dist Wed Aug 23 00:53:14 2000
+@@ -47,7 +47,7 @@
+ * file and the ircII can find it, this setting is overridden.
+ */
+ #ifndef DEFAULT_SERVER
+-# define DEFAULT_SERVER "change.this.to.a.server"
++# define DEFAULT_SERVER "poznan.irc.pl"
+ #endif
+
+ /*
+@@ -89,7 +89,7 @@
+ * DEFAULT_SERVER.
+ */
+
+-#define SERVERS_FILE "ircII.servers"
++#define SERVERS_FILE "/etc/irc/ircII.servers"
+
+ /* Uncomment the following if you want ircII to display the file
+ * ircII.motd in the ircII library at startup.
+@@ -159,7 +159,7 @@
+ #define DEFAULT_LASTLOG 44
+ #define DEFAULT_LASTLOG_LEVEL "ALL -CRAP"
+ #define DEFAULT_LOG 0
+-#define DEFAULT_LOGFILE "IrcLog"
++#define DEFAULT_LOGFILE ".irciilog"
+ #define DEFAULT_MAIL 0
+ #define DEFAULT_MAKE_NOTICE_MSG 1
+ #define DEFAULT_MAX_RECURSIONS 10
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ircii-02.cast.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,11 @@
+--- ircii-20060725/include/cast_sbox.h.orig 2007-08-01 23:47:18.213853553 +0700
++++ ircii-20060725/include/cast_sbox.h 2007-08-01 23:47:35.336743570 +0700
+@@ -9,7 +9,7 @@
+ */
+
+ /* sigh */
+-#if __STDC__ /* || (__STDC__ == 0 && defined(__sun)) */
++#if defined(__sun)
+ #define U(x) x##U
+ #define UL(x) x##UL
+ #else
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libdts-02-shared.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,79 @@
+diff -urN aa/libdts-0.0.2/configure.ac libdts-0.0.2/configure.ac
+--- aa/libdts-0.0.2/configure.ac 2004-02-29 13:00:32.000000000 +0100
++++ libdts-0.0.2/configure.ac 2004-08-02 23:38:20.731578544 +0200
+@@ -83,16 +83,7 @@
+ #libtool# AC_PROG_LIBTOOL
+
+ dnl Build the PIC library? - to be removed once libtool is re-enabled
+-AC_PROG_RANLIB
+-case "${target_os}" in
+- *mingw32* | *cygwin* | *djgpp*)
+- NEED_PIC=false
+- ;;
+- *)
+- NEED_PIC=:
+- ;;
+-esac
+-AM_CONDITIONAL(NEED_PIC, ${NEED_PIC})
++AC_PROG_LIBTOOL
+
+ dnl Checks for libraries.
+ LIBAO_LIBS="-lm"
+diff -urN aa/libdts-0.0.2/libdts/Makefile.am libdts-0.0.2/libdts/Makefile.am
+--- aa/libdts-0.0.2/libdts/Makefile.am 2004-02-25 14:52:15.000000000 +0100
++++ libdts-0.0.2/libdts/Makefile.am 2004-08-02 23:39:31.091882152 +0200
+@@ -1,22 +1,13 @@
+ AM_CFLAGS = $(OPT_CFLAGS) $(LIBDTS_CFLAGS)
+
+-#libtool# lib_LTLIBRARIES = libdts.la
+-#libtool#
+-#libtool# libdts_la_SOURCES = bitstream.c parse.c downmix.c
+-#libtool# libdts_la_LIBADD = $(LIBDTS_LIBS)
+-#libtool# libdts_la_LDFLAGS = -no-undefined
++lib_LTLIBRARIES = libdts.la
+
+-lib_LIBRARIES = libdts.a $(libdts_pic_a)
+-libdts_a_SOURCES = bitstream.c parse.c downmix.c
++libdts_la_SOURCES = bitstream.c parse.c downmix.c
++libdts_la_LIBADD = $(LIBDTS_LIBS)
++libdts_la_LDFLAGS = -no-undefined
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libdts.pc
+
+ EXTRA_DIST = configure.incl dts_internal.h bitstream.h tables.h tables_quantization.h tables_huffman.h tables_fir.h tables_adpcm.h tables_vq.h
+
+-if NEED_PIC
+-libdts_pic_a = libdts_pic.a
+-endif
+-libdts_pic_a_SOURCES = $(libdts_a_SOURCES)
+-libdts_pic_a_CPPFLAGS = -fPIC -DPIC
+-
+diff -urN aa/libdts-0.0.2/src/Makefile.am libdts-0.0.2/src/Makefile.am
+--- aa/libdts-0.0.2/src/Makefile.am 2004-02-25 14:52:16.000000000 +0100
++++ libdts-0.0.2/src/Makefile.am 2004-08-02 23:40:13.531430360 +0200
+@@ -2,10 +2,8 @@
+
+ bin_PROGRAMS = dtsdec extract_dts
+ dtsdec_SOURCES = dtsdec.c getopt.c gettimeofday.c
+-#libtool# dtsdec_LDADD = $(top_builddir)/libdts/libdts.la \
+-#libtool# $(top_builddir)/libao/libao.a $(LIBAO_LIBS)
+-dtsdec_LDADD = $(top_builddir)/libdts/libdts.a \
+- $(top_builddir)/libao/libao.a $(LIBAO_LIBS)
++dtsdec_LDADD = $(top_builddir)/libdts/libdts.la \
++ $(top_builddir)/libao/libao.a $(LIBAO_LIBS)
+ extract_dts_SOURCES = extract_dts.c getopt.c
+
+ man_MANS = dtsdec.1 extract_dts.1
+--- libdts-0.0.2/libdts/configure.incl.orig 2004-02-05 10:13:58.000000000 +0100
++++ libdts-0.0.2/libdts/configure.incl 2004-08-24 21:58:48.878518052 +0200
+@@ -1,9 +1,6 @@
+ AC_SUBST([LIBDTS_CFLAGS])
+ AC_SUBST([LIBDTS_LIBS])
+
+-dnl avoid -fPIC when possible
+-AC_LIBTOOL_NON_PIC([LIBDTS_CFLAGS="$LIBDTS_CFLAGS -prefer-non-pic"])
+-
+ AC_ARG_ENABLE([fixed],
+ [ --enable-fixed use fixed-point (integer-based) arithmetic])
+ AC_ARG_ENABLE([double],
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libdts-03-opt.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,38 @@
+--- libdts-0.0.2/configure.ac.orig 2004-08-24 21:52:52.433773000 +0200
++++ libdts-0.0.2/configure.ac 2004-08-24 21:57:56.510045071 +0200
+@@ -26,13 +26,6 @@
+ TRY_CFLAGS="$OPT_CFLAGS -Wall"
+ AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS=$TRY_CFLAGS])
+
+- dnl -O3
+- changequote(<<,>>)
+- TRY_CFLAGS=`echo "$OPT_CFLAGS $CFLAGS"|sed "s/-O[0-9]*//g"`
+- changequote([,])
+- TRY_CFLAGS="$TRY_CFLAGS -O3"
+- AC_TRY_CFLAGS([$TRY_CFLAGS],[OPT_CFLAGS=$TRY_CFLAGS; CFLAGS=""])
+-
+ AC_ARG_ENABLE([debug],
+ [ --enable-debug debug mode configuration])
+ if test x"$enable_debug" = x"yes"; then
+@@ -43,21 +36,6 @@
+ AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS=$TRY_CFLAGS])
+ fi
+
+- dnl arch-specific flags
+- case "$host" in
+- i?86-* | k?-*)
+- case "$host" in
+- i386-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i386";;
+- i486-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i486";;
+- i586-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentium";;
+- i686-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentiumpro";;
+- k6-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=k6";;
+- esac
+- AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS=$TRY_CFLAGS]);;
+- sparc-* | sparc64-*)
+- TRY_CFLAGS="$OPT_CFLAGS -mtune=ultrasparc"
+- AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS=$TRY_CFLAGS]);;
+- esac
+ elif test x"$CC" = x"tendracc"; then
+ dnl TenDRA portability checking compiler
+ TENDRA=yes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libgsm-01-makefile.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,116 @@
+--- gsm-1.0-pl12/Makefile.orig 2007-08-01 13:16:42.866319697 +0700
++++ gsm-1.0-pl12/Makefile 2007-08-01 13:50:03.271259284 +0700
+@@ -30,6 +30,8 @@
+ ######### define this, and read about the GSM_OPT_WAV49 option in the
+ ######### manual page on gsm_option(3).
+
++MAJOR=1
++
+ # Choose a compiler. The code works both with ANSI and K&R-C.
+ # Use -DNeedFunctionPrototypes to compile with, -UNeedFunctionPrototypes to
+ # compile without, function prototypes in the header files.
+@@ -43,8 +45,8 @@
+ # CC = /usr/lang/acc
+ # CCFLAGS = -c -O
+
+-CC = gcc -ansi -pedantic
+-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
++# CC = gcc -ansi -pedantic
++# CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
+
+ LD = $(CC)
+
+@@ -71,17 +73,17 @@
+ # Leave INSTALL_ROOT empty (or just don't execute "make install") to
+ # not install gsm and toast outside of this directory.
+
+-INSTALL_ROOT =
++# INSTALL_ROOT =
+
+ # Where do you want to install the gsm library, header file, and manpages?
+ #
+ # Leave GSM_INSTALL_ROOT empty to not install the GSM library outside of
+ # this directory.
+
+-GSM_INSTALL_ROOT = $(INSTALL_ROOT)
++GSM_INSTALL_ROOT = $(DESTDIR)$(INSTALL_ROOT)
+ GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
+-GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
+-GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
++GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include
++GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/share/man/man3
+
+
+ # Where do you want to install the toast binaries and their manpage?
+@@ -89,18 +91,18 @@
+ # Leave TOAST_INSTALL_ROOT empty to not install the toast binaries outside
+ # of this directory.
+
+-TOAST_INSTALL_ROOT = $(INSTALL_ROOT)
++TOAST_INSTALL_ROOT = $(DESTDIR)$(INSTALL_ROOT)
+ TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
+-TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
++TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/share/man/man1
+
+ # Other tools
+
+-SHELL = /bin/sh
++SHELL = /bin/bash
+ LN = ln
+ BASENAME = basename
+ AR = ar
+ ARFLAGS = cr
+-RMFLAGS =
++RMFLAGS = -f
+ FIND = find
+ COMPRESS = compress
+ COMPRESSFLAGS =
+@@ -129,7 +131,7 @@
+ # DEBUG = -DNDEBUG
+ ######### Remove -DNDEBUG to enable assertions.
+
+-CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
++CFLAGS = -c $(PICFLAG) $(OPTFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
+ $(WAV49) $(CCINC) -I$(INC)
+ ######### It's $(CC) $(CFLAGS)
+
+@@ -139,7 +141,7 @@
+
+ # Targets
+
+-LIBGSM = $(LIB)/libgsm.a
++LIBGSM = $(LIB)/libgsm.so.$(MAJOR)
+
+ TOAST = $(BIN)/toast
+ UNTOAST = $(BIN)/untoast
+@@ -257,7 +259,7 @@
+ # Install targets
+
+ GSM_INSTALL_TARGETS = \
+- $(GSM_INSTALL_LIB)/libgsm.a \
++ $(GSM_INSTALL_LIB)/libgsm.so.$(MAJOR) \
+ $(GSM_INSTALL_INC)/gsm.h \
+ $(GSM_INSTALL_MAN)/gsm.3 \
+ $(GSM_INSTALL_MAN)/gsm_explode.3 \
+@@ -301,8 +303,7 @@
+
+ $(LIBGSM): $(LIB) $(GSM_OBJECTS)
+ -rm $(RMFLAGS) $(LIBGSM)
+- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
+- $(RANLIB) $(LIBGSM)
++ $(LD) -G $(GSM_OBJECTS) -o $(LIBGSM) $(LDFLAGS)
+
+
+ # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+@@ -393,9 +394,10 @@
+ cp $? $@
+ chmod 444 $@
+
+-$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
++$(GSM_INSTALL_LIB)/libgsm.so.$(MAJOR): $(LIBGSM)
+ -rm $@
+ cp $? $@
++ ( cd $(GSM_INSTALL_LIB) ; ln -s libgsm.so.$(MAJOR) libgsm.so )
+ chmod 444 $@
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libmspack-01-wall.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,12 @@
+--- libmspack-0.0.20060920alpha/Makefile.am.orig 2007-08-01 12:40:41.815627078 +0700
++++ libmspack-0.0.20060920alpha/Makefile.am 2007-08-01 12:41:27.117845875 +0700
+@@ -9,8 +9,7 @@
+ -rm -rf `find $(distdir) -name CVS`
+ -rm -f $(distdir)/*.la
+
+-AM_CFLAGS = -std=c99 -Wall -Wsign-compare -Wconversion -pedantic \
+- -I$(srcdir)/mspack $(MSPACK_FLAGS)
++AM_CFLAGS = -I$(srcdir)/mspack $(MSPACK_FLAGS)
+
+ lib_LTLIBRARIES = libmspack.la
+ include_HEADERS = mspack/mspack.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vlc-07-live.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,15 @@
+--- vlc-0.8.6/modules/demux/live555.cpp~ 2006-12-09 03:12:13.000000000 +0200
++++ vlc-0.8.6/modules/demux/live555.cpp 2006-12-12 23:32:31.281541540 +0200
+@@ -37,9 +37,9 @@
+ # include <winsock2.h>
+ #endif
+
+-#include "BasicUsageEnvironment.hh"
+-#include "GroupsockHelper.hh"
+-#include "liveMedia.hh"
++#include <liveMedia/BasicUsageEnvironment.hh>
++#include <liveMedia/GroupsockHelper.hh>
++#include <liveMedia/liveMedia.hh>
+
+ extern "C" {
+ #include "../access/mms/asf.h" /* Who said ugly ? */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vlc-08-osdmenu_path.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,27 @@
+--- vlc.orig/share/osdmenu/default.cfg
++++ vlc/share/osdmenu/default.cfg
+@@ -1,4 +1,4 @@
+-dir share/osdmenu/default
++dir /usr/share/vlc/osdmenu/default
+ action key-play-pause (0,0)
+ unselect unselected.png
+ select selection/play_pause.png
+--- vlc.orig/share/osdmenu/dvd.cfg
++++ vlc/share/osdmenu/dvd.cfg
+@@ -1,4 +1,4 @@
+-dir share/osdmenu/dvd
++dir /usr/share/vlc/osdmenu/dvd
+ action key-play (0,0)
+ unselect unselect/barroff.png
+ select selection/play.png
+--- vlc.orig/modules/video_filter/osdmenu.c
++++ vlc/modules/video_filter/osdmenu.c
+@@ -90,7 +90,7 @@
+ #if defined( WIN32 ) || defined( UNDER_CE )
+ #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
+ #else
+-#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
++#define OSD_DEFAULT_CFG "/usr/share/vlc/osdmenu/default.cfg"
+ #endif
+
+ #define OSD_UPDATE_MIN 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vlc-09-pic-mmx.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,89 @@
+--- vlc-0.8.2-pic/modules/video_chroma/i420_rgb16.c 2005-07-10 23:59:57.656177984 +0200
++++ vlc-0.8.6/modules/video_chroma/i420_rgb16.c 2006-12-13 10:51:50.256615375 +0200
+@@ -31,9 +31,10 @@
+ #include <vlc/vout.h>
+
+ #include "i420_rgb.h"
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ # include "i420_rgb_c.h"
+-#elif defined (MODULE_NAME_IS_i420_rgb_mmx)
++#endif
++#if defined (MODULE_NAME_IS_i420_rgb_mmx)
+ # if defined(HAVE_MMX_INTRINSICS)
+ # include <mmintrin.h>
+ # endif
+@@ -216,7 +217,7 @@
+ int i_scale_count; /* scale modulo counter */
+ int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ uint16_t * p_pic_start; /* beginning of the current line for copy */
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined (__PIC__)
+ int i_uval, i_vval; /* U and V samples */
+ int i_red, i_green, i_blue; /* U and V modified samples */
+ uint16_t * p_yuv = p_vout->chroma.p_sys->p_rgb16;
+@@ -264,7 +265,7 @@
+ p_pic_start = p_pic;
+ p_buffer = b_hscale ? p_buffer_start : p_pic;
+
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ {
+ CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
+@@ -323,7 +324,7 @@
+ p_u -= i_rewind >> 1;
+ p_v -= i_rewind >> 1;
+ p_buffer -= i_rewind;
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
+ CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
+ CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
+@@ -397,7 +398,7 @@
+ int i_scale_count; /* scale modulo counter */
+ int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ uint32_t * p_pic_start; /* beginning of the current line for copy */
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined (__PIC__)
+ int i_uval, i_vval; /* U and V samples */
+ int i_red, i_green, i_blue; /* U and V modified samples */
+ uint32_t * p_yuv = p_vout->chroma.p_sys->p_rgb32;
+@@ -447,7 +448,7 @@
+
+ for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ {
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
+ CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
+ CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
+@@ -477,7 +478,7 @@
+ p_u -= i_rewind >> 1;
+ p_v -= i_rewind >> 1;
+ p_buffer -= i_rewind;
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
+ CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
+ CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
+--- vlc-0.8.2/modules/video_chroma/i420_rgb.h 2005-06-25 15:43:10.000000000 +0200
++++ vlc-0.8.2-pic/modules/video_chroma/i420_rgb.h 2005-07-10 23:57:30.248587344 +0200
+@@ -35,7 +35,7 @@
+ uint8_t *p_buffer;
+ int *p_offset;
+
+-#ifdef MODULE_NAME_IS_i420_rgb
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ /**< Pre-calculated conversion tables */
+ void *p_base; /**< base for all conversion tables */
+ uint8_t *p_rgb8; /**< RGB 8 bits table */
+@@ -55,7 +55,7 @@
+ /*****************************************************************************
+ * Prototypes
+ *****************************************************************************/
+-#ifdef MODULE_NAME_IS_i420_rgb
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ void E_(I420_RGB8) ( vout_thread_t *, picture_t *, picture_t * );
+ void E_(I420_RGB16_dither) ( vout_thread_t *, picture_t *, picture_t * );
+ #endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vlc-10-real_codecs_path.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,15 @@
+--- vlc-0.8.5-test1/modules/codec/realaudio.c.orig 2006-03-10 13:35:43.000000000 +0100
++++ vlc-0.8.5-test1/modules/codec/realaudio.c 2006-03-28 07:46:19.000000000 +0200
+@@ -255,9 +255,9 @@
+ {
+ ".",
+ #ifndef WIN32
+- "/usr/local/RealPlayer8/Codecs",
+- "/usr/RealPlayer8/Codecs",
+- "/usr/lib/RealPlayer8/Codecs",
++ "/usr/lib/RealPlay/codecs",
++ "/usr/lib64/realplay/codecs",
++ "/usr/lib/codecs",
+ "/opt/RealPlayer8/Codecs",
+ "/usr/lib/RealPlayer9/users/Real/Codecs",
+ "/usr/lib64/RealPlayer8/Codecs",
--- a/patches/wine-01-nameconfict.diff Thu Aug 02 06:06:42 2007 +0000
+++ b/patches/wine-01-nameconfict.diff Fri Aug 03 14:12:14 2007 +0000
@@ -238,3 +238,41 @@
}
static void test_Invoke(void)
+--- wine-0.9.42/dlls/ntdll/actctx.c.orig 2007-08-02 13:20:02.210101857 +0700
++++ wine-0.9.42/dlls/ntdll/actctx.c 2007-08-02 13:27:21.408872232 +0700
+@@ -72,7 +72,7 @@
+ WCHAR *info;
+ };
+
+-struct version
++struct version_s
+ {
+ USHORT major;
+ USHORT minor;
+@@ -87,7 +87,7 @@
+ WCHAR *public_key;
+ WCHAR *language;
+ WCHAR *type;
+- struct version version;
++ struct version_s version;
+ BOOL optional;
+ };
+
+@@ -264,7 +264,7 @@
+ return debugstr_an(str->ptr, str->len);
+ }
+
+-static inline const char* debugstr_version(const struct version *ver)
++static inline const char* debugstr_version(const struct version_s *ver)
+ {
+ return wine_dbg_sprintf("%u.%u.%u.%u", ver->major, ver->minor, ver->build, ver->revision);
+ }
+@@ -735,7 +735,7 @@
+ return TRUE;
+ }
+
+-static BOOL parse_version(const xmlstr_t *str, struct version *version)
++static BOOL parse_version(const xmlstr_t *str, struct version_s *version)
+ {
+ unsigned int ver[4];
+ unsigned int pos;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/xvid-01-solaris.diff Fri Aug 03 14:12:14 2007 +0000
@@ -0,0 +1,28 @@
+--- xvidcore-1.1.3/build/generic/configure.in.orig 2007-07-31 14:21:53.877885306 +0700
++++ xvidcore-1.1.3/build/generic/configure.in 2007-07-31 14:36:22.539055836 +0700
+@@ -265,13 +265,24 @@
+ SPECIFIC_CFLAGS=""
+ PRE_SHARED_LIB=""
+ case "$target_os" in
+- linux*|solaris*)
++ linux*)
+ AC_MSG_RESULT([ok])
+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
+ SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm"
+ SPECIFIC_CFLAGS="-fPIC"
+ ;;
++ solaris*)
++ AC_MSG_RESULT([ok])
++ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
++ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
++ SPECIFIC_LDFLAGS="-Wl,-h,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -Wl,-G -Wl,-M,libxvidcore.ld -lc -lm"
++ if test "`basename $CC`" = "gcc" ; then
++ SPECIFIC_CFLAGS="-fPIC"
++ else
++ SPECIFIC_CFLAGS="-KPIC -D__inline=inline"
++ fi
++ ;;
+ *bsd*|irix*)
+ AC_MSG_RESULT([ok])
+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"