Author: thl Update of /cvs/free/rpms/xine-lib-extras-freeworld/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv27896 Modified Files: .cvsignore sources Added Files: xine-lib-1.1.1-deepbind-939.patch xine-lib-1.1.3-optflags.patch xine-lib-extras-freeworld.spec Log Message: initial import from livna after rename in devel xine-lib-1.1.1-deepbind-939.patch: --- NEW FILE xine-lib-1.1.1-deepbind-939.patch --- --- xine-lib-1.1.1/src/xine-engine/load_plugins.c.~1~ 2005-09-19 09:14:02.000000000 -0700 +++ xine-lib-1.1.1/src/xine-engine/load_plugins.c 2006-04-22 23:07:33.000000000 -0700 @@ -591,7 +591,7 @@ static void collect_plugins(xine_t *this printf("load_plugins: %s not cached\n", str); #endif - if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL)) == NULL) { + if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) { const char *error = dlerror(); /* too noisy -- but good to catch unresolved references */ xprintf(this, XINE_VERBOSITY_LOG, @@ -649,7 +649,7 @@ static int _load_plugin_class(xine_t *th /* load the dynamic library if needed */ if (!node->file->lib_handle) { lprintf("dlopen %s\n", filename); - if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL)) == NULL) { + if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) { const char *error = dlerror(); xine_log (this, XINE_LOG_PLUGIN, xine-lib-1.1.3-optflags.patch: --- NEW FILE xine-lib-1.1.3-optflags.patch --- --- xine-lib-1.1.3/m4/optimizations.m4~ 2006-06-17 18:20:56.000000000 +0300 +++ xine-lib-1.1.3/m4/optimizations.m4 2006-12-17 11:49:44.000000000 +0200 @@ -107,7 +107,7 @@ DEBUG_CFLAGS="-O $DEBUG_CFLAGS" - if test x"$sarchopt" != "xno"; then + if false ; then archopt_val= case "$host_or_hostalias" in --- xine-lib-1.1.3/configure~ 2006-12-03 21:41:27.000000000 +0200 +++ xine-lib-1.1.3/configure 2006-12-17 11:50:07.000000000 +0200 @@ -46971,7 +46971,7 @@ DEBUG_CFLAGS="-O $DEBUG_CFLAGS" - if test x"$sarchopt" != "xno"; then + if false ; then archopt_val= case "$host_or_hostalias" in --- NEW FILE xine-lib-extras-freeworld.spec --- # TODO: # - external dvdnav - not compatible as of 1.1.11 and 4.1.1 %define abiver 1.21 Name: xine-lib-extras-freeworld Summary: Non-free extra codecs for the Xine library Version: 1.1.12 Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2 Patch0: xine-lib-1.1.3-optflags.patch Patch6: xine-lib-1.1.1-deepbind-939.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: pkgconfig BuildRequires: zlib-devel BuildRequires: gawk # External libs BuildRequires: xvidcore-devel BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804 BuildRequires: a52dec-devel BuildRequires: libmad-devel BuildRequires: libdca-devel # X11 for DXR3 output (#1258), libXt-devel needed in FC5 BuildRequires: libXt-devel BuildRequires: libXext-devel BuildRequires: libXinerama-devel # vcdimager reads and writes MPEG BuildRequires: vcdimager-devel >= 0.7.23 # Obsolete DXR3 deps, better handled by ffmpeg BuildConflicts: rte-devel BuildConflicts: libfame-devel Requires: vcdimager >= 0.7.23 Requires: xine-lib(plugin-abi) = %{abiver} # obsolete old livna package Provides: xine-lib-extras-nonfree = %{version}-%{release} Obsoletes: xine-lib-extras-nonfree < 1.1.12-2 # obsolete old frehsrpms package Provides: xine-lib-moles = %{version}-%{release} Obsoletes: xine-lib-moles < 1.1.12-2 %description This package adds extra functionality to the Xine library. Those plugins may contain patented code. %prep %setup -q -n xine-lib-%{version} touch -r m4/optimizations.m4 m4/optimizations.m4.stamp %patch0 -p1 -b .optflags touch -r m4/optimizations.m4.stamp m4/optimizations.m4 # Patch6 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind # Avoid standard rpaths on lib64 archs: sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure %build # Keep order of options the same as in ./configure --help for easy maintenance %configure --disable-dependency-tracking \ --with-external-ffmpeg \ --enable-ipv6 \ --disable-opengl \ --disable-xvmc \ --disable-aalib \ --disable-caca \ --disable-sdl \ --disable-rte \ --disable-libfame \ --disable-speex \ --disable-flac \ --disable-mng \ --disable-imagemagick \ --disable-freetype \ --disable-alsa \ --disable-esd \ --disable-arts \ --disable-gnomevfs \ --disable-gdkpixbuf \ --disable-samba \ --with-external-ffmpeg \ --with-external-a52dec \ --with-external-libmad \ --with-external-libdts make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Removing useless files rm -rf $RPM_BUILD_ROOT%{_bindir} rm -rf $RPM_BUILD_ROOT%{_includedir} rm -rf $RPM_BUILD_ROOT%{_datadir} rm -rf $RPM_BUILD_ROOT%{_libdir}/lib* rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig # Plugins - credits go to the SuSE RPM maintainer, congrats cat > plugins << EOF # # libmad and MPEG related plugins xineplug_decode_mad xineplug_decode_mpeg2 xineplug_dmx_mpeg xineplug_dmx_mpeg_block xineplug_dmx_mpeg_ts xineplug_dmx_mpeg_elem xineplug_dmx_mpeg_pes xineplug_dmx_yuv4mpeg2 xineplug_inp_vcd xineplug_inp_vcdo # # NES Music File Format. free ?? xineplug_decode_nsf # # AC3 xineplug_decode_a52 # # likely to have legal problems xineplug_decode_dvaudio xineplug_decode_faad xineplug_decode_ff xineplug_dmx_asf # # dxr3 plugin is more featureful with mpeg xineplug_decode_dxr3_spu xineplug_decode_dxr3_video xineplug_vo_out_dxr3 # # DVD reading xineplug_inp_dvd # # http://www.videolan.org/dtsdec.html xineplug_decode_dts # # MMS xineplug_inp_mms # # Don't build on the free rpm post/xineplug_post_planar post/xineplug_post_tvtime # EOF DIR="$(ls -1d $RPM_BUILD_ROOT%{_libdir}/xine/plugins/*)" mv $DIR $DIR.temp mkdir -p $DIR/post grep -v ^# plugins | while read i; do mv $DIR.temp/$i.so $DIR/$i.so done rm -rf $DIR.temp %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc doc/README.dxr3 doc/README.network_dvd %{_libdir}/xine/plugins/%{abiver}/xineplug_*.so %{_libdir}/xine/plugins/%{abiver}/post/xineplug_*.so %changelog * Sun Aug 10 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 1.1.12-2 - rename to xine-lib-extras-freeworld - add provides and obsoletes for packages from livna and freshrpms * Wed Apr 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-1 - 1.1.12. * Sun Mar 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-1 - 1.1.11.1. - Require xine-lib(plugin-abi) instead of xine-lib. * Wed Mar 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11-1 - 1.1.11. - Specfile cleanups. * Fri Feb 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10.1-2 - Be explicit about using internal dvdnav for now. * Fri Feb 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10.1-1 - 1.1.10.1. * Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-2 - Move spu, spucc, and spucmml decoders to main xine-lib. * Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-1 - 1.1.10 (security update). * Sat Jan 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-1 - 1.1.9.1 (security update). * Sun Jan 6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9-1 - 1.1.9. * Wed Dec 5 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-6 - Rebuild to fix crashes with new libdvdnav. * Sat Nov 24 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.1.8-5 - rebuilt * Tue Nov 06 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.1.8-4 - fix building against latest ffmpeg * Tue Nov 06 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.1.8-3 - rebuild * Sat Sep 1 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-2 - BuildRequires: gawk * Sat Sep 1 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-1 - 1.1.8, "open" patch applied upstream. * Tue Aug 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-2 - Protect "open" for glibc 2.6.90 and -D_FORTIFY_SOURCE=2. - License: GPLv2+ * Thu Jun 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-1 - 1.1.7. * Wed Apr 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-1 - 1.1.6. * Wed Apr 11 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.5-1 - 1.1.5, GSM 06.10 decoder moved to Fedora xine-lib. * Wed Jan 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-1 - 1.1.4. * Tue Dec 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-4 - Use system libdca. * Sun Dec 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-3 - Fix build time libpostproc version check. * Sun Dec 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-2 - Don't run autotools during build. * Sat Dec 9 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-1 - 1.1.3, require same version of xine-lib. * Mon Nov 6 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.2-5 - Build DXR3 output with X11 (#1258). - Explicitly disable building aRts stuff. * Fri Nov 03 2006 Aurelien Bompard <abompard(a)fedoraproject.org&gt; 1.1.2-4 - require xine-lib >= 1.1.2-17 to ease transition * Wed Nov 1 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.2-3 - Explicitly disable quite a few features we don't want in this package. - Drop multilib devel patch, it's a no-op here. * Wed Nov 01 2006 Aurelien Bompard <abompard(a)fedoraproject.org&gt; 1.1.2-2 - remove vdr stuff (unmaintained) * Tue Oct 31 2006 Aurelien Bompard <abompard(a)fedoraproject.org&gt; 1.1.2-1 - initial rpm as xine-extras-nonfree * Fri Aug 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.2-11 - Apply patch from upstream CVS to take advantage of new ffmpeg goodies. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:57:24 -0000 1.1 +++ .cvsignore 10 Aug 2008 11:42:24 -0000 1.2 @@ -0,0 +1 @@ +xine-lib-1.1.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:57:24 -0000 1.1 +++ sources 10 Aug 2008 11:42:24 -0000 1.2 @@ -0,0 +1 @@ +b7254614c78c8b0f1652b8dc06f80b3a xine-lib-1.1.12.tar.bz2