Update the ffmpeg patch to contain libav content, reduce the need for the sed. Fixes bug#443208.

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

3 files changed, 43 insertions, 10 deletions

diff --git a/media-plugins/vdr-pcd/ChangeLog b/media-plugins/vdr-pcd/ChangeLog
index 8a52471b6cb5..d9b96b1e727e 100644
--- a/media-plugins/vdr-pcd/ChangeLog
+++ b/media-plugins/vdr-pcd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-pcd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/ChangeLog,v 1.6 2013/03/17 15:33:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/ChangeLog,v 1.7 2013/06/17 19:20:32 scarabeus Exp $
+
+  17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  files/vdr-pcd-0.9-ffmpeg-1.patch, vdr-pcd-0.9.ebuild:
+  Update the ffmpeg patch to contain libav content, reduce the need for the sed.
+  Fixes bug#443208.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch b/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch
index f1599bc918a9..045605e345f0 100644
--- a/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch
+++ b/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch
@@ -1,8 +1,7 @@
-Index: pcd-0.9/mpeg.c
-===================================================================
---- pcd-0.9.orig/mpeg.c
-+++ pcd-0.9/mpeg.c
-@@ -44,7 +44,6 @@ cMpegFrame::cMpegFrame(bool Pal)
+diff -urN pcd-0.9.old/mpeg.c pcd-0.9/mpeg.c
+--- pcd-0.9.old/mpeg.c	2013-06-17 21:11:54.125454721 +0200
++++ pcd-0.9/mpeg.c	2013-06-17 21:12:15.325453967 +0200
+@@ -44,7 +44,6 @@
    bufferSize = 0;
    mpegSize = 0;
  
@@ -10,3 +9,33 @@ Index: pcd-0.9/mpeg.c
    avcodec_register_all();
  
    if (!(avCodec = avcodec_find_encoder(CODEC_ID_MPEG2VIDEO))) {
+@@ -52,7 +51,7 @@
+      return;
+   }
+ 
+-  avContext = avcodec_alloc_context();
++  avContext = avcodec_alloc_context3(NULL);
+   avFrame = avcodec_alloc_frame();
+ 
+   avContext->bit_rate = 400000;
+@@ -63,7 +62,7 @@
+   avContext->flags |= CODEC_FLAG_QSCALE;
+   avContext->pix_fmt = PIX_FMT_YUV420P;
+ 
+-  if (avcodec_open(avContext, avCodec) < 0) {
++  if (avcodec_open2(avContext, avCodec, NULL) < 0) {
+      dsyslog("PCD: Can't open codec");
+      return;
+   }
+diff -urN pcd-0.9.old/mpeg.h pcd-0.9/mpeg.h
+--- pcd-0.9.old/mpeg.h	2013-06-17 21:11:54.125454721 +0200
++++ pcd-0.9/mpeg.h	2013-06-17 21:13:15.595451823 +0200
+@@ -25,7 +25,7 @@
+ 
+ #include <vdr/tools.h>
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ };
+ 
+ #define TMP_WIDTH   768
diff --git a/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild b/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild
index 363d7290b804..7793889be421 100644
--- a/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild
+++ b/media-plugins/vdr-pcd/vdr-pcd-0.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-plugins/vdr-pcd/vdr-pcd-0.9.ebuild,v 1.7 2013/01/26 14:44:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild,v 1.8 2013/06/17 19:20:32 scarabeus Exp $
 
-EAPI="3"
+EAPI=3
 
 inherit vdr-plugin flag-o-matic eutils
 
@@ -22,9 +22,8 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	vdr-plugin_src_prepare
 
-	sed -e "s:ffmpeg/avcodec.h:libavcodec/avcodec.h:" -i mpeg.h
 	epatch "${FILESDIR}/${P}-ffmpeg-1.patch"
 
 	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
+	append-cppflags -D__STDC_CONSTANT_MACROS
 }