xine-lib 1.2.1-2 ajout patch ffmpeg-0.11.patch

6 files changed, 95 insertions, 11 deletions

diff --git a/xine-lib/.footprint.i686 b/xine-lib/.footprint.i686
index 341a92638..b8f7c23d7 100644
--- a/xine-lib/.footprint.i686
+++ b/xine-lib/.footprint.i686
@@ -68,8 +68,10 @@ drwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_alsa.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_esd.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_file.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_jack.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_none.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_oss.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_pulseaudio.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_a52.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_bitplane.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_dts.so
@@ -143,6 +145,7 @@ drwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_nsf.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_sputext.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vdr.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_aa.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_caca.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_dxr3.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_fb.so
diff --git a/xine-lib/.footprint.x86_64 b/xine-lib/.footprint.x86_64
index 341a92638..b8f7c23d7 100644
--- a/xine-lib/.footprint.x86_64
+++ b/xine-lib/.footprint.x86_64
@@ -68,8 +68,10 @@ drwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_alsa.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_esd.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_file.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_jack.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_none.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_oss.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_ao_out_pulseaudio.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_a52.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_bitplane.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_decode_dts.so
@@ -143,6 +145,7 @@ drwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/post/
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_nsf.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_sputext.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vdr.so
+-rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_aa.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_caca.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_dxr3.so
 -rwxr-xr-x	root/root	usr/lib/xine/plugins/2.1/xineplug_vo_out_fb.so
diff --git a/xine-lib/.md5sum.i686 b/xine-lib/.md5sum.i686
index 94ecd1286..ff6a024d4 100644
--- a/xine-lib/.md5sum.i686
+++ b/xine-lib/.md5sum.i686
@@ -1 +1,2 @@
+5b8c22606a55e1b1f723cd8c1c1ae0d7  ffmpeg-0.11.patch
 6884ba356ebd7f0ccf900f91ebf15a65  xine-lib-1.2.1.tar.xz
diff --git a/xine-lib/.md5sum.x86_64 b/xine-lib/.md5sum.x86_64
index 94ecd1286..ff6a024d4 100644
--- a/xine-lib/.md5sum.x86_64
+++ b/xine-lib/.md5sum.x86_64
@@ -1 +1,2 @@
+5b8c22606a55e1b1f723cd8c1c1ae0d7  ffmpeg-0.11.patch
 6884ba356ebd7f0ccf900f91ebf15a65  xine-lib-1.2.1.tar.xz
diff --git a/xine-lib/Pkgfile b/xine-lib/Pkgfile
index 1bcdfe342..afb26042c 100755
--- a/xine-lib/Pkgfile
+++ b/xine-lib/Pkgfile
@@ -2,17 +2,18 @@
 # URL: http://xinehq.de/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: mesa3d, xorg-libxvmc, xorg-libxcb, faad2, libcaca, speex, libmng, esound, libvorbis, flac, libtheora, sdl, ffmpeg, vcdimager, wavpack, samba3, librsvg, imagemagick, libvdpau
-# Run on: mesa3d,xorg-libxvmc,xorg-libxcb,faad2,libcaca,speex,libmng,esound,libvorbis,flac,libtheora,sdl,ffmpeg,vcdimager,wavpack,samba3,librsvg,imagemagick,libvdpau
+# Depends on: mesa3d, xorg-libxvmc, xorg-libxcb, faad2, libcaca, speex, libmng, esound, libvorbis, flac, libtheora, sdl, ffmpeg, vcdimager, wavpack, samba3, librsvg, imagemagick, libvdpau, jack2, pulseaudio, speex
+# Run on: mesa3d,xorg-libxvmc,xorg-libxcb,faad2,libcaca,speex,libmng,esound,libvorbis,flac,libtheora,sdl,ffmpeg,vcdimager,wavpack,samba3,librsvg,imagemagick,libvdpau,jack2,pulseaudio,speex
 
 name=xine-lib
 version=1.2.1
-release=1
-source=(http://downloads.sourceforge.net/xine/$name-$version.tar.xz)
+release=2
+source=(http://downloads.sourceforge.net/xine/$name-$version.tar.xz
+	ffmpeg-0.11.patch)
 
 build() {
 	cd $name-$version
-
+	patch -p1 < ../ffmpeg-0.11.patch
 	./configure  --prefix=/usr \
 		--with-w32-path=/usr/lib/codecs \
 		--with-xv-path=/usr/lib \
@@ -21,14 +22,11 @@ build() {
 		--with-libflac \
 		--with-wavpack \
 		--with-xcb \
-		--without-arts \
-		--without-speex \
+		--with-speex \
 		--disable-gnomevfs \
-		--without-pulseaudio \
-		--disable-aalib \
+		--with-pulseaudio \
 		--disable-modplug \
-		--with-external-ffmpeg \
-		--without-jack
+		--with-jack
 	make
 	make DESTDIR=$PKG install
 }
diff --git a/xine-lib/ffmpeg-0.11.patch b/xine-lib/ffmpeg-0.11.patch
new file mode 100644
index 000000000..c24aee8a3
--- /dev/null
+++ b/xine-lib/ffmpeg-0.11.patch
@@ -0,0 +1,78 @@
+From ebbd60ff7043826886cd7c35fde9e06bfe3b5093 Mon Sep 17 00:00:00 2001
+From: Edgar Hucek
+Date: Sun, 29 Jan 2012 21:39:38 +0000
+Subject: fix compile against recent ffmpeg
+
+---
+diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
+index ecfa0a8..2ec18c5 100644
+--- a/src/combined/ffmpeg/ff_video_decoder.c
++++ b/src/combined/ffmpeg/ff_video_decoder.c
+@@ -130,7 +130,9 @@ struct ff_video_decoder_s {
+ 
+   yuv_planes_t      yuv;
+ 
++#ifdef AVPaletteControl
+   AVPaletteControl  palette_control;
++#endif
+ 
+ #ifdef LOG
+   enum PixelFormat  debug_fmt;
+@@ -218,7 +220,9 @@ static int get_buffer(AVCodecContext *context, AVFrame *av_frame){
+   /* We should really keep track of the ages of xine frames (see
+    * avcodec_default_get_buffer in libavcodec/utils.c)
+    * For the moment tell ffmpeg that every frame is new (age = bignumber) */
++#ifdef AVFRAMEAGE
+   av_frame->age = 256*256*256*64;
++#endif
+ 
+   av_frame->type= FF_BUFFER_TYPE_USER;
+ 
+@@ -1028,7 +1032,9 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b
+     memcpy(this->context->extradata, buf->decoder_info_ptr[2],
+       buf->decoder_info[2]);
+ 
+-  } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) {
++  }
++#ifdef AVPaletteControl
++  else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) {
+     unsigned int i;
+ 
+     palette_entry_t *demuxer_palette;
+@@ -1047,7 +1053,9 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b
+     }
+     decoder_palette->palette_changed = 1;
+ 
+-  } else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) {
++  }
++#endif
++  else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) {
+     int i;
+ 
+     lprintf("BUF_SPECIAL_RV_CHUNK_TABLE\n");
+@@ -1794,7 +1802,9 @@ static video_decoder_t *ff_video_open_plugin (video_decoder_class_t *class_gen,
+   this->av_frame          = avcodec_alloc_frame();
+   this->context           = avcodec_alloc_context();
+   this->context->opaque   = this;
++#ifdef AVPaletteControl
+   this->context->palctrl  = NULL;
++#endif
+ 
+   this->decoder_ok        = 0;
+   this->decoder_init_mode = 1;
+diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h
+index 371b5cc..69b9aa3 100644
+--- a/src/combined/ffmpeg/ffmpeg_compat.h
++++ b/src/combined/ffmpeg/ffmpeg_compat.h
+@@ -91,5 +91,9 @@
+ #  define AVAUDIO 2
+ #endif
+ 
++/* AVFrame.age */
++#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1)
++#  define AVFRAMEAGE 1
++#endif
+ 
+ #endif /* XINE_AVCODEC_COMPAT_H */
+--
+cgit v0.9.0.2-39-g756e