Added patch to compile against newer ffmpeg.

Package-Manager: portage-2.1.3_rc9

4 files changed, 63 insertions, 13 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/Manifest b/media-plugins/vdr-softplay/Manifest
index 49cc3efe2722..57a878b063aa 100644
--- a/media-plugins/vdr-softplay/Manifest
+++ b/media-plugins/vdr-softplay/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX new-ffmpeg.diff 975 RMD160 0a88fe57e5a3d9030d69ce60ba3687fe89444645 SHA1 a55b32655558b4c2d341f40fb4bf6c3eec0abc29 SHA256 2eca67bc3c0d139778f6e873fc8ab3a6f0c6e2b5e011c81e2c1d6a3acddbf649
+MD5 14da09ef4077235893d443ed2d78dc82 files/new-ffmpeg.diff 975
+RMD160 0a88fe57e5a3d9030d69ce60ba3687fe89444645 files/new-ffmpeg.diff 975
+SHA256 2eca67bc3c0d139778f6e873fc8ab3a6f0c6e2b5e011c81e2c1d6a3acddbf649 files/new-ffmpeg.diff 975
 AUX vdr-softplay-0.0.2-softdevice-header.diff 392 RMD160 557269219a6b1a30d08e4a418c0472736400e51f SHA1 2eae77baae384763e37b34e07d522072682fd782 SHA256 35671509431e4b55f5e4121cf9fe1b9a41406d66eb6a96f822a149b666b818d4
 MD5 9e3fa16043fa501c31f4b7de0079d78e files/vdr-softplay-0.0.2-softdevice-header.diff 392
 RMD160 557269219a6b1a30d08e4a418c0472736400e51f files/vdr-softplay-0.0.2-softdevice-header.diff 392
@@ -11,14 +15,14 @@ EBUILD vdr-softplay-0.0.2.20060815.ebuild 1061 RMD160 c7f7300d73979beb03823c2fb4
 MD5 09f5957a2313338d196c1850c2a0cdb9 vdr-softplay-0.0.2.20060815.ebuild 1061
 RMD160 c7f7300d73979beb03823c2fb484c11130afa522 vdr-softplay-0.0.2.20060815.ebuild 1061
 SHA256 5398a8fb1cc7f4a314177bcbdd9bfd06d565672b7b557abc654cf97e02fdf8f0 vdr-softplay-0.0.2.20060815.ebuild 1061
-EBUILD vdr-softplay-0.0.2.20070730.ebuild 1052 RMD160 e2ab983af8e07f1358d4d25cce45a5ae75cb8ca1 SHA1 d5f0168877aca37dd22cf230bf6b31755bbcec4a SHA256 6ba5942644bcafa1d0842b3f1506a92ebde1e26760374e9b79eb01bdb626e3f7
-MD5 f63a86362439a464ab0193a180630679 vdr-softplay-0.0.2.20070730.ebuild 1052
-RMD160 e2ab983af8e07f1358d4d25cce45a5ae75cb8ca1 vdr-softplay-0.0.2.20070730.ebuild 1052
-SHA256 6ba5942644bcafa1d0842b3f1506a92ebde1e26760374e9b79eb01bdb626e3f7 vdr-softplay-0.0.2.20070730.ebuild 1052
-MISC ChangeLog 749 RMD160 2187470d3e7bbf54b18deaa1b3ec1c8a3ceb0b8d SHA1 95e54bcf64ef4522804cd05697dc54a74c26497d SHA256 391985c25a2925c2e3f41d7e53a30be1218ebd9188c304fc682c30f9de6ac41c
-MD5 346a1d7fac17cb89ec4937612caf48c6 ChangeLog 749
-RMD160 2187470d3e7bbf54b18deaa1b3ec1c8a3ceb0b8d ChangeLog 749
-SHA256 391985c25a2925c2e3f41d7e53a30be1218ebd9188c304fc682c30f9de6ac41c ChangeLog 749
+EBUILD vdr-softplay-0.0.2.20070730.ebuild 1091 RMD160 84ad189465a5d275f93319dadc998c39fb5b60bb SHA1 ad44dfe4ebb44f13e2b4cdab281d99bf10059975 SHA256 3a46184f17ea5f8b6329604af47a6df5a0c18a8f083749b06ff5e2e982d3ef23
+MD5 3aa6e8d48509265608428b783645e940 vdr-softplay-0.0.2.20070730.ebuild 1091
+RMD160 84ad189465a5d275f93319dadc998c39fb5b60bb vdr-softplay-0.0.2.20070730.ebuild 1091
+SHA256 3a46184f17ea5f8b6329604af47a6df5a0c18a8f083749b06ff5e2e982d3ef23 vdr-softplay-0.0.2.20070730.ebuild 1091
+MISC ChangeLog 912 RMD160 930de947c22191b3d3d1c61fe78a7ed8351b68a3 SHA1 acb6ca577c87b5f874a84062572133999faa9c99 SHA256 c76ee76ddb4ad66f9cb80323d5727be4c5d384172ff8adbc3aaecfd7b6d395ee
+MD5 543166c6974f3802fbf27c2637976055 ChangeLog 912
+RMD160 930de947c22191b3d3d1c61fe78a7ed8351b68a3 ChangeLog 912
+SHA256 c76ee76ddb4ad66f9cb80323d5727be4c5d384172ff8adbc3aaecfd7b6d395ee ChangeLog 912
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -32,7 +36,7 @@ SHA256 56ec024d8a20f2e48fdb2ec96a6c1da2afd144154669144add38bc4e5b0a006a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGrg0Dt2vP6XvVdOcRAs0+AJwOdlA5ZiK8gIoe04dFtTrlexvTVgCghGYU
-HVFNuT2kFevZhE5G7H2kwEk=
-=lmYo
+iD8DBQFGrhY0t2vP6XvVdOcRAvwXAKCX5axSVSrUVou3u66kZb8l8O9DEQCfZKKg
+62u6c4HZ4Z5Bp4U9RmkbRO4=
+=Ro5J
 -----END PGP SIGNATURE-----
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"
 }