Added patch to compile with ffmpeg-0.4.9_p20070616-r1

Package-Manager: portage-2.1.3_rc6

5 files changed, 57 insertions, 18 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index fe736e3b4ad7..4215e2b5a6c9 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-softdevice
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.40 2007/05/15 21:24:26 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.41 2007/07/03 14:22:13 zzam Exp $
+
+  03 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/patches-0.4.0/new-ffmpeg-extern-c.diff, files/patches-0.4.0/series,
+  vdr-softdevice-0.4.0.20070515.ebuild:
+  Added patch to compile with ffmpeg-0.4.9_p20070616-r1
 
 *vdr-softdevice-0.4.0.20070515 (15 May 2007)
 
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 4d91a51d0e89..2b588b6a5988 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -5,10 +5,14 @@ AUX confd 431 RMD160 14e9370497da9ff23e81a315dd92985e4fb861c3 SHA1 f58d450430066
 MD5 dacfaa95c10d3b9ae3c1e08ff04dcc65 files/confd 431
 RMD160 14e9370497da9ff23e81a315dd92985e4fb861c3 files/confd 431
 SHA256 5a82e32365ff3c77dfdad50884be7ae6f7d5f54e249c69308fc041cdce61290e files/confd 431
-AUX patches-0.4.0/series 30 RMD160 c9f07af60848f2b8f0afd5ea81d73594002e9b15 SHA1 2c6d6d1ae2703fb04a27d2ee8e7ae9bcf695fe0d SHA256 abf6941b98dffc48dbe37d127e9907075ee5e22ceb9c07b4d6a1edb187fb104c
-MD5 7547d1b471f51ff3eda948f402f3bc3f files/patches-0.4.0/series 30
-RMD160 c9f07af60848f2b8f0afd5ea81d73594002e9b15 files/patches-0.4.0/series 30
-SHA256 abf6941b98dffc48dbe37d127e9907075ee5e22ceb9c07b4d6a1edb187fb104c files/patches-0.4.0/series 30
+AUX patches-0.4.0/new-ffmpeg-extern-c.diff 961 RMD160 89e9587ebf279bb713198361cff4b9f38cb531b1 SHA1 712fa63c0910bd7a33dcc9338c92a65253dad1cd SHA256 604c0e1f8c1683ed8492e6147ad44af48d65fee2503e22b93bac9c3cbc115615
+MD5 2a15a7ead9d394906f6be4e874d2d0ec files/patches-0.4.0/new-ffmpeg-extern-c.diff 961
+RMD160 89e9587ebf279bb713198361cff4b9f38cb531b1 files/patches-0.4.0/new-ffmpeg-extern-c.diff 961
+SHA256 604c0e1f8c1683ed8492e6147ad44af48d65fee2503e22b93bac9c3cbc115615 files/patches-0.4.0/new-ffmpeg-extern-c.diff 961
+AUX patches-0.4.0/series 55 RMD160 8474e73a6bf8d9681cca30957aa43d11609c3980 SHA1 97517ffd8b8d4b23498ddb53c547444f17b0abed SHA256 34c9603502734813edd0ffb5d9700b14026850564bcf18088e9870151d662591
+MD5 11883753cad3fecb39f8f34898506d02 files/patches-0.4.0/series 55
+RMD160 8474e73a6bf8d9681cca30957aa43d11609c3980 files/patches-0.4.0/series 55
+SHA256 34c9603502734813edd0ffb5d9700b14026850564bcf18088e9870151d662591 files/patches-0.4.0/series 55
 AUX patches-0.4.0/shm-fullscreen-parameter.diff 737 RMD160 b09e27d40bc733b05ed2f01d3026e37671ef9bea SHA1 93da236176add5a323737ea845054f2964188451 SHA256 2665dd3d2e6059ec61ad8707af7f2b532485d49c8771f5875e0343a7325b48eb
 MD5 153b382d28f33fe46a3a6a52db33d89c files/patches-0.4.0/shm-fullscreen-parameter.diff 737
 RMD160 b09e27d40bc733b05ed2f01d3026e37671ef9bea files/patches-0.4.0/shm-fullscreen-parameter.diff 737
@@ -77,18 +81,18 @@ EBUILD vdr-softdevice-0.3.1.20070410.ebuild 3692 RMD160 5f91484ab857180cf573443d
 MD5 d16a1231960b3b6c2086c5200531704b vdr-softdevice-0.3.1.20070410.ebuild 3692
 RMD160 5f91484ab857180cf573443d0320228340319f22 vdr-softdevice-0.3.1.20070410.ebuild 3692
 SHA256 9f40afb5415712c00cf60d9bae00024a820773eda8ffc03b08a9949cbd085a3c vdr-softdevice-0.3.1.20070410.ebuild 3692
-EBUILD vdr-softdevice-0.4.0.20070515.ebuild 3562 RMD160 6a967037aa3413f2f2ff03bf54888269e70650a7 SHA1 9966b9e83194b1eb0515a504a3a3bda9bd3896ff SHA256 65d5715d13908626a7ef8ddba8688b68286e28c0912b8ff1a448d7b3a48ce7d6
-MD5 8330403da60ce871e3ccb085077c751b vdr-softdevice-0.4.0.20070515.ebuild 3562
-RMD160 6a967037aa3413f2f2ff03bf54888269e70650a7 vdr-softdevice-0.4.0.20070515.ebuild 3562
-SHA256 65d5715d13908626a7ef8ddba8688b68286e28c0912b8ff1a448d7b3a48ce7d6 vdr-softdevice-0.4.0.20070515.ebuild 3562
+EBUILD vdr-softdevice-0.4.0.20070515.ebuild 3615 RMD160 0186d3edf64a473b7958838b1b04e1545ae5f29b SHA1 4e1e964aea5db8a18e4ede4a6e726e94aac0463a SHA256 3819d0c277c37e2d9936666af73f796d6dc8b836fe26b9bf376fa6ed534c498e
+MD5 27d69645dd00443b6b89a8997f053010 vdr-softdevice-0.4.0.20070515.ebuild 3615
+RMD160 0186d3edf64a473b7958838b1b04e1545ae5f29b vdr-softdevice-0.4.0.20070515.ebuild 3615
+SHA256 3819d0c277c37e2d9936666af73f796d6dc8b836fe26b9bf376fa6ed534c498e vdr-softdevice-0.4.0.20070515.ebuild 3615
 EBUILD vdr-softdevice-0.4.0.ebuild 3653 RMD160 d6ad704f9ec1808c0b7883453a9a2de913b0299b SHA1 eaa0daa917a1401a67d08d5280f0fac9cf76a547 SHA256 a775a351ee9e1d2e94b1d5a79cfde451dde9e4d0716e10190dcfb38641a13f46
 MD5 c372535a8b2dc075f2f933539c5b9ace vdr-softdevice-0.4.0.ebuild 3653
 RMD160 d6ad704f9ec1808c0b7883453a9a2de913b0299b vdr-softdevice-0.4.0.ebuild 3653
 SHA256 a775a351ee9e1d2e94b1d5a79cfde451dde9e4d0716e10190dcfb38641a13f46 vdr-softdevice-0.4.0.ebuild 3653
