media-video/gpac-0.4.2: Fix to compile against latest ffmpeg snapshots, bug #148939

Package-Manager: portage-2.1.2_pre2-r7

4 files changed, 39 insertions, 10 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 05ac5b4e0796..571b4d675bce 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.26 2006/09/22 00:13:36 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.27 2006/10/09 21:42:59 aballier Exp $
+
+  09 Oct 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/gpac-0.4.2-ffmpeg-snapshots-compat.patch, gpac-0.4.2.ebuild:
+  Fix to compile against latest ffmpeg snapshots, bug #148939
 
   22 Sep 2006; Steve Dibb <beandog@gentoo.org>
   gpac-0.4.1_pre20060122-r1.ebuild, gpac-0.4.2.ebuild:
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 818455d27b12..2761135665f8 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -18,6 +18,10 @@ AUX gpac-0.4.2-configure-ogg.patch 917 RMD160 075b0adac5e3b309219bbe70dd54e2c91e
 MD5 79f273f198d200bc7f453e48c75f5055 files/gpac-0.4.2-configure-ogg.patch 917
 RMD160 075b0adac5e3b309219bbe70dd54e2c91e149895 files/gpac-0.4.2-configure-ogg.patch 917
 SHA256 03527ecaef5de7435bf840804447f9c323361e85db5be406c0690eb090eb3794 files/gpac-0.4.2-configure-ogg.patch 917
+AUX gpac-0.4.2-ffmpeg-snapshots-compat.patch 492 RMD160 147bd36fbc18dc5f39fa0eca95ee3739be6a27e1 SHA1 5c2d104484a00e0bfff39b28b371eb4abc7e8b40 SHA256 1273ed74bdf0cd2c2aa051a0474e7e87a5f7a48a126dc4fc360f4e54dbf0ac24
+MD5 a42018ea4472207c822f6f1c0eca0738 files/gpac-0.4.2-ffmpeg-snapshots-compat.patch 492
+RMD160 147bd36fbc18dc5f39fa0eca95ee3739be6a27e1 files/gpac-0.4.2-ffmpeg-snapshots-compat.patch 492
+SHA256 1273ed74bdf0cd2c2aa051a0474e7e87a5f7a48a126dc4fc360f4e54dbf0ac24 files/gpac-0.4.2-ffmpeg-snapshots-compat.patch 492
 AUX gpac-0.4.2-nostrip.patch 2080 RMD160 9c1a83363837a7bf3e09d4665c0c7cd4a05d9a27 SHA1 e0680ea05b97fda41a59b3c4f5c7c8a24e39c94b SHA256 004119af40c0e5c6948c1a743464c2e7b07451052784bdd3821ce2886f5feffb
 MD5 cf5386f74e7db3339ac5f0e8c2fe8d00 files/gpac-0.4.2-nostrip.patch 2080
 RMD160 9c1a83363837a7bf3e09d4665c0c7cd4a05d9a27 files/gpac-0.4.2-nostrip.patch 2080
@@ -53,14 +57,14 @@ EBUILD gpac-0.4.1_pre20060122.ebuild 3816 RMD160 e7691173882105478404d29fa575258
 MD5 bfdee026e0b9fd53544b5f148f8acfdd gpac-0.4.1_pre20060122.ebuild 3816
 RMD160 e7691173882105478404d29fa5752589123c0153 gpac-0.4.1_pre20060122.ebuild 3816
 SHA256 5d106a90a5a1b1aab606a4719a7a0c7f14c8728bc24fce78ef14f6e6330f946a gpac-0.4.1_pre20060122.ebuild 3816
-EBUILD gpac-0.4.2.ebuild 3848 RMD160 00c7d3ff18d996319fd43546b79872d5dde9f647 SHA1 86c7f7dc84e99b414a2c7081c3055e8887f53e1b SHA256 07346d6d0ee2cbe7fba6fd8984955d6d97c3dacd606e1764a0c194e741a4fc89
-MD5 ce11aaa07d2f2fa607f6381e0a09fc24 gpac-0.4.2.ebuild 3848
-RMD160 00c7d3ff18d996319fd43546b79872d5dde9f647 gpac-0.4.2.ebuild 3848
-SHA256 07346d6d0ee2cbe7fba6fd8984955d6d97c3dacd606e1764a0c194e741a4fc89 gpac-0.4.2.ebuild 3848
-MISC ChangeLog 4042 RMD160 7d734db8405b4acbe830b660be4d2a7a0fb60314 SHA1 f181591b8f746f7412e10bc7f0ca896f3d80979c SHA256 93844ca3d2379d0d05062c36fd7ea635a24d50dcffdfb92e2f2752014404d40f
-MD5 a97901dd23fd7415fee96be5d1973e0b ChangeLog 4042
-RMD160 7d734db8405b4acbe830b660be4d2a7a0fb60314 ChangeLog 4042
-SHA256 93844ca3d2379d0d05062c36fd7ea635a24d50dcffdfb92e2f2752014404d40f ChangeLog 4042
+EBUILD gpac-0.4.2.ebuild 3906 RMD160 1537ad051caabd9b833890dfa29a1c82ade5e40c SHA1 c08146da9baec53cc81f81250904cb75ac7fc9b6 SHA256 bb962564ec34871c9028f55bbdad4ee420f91837eded3341050ad136eed7ed7e
+MD5 7ae88a1cc4647a4e9aa5266afb9b1e05 gpac-0.4.2.ebuild 3906
+RMD160 1537ad051caabd9b833890dfa29a1c82ade5e40c gpac-0.4.2.ebuild 3906
+SHA256 bb962564ec34871c9028f55bbdad4ee420f91837eded3341050ad136eed7ed7e gpac-0.4.2.ebuild 3906
+MISC ChangeLog 4228 RMD160 6cbc46829be2155289d47c26e2b071e5cb34e3b0 SHA1 368d16e477785d034b897caa2ab9db810248fa01 SHA256 13d164f4bc094d23200118af34ce9c1095b5a35a8209d0bcedd43f623d13f52d
+MD5 80bca8350596175f8a6d08039013eb3b ChangeLog 4228
+RMD160 6cbc46829be2155289d47c26e2b071e5cb34e3b0 ChangeLog 4228
+SHA256 13d164f4bc094d23200118af34ce9c1095b5a35a8209d0bcedd43f623d13f52d ChangeLog 4228
 MISC metadata.xml 347 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 SHA1 08f88c0a9437bad24a2c6655e8e370870145c833 SHA256 702b878c0a6c23d19442ee367c51725d5f7c0a61e0c7b2a57a2708f4622ba8fc
 MD5 cb378e7131783653c967c6365ca31a16 metadata.xml 347
 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 metadata.xml 347
diff --git a/media-video/gpac/files/gpac-0.4.2-ffmpeg-snapshots-compat.patch b/media-video/gpac/files/gpac-0.4.2-ffmpeg-snapshots-compat.patch
new file mode 100644
index 000000000000..c40790629188
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.4.2-ffmpeg-snapshots-compat.patch
@@ -0,0 +1,20 @@
+--- gpac/modules/ffmpeg_in/ffmpeg_decode.c.old	2006-10-09 21:33:37.000000000 +0200
++++ gpac/modules/ffmpeg_in/ffmpeg_decode.c	2006-10-09 21:34:20.000000000 +0200
+@@ -25,6 +25,17 @@
+ #include "ffmpeg_in.h"
+ #include <gpac/avparse.h>
+ 
++
++#ifndef STRINGIFY
++# define STRINGIFY(x)    STRINGIFY1(x)
++# define STRINGIFY1(x)   #x
++#endif
++
++#ifndef FFMPEG_VERSION
++#define FFMPEG_VERSION STRINGIFY(LIBAVCODEC_VERSION)
++#endif
++
++
+ static AVCodec *ffmpeg_get_codec(u32 codec_4cc)
+ {
+ 	char name[5];
diff --git a/media-video/gpac/gpac-0.4.2.ebuild b/media-video/gpac/gpac-0.4.2.ebuild
index 1abe7bc730a0..61f89b56cf94 100644
--- a/media-video/gpac/gpac-0.4.2.ebuild
+++ b/media-video/gpac/gpac-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2.ebuild,v 1.4 2006/09/22 00:13:36 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2.ebuild,v 1.5 2006/10/09 21:42:59 aballier Exp $
 
 inherit eutils wxwidgets flag-o-matic multilib
 
@@ -60,6 +60,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-static-defs.patch"
 	epatch "${FILESDIR}/${P}-nostrip.patch"
 	epatch "${FILESDIR}/${P}-soname.patch"
+	epatch "${FILESDIR}/${P}-ffmpeg-snapshots-compat.patch"
 	sed -ie '/ldconfig / d' "${S}/Makefile"
 
 	if use amr; then