packages: xine-lib/xine-lib.spec, xine-lib/xine-lib-a52.patch (NEW) - added...

Fri Nov 25 19:08:16 CET 2011

Author: qboosh                       Date: Fri Nov 25 18:08:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added a52 patch
- use external liba52, libdts, libmad; separated -decode-a52, -decode-dts, -decode-mad

---- Files affected:
packages/xine-lib:
   xine-lib.spec (1.294 -> 1.295) , xine-lib-a52.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xine-lib/xine-lib.spec
diff -u packages/xine-lib/xine-lib.spec:1.294 packages/xine-lib/xine-lib.spec:1.295

--- packages/xine-lib/xine-lib.spec:1.294	Fri Nov 25 16:49:29 2011
+++ packages/xine-lib/xine-lib.spec	Fri Nov 25 19:08:10 2011
@@ -1,8 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - consider --with-external-a52dec (or document why using internal)
-# - consider --with-external-libdts (or document why using internal)
-# - consider --with-external-libmad (or document why using internal)
 #
 # Workaround for xine-lib.spec - libstk.spec updating:
 # 	1. make-request -r --without stk xine-lib
@@ -56,7 +52,8 @@
 Patch3:		%{name}-sh.patch
 Patch4:		%{name}-vdr.patch
 Patch5:		%{name}-ac.patch
-Patch8:		%{name}-pvr.patch
+Patch6:		%{name}-a52.patch
+Patch7:		%{name}-pvr.patch
 URL:		http://xine.sourceforge.net/
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.22}
 %{?with_fusionsound:BuildRequires:	FusionSound-devel >= 0.9.23}
@@ -64,6 +61,7 @@
 %{?with_opengl:BuildRequires:	OpenGL-GLU-devel}
 %{?with_opengl:BuildRequires:	OpenGL-glut-devel}
 %{?with_sdl:BuildRequires:	SDL-devel >= 1.2.11}
+BuildRequires:	a52dec-libs-devel
 %{?with_aalib:BuildRequires:	aalib-devel >= 1.4}
 %{?with_alsa:BuildRequires:	alsa-lib-devel >= 0.9.0}
 BuildRequires:	autoconf >= 2.59
@@ -80,7 +78,9 @@
 %{?with_caca:BuildRequires:	libcaca-devel >= 0.99-0.beta14}
 BuildRequires:	libcdio-devel >= 0.72
 %{?with_dvd:BuildRequires:	libdvdnav-devel >= 0.1.9}
+BuildRequires:	libdts-devel
 %{?with_dxr3:BuildRequires:	libfame-devel >= 0.8.10}
+BuildRequires:	libmad-devel
 BuildRequires:	libmng-devel
 BuildRequires:	libmodplug-devel >= 0.7
 BuildRequires:	libmpcdec-devel
@@ -178,6 +178,30 @@
 Arquivos include a bibliotecas estáticas necessárias para compilar
 plugins para o xine e o xine-ui.
 
+%package -n xine-decode-a52
+Summary:	XINE - A52 audio decoder plugin
+Summary(pl.UTF-8):	XINE - wtyczka dekodera dźwięku A52
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description -n xine-decode-a52
+XINE - A52 audio decoder plugin.
+
+%description -n xine-decode-a52 -l pl.UTF-8
+XINE - wtyczka dekodera dźwięku A52.
+
+%package -n xine-decode-dts
+Summary:	XINE - DTS audio decoder plugin
+Summary(pl.UTF-8):	XINE - wtyczka dekodera dźwięku DTS
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description -n xine-decode-dts
+XINE - DTS audio decoder plugin.
+
+%description -n xine-decode-dts -l pl.UTF-8
+XINE - wtyczka dekodera dźwięku DTS.
+
 %package -n xine-decode-faad
 Summary:	XINE - FAAD audio decoder plugin
 Summary(pl.UTF-8):	XINE - wtyczka dekodera dźwięku FAAD
@@ -238,12 +262,23 @@
 %description -n xine-decode-image -l pl.UTF-8
 XINE - wtyczka dekodera obrazów opartego na ImageMagick.
 
+%package -n xine-decode-mad
+Summary:	XINE - MAD-based MP3 audio decoder plugin
+Summary(pl.UTF-8):	XINE - wtyczka dekodera dźwięku MP3 oparta na bibliotece MAD
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description -n xine-decode-mad
+XINE - MAD-based MP3 audio decoder plugin.
+
+%description -n xine-decode-mad -l pl.UTF-8
+XINE - wtyczka dekodera dźwięku MP3 oparta na bibliotece MAD.
+
 %package -n xine-decode-mpc
 Summary:	XINE - MPC/MusePack audio decoder plugin
 Summary(pl.UTF-8):	XINE - wtyczka dekodera dźwięku MPC/MusePack
 Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	xine-decode-vorbis
 
 %description -n xine-decode-mpc
 XINE - MPC/MusePack audio decoder plugin.
@@ -846,7 +881,8 @@
 %patch3 -p1
 %{?with_vdr:%patch4 -p1}
 %patch5 -p1
-%patch8 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %{__gettextize}
@@ -865,8 +901,11 @@
 	%{!?with_pulseaudio:--without-pulseaudio} \
 	%{!?with_smb:--disable-samba} \
 	%{?with_aalib:--with-aalib-prefix=/usr} \
+	--with-external-a52dec \
 	--with-external-dvdnav \
 	--with-external-ffmpeg \
+	--with-external-libdts \
+	--with-external-libmad \
 	--with-external-libmpcdec \
 	%{?with_fusionsound:--with-fusionsound} \
 	--with-libflac \
@@ -959,13 +998,10 @@
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_yuv_frames.so
 
 # decoder plugins
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_a52.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_bitplane.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_dts.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_dvaudio.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_gsm610.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_lpcm.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_mad.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_mpeg2.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_nsf.so
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_real.so
@@ -994,6 +1030,14 @@
 %{_pkgconfigdir}/libxine.pc
 %{_mandir}/man1/xine-config.1*
 
+%files -n xine-decode-a52
+%defattr(644,root,root,755)
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_a52.so
+
+%files -n xine-decode-dts
+%defattr(644,root,root,755)
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_dts.so
+
 %files -n xine-decode-faad
 %defattr(644,root,root,755)
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_faad.so
@@ -1016,6 +1060,10 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_image.so
 
+%files -n xine-decode-mad
+%defattr(644,root,root,755)
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_mad.so
+
 %files -n xine-decode-mpc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_mpc.so
@@ -1245,6 +1293,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.295  2011/11/25 18:08:10  qboosh
+- added a52 patch
+- use external liba52, libdts, libmad; separated -decode-a52, -decode-dts, -decode-mad
+
 Revision 1.294  2011/11/25 15:49:29  qboosh
 - updated BRs (ac, gt, vcdimager; added libv4l)
 - separated -decode-faad (FAAD audio decoder)

================================================================
Index: packages/xine-lib/xine-lib-a52.patch
diff -u /dev/null packages/xine-lib/xine-lib-a52.patch:1.1
--- /dev/null	Fri Nov 25 19:08:16 2011
+++ packages/xine-lib/xine-lib-a52.patch	Fri Nov 25 19:08:10 2011
@@ -0,0 +1,27 @@
+Nothing from a52_internal.h is needed by xine plugin
+--- xine-lib-1.1.20/configure.ac.orig	2011-11-25 18:43:46.799774547 +0100
++++ xine-lib-1.1.20/configure.ac	2011-11-25 18:59:53.849806927 +0100
+@@ -1310,7 +1310,7 @@
+   AC_MSG_RESULT([a52dec support disabled])
+ elif test "x$external_a52dec" = "xyes"; then
+   have_a52="yes"
+-  AC_CHECK_HEADERS([a52dec/a52.h a52dec/a52_internal.h],, have_a52="no",
++  AC_CHECK_HEADERS([a52dec/a52.h],, have_a52="no",
+ [
+   #ifdef HAVE_SYS_TYPES_H
+   # include <sys/types.h>
+--- xine-lib-1.1.20/src/liba52/xine_a52_decoder.c.orig	2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.20/src/liba52/xine_a52_decoder.c	2011-11-25 18:59:23.256472569 +0100
+@@ -53,12 +53,6 @@
+ # include "a52.h"
+ #endif
+ 
+-#ifdef HAVE_A52DEC_A52_INTERNAL_H
+-# include <a52dec/a52_internal.h>
+-#else
+-# include "a52_internal.h"
+-#endif
+-
+ #include "buffer.h"
+ #include "xineutils.h"
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xine-lib/xine-lib.spec?r1=1.294&r2=1.295&f=u