-MISC ChangeLog 9351 RMD160 605fbd098a50a5662c06053b692b590c9ace30e4 SHA1 faa3724d9bc3b36667e8119af9ce33354f8149c7 SHA256 e4134299d190df49aeaa20f1e89aab9473d5ea83f0f318e9351822fd7b14a23a
-MD5 0d23d476c08901aa657f71ca1a483ffe ChangeLog 9351
-RMD160 605fbd098a50a5662c06053b692b590c9ace30e4 ChangeLog 9351
-SHA256 e4134299d190df49aeaa20f1e89aab9473d5ea83f0f318e9351822fd7b14a23a ChangeLog 9351
+MISC ChangeLog 9578 RMD160 de408ca75ab5d72cd107d338cd193d0becbc731e SHA1 eafc2e0d9dee044c98681b71651f7bbcb4175b12 SHA256 2c1e7dfaa1baf149f65b1780de115e31b8ba69bace1213270e92f2559c363407
+MD5 c518b5eb8a58c8d59a1e74cdec05d04c ChangeLog 9578
+RMD160 de408ca75ab5d72cd107d338cd193d0becbc731e ChangeLog 9578
+SHA256 2c1e7dfaa1baf149f65b1780de115e31b8ba69bace1213270e92f2559c363407 ChangeLog 9578
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -120,7 +124,7 @@ SHA256 b4d883a9f427145bd935ead8b1f50cc13041a836d9cd77a997d76e737fc88438 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGSiUQt2vP6XvVdOcRAij+AKDcOwPIITXUPq/gptDWkcHARjLY4ACgrdRd
-WMXtzG1x1XRv+vBQ52UzN+s=
-=dHUO
+iD8DBQFGilubt2vP6XvVdOcRAuXCAJ0eLq3na5tyjyKkPddLFKRoJSq7KwCeOlCN
+0bgOrZxbh+1zbvfgCWNKmxY=
+=pgPv
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff b/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff
new file mode 100644
index 000000000000..e4fca0bd738c
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff
@@ -0,0 +1,28 @@
+Index: softdevice-cvs/configure
+===================================================================
+--- softdevice-cvs.orig/configure
++++ softdevice-cvs/configure
+@@ -173,9 +173,11 @@ test_ffmpeg()
+   ffmpeg="yes";
+ cat > ${TMPC} << EOF
+ #define __STDC_CONSTANT_MACROS
++extern "C" {
+ #include <stdlib.h>
+ #include <avcodec.h>
+ #include <avformat.h>
++}
+ int main(void) {
+ /*  if ( avcodec_build() != LIBAVCODEC_BUILD ) {
+      fprintf(stderr,"Fatal Error! Libavcodec library build(%d) doesn't match avcodec.h build(%d)!!!\n",avcodec_build(),LIBAVCODEC_BUILD);
+@@ -249,9 +251,11 @@ test_swscale()
+ cat > ${TMPC} << EOF
+ #define __STDC_CONSTANT_MACROS
+ #include <stdlib.h>
++extern "C" {
+ #include <avcodec.h>
+ #include <avformat.h>
+ #include <swscale.h>
++}
+ int main(void) {
+ /*  if ( avcodec_build() != LIBAVCODEC_BUILD ) {
+      fprintf(stderr,"Fatal Error! Libavcodec library build(%d) doesn't match avcodec.h build(%d)!!!\n",avcodec_build(),LIBAVCODEC_BUILD);
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/series b/media-plugins/vdr-softdevice/files/patches-0.4.0/series
index f4d49416df58..3e52f157fc9e 100644
--- a/media-plugins/vdr-softdevice/files/patches-0.4.0/series
+++ b/media-plugins/vdr-softdevice/files/patches-0.4.0/series
@@ -1 +1,2 @@
+new-ffmpeg-extern-c.diff
 shm-fullscreen-parameter.diff
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild
index 8ab61c117710..bddee44070d9 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.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-softdevice/vdr-softdevice-0.4.0.20070515.ebuild,v 1.1 2007/05/15 21:24:26 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070515.ebuild,v 1.2 2007/07/03 14:22:13 zzam Exp $
 
 inherit vdr-plugin versionator
 
@@ -55,7 +55,8 @@ DEPEND="${RDEPEND}
 DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
 
 PATCHES="
-		${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff"
+		${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff
+		${FILESDIR}/patches-0.4.0/new-ffmpeg-extern-c.diff"
 
 pkg_setup() {
 	vdr-plugin_pkg_setup