rpms/xine-lib-extras-freeworld/EL-6 xine-lib-1.1.19-no_autopoint.patch, 1.2, 1.3 xine-lib-1.1.4-optflags.patch, 1.2, 1.3 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 xine-lib-extras-freeworld.spec, 1.55, 1.56 xine-lib-1.1.1-deepbind-939.patch, 1.3, NONE xine-lib-1.1.18-ffmpeg.patch, 1.1, NONE xine-lib-1.1.3-optflags.patch, 1.3, NONE

Rex Dieter rdieter at rpmfusion.org
Tue Aug 26 23:36:28 CEST 2014 

Author: rdieter

Update of /cvs/free/rpms/xine-lib-extras-freeworld/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3907

Modified Files:
	.cvsignore sources xine-lib-extras-freeworld.spec 
Added Files:
	xine-lib-1.1.19-no_autopoint.patch 
	xine-lib-1.1.4-optflags.patch 
Removed Files:
	xine-lib-1.1.1-deepbind-939.patch xine-lib-1.1.18-ffmpeg.patch 
	xine-lib-1.1.3-optflags.patch 
Log Message:
sync with F-19 branch, for 1.1.21


xine-lib-1.1.19-no_autopoint.patch:
 autogen.sh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: xine-lib-1.1.19-no_autopoint.patch
===================================================================
RCS file: xine-lib-1.1.19-no_autopoint.patch
diff -N xine-lib-1.1.19-no_autopoint.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xine-lib-1.1.19-no_autopoint.patch	26 Aug 2014 21:36:27 -0000	1.3
@@ -0,0 +1,17 @@
+diff -up xine-lib-1.1.17/autogen.sh.no_autopoint xine-lib-1.1.17/autogen.sh
+--- xine-lib-1.1.17/autogen.sh.no_autopoint	2009-10-09 09:33:31.000000000 -0500
++++ xine-lib-1.1.17/autogen.sh	2009-12-02 09:15:48.534555467 -0600
+@@ -229,10 +229,10 @@ run_aclocal () {
+     echo
+   fi
+   
+-  echo $_echo_n " + Running autopoint: $_echo_c"
++  #echo $_echo_n " + Running autopoint: $_echo_c"
+   
+-  autopoint
+-  echo "done." 
++  #autopoint
++  #echo "done." 
+ 
+   echo $_echo_n " + Running aclocal: $_echo_c"
+ 

xine-lib-1.1.4-optflags.patch:
 optimizations.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: xine-lib-1.1.4-optflags.patch
===================================================================
RCS file: xine-lib-1.1.4-optflags.patch
diff -N xine-lib-1.1.4-optflags.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xine-lib-1.1.4-optflags.patch	26 Aug 2014 21:36:27 -0000	1.3
@@ -0,0 +1,11 @@
+--- xine-lib-1.1.4/m4/optimizations.m4~	2006-06-17 18:20:56.000000000 +0300
++++ xine-lib-1.1.4/m4/optimizations.m4	2007-01-30 23:03:27.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


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-6/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	7 Dec 2013 18:36:30 -0000	1.16
+++ .cvsignore	26 Aug 2014 21:36:27 -0000	1.17
@@ -1 +1 @@
-xine-lib-1.1.18.1.tar.bz2
+xine-lib-1.1.21.tar.xz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-6/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	7 Dec 2013 18:36:30 -0000	1.16
+++ sources	26 Aug 2014 21:36:27 -0000	1.17
@@ -1 +1 @@
-3efad551f2f8a9c5734855a6639694ef  xine-lib-1.1.18.1.tar.bz2
+d0163d4f9d7613fb050c5c2205973336  xine-lib-1.1.21.tar.xz


Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-6/xine-lib-extras-freeworld.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xine-lib-extras-freeworld.spec	7 Dec 2013 18:36:30 -0000	1.55
+++ xine-lib-extras-freeworld.spec	26 Aug 2014 21:36:27 -0000	1.56
@@ -1,38 +1,25 @@
-# TODO:
-# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
 
-%define plugin_abi  1.28
-
-%if 0%{?fedora} > 6 || 0%{?rhel} > 4
-%define _with_external_ffmpeg --with-external-ffmpeg
-%define _with_external_libfaad --with-external-libfaad
-%endif
+%define plugin_abi  1.30
 
 Name:           xine-lib-extras-freeworld
 Summary:        Extra codecs for the Xine multimedia library
-Version:        1.1.18.1
-Release:        2%{?dist}
+Version:        1.1.21
+Release:        6%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
-Source0:        http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: xine-lib-1.1.3-optflags.patch
-Patch1: xine-lib-1.1.18-ffmpeg.patch
-Patch6: xine-lib-1.1.1-deepbind-939.patch
-
-## upstreamable patches
+Patch0:         xine-lib-1.1.19-no_autopoint.patch
+Patch1:         xine-lib-1.1.4-optflags.patch
 
+BuildRequires:  autoconf automake libtool
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
 BuildRequires:  gawk
-%if 0%{?_with_external_libfaad:1}
 BuildRequires:  faad2-devel
-%endif
-%if 0%{?_with_external_ffmpeg:1}
 BuildRequires:  ffmpeg-devel >= 0.4.9-0.22.20060804
-%endif
 BuildRequires:  a52dec-devel
 BuildRequires:  libmad-devel
 BuildRequires:  libdca-devel
@@ -43,12 +30,16 @@
 # vcdimager reads and writes MPEG
 BuildRequires:  vcdimager-devel >= 0.7.23
 BuildRequires:  sed
+BuildRequires:  libdvdnav-devel
+BuildRequires:  libdvdread-devel
 # Obsolete DXR3 deps, better handled by ffmpeg
 BuildConflicts: rte-devel
 BuildConflicts: libfame-devel
 
 Requires:       vcdimager >= 0.7.23
 Requires:       xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}
+# DVD plugin moved to Fedora (not encumbered)
+Requires:       xine-lib >= 1.1.21-2
 
 # obsolete old livna package
 Provides:       xine-lib-extras-nonfree = %{version}-%{release}
@@ -68,15 +59,12 @@
 %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
-%patch1 -p1 -b .ffmpeg
-# when compiling with external ffmpeg and internal libfaad #939.
-#patch6 -p1 -b .deepbind
+%patch0 -p1 -b .no_autopoint
+# extra work for to omit old libtool-related crud
+rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
+%patch1 -p1 -b .optflags
 
-# Avoid standard rpaths on lib64 archs:
-sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
+./autogen.sh noconfig
 
 
 %build
@@ -87,24 +75,25 @@
     --disable-opengl \
     --disable-xvmc \
     --disable-aalib \
-    --disable-caca \
-    --disable-sdl \
-    --disable-rte \
-    --disable-libfame \
-    --disable-speex \
-    --disable-flac \
+    --disable-musepack \
     --disable-mng \
-    --disable-imagemagick \
-    --disable-freetype \
-    --disable-alsa \
-    --disable-esd \
-    --disable-arts \
     --disable-gnomevfs \
     --disable-gdkpixbuf \
     --disable-samba \
-    %{?_with_external_ffmpeg} \
+    --with-external-ffmpeg \
+    --without-caca \
+    --without-sdl \
+    --without-speex \
+    --without-libflac \
     --with-external-a52dec \
     --with-external-libmad \
+    --without-imagemagick \
+    --without-freetype \
+    --without-alsa \
+    --without-esound \
+    --without-arts \
+    --with-external-dvdnav \
+    --with-external-libfaad \
     --with-external-libdts
 
 make %{?_smp_mflags}
@@ -154,9 +143,6 @@
 xineplug_decode_dxr3_video
 xineplug_vo_out_dxr3
 #
-# DVD reading
-xineplug_inp_dvd
-#
 # http://www.videolan.org/dtsdec.html
 xineplug_decode_dts
 #
@@ -184,14 +170,64 @@
 
 %files
 %defattr(-,root,root,-)
-%doc doc/README.dxr3 doc/README.network_dvd
+%doc doc/README.dxr3
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_*.so
 %{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_*.so
 
 
 %changelog
-* Sat Dec 07 2013 Robert Scheck <robert at fedoraproject.org> 1.1.18.1-2
-- Rebuild for Red Hat Enterprise Linux 6 (RFBZ #3052)
+* Sun May 26 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.1.21-6
+- Rebuilt for x264/FFmpeg
+
+* Wed Jan 30 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.1.21-5
+- Rebuilt for ffmpeg
+
+* Sat Nov 24 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.1.21-4
+- Rebuilt for FFmpeg 1.0
+
+* Mon Jul 16 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.21-3
+- drop DVD plugin, not encumbered (by itself), moved to Fedora
+
+* Tue Jun 26 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.1.21-2
+- Rebuilt for FFmpeg
+
+* Sat Jun 23 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.21-1
+- update to 1.1.21 (bugfix release, matches Fedora xine-lib)
+
+* Fri Mar 09 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.1.20.1-2
+- Rebuilt
+
+* Tue Jan 03 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.1.20.1-1
+- update to 1.1.20.1 (bugfix release, matches Fedora xine-lib)
+- drop upstreamed link-libdvdread and system-a52dec patches
+
+* Fri Nov 25 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.20-3
+- --disable-musepack, avoids building the unused bundled libmusepack (the
+  musepack plugin (using the system lib) is included in the Fedora xine-lib)
+
+* Thu Nov 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.20-2
+- don't check for and include a52_internal.h, fixes system a52dec support
+
+* Tue Nov 22 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.20-1
+- update to 1.1.20 (matches Fedora xine-lib)
+- use .xz tarball
+- drop old conditionals
+- drop unused deepbind patch
+- use the system libdvdnav (and libdvdread) instead of the bundled one
+- fix system libdvdnav support to also link libdvdread
+- run autogen.sh in %%prep, don't patch generated files
+- drop ffmpeg08 patch, fixed upstream
+- update configure flags (drop nonexistent ones, fix renamed ones)
+- plugin ABI is now 1.30
+
+* Thu Sep 29 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.19-3
+- fix build with FFmpeg 0.8 (#1957)
+
+* Mon Sep 26 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.1.19-2
+- Rebuilt for FFmpeg-0.8
+
+* Sun Jul 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.19-1
+- xine-lib-1.1.19
 
 * Sun Mar 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.18.1-1
 - xine-lib-1.1.18.1


--- xine-lib-1.1.1-deepbind-939.patch DELETED ---


--- xine-lib-1.1.18-ffmpeg.patch DELETED ---


--- xine-lib-1.1.3-optflags.patch DELETED ---

More information about the rpmfusion-commits mailing list