rpms/xine-lib/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xine-lib-cleanup-sources.sh, 1.1, 1.2 xine-lib.spec, 1.1, 1.2

[Aurelien Bompard (abompard) <fedora-extras-commits redhat com>]

Author: abompard

Update of /cvs/extras/rpms/xine-lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7155

Modified Files:
	.cvsignore sources xine-lib-cleanup-sources.sh xine-lib.spec 
Log Message:
version 1.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Oct 2006 18:32:55 -0000	1.2
+++ .cvsignore	8 Dec 2006 07:31:46 -0000	1.3
@@ -1 +1 @@
-xine-lib-1.1.2.tar.bz2
+xine-lib-1.1.3-pruned.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Oct 2006 18:32:55 -0000	1.2
+++ sources	8 Dec 2006 07:31:46 -0000	1.3
@@ -1 +1 @@
-d1afb34d2335f8c9ded4d9a2b741251e  xine-lib-1.1.2.tar.bz2
+eff682745f198e1881773509f12c70c3  xine-lib-1.1.3-pruned.tar.bz2


Index: xine-lib-cleanup-sources.sh
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/devel/xine-lib-cleanup-sources.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xine-lib-cleanup-sources.sh	30 Oct 2006 18:32:55 -0000	1.1
+++ xine-lib-cleanup-sources.sh	8 Dec 2006 07:31:46 -0000	1.2
@@ -6,8 +6,9 @@
 fi
 
 version=$1
-tarball="xine-lib-$version.tar.bz2"
+tarball="xine-lib-$version.tar.gz"
 dir="xine-lib-$version"
+modtarball="xine-lib-$version-pruned.tar.bz2"
 
 
 if [ ! -f $tarball ]; then
@@ -17,7 +18,7 @@
 
 echo "Uncompressing $tarball..."
 rm -rf $dir
-tar -xjf $tarball
+tar -xzf $tarball
 cd $dir
 
 # Main libraries
@@ -58,8 +59,6 @@
 # All clean !
 
 cd ..
-echo "Generating $tarball..."
-rm -f $tarball.orig
-mv $tarball $tarball.orig
-tar -cjf $tarball $dir
+echo "Generating $modtarball..."
+tar -cjf $modtarball $dir
 rm -rf $dir


Index: xine-lib.spec
===================================================================
RCS file: /cvs/extras/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xine-lib.spec	30 Oct 2006 18:32:55 -0000	1.1
+++ xine-lib.spec	8 Dec 2006 07:31:46 -0000	1.2
@@ -1,20 +1,21 @@
 # TODO, sometime, maybe:
 # - libstk:  http://www.libstk.net/
-# - polypaudio
+# - pulseaudio
 
 %define         codecdir %{_libdir}/codecs
 #%define         vdrver 0.7.9
 
 Summary:        Xine library
 Name:           xine-lib
-Version:        1.1.2
-Release:        17%{?dist}
+Version:        1.1.3
+Release:        1%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
 # The tarball is generated from the upstream tarball using
 # the script in SOURCE1. It prunes potentially patented code
-Source0:        http://dl.sourceforge.net/xine/xine-lib-1.1.2.tar.bz2
+#Source0:        http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.gz
+Source0:        xine-lib-%{version}-pruned.tar.bz2
 Source1:        xine-lib-cleanup-sources.sh
 Patch1:         xine-lib-1.1.1-configure-no-mcpu-march.patch
 Patch6:         xine-lib-1.1.1-deepbind-939.patch
@@ -24,22 +25,26 @@
 BuildRequires:  libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel
 # Video
 BuildRequires:  freetype-devel SDL-devel libtheora-devel libmng-devel
-BuildRequires:  aalib-devel >= 1.4 libcaca-devel
+BuildRequires:  aalib-devel >= 1.4
+%if 0%{!?_without_directfb:1}
+BuildRequires:  directfb-devel
+%endif
+%if 0%{!?_without_imagemagick:1}
+BuildRequires:  ImageMagick-devel >= 6.2.4.6-1
+%endif
 # Audio
 BuildRequires:  libogg-devel libvorbis-devel flac-devel libmodplug-devel
 BuildRequires:  esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0
+BuildRequires:  jack-audio-connection-kit-devel
+%if 0%{?_with_caca:1}
+BuildRequires:  libcaca-devel >= 0.99
+%endif
 # CDs
 BuildRequires:  libcdio-devel
 # Other
 BuildRequires:  pkgconfig gnome-vfs2-devel gtk2-devel
 BuildRequires:  libtool >= 1.4.0 /usr/bin/automake-1.9 samba-common
 
-%if 0%{?_with_directfb:1}
-BuildRequires:        directfb-devel
-%endif
-%if 0%{!?_without_imagemagick:1}
-BuildRequires:        ImageMagick-devel >= 6.2.4.6-1
-%endif
 #Provides:        %{name}(vdr) = %{vdrver}
 
 %package devel
@@ -50,6 +55,11 @@
 #Requires:        %{name}(vdr) = %{vdrver}
 #Provides:        %{name}-devel(vdr) = %{vdrver}
 
+%package extras
+Summary:         Additional plugins for xine-lib
+Group:           System Environment/Libraries
+Requires:        %{name} = %{version}-%{release}
+
 
 %description
 This package contains the Xine library. Xine is a free multimedia player.
@@ -58,11 +68,31 @@
 interprets many of the most common multimedia formats available - and some
 of the most uncommon formats, too.  Non-default rpmbuild options:
 --without imagemagick:  Disable ImageMagick support
---with    directfb:     Enable DirectFB support
+--without directfb:     Disable DirectFB support
+--with    caca:         Enable CACA support
 
 %description devel
 This package contains development files for xine-lib.
 
+%description extras
+This package contains extra plugins for xine-lib:
+  - Arts
+  - ESD
+  - Jack
+  - GNOME VFS
+  - SDL
+  - AAlib
+%if 0%{?_with_caca:1}
+  - CACAlib
+%endif
+%if 0%{!?_without_imagemagick:1}
+  - image decoding
+%endif
+%if 0%{!?_without_directfb:1}
+  - DirectFB output
+%endif
+
+
 
 %prep
 %setup -q
@@ -85,21 +115,24 @@
 
 
 %build
-FFMPEG_CPPFLAGS=" "; FFMPEG_LIBS=" "; export FFMPEG_CPPFLAGS FFMPEG_LIBS
+export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
+export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" "
+export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
 %configure --disable-dependency-tracking \
     --with-xv-path=%{_libdir} \
     --with-w32-path=%{codecdir} \
     --with-external-ffmpeg \
     --enable-ipv6 \
-%if 0%{?_with_directfb:1}
+%if 0%{!?_without_directfb:1}
     --enable-directfb \
 %endif
 %if 0%{?_without_imagemagick:1}
-    --disable-imagemagick \
+    --without-imagemagick \
+%endif
+%if 0%{!?_with_caca:1}
+    --without-caca \
 %endif
-    --disable-rte \
     --disable-libfame \
-    --disable-ffmpegtest \
     --disable-faad \
     --disable-mad \
     --disable-asf \
@@ -146,7 +179,6 @@
 %dir %{_libdir}/xine/plugins/%{version}/
 # I list all the plugins because I don't want a non-free plugin
 # to sneak into a future version
-# these plugins do not have legal problems according to the SuSE RPM
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so
@@ -154,6 +186,7 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_dvb.so
@@ -201,7 +234,6 @@
 %{_libdir}/xine/plugins/%{version}/xineplug_flac.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so
-%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
 %ifarch %ix86
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so
@@ -213,13 +245,24 @@
 %endif
 %{_libdir}/xine/plugins/%{version}/post/
 %{_libdir}/xine/plugins/%{version}/vidix/
-# Put it in a xine-lib-extras package one day ?
+
+
+%files extras
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so
 %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so
+%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so
 %{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so
 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so
+%if 0%{?_with_caca:1}
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so
+%endif
+%if 0%{!?_without_imagemagick:1}
 %{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so
+%endif
+%if 0%{!?_without_directfb:1}
+%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so
+%endif
 
 
 %files devel
@@ -233,9 +276,22 @@
 %{_libdir}/pkgconfig/libxine.pc
 %{_mandir}/man1/xine-config.1*
 
-# --------------------------------------------------------------------
+
 
 %changelog
+* Mon Dec 04 2006 Aurelien Bompard <abompard fedoraproject org> 1.1.3-1
+- version 1.1.3
+- patch2 applied upstream
+- Disable CACA support by default, needs newer than what's in FE ATM.
+- Split extras plugins in a separate package
+- Enable JACK support (in extras subpackage)
+- Enable DirectFB support (in extras subpackage)
+
+* Sat Nov 11 2006 Aurelien Bompard <abompard fedoraproject org> 1.1.2-18
+- Make shn files available to amarok. References:
+  http://xine.cvs.sourceforge.net/xine/xine-lib/src/demuxers/demux_shn.c?r1=1.1.2.2&r2=1.2
+  https://launchpad.net/distros/ubuntu/+source/xine-lib/+bug/63130
+
 * Wed Oct 18 2006 Aurelien Bompard <abompard fedoraproject org> 1.1.2-17
 - cleanup docs
 - remove mms