[gentoo-commits] gentoo-x86 commit in media-sound/xmms2/files: xmms2-0.8-ffmpeg-0.11.patch xmms2-0.8-libav-9-p2.patch xmms2-0.8-libav-9.patch

[gentoo-commits] gentoo-x86 commit in media-sound/xmms2/files: xmms2-0.8-ffmpeg-0.11.patch xmms2-0.8-libav-9-p2.patch xmms2-0.8-libav-9.patch

[Sergei Trofimovich (slyfox)]

slyfox      13/01/18 08:05:25

  Modified:             xmms2-0.8-libav-9.patch
  Added:                xmms2-0.8-ffmpeg-0.11.patch
                        xmms2-0.8-libav-9-p2.patch
  Log:
  Pulled real patches to fix against libav-9 noticed by Alexis Ballier (bug #443256 by Diego Elio Pettenò).
  
  (Portage version: 2.2.0_alpha153_p6/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

Revision  Changes    Path
1.2                  media-sound/xmms2/files/xmms2-0.8-libav-9.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/files/xmms2-0.8-libav-9.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/files/xmms2-0.8-libav-9.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/files/xmms2-0.8-libav-9.patch?r1=1.1&r2=1.2

Index: xmms2-0.8-libav-9.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/xmms2/files/xmms2-0.8-libav-9.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmms2-0.8-libav-9.patch	16 Jan 2013 12:35:31 -0000	1.1
+++ xmms2-0.8-libav-9.patch	18 Jan 2013 08:05:25 -0000	1.2
@@ -1,21 +1,20 @@
-commit a1fe1f45c19c67ed80c05d8276b88d1296f984d2
-Author: Raphaël Bois <virtualdust@gmail.com>
-Date:   Sun Nov 25 17:55:12 2012 +0100
+commit d61dbc522f4024debb1f99de758de9e5cc7c0936
+Author: Diego Biurrun <diego@biurrun.de>
+Date:   Sun Nov 25 17:33:02 2012 +0100
 
-    OTHER: Add Diego Biurrun in AUTHORS file
+    OTHER: Support for newer libavcodec versions
+    
+    Add missing #include
 
-diff --git a/AUTHORS b/AUTHORS
-index 9d05e1a..3b84fce 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -37,6 +37,10 @@ E: xkr47@outerspace.dyndns.org
- W: http://xkr47.outerspace.dyndns.org/
- D: curl_http updated to xforms, icymetaint plugin (extracted from curl)
+diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+index c846d64..114d7df 100644
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
++#include <libavutil/mem.h>
+ 
+ #include "avcodec_compat.h"
  
-+N: Diego Biurrun
-+E: diego@biurrun.de
-+D: Support for libav 9 in avcodec plugin
-+
- N: Magnus Bjernstad
- E: bjernstad@gmail.com
- D: PythonAPI fixes.



1.1                  media-sound/xmms2/files/xmms2-0.8-ffmpeg-0.11.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/files/xmms2-0.8-ffmpeg-0.11.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/files/xmms2-0.8-ffmpeg-0.11.patch?rev=1.1&content-type=text/plain

Index: xmms2-0.8-ffmpeg-0.11.patch
===================================================================
commit 8743e0c3a4f06053d89b74e40a362ba4949ed53c
Author: Juho Vähä-Herttua <juhovh@iki.fi>
Date:   Fri Jun 8 09:30:47 2012 +0300

    OTHER: Quick fix to make XMMS2 compile on ffmpeg 0.11

diff --git a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
index df87b27..f1b1af7 100644
--- a/src/plugins/avcodec/avcodec_compat.h
+++ b/src/plugins/avcodec/avcodec_compat.h
@@ -65,3 +65,7 @@ typedef struct AVPacket {
 # define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
 #endif
 
+/* Calling avcodec_init is not necessary after 53.04 (ffmpeg 0.9) */
+#if LIBAVCODEC_VERSION_INT >= 0x350400
+# define avcodec_init()
+#endif



1.1                  media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch?rev=1.1&content-type=text/plain

Index: xmms2-0.8-libav-9-p2.patch
===================================================================
commit 4781c507be338fe151e08af7d13267a24cbd7572
Author: Juho Vähä-Herttua <juhovh@iki.fi>
Date:   Fri Jun 8 09:47:03 2012 +0300

    OTHER: Fix some deprecated warnings in libavcodec

diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
index 242e333..c846d64 100644
--- a/src/plugins/avcodec/avcodec.c
+++ b/src/plugins/avcodec/avcodec.c
@@ -208,7 +208,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
 		}
 	}
 
-	data->codecctx = avcodec_alloc_context ();
+	data->codecctx = avcodec_alloc_context3 (codec);
 	data->codecctx->sample_rate = data->samplerate;
 	data->codecctx->channels = data->channels;
 	data->codecctx->bit_rate = data->bitrate;
@@ -219,7 +219,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
 	data->codecctx->codec_id = codec->id;
 	data->codecctx->codec_type = codec->type;
 
-	if (avcodec_open (data->codecctx, codec) < 0) {
+	if (avcodec_open2 (data->codecctx, codec, NULL) < 0) {
 		XMMS_DBG ("Opening decoder '%s' failed", codec->name);
 		goto err;
 	} else {
diff --git a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
index f1b1af7..bc770f2 100644
--- a/src/plugins/avcodec/avcodec_compat.h
+++ b/src/plugins/avcodec/avcodec_compat.h
@@ -69,3 +69,17 @@ typedef struct AVPacket {
 #if LIBAVCODEC_VERSION_INT >= 0x350400
 # define avcodec_init()
 #endif
+
+/* Map avcodec_alloc_context3 into the deprecated version
+ * avcodec_alloc_context in versions earlier than 53.04 (ffmpeg 0.9) */
+#if LIBAVCODEC_VERSION_INT < 0x350400
+# define avcodec_alloc_context3(codec) \
+    avcodec_alloc_context()
+#endif
+
+/* Map avcodec_open2 into the deprecated version
+ * avcodec_open in versions earlier than 53.04 (ffmpeg 0.9) */
+#if LIBAVCODEC_VERSION_INT < 0x350400
+# define avcodec_open2(avctx, codec, options) \
+    avcodec_open(avctx, codec)
+#endif