Updated ffmpeg patch to get away the last unresolved symbols.

Package-Manager: portage-2.1.3_rc6

3 files changed, 42 insertions, 13 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 4215e2b5a6c9..a4a6305a35d5 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.41 2007/07/03 14:22:13 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.42 2007/07/09 09:36:47 zzam Exp $
+
+  09 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  files/patches-0.4.0/new-ffmpeg-extern-c.diff:
+  Updated ffmpeg patch to get away the last unresolved symbols.
 
   03 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
   +files/patches-0.4.0/new-ffmpeg-extern-c.diff, files/patches-0.4.0/series,
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 2b588b6a5988..1f710dd61c93 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -5,10 +5,10 @@ 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/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/new-ffmpeg-extern-c.diff 1526 RMD160 ff074327176d72b3e65b7f5f61c615c196d95d6d SHA1 0293a877b0c03012be2e246e1f91fd06c1cb17ec SHA256 4840b91d58672a9f98a04d84fa68e5e74baab9728f31907ab47a55cdfd9d06b0
+MD5 7bf1216f21e700d544bc8b10eba5fdc8 files/patches-0.4.0/new-ffmpeg-extern-c.diff 1526
+RMD160 ff074327176d72b3e65b7f5f61c615c196d95d6d files/patches-0.4.0/new-ffmpeg-extern-c.diff 1526
+SHA256 4840b91d58672a9f98a04d84fa68e5e74baab9728f31907ab47a55cdfd9d06b0 files/patches-0.4.0/new-ffmpeg-extern-c.diff 1526
 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
@@ -89,10 +89,10 @@ EBUILD vdr-softdevice-0.4.0.ebuild 3653 RMD160 d6ad704f9ec1808c0b7883453a9a2de91
 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 9578 RMD160 de408ca75ab5d72cd107d338cd193d0becbc731e SHA1 eafc2e0d9dee044c98681b71651f7bbcb4175b12 SHA256 2c1e7dfaa1baf149f65b1780de115e31b8ba69bace1213270e92f2559c363407
-MD5 c518b5eb8a58c8d59a1e74cdec05d04c ChangeLog 9578
-RMD160 de408ca75ab5d72cd107d338cd193d0becbc731e ChangeLog 9578
-SHA256 2c1e7dfaa1baf149f65b1780de115e31b8ba69bace1213270e92f2559c363407 ChangeLog 9578
+MISC ChangeLog 9744 RMD160 6b63b4c7e666c09701b782ddbe95a0b3df06e501 SHA1 183e0ee60d390168edf2038612dba6070166e1a0 SHA256 8f32241b4af6e7e7d2da12b033e081bf424e15a76dd99a592ce47cd26c8e8fb2
+MD5 af4869ad7c2c798e7ffc93c54ac35226 ChangeLog 9744
+RMD160 6b63b4c7e666c09701b782ddbe95a0b3df06e501 ChangeLog 9744
+SHA256 8f32241b4af6e7e7d2da12b033e081bf424e15a76dd99a592ce47cd26c8e8fb2 ChangeLog 9744
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -122,9 +122,9 @@ MD5 0e3425b134288786106a7e67e5fdfd67 files/digest-vdr-softdevice-0.4.0.20070515
 RMD160 28fadacb573f89e0512dfe2b462b93ff2595a9c7 files/digest-vdr-softdevice-0.4.0.20070515 286
 SHA256 b4d883a9f427145bd935ead8b1f50cc13041a836d9cd77a997d76e737fc88438 files/digest-vdr-softdevice-0.4.0.20070515 286
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGilubt2vP6XvVdOcRAuXCAJ0eLq3na5tyjyKkPddLFKRoJSq7KwCeOlCN
-0bgOrZxbh+1zbvfgCWNKmxY=
-=pgPv
+iD8DBQFGkgG3t2vP6XvVdOcRAsN0AKCIAZKoujXZ5CCFu8yLq6l57UbyzACg3+hw
+joBAhxhXGsBL1T1jC0kj1NQ=
+=+aeM
 -----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
index e4fca0bd738c..e5148463b03b 100644
--- 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
@@ -26,3 +26,28 @@ Index: softdevice-cvs/configure
  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);
+Index: softdevice-cvs/VideoFilter.h
+===================================================================
+--- softdevice-cvs.orig/VideoFilter.h
++++ softdevice-cvs/VideoFilter.h
+@@ -14,8 +14,10 @@
+ 
+ #ifdef PP_LIBAVCODEC
+ #include <stdint.h> //needed by postproc.h
++extern "C" {
+   #include <postprocess.h>
+   //#include <postproc/postprocess.h>
++}
+ #endif //PP_LIBAVCODEC
+ 
+ #include "video.h"
+@@ -60,7 +62,9 @@ public:
+ };
+ 
+ #ifdef USE_SWSCALE
++extern "C" {
+ #include <swscale.h>
++}
+ #endif
+ class cImageConvert : public cVideoFilter {
+         sPicBuffer *outBuf;