remove also the patches...

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

7 files changed, 13 insertions, 124 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/Manifest b/media-libs/xine-lib/Manifest
index f7d01d1e1c78..40cfe0319d33 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,19 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX xine-lib-1.1.15-GetImagePixels.patch 1209 RMD160 32f9ca2c96ede51238119899520ea1c2a2915654 SHA1 24e2741f1bd6df6c04a0d204966219c63c18e9bf SHA256 8f4d93765f8610117af8fe98fc915d0ef7c6a6373bc126f06be3d3f1d27fb7d1
-AUX xine-lib-1.1.15-buffer_h_ansi.patch 556 RMD160 d6607e3319a1fe0d6f88a40dd775d3064ce8fb5e SHA1 f96f76c22267d3a814caf6db080f81df5070bd5d SHA256 d5aa882549203e56f9f15225e051f2aabc06302396f07aa2a2306cba62451d9b
-AUX xine-lib-1.1.15-ffmpeg.patch 1346 RMD160 a15b850afa2169a4f2cffc551eda067b5290e1b0 SHA1 de8d2d3f755ed87bb9650749ba339974f57a7538 SHA256 6bd74e3646a7bed6bbb8449de25995006d7a011b3e3abdfbf8791334a00b8d85
-AUX xine-lib-1.1.15-libmpeg2-vis.patch 405 RMD160 896298250884a9e3a1b168fe7140835a7112bc53 SHA1 3a3212a629c630e52327f25b3df3c5ecef5b5bbb SHA256 90af2c9a50db6dc358df59c9ab3e4aaed4bc8a8686f2b512e1dffa97b64825fe
-AUX xine-lib-1.1.16.2-avutil.patch 1146 RMD160 eca8f43139e5d5bd6ea6ae0fb22c2ed564a2684f SHA1 831fbfcceaf81e68e31a73adca97379e8b95bb6f SHA256 26d64b3df1f711ed76e4a44adc47361559d185456f17e06748aafc3e8142b59d
 DIST xine-lib-1.1.16.3.tar.bz2 7468182 RMD160 279304a4e998472b2b5e79887e54c47765044ec6 SHA1 64c57c5f55ff37023cc4c3d93d4df3c06950d235 SHA256 d25a241efa55dc7d8f482336efa8bb7b9bb9d69b6df8a8a37f2660948fd67b52
 EBUILD xine-lib-1.1.16.3.ebuild 5441 RMD160 eca15fe5cf89a88918c333d93bcdb0d89952005d SHA1 61e965cf2939b6637595d1aab0457a33c71b01db SHA256 b3fbba9d1195eb99104ee8c81d16d6fa44ee0c6b4664d638571913eeee73cd05
-MISC ChangeLog 68342 RMD160 4d76e0f4cbcd0e0e08fd3c229ef51b34d957f9fc SHA1 b1a5b8763eeb5e59b4531f26e1c7e1402e131b9b SHA256 aff7f75fb9f90e6f7cb8e2b3d5d429459edf90c12e85606b5462ea915b8396af
+MISC ChangeLog 68642 RMD160 7f58e5d26e061908afae996130b47c7b80bdcb44 SHA1 56e42fdb6baf2479e30a27c5b78e7ec61cfa30c3 SHA256 8096d0491c70ae1dc7cd7a16ac387d575e95b99748531d33e798e53420eb0610
 MISC metadata.xml 2914 RMD160 bed4bab81a32b49e4923ddfcc02e8338a45ef7ef SHA1 fe3faf7dba7f929241acfe5eaa17b2f66bfb2722 SHA256 efe3b879c59c9971e1ffcd732c2bdbd8f60f2b173fde675a371202ceeb96b0fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknmLakACgkQvFcC4BYPU0rp0wCdGEQ4MaFBdqT8Bo1183qvmH9l
-tEQAnAibY1dK1pRbv+NUKPL9psUan+Ww
-=2z7G
+iEYEARECAAYFAknmPoYACgkQvFcC4BYPU0pozgCfeI3xufTbpUUuUAMUdezFEj4H
+XmMAoIb6goq41Row1HIR36hn88OIv0V1
+=r8L2
 -----END PGP SIGNATURE-----
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) ||