Added patch to compile against newer ffmpeg.

(Portage version: 2.1.3_rc9)

3 files changed, 48 insertions, 2 deletions

diff --git a/media-plugins/vdr-softplay/ChangeLog b/media-plugins/vdr-softplay/ChangeLog
index 13aa206b33ab..235b2d26b636 100644
--- a/media-plugins/vdr-softplay/ChangeLog
+++ b/media-plugins/vdr-softplay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-softplay
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softplay/ChangeLog,v 1.3 2007/07/30 16:08:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softplay/ChangeLog,v 1.4 2007/07/30 16:47:41 zzam Exp $
+
+  30 Jul 2007; Matthias Schwarzott <zzam@gentoo.org> +files/new-ffmpeg.diff,
+  vdr-softplay-0.0.2.20070730.ebuild:
+  Added patch to compile against newer ffmpeg.
 
 *vdr-softplay-0.0.2.20070730 (30 Jul 2007)
 
diff --git a/media-plugins/vdr-softplay/files/new-ffmpeg.diff b/media-plugins/vdr-softplay/files/new-ffmpeg.diff
new file mode 100644
index 000000000000..15c42eedc0e5
--- /dev/null
+++ b/media-plugins/vdr-softplay/files/new-ffmpeg.diff
@@ -0,0 +1,40 @@
+Index: softplay-cvs/getFFmpegLibs.c
+===================================================================
+--- softplay-cvs.orig/getFFmpegLibs.c
++++ softplay-cvs/getFFmpegLibs.c
+@@ -1,5 +1,7 @@
+ #include <stdio.h>
++extern "C" {
+ #include <avcodec.h>
++}
+ 
+ int main() {
+         if ( LIBAVCODEC_BUILD > 4795 )
+Index: softplay-cvs/SoftHandles.h
+===================================================================
+--- softplay-cvs.orig/SoftHandles.h
++++ softplay-cvs/SoftHandles.h
+@@ -12,7 +12,9 @@
+ #ifndef __SOFTHANDLES_H
+ #define __SOFTHANDLES_H
+ 
++extern "C" {
+ #include <avformat.h>
++}
+ 
+ #if VDRVERSNUM >= 10330
+ #define SOFTDEVICE_VIDEO_STREAM  1
+Index: softplay-cvs/SoftPlayer.h
+===================================================================
+--- softplay-cvs.orig/SoftPlayer.h
++++ softplay-cvs/SoftPlayer.h
+@@ -15,7 +15,9 @@
+ #include <vdr/device.h>
+ #include <vdr/player.h>
+ 
++extern "C" {
+ #include <avformat.h>
++}
+ 
+ #include "SoftHandles.h"
+ #include "PlayList.h"
diff --git a/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20070730.ebuild b/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20070730.ebuild
index 715be604bf23..60ea1916e878 100644
--- a/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20070730.ebuild
+++ b/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20070730.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20070730.ebuild,v 1.1 2007/07/30 16:08:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softplay/vdr-softplay-0.0.2.20070730.ebuild,v 1.2 2007/07/30 16:47:41 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -32,4 +32,6 @@ src_unpack() {
 
 	# ffmpeg-header-directory
 	sed -i Makefile -e 's#^LIBFFMPEG=.*$#LIBFFMPEG=/usr/include/ffmpeg#'
+
+	epatch "${FILESDIR}/new-ffmpeg.diff"
 }