rpms/xine-lib/devel .cvsignore, 1.17, 1.18 sources, 1.18, 1.19 xine-lib-cleanup-sources.sh, 1.7, 1.8 xine-lib.spec, 1.50, 1.51 xine-lib-1.1.15-ansi.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29475

Modified Files:
	.cvsignore sources xine-lib-cleanup-sources.sh xine-lib.spec 
Removed Files:
	xine-lib-1.1.15-ansi.patch 
Log Message:
* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16, plugin ABI 1.25
- --with-external-libdvdnav, include demuxers (#213597)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	15 Aug 2008 19:38:41 -0000	1.17
+++ .cvsignore	7 Jan 2009 19:18:46 -0000	1.18
@@ -1,2 +1,2 @@
-xine-lib-1.1.15-autotools.patch.bz2
-xine-lib-1.1.15-pruned.tar.bz2
+xine-lib-1.1.16-autotools.patch.bz2
+xine-lib-1.1.16-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	15 Aug 2008 19:38:41 -0000	1.18
+++ sources	7 Jan 2009 19:18:46 -0000	1.19
@@ -1,2 +1,2 @@
-ffd74ec893a5f1167c69987a68f436fd  xine-lib-1.1.15-autotools.patch.bz2
-acdbdc024382afac111eb076304448ed  xine-lib-1.1.15-pruned.tar.bz2
+5caed155987cd453b6e23b8720dfbd3d  xine-lib-1.1.16-autotools.patch.bz2
+512f31d8414ef4654ca366c0dce37301  xine-lib-1.1.16-pruned.tar.bz2


Index: xine-lib-cleanup-sources.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib-cleanup-sources.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xine-lib-cleanup-sources.sh	19 Mar 2008 19:51:59 -0000	1.7
+++ xine-lib-cleanup-sources.sh	7 Jan 2009 19:18:46 -0000	1.8
@@ -56,11 +56,12 @@
   sed -i -e "/xineplug_inp_$p/d" src/input/Makefile.am
 done
 # Demuxers
-for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do
-  echo "removing $p demuxer..."
-  [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c
-  sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am
-done
+# These are ok now ( http://bugzilla.redhat.com/213597 )
+#for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do
+#  echo "removing $p demuxer..."
+#  [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c
+#  sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am
+#done
 # Postprocessors
 echo "removing planar and deinterlace postprocessors..."
 sed -i -e 's/deinterlace //g' src/post/Makefile.am # see comments in speedy.c


Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xine-lib.spec	12 Dec 2008 21:17:03 -0000	1.50
+++ xine-lib.spec	7 Jan 2009 19:18:46 -0000	1.51
@@ -2,10 +2,9 @@
 # - libstk:  http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
 # - drop the opengl video out plugin?
 #   http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
-# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
 # - deprecate ESD support?
 
-%define         abiver      1.24
+%define         abiver      1.25
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -32,8 +31,8 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.15
-Release:        4%{?dist}
+Version:        1.1.16
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -50,8 +49,6 @@
 Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
 ## upstream patches
-# phonon-xine doesn't compile with xine-lib-1.1.15, http://bugs.kde.org/169365
-Patch100:       xine-lib-1.1.15-ansi.patch
 
 Provides:       xine-lib(plugin-abi) = %{abiver}
 # X11
@@ -111,6 +108,7 @@
 %else
 BuildRequires:  samba-common
 %endif
+BuildRequires:  libdvdnav-devel
 
 %description
 This package contains the Xine library. Xine is a free multimedia player.
@@ -191,10 +189,8 @@
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 
-%patch100 -p1 -b .ansi
-
-# Avoid standard rpaths on lib64 archs:
-sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
+# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
+#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
 
 %build
@@ -223,6 +219,7 @@
     --with-external-ffmpeg \
     --with-xv-path=%{_libdir} \
     --with-libflac \
+    --with-external-libdvdnav \
     --with-external-libmpcdec \
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
@@ -418,6 +415,10 @@
 
 
 %changelog
+* Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
+- xine-lib-1.1.16, plugin ABI 1.25
+- --with-external-libdvdnav, include demuxers (#213597)
+
 * Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-4
 - rebuild for pkgconfig deps
 


--- xine-lib-1.1.15-ansi.patch DELETED ---