Fix building with libav9.

(Portage version: 2.2.0_alpha184/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

3 files changed, 63 insertions, 5 deletions

diff --git a/media-video/vdr2jpeg/ChangeLog b/media-video/vdr2jpeg/ChangeLog
index bf290656ec5e..8b5f437c5de0 100644
--- a/media-video/vdr2jpeg/ChangeLog
+++ b/media-video/vdr2jpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vdr2jpeg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/ChangeLog,v 1.28 2013/02/08 21:39:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/ChangeLog,v 1.29 2013/06/22 18:18:02 scarabeus Exp $
+
+  22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/vdr2jpeg-0.1.9-libav9.patch, vdr2jpeg-0.1.9.ebuild:
+  Fix building with libav9.
 
   08 Feb 2013; Alexis Ballier <aballier@gentoo.org> vdr2jpeg-0.1.9.ebuild,
   +files/vdr2jpeg-0.1.9-ffmpeg1.patch:
@@ -137,4 +141,3 @@
   24 Apr 2006; Joerg Bornkessel <hd_brummy@gentoo.org> +metadata.xml,
   +vdr2jpeg-0.0.7.ebuild, +vdr2jpeg-0.0.8b.ebuild:
   initial ebuild; imported from Gentoo.de CVS
-
diff --git a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch
new file mode 100644
index 000000000000..c984cfc4cff5
--- /dev/null
+++ b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch
@@ -0,0 +1,54 @@
+--- ffm.cpp.old	2013-06-22 20:12:27.972712290 +0200
++++ ffm.cpp	2013-06-22 20:13:33.586709956 +0200
+@@ -672,7 +672,7 @@
+                         ost->file_index, ost->index);
+                 return false;
+             }
+-            if (avcodec_open(ost->st->codec, codec) < 0) {
++            if (avcodec_open2(ost->st->codec, codec, NULL) < 0) {
+                 fprintf(stderr, "Error while opening codec for output stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height\n",
+                         ost->file_index, ost->index);
+                 return false;
+@@ -691,7 +691,7 @@
+                         ist->st->codec->codec_id, ist->file_index, ist->index);
+                 return false;
+             }
+-            if (avcodec_open(ist->st->codec, codec) < 0) {
++            if (avcodec_open2(ist->st->codec, codec, NULL) < 0) {
+                 fprintf(stderr, "Error while opening codec for input stream #%d.%d\n",
+                         ist->file_index, ist->index);
+                 return false;
+@@ -937,7 +937,7 @@
+ 
+     /* If not enough info to get the stream parameters, we decode the
+        first frames to get it. (used in mpeg case for example) */
+-    ret = av_find_stream_info(ic);
++    ret = avformat_find_stream_info(ic, NULL);
+     if (ret < 0 && verbose >= 0) {
+         fprintf(stderr, "%s: could not find codec parameters\n", filename);
+         return false;
+@@ -1034,12 +1034,13 @@
+     AVCodecContext *video_enc;
+     CodecID codec_id;
+ 
+-    st = av_new_stream(oc, oc->nb_streams);
++    st = avformat_new_stream(oc, NULL);
+     if (!st) {
+         fprintf(stderr, "Could not alloc stream\n");
+         return false;
+     }
+-    avcodec_get_context_defaults2(st->codec, AVMEDIA_TYPE_VIDEO);
++    st->id = oc->nb_streams;
++    avcodec_get_context_defaults3(st->codec, NULL);
+ 
+     video_enc = st->codec;
+ 
+@@ -1204,7 +1205,7 @@
+ {
+     av_log_set_level(verbose);
+     av_register_all();
+-    avctx_opts= avcodec_alloc_context();
++    avctx_opts= avcodec_alloc_context3(NULL);
+ }
+ 
+ void ffm_deinitalize(void)
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild
index e2ac17e9198a..08386c505b55 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild,v 1.7 2013/02/08 21:39:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild,v 1.8 2013/06/22 18:18:02 scarabeus Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils
 
@@ -30,7 +30,8 @@ src_prepare() {
 		-e "s:-o vdr2jpeg:\$(LDFLAGS) -o vdr2jpeg:" \
 		Makefile || die
 	epatch "${FILESDIR}/${P}-ffmpeg.patch" \
-		"${FILESDIR}/${P}-ffmpeg1.patch"
+		"${FILESDIR}/${P}-ffmpeg1.patch" \
+		"${FILESDIR}/${P}-libav9.patch"
 }
 
 src_install() {