diff options
6 files changed, 9 insertions, 115 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index e288eb4b1f5b..05acb3d8fd87 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/xine-lib # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.596 2009/04/15 18:55:31 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.597 2009/04/15 20:07:28 aballier Exp $ + + 15 Apr 2009; Alexis Ballier <aballier@gentoo.org> + -files/xine-lib-1.1.15-GetImagePixels.patch, + -files/xine-lib-1.1.15-buffer_h_ansi.patch, + -files/xine-lib-1.1.15-ffmpeg.patch, + -files/xine-lib-1.1.15-libmpeg2-vis.patch, + -files/xine-lib-1.1.16.2-avutil.patch: + remove also the patches... 15 Apr 2009; Alexis Ballier <aballier@gentoo.org> -xine-lib-1.1.15-r1.ebuild, -xine-lib-1.1.16.ebuild, diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch deleted file mode 100644 index c1c572dc72b3..000000000000 --- a/media-libs/xine-lib/files/xine-lib-1.1.15-GetImagePixels.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream ImageMagick changed part of the API and did not updated their -deprecated support stuff, so bump us along for now to avoid having to downgrade. - -Gentoo-bug: 247292 -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> - -diff -Nuar --exclude '*~' xine-lib-1.1.15.orig/src/libxinevdec/image.c xine-lib-1.1.15/src/libxinevdec/image.c ---- xine-lib-1.1.15.orig/src/libxinevdec/image.c 2008-06-14 16:15:00.000000000 -0700 -+++ xine-lib-1.1.15/src/libxinevdec/image.c 2008-11-26 18:10:16.416309036 -0800 -@@ -110,7 +110,15 @@ - width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */ - height = MagickGetImageHeight(wand); - img_buf = malloc(width * height * 3); -+/* In 6.4.5.4 MagickGetImagePixels changed to MagickGetAuthenticPixels -+ * But upstream did not update their deprecated compat stuff. -+ * So do a fun hack to make it work. -+ * - 2008/11/26 Robin H. Johnson <robbat2@gentoo.org> -+ */ -+#if MagickLibVersion >= 0x645 -+#define MagickGetImagePixels MagickGetAuthenticPixels -+#endif - MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf); - DestroyMagickWand(wand); - - _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width); diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-buffer_h_ansi.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-buffer_h_ansi.patch deleted file mode 100644 index e3e411f363e3..000000000000 --- a/media-libs/xine-lib/files/xine-lib-1.1.15-buffer_h_ansi.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xine-lib-1.1.15/src/xine-engine/buffer.h -=================================================================== ---- xine-lib-1.1.15.orig/src/xine-engine/buffer.h -+++ xine-lib-1.1.15/src/xine-engine/buffer.h -@@ -676,7 +676,7 @@ void _x_bmiheader_le2me( xine_bmiheader - /* convert xine_waveformatex struct from little endian */ - void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED; - --static inline _x_is_fourcc(void *ptr, void *tag) { -+static __inline int _x_is_fourcc(void *ptr, void *tag) { - return memcmp(ptr, tag, 4) == 0; - } - diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch deleted file mode 100644 index 27279be377d6..000000000000 --- a/media-libs/xine-lib/files/xine-lib-1.1.15-ffmpeg.patch +++ /dev/null @@ -1,33 +0,0 @@ -# HG changeset patch -# User Darren Salt <linux@youmustbejoking.demon.co.uk> -# Date 1221306490 -3600 -# Node ID f5ff69fc65d3229ac9908b13c5bb0b9317adf80c -# Parent 89c3e23896babb1fc6fe0f4299fa645a47297d4c -Compilation fixes for ffmpeg API & ABI changes. - -diff -r 89c3e23896ba -r f5ff69fc65d3 src/combined/ffmpeg/ff_audio_decoder.c ---- a/src/combined/ffmpeg/ff_audio_decoder.c Fri Sep 05 21:26:59 2008 +0200 -+++ b/src/combined/ffmpeg/ff_audio_decoder.c Sat Sep 13 12:48:10 2008 +0100 -@@ -322,7 +322,7 @@ - - if (!this->output_open) { - if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { -- avcodec_decode_audio (this->context, -+ avcodec_decode_audio2 (this->context, - (int16_t *)this->decode_buffer, - &decode_buffer_size, - &this->buf[0], -diff -r 89c3e23896ba -r f5ff69fc65d3 src/combined/ffmpeg/ffmpeg_decoder.h ---- a/src/combined/ffmpeg/ffmpeg_decoder.h Fri Sep 05 21:26:59 2008 +0200 -+++ b/src/combined/ffmpeg/ffmpeg_decoder.h Sat Sep 13 12:48:10 2008 +0100 -@@ -33,6 +33,10 @@ - # include "../../libffmpeg/libavcodec/avcodec.h" - #endif - -+#if LIBAVCODEC_VERSION_MAJOR > 51 -+#define bits_per_sample bits_per_coded_sample -+#endif -+ - typedef struct ff_codec_s { - uint32_t type; - enum CodecID id; diff --git a/media-libs/xine-lib/files/xine-lib-1.1.15-libmpeg2-vis.patch b/media-libs/xine-lib/files/xine-lib-1.1.15-libmpeg2-vis.patch deleted file mode 100644 index c85fa6086d1f..000000000000 --- a/media-libs/xine-lib/files/xine-lib-1.1.15-libmpeg2-vis.patch +++ /dev/null @@ -1,13 +0,0 @@ -src/libmpeg2/motion_comp_vis.c checks for ENABLE_VIS therefore we also need to check for it. - ---- src/libmpeg2/motion_comp.c -+++ src/libmpeg2/motion_comp.c -@@ -68,7 +68,7 @@ - mpeg2_mc = mpeg2_mc_altivec; - } else - #endif --#ifdef ARCH_SPARC -+#if defined(ARCH_SPARC) && defined(ENABLE_VIS) - if (mm_accel & MM_ACCEL_SPARC_VIS) { - #ifdef LOG - fprintf (stderr, "Using VIS for motion compensation\n"); diff --git a/media-libs/xine-lib/files/xine-lib-1.1.16.2-avutil.patch b/media-libs/xine-lib/files/xine-lib-1.1.16.2-avutil.patch deleted file mode 100644 index 3e92db9136b8..000000000000 --- a/media-libs/xine-lib/files/xine-lib-1.1.16.2-avutil.patch +++ /dev/null @@ -1,30 +0,0 @@ -# HG changeset patch -# User Alexis Ballier <aballier@gentoo.org> -# Date 1236540650 -3600 -# Node ID 044a503f894304328c991f6495f9e14c4c4e5ecb -# Parent ba642133c0c8b4ece4cb4d2a98355afde7264900 -Fix build with libavutil >= 50.0.0 - -PIX_FMT_RGBA32 was #defined to PIX_FMT_RGB32 since 2006. - -diff -r ba642133c0c8 -r 044a503f8943 src/combined/ffmpeg/ff_video_decoder.c ---- a/src/combined/ffmpeg/ff_video_decoder.c Sun Mar 08 16:33:02 2009 +0000 -+++ b/src/combined/ffmpeg/ff_video_decoder.c Sun Mar 08 20:30:50 2009 +0100 -@@ -588,7 +588,7 @@ - img->width, - this->bih.biHeight); - -- } else if (this->context->pix_fmt == PIX_FMT_RGBA32) { -+ } else if (this->context->pix_fmt == PIX_FMT_RGB32) { - - int x, plane_ptr = 0; - uint32_t *argb_pixels; -@@ -1304,7 +1304,7 @@ - - /* initialize the colorspace converter */ - if (!this->cs_convert_init) { -- if ((this->context->pix_fmt == PIX_FMT_RGBA32) || -+ if ((this->context->pix_fmt == PIX_FMT_RGB32) || - (this->context->pix_fmt == PIX_FMT_RGB565) || - (this->context->pix_fmt == PIX_FMT_RGB555) || - (this->context->pix_fmt == PIX_FMT_BGR24) || |