Simplify ffmpeg patch (fixes bug #387017).

Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64

3 files changed, 14 insertions, 129 deletions

diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog
index 935419b43100..254913b39e93 100644
--- a/media-sound/cmus/ChangeLog
+++ b/media-sound/cmus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/cmus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.48 2011/09/30 08:04:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.49 2011/10/19 19:23:19 radhermit Exp $
+
+  19 Oct 2011; Tim Harder <radhermit@gentoo.org> files/cmus-2.4.2-ffmpeg.patch:
+  Simplify ffmpeg patch (fixes bug #387017).
 
 *cmus-2.4.2 (30 Sep 2011)
 
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 638d49b55a9a..bdde268c046d 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA512
 
 AUX cmus-2.3.4-detect_mp4.h.patch 883 RMD160 501845ed81350bd6b99872b38289d573e335d146 SHA1 90863c07b35d157304b6f5a4b6e03f03256c8407 SHA256 41dad941beef8f6e8e0b86c42523d4caecb0935296a9a39037667b9ac4941f0b
-AUX cmus-2.4.2-ffmpeg.patch 3387 RMD160 7bc71b1d57dd799729b2a807c8cc3034fab399b8 SHA1 863d039319acb7d41d062069375d6797b7b88c83 SHA256 09c6e2e72e8332414a074d6de48a3be92ee1dcf4c10e8065d9d58b0c3f4a70a0
+AUX cmus-2.4.2-ffmpeg.patch 310 RMD160 c81915cca8febee3e9a8d144928413b268eb06c9 SHA1 236bba7c9cc36d960d4af96cb7ff47009f510aa3 SHA256 948de57576f9f42042558dbec47b560dad41e285e5777bc7c1cad99364595abd
 DIST cmus-v2.3.2.tar.bz2 167078 RMD160 bef8227ce02cb3c2c09e6014246a784ae4b3f5fc SHA1 fdfb96f0c53373475ecd05139ebfcb3fd4613a18 SHA256 27d7d17e00945e70c14e33f9d46608e0ba7fee0513b2714feec157e46f90ca46
 DIST cmus-v2.4.0.tar.bz2 202970 RMD160 3c169d33e756b4fd18730227e091a7ebe2237a8f SHA1 cbd80d1ff12be5dbf9a3b8b6494381f8b3073761 SHA256 42a1ea7597d7388e50a1534ad1f51636ce05cf31a939e01b4901a539f7348803
 DIST cmus-v2.4.1.tar.bz2 203515 RMD160 977bd55cda7d7f22dfe2511c58e4acd213455a98 SHA1 918c637becdcbca3652b836b38b164eb852fa896 SHA256 402f2f17ca2e961e1b3426733db25edc2dcdbc6d1aa4dfb32ddadb05f6c37934
@@ -11,16 +11,16 @@ EBUILD cmus-2.3.2.ebuild 2334 RMD160 55277d3736e82f0b78bf4d1fcbc9ef9fa412133c SH
 EBUILD cmus-2.4.0.ebuild 2385 RMD160 3e64ec230dbba76a539f0566a335fdb94c2464b8 SHA1 094fd615472d0146e995efac815e8fc996524346 SHA256 a38c280f7589b38a55cc7c323be0f69f4ed3fbf48518c6b49131230c8df7c979
 EBUILD cmus-2.4.1.ebuild 2385 RMD160 e14fa5c09d8a58bd106724a23b6a6bae67c29210 SHA1 f9a1b3ab4c1ce554768455843b1354ed17b67b7b SHA256 8daa101198004a83b54734d14806b476fbadac6e2b4d4606117ab4b5ae8f90ae
 EBUILD cmus-2.4.2.ebuild 2379 RMD160 51ccb47e9d9bbba847f0bbce7d8329e8e5c38d65 SHA1 bf78f5c35ee5bb16173fa32f2da667dcd0a386d3 SHA256 d754918bbbdd3d4654e1d95a90a7fb5f095494b5b0368c4e2b68b56b373453ee
-MISC ChangeLog 7453 RMD160 760e950d2bd8ee200fb29cdd8aa5e05260f44deb SHA1 4635887b31436db98b68b557d3a6248735a3ea04 SHA256 68a4a36d7de092d6a99f1279220c67924c9855b7b2d13663189fb1fc61395822
+MISC ChangeLog 7579 RMD160 8f38b08c54976b491a3194c34b438047a26ad462 SHA1 7cd0fa709e34cd4c06ab0c8c2b7c5230599a0417 SHA256 47a7343305b3292cdd1a42681fd9a21ebdc26ae34e3aae6d8ea7d6e9d08b0893
 MISC metadata.xml 429 RMD160 b012d0b87dd5b8301c599ad13a0f9b41032f970d SHA1 4239c00ab77d094867e9430c7e31e335d24669ed SHA256 4433bda20d42a74320957493f0f7cf2ddfc70e6f06875f136fe1d70c64c2e28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOhXgZAAoJEEqz6FtPBkyjt6gH/jgAYcxU654DeAMfgbAQCbRk
-lSEjpoyOppwVh/TG1zvLbKj40SNah8N8uF0m8aQUWBxMfHzNEVxIZcpFCT+3SWP2
-guuBIf7u4zdZSnAXilNH14VitVuzp+T6qqiD/LrSZnsjLDeZ97VFwB6Zp911P9RR
-QPpEEcf8XCggBj9wdvD5omrKBTRgBceD74pCaemgacMMKopvo2hGcTrGMPu3xroc
-ulk8pBYdjBLF+xhjwqAq3DHEKtaetpS28+xhqv2lyYzfc1asDWRZmUtGXtA+OvWZ
-ktr14g2wrByI+tzVY//g1w2L6nRBe4gU8hk+oNncuv+QOhmSJFaAPz1Kz+hv8es=
-=Wr2h
+iQEcBAEBCgAGBQJOnyOwAAoJEEqz6FtPBkyjPRQH/0mb7AIiFvlmkgYvDo3+TG9f
+KRgj2FcCgvCYklXhtb4G9JlL1U60vSw2FnFaRYyGLToHY34MTYaOjhmIBneNmblo
+LBWaBw0etiYzAyXzJq6uL7ctGXoJ4BUXgWD08YkIMyHCoWdNJb3HnyTsnA6wfD4P
+zMmgrtMC1dG0pf6bRlGZyaw4Uj7+hR7fPFeB7JVodJc8k53i0RwmqSApYxxNIDbt
++cXUt2kY3VHkBof1LFBqXAUbocXKVY/cx//glOPY0s8Pg6Pb8CeoHJdXLII0smMN
+aoAJDaujl769g5EPunOAQx5ae32a2AODp/ord8ji/G6970gGsu8Lpl1RsEpiSFQ=
+=PE4Y
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch b/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch
index c1ca17e72391..eb6c97e6c1ec 100644
--- a/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch
+++ b/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch
@@ -1,14 +1,6 @@
 --- cmus-v2.4.2/ffmpeg.c.orig
 +++ cmus-v2.4.2/ffmpeg.c
-@@ -21,6 +21,7 @@
- #include "xmalloc.h"
- #include "debug.h"
- #include "utils.h"
-+#include "comment.h"
- #include "config/ffmpeg.h"
- 
- #include <stdio.h>
-@@ -32,6 +33,9 @@
+@@ -32,6 +32,9 @@
  #include <libavcodec/avcodec.h>
  #include <libavformat/avformat.h>
  #include <libavformat/avio.h>
@@ -18,113 +10,3 @@
  #endif
  
  #if (LIBAVFORMAT_VERSION_INT < ((52<<16)+(31<<8)+0))
-@@ -52,10 +56,19 @@
- #endif
- #endif
- 
-+#if (LIBAVUTIL_VERSION_INT < ((51<<16)+(5<<8)+0))
-+#define AV_DICT_IGNORE_SUFFIX AV_METADATA_IGNORE_SUFFIX
-+#define av_dict_get av_metadata_get
-+#define AVDictionaryEntry AVMetadataTag
-+#endif
-+
- struct ffmpeg_input {
- 	AVPacket pkt;
- 	int curr_pkt_size;
- 	uint8_t *curr_pkt_buf;
-+
-+	unsigned long curr_size;
-+	unsigned long curr_duration;
- };
- 
- struct ffmpeg_output {
-@@ -166,18 +179,26 @@
- 	int stream_index = -1;
- 	AVCodec *codec;
- 	AVCodecContext *cc = NULL;
--	AVFormatContext *ic;
-+	AVFormatContext *ic = NULL;
- 
- 	ffmpeg_init();
- 
-+#if (LIBAVFORMAT_VERSION_INT < ((53<<16)+(2<<8)+0))
- 	err = av_open_input_file(&ic, ip_data->filename, NULL, 0, NULL);
-+#else
-+	err = avformat_open_input(&ic, ip_data->filename, NULL, NULL);
-+#endif
- 	if (err < 0) {
- 		d_print("av_open failed: %d\n", err);
- 		return -IP_ERROR_FILE_FORMAT;
- 	}
- 
- 	do {
-+#if (LIBAVFORMAT_VERSION_INT < ((53<<16)+(3<<8)+0))
- 		err = av_find_stream_info(ic);
-+#else
-+		err = avformat_find_stream_info(ic, NULL);
-+#endif
- 		if (err < 0) {
- 			d_print("unable to find stream info: %d\n", err);
- 			err = -IP_ERROR_FILE_FORMAT;
-@@ -208,7 +229,11 @@
- 		if (codec->capabilities & CODEC_CAP_TRUNCATED)
- 			cc->flags |= CODEC_FLAG_TRUNCATED;
- 
-+#if (LIBAVCODEC_VERSION_INT < ((53<<16)+(6<<8)+0))
- 		if (avcodec_open(cc, codec) < 0) {
-+#else
-+		if (avcodec_open2(cc, codec, NULL) < 0) {
-+#endif
- 			d_print("could not open codec: %d, %s\n", cc->codec_id, cc->codec_name);
- 			err = -IP_ERROR_UNSUPPORTED_FILE_TYPE;
- 			break;
-@@ -299,6 +324,8 @@
- 			}
- 			input->curr_pkt_size = input->pkt.size;
- 			input->curr_pkt_buf = input->pkt.data;
-+			input->curr_size += input->pkt.size;
-+			input->curr_duration += input->pkt.duration;
- 			continue;
- 		}
- 
-@@ -409,7 +436,7 @@
- 	char buff[16];
- 	int i = 0;
- 
--	*comments = xnew0(struct keyval, NUM_FFMPEG_KEYS + 1);
-+	*comments = keyvals_new(NUM_FFMPEG_KEYS);
- 
- 	i = set_comment(*comments, i, "artist", ic->author);
- 	i = set_comment(*comments, i, "album", ic->album);
-@@ -427,9 +454,9 @@
- 	}
- #else
- 	GROWING_KEYVALS(c);
--	AVMetadataTag *tag = NULL;
-+	AVDictionaryEntry *tag = NULL;
-  
--	while ((tag = av_metadata_get(ic->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) {
-+	while ((tag = av_dict_get(ic->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
- 		if (tag && tag->value[0])
- 			comments_add_const(&c, tag->key, tag->value);
- 	}
-@@ -472,15 +499,15 @@
- };
- 
- const int ip_priority = 30;
--#ifdef USE_FALLBACK_IP
--const char *const ip_extensions[] = { "any", NULL };
--#else
- const char *const ip_extensions[] = {
- 	"ac3", "aif", "aifc", "aiff", "ape", "au", "mka", "shn", "tta", "wma",
- 	/* also supported by other plugins */
- 	"aac", "fla", "flac", "m4a", "m4b", "mp+", "mp2", "mp3", "mp4", "mpc",
- 	"mpp", "ogg", "wav", "wv",
-+#ifdef USE_FALLBACK_IP
-+	"*",
-+#endif
- 	NULL
- };
--#endif
- const char *const ip_mime_types[] = { NULL };
-+const char * const ip_options[] = { NULL };