rpms/xine-lib/EL-5 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xine-lib-cleanup-sources.sh, 1.4, 1.5 xine-lib.spec, 1.20, 1.21 xine-lib-1.1.15-ansi.patch, 1.1, NONE

Wed Jan 7 21:38:36 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22276

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 mpeg demuxers (#213597)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10

--- .cvsignore	22 Sep 2008 21:01:29 -0000	1.9
+++ .cvsignore	7 Jan 2009 21:38:05 -0000	1.10
@@ -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/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Sep 2008 21:01:29 -0000	1.9
+++ sources	7 Jan 2009 21:38:05 -0000	1.10
@@ -1,2 +1,2 @@
-ffd74ec893a5f1167c69987a68f436fd  xine-lib-1.1.15-autotools.patch.bz2
-acdbdc024382afac111eb076304448ed  xine-lib-1.1.15-pruned.tar.bz2
+fe8148f2a0ec7b2e75ad509e8086e33f  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/EL-5/xine-lib-cleanup-sources.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xine-lib-cleanup-sources.sh	22 Sep 2008 21:01:29 -0000	1.4
+++ xine-lib-cleanup-sources.sh	7 Jan 2009 21:38:05 -0000	1.5
@@ -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/EL-5/xine-lib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xine-lib.spec	22 Sep 2008 21:01:29 -0000	1.20
+++ xine-lib.spec	7 Jan 2009 21:38:05 -0000	1.21
@@ -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}
@@ -14,14 +13,16 @@
     %define     have_vidix  0
 %endif # ix86
 
+%if 0%{?fedora} > 9
+%define _with_caca --with-caca 
+%endif
+
 %if 0%{?fedora}
     %define     with_aalib  %{?_without_aalib:0}%{!?_without_aalib:1}
-    %define     with_caca   %{?_without_caca:0}%{!?_without_caca:1}
     %define     with_pa     %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
     %define     with_xcb    %{?_without_xcb:0}%{!?_without_xcb:1}
 %else
     %define     with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
-    %define     with_caca   %{?_with_caca:1}%{!?_with_caca:0}
     %define     with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
     %define     with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif # Fedora
@@ -32,7 +33,7 @@
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.15
+Version:        1.1.16
 Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
@@ -50,8 +51,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
@@ -70,8 +69,8 @@
 %if %{with_aalib}
 BuildRequires:  aalib-devel >= 1.4
 %endif # aalib
-%if %{with_caca}
-BuildRequires:  libcaca-devel >= 0.99
+%if 0%{?_with_caca:1}
+BuildRequires:  libcaca-devel >= 0.99-0.5.beta16 
 %endif # caca
 %if 0%{!?_without_directfb:1}
 BuildRequires:  directfb-devel
@@ -111,6 +110,7 @@
 %else
 BuildRequires:  samba-common
 %endif
+BuildRequires:  libdvdnav-devel
 
 %description
 This package contains the Xine library. Xine is a free multimedia player.
@@ -170,7 +170,7 @@
 %if %{with_aalib}
   - AA-lib
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca:1}
   - Libcaca
 %endif # caca
 %if 0%{!?_without_imagemagick:1}
@@ -191,15 +191,14 @@
 # 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
 export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
 export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" "
+export FFMPEG_UTIL_CFLAGS=" " FFMPEG_UTIL_LIBS=" "
 export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
 # Keep list of options in mostly the same order as ./configure --help.
 %configure \
@@ -223,10 +222,12 @@
     --with-external-ffmpeg \
     --with-xv-path=%{_libdir} \
     --with-libflac \
+    --with-external-libdvdnav \
     --with-external-libmpcdec \
 %if 0%{?_without_imagemagick:1}
     --without-imagemagick \
 %endif # imagemagick
+    %{?_with_caca} %{!?_with_caca:--without-caca} \
     %{!?_without_arts:--with-arts} %{?_without_arts} \
     --with-wavpack \
     --with-real-codecs-path=%{codecdir} \
@@ -330,6 +331,11 @@
 %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_image.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_matroska.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mng.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_block.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_elem.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_pes.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_ts.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_nsv.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_ogg.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_pva.so
@@ -339,6 +345,7 @@
 %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_slave.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_sputext.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv_frames.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv4mpeg2.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so
 %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so
@@ -394,7 +401,7 @@
 %if %{with_aalib}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so
 %endif # aalib
-%if %{with_caca}
+%if 0%{?_with_caca:1}
 %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so
 %endif # caca
 %if 0%{!?_without_directfb:1}
@@ -418,6 +425,19 @@
 
 
 %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 mpeg demuxers (#213597)
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-4
+- rebuild for pkgconfig deps
+
+* Tue Oct 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.15-3
+- rebuild for new libcaca
+
+* Thu Oct 23 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-2
+- respin
+
 * Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-1
 - xine-lib-1.1.15, plugin ABI 1.24 (rh#455752, CVE-2008-3231)
 - Obsoletes: -arts (f9+)


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


