Author: goetz
Date: Mon Dec 4 10:31:32 2006
New Revision: 90339
Added:
packages/cooker/xine-lib/current/SOURCES/xine-lib-1.1.3.tar.bz2 (contents,
props changed)
Modified:
packages/cooker/xine-lib/current/SPECS/xine-lib.spec
Log:
- move caca output plugin to subpackage
- bump caca deps
- enable jack, syncfb and pulse plugins
- drop patches 0,2
- new version
Added: packages/cooker/xine-lib/current/SOURCES/xine-lib-1.1.3.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/xine-lib/current/SPECS/xine-lib.spec
==============================================================================
--- packages/cooker/xine-lib/current/SPECS/xine-lib.spec (original)
+++ packages/cooker/xine-lib/current/SPECS/xine-lib.spec Mon Dec 4
10:31:32 2006
@@ -1,5 +1,5 @@
-%define version 1.1.2
-%define rel 6
+%define version 1.1.3
+%define rel 1
%define release %mkrel %rel
%define name xine-lib
%define major 1
@@ -9,7 +9,7 @@
#fixed2
%{?!mkrel:%define mkrel(c:) %{-c: 0.%{-c*}.}%{!?_with_unstable:%(perl -e
'$_="%{1}";m/(.\*\\D\+)?(\\d+)$/;$rel=${2}-1;re;print
"$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo
$[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}}
-%define build_pulse 0
+%define build_pulse 1
%define build_magick 1
%if %mdkversion < 1010
@@ -96,17 +96,16 @@
License: GPL
Group: System/Libraries
Source: http://prdownloads.sourceforge.net/xine/%name-%version.tar.bz2
-Patch: xine-lib-1.1.2+flac-1.1.3.patch
Patch1: xine-lib-1.0-real.patch.bz2
-Patch2: xine-lib-1.1.2-CVE-2006-4800.patch
# TODO: build vidix on amd64 and other arches?
URL: http://xine.sourceforge.net
BuildRoot: %_tmppath/%{name}-buildroot
Buildrequires: aalib-devel
-Buildrequires: libcaca-devel
+Buildrequires: libcaca-devel >= 0.99
Buildrequires: esound-devel
Buildrequires: libvorbis-devel
Buildrequires: libspeex-devel
+Buildrequires: libjack-devel
Buildrequires: libarts-devel
Buildrequires: libSDL-devel
Buildrequires: libmng-devel
@@ -207,6 +206,17 @@
This package contains the SDL video output plugin.
+%package -n %{bname}-caca
+Group: Video
+Summary: Caca video output plugin for xine
+Requires: %{bname}-plugins = %version
+
+%description -n %bname-caca
+xine is a free gpl-licensed video player for unix-like systems.
+
+This package contains the Caca video output plugin.
+
+
%package -n %libname
Summary: A Free Video Player (Libraries)
Group: System/Libraries
@@ -250,6 +260,16 @@
- Esd audio output plugin
+%package -n %{bname}-jack
+Summary: Jack plugin for xine
+Group: Sound
+Requires: %{bname}-plugins = %version
+
+%description -n %{bname}-jack
+xine is a free gpl-licensed video player for unix-like systems.
+
+- Jack audio output plugin
+
%if %build_pulse
%package -n %{bname}-pulse
Summary: Pulseaudio plugin for xine
@@ -375,9 +395,7 @@
%prep
%setup -q
-%patch -p1 -b .flac
%patch1 -p1 -b .real
-%patch2 -p1 -b .cve-2006-4800
#gw we need the one from flac 1.1.3
rm m4/libFLAC.m4
aclocal-1.9 -I m4
@@ -385,13 +403,14 @@
automake-1.9
%build
-#gw bug on Mandrakelinux 9.0:
-export SED=sed
%if %mdkversion <= 1000
%define __libtoolize true
%endif
+#gw for flac
+export OGG_LIBS=-logg
+
%if !%build_optimization
export CFLAGS="%(echo %optflags|sed s/-Wp,-D_FORTIFY_SOURCE=2//)"
%configure2_5x \
@@ -444,8 +463,7 @@
%install
rm -rf %buildroot libxine1.lang
-#gw the transform trick is needed for mdk9.0
-%makeinstall_std transform=""
+%makeinstall_std
%if %mdkversion >= 1020
%multiarch_binaries %buildroot%_bindir/xine-config
%endif
@@ -515,13 +533,13 @@
%endif
%_libdir/xine/plugins/%version/xineplug_decode_vorbis.so
%_libdir/xine/plugins/%version/xineplug_decode_yuv.so
-%_libdir/xine/plugins/%version/xineplug_vo_out_caca.so
%if %build_directfb
%_libdir/xine/plugins/%version/xineplug_vo_out_directfb.so
%endif
%if %build_linuxfb
%_libdir/xine/plugins/%version/xineplug_vo_out_fb.so
%endif
+%_libdir/xine/plugins/%version/xineplug_vo_out_syncfb.so
%_libdir/xine/plugins/%version/xineplug_vo_out_opengl.so
%_libdir/xine/plugins/%version/xineplug_vo_out_none.so
%if %build_vidix
@@ -552,6 +570,11 @@
%doc README
%_libdir/xine/plugins/%version/xineplug_vo_out_sdl.so
+%files -n %bname-caca
+%defattr(-,root,root)
+%doc README
+%_libdir/xine/plugins/%version/xineplug_vo_out_caca.so
+
%if %build_magick
%files -n %{bname}-image
%defattr(-,root,root)
@@ -590,6 +613,11 @@
%doc README
%_libdir/xine/plugins/%version/xineplug_ao_out_esd.so
+%files -n %{bname}-jack
+%defattr(-,root,root)
+%doc README
+%_libdir/xine/plugins/%version/xineplug_ao_out_jack.so
+
%if %build_pulse
%files -n %{bname}-pulse
%defattr(-,root,root)
