fix build with recent ffmpeg snapshots, bug #173772

Package-Manager: portage-2.1.2.3

4 files changed, 43 insertions, 14 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index daafe2f485e3..53b884097a07 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.38 2007/02/14 19:09:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.39 2007/04/11 20:53:40 aballier Exp $
+
+  11 Apr 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/gpac-0.4.2-ffmpeg-errno.patch, gpac-0.4.2-r1.ebuild:
+  fix build with recent ffmpeg snapshots, bug #173772
 
   14 Feb 2007; Alexis Ballier <aballier@gentoo.org>
   -files/gpac-0.4.0-downloader.patch,
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index f5464c72090e..b394296dc72a 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -13,6 +13,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-errno.patch 643 RMD160 8ceb2bedc6cb701265183c9e9f8cc35951f76599 SHA1 8b214884bff145a1320893138b0db26e26ec9ce2 SHA256 510d2bc0a549e18008114d0b13d4b5456774f2bf3b7b0b676a741e8cdc104f1f
+MD5 722906adc18ff4dec54711fae0ba7339 files/gpac-0.4.2-ffmpeg-errno.patch 643
+RMD160 8ceb2bedc6cb701265183c9e9f8cc35951f76599 files/gpac-0.4.2-ffmpeg-errno.patch 643
+SHA256 510d2bc0a549e18008114d0b13d4b5456774f2bf3b7b0b676a741e8cdc104f1f files/gpac-0.4.2-ffmpeg-errno.patch 643
 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
@@ -33,18 +37,18 @@ DIST 26104-610.zip 292640 RMD160 84b2642709ca072c30658a71a6d8bec50fceb2fe SHA1 7
 DIST 26204-600.zip 255764 RMD160 d85a1879e60deeaa9b371646a1d43dd07ae07777 SHA1 fe0746e0456abe9285a54f0c3fd8e20598ee0408 SHA256 01513a7ae5d26ff16a37fba5deec2994a1992829180b4a15d9c646c51eb8fcdb
 DIST gpac-0.4.2-patches.tar.bz2 3899 RMD160 42f9de741f27ca2a942728640582978a497e8721 SHA1 d29abbb5d1aa563e95e45647b5b265bdbbe21a9b SHA256 d0316a55dfc6077437645b8b11a6b0f77ff9d896efd31c8b6fae4d827e7e0e84
 DIST gpac-0.4.2.tar.gz 3916608 RMD160 17d2691651b633497ae96ec71912cfafa864c90a SHA1 800db66f33849886888b24414fb580eaa034a134 SHA256 0e300b02824f12767e5fa0c70b138b6a17375c3d6000aea2568464a9bb1cd956
-EBUILD gpac-0.4.2-r1.ebuild 3948 RMD160 066e1ef5623d2e3c36697acb4e35d1c5a12db867 SHA1 21a257638c8fd9dd0c02d2549635f24febccf257 SHA256 9dcf37435945b28536a7a6b208f274527f430c5d13213f070aa1fa593b1b086f
-MD5 c47fefa9ad1203e1eef7428c3e3d322a gpac-0.4.2-r1.ebuild 3948
-RMD160 066e1ef5623d2e3c36697acb4e35d1c5a12db867 gpac-0.4.2-r1.ebuild 3948
-SHA256 9dcf37435945b28536a7a6b208f274527f430c5d13213f070aa1fa593b1b086f gpac-0.4.2-r1.ebuild 3948
+EBUILD gpac-0.4.2-r1.ebuild 3999 RMD160 0fedd7284232712f44fd85d7f5e6756ed2eba12c SHA1 985f96035008524d177595b90594c43e43188654 SHA256 59fd8ead10f07e13847caec0367736b1f04740266a66e9392e9a51cb327054e8
+MD5 653e34e4aa947f93e3f0855b5174584d gpac-0.4.2-r1.ebuild 3999
+RMD160 0fedd7284232712f44fd85d7f5e6756ed2eba12c gpac-0.4.2-r1.ebuild 3999
+SHA256 59fd8ead10f07e13847caec0367736b1f04740266a66e9392e9a51cb327054e8 gpac-0.4.2-r1.ebuild 3999
 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 5836 RMD160 7853d44fca837bb5fb513e025a961819a784067b SHA1 a664dd776e0f17eace9405e8a25a8072802e2ac9 SHA256 ff17908ec115fa7066d4a39ba9355122031d9bbc4474a3f62211d17089d9f2e7
-MD5 7ae7325836ff585acdc3c7a83201bb44 ChangeLog 5836
-RMD160 7853d44fca837bb5fb513e025a961819a784067b ChangeLog 5836
-SHA256 ff17908ec115fa7066d4a39ba9355122031d9bbc4474a3f62211d17089d9f2e7 ChangeLog 5836
+MISC ChangeLog 6005 RMD160 ecbfffaf12b67117fb36f6a26a14d0c859e8de1e SHA1 be59a33bb1e25719a053b9d848e3002774fa2cce SHA256 368bc9b774a0790779061e70e21064c4b2c962f82252c959ba9386083278e382
+MD5 bbc17f26539eae25de4357ae3237fe48 ChangeLog 6005
+RMD160 ecbfffaf12b67117fb36f6a26a14d0c859e8de1e ChangeLog 6005
+SHA256 368bc9b774a0790779061e70e21064c4b2c962f82252c959ba9386083278e382 ChangeLog 6005
 MISC metadata.xml 347 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 SHA1 08f88c0a9437bad24a2c6655e8e370870145c833 SHA256 702b878c0a6c23d19442ee367c51725d5f7c0a61e0c7b2a57a2708f4622ba8fc
 MD5 cb378e7131783653c967c6365ca31a16 metadata.xml 347
 RMD160 41aa55c1c1abb3244d641ac280b0ff134fd20720 metadata.xml 347
@@ -56,9 +60,9 @@ MD5 55c51bbc91cbdf60550e92e71ae627f5 files/digest-gpac-0.4.2-r1 928
 RMD160 1c9ad78dc0dba2b8cdbd9a05cfdf515a721d85ad files/digest-gpac-0.4.2-r1 928
 SHA256 397999a1e7316e095eabeb09481b0c7ef90c0917bdba649ad4e3040a093b76ce files/digest-gpac-0.4.2-r1 928
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF015WvFcC4BYPU0oRAuHfAJ9w7rVJjKFi8/nHltp/O7xO/Hw5FgCgh2pB
-aYI5oSVlti3TDo6UzXpoK/Q=
-=Pprz
+iD8DBQFGHUrOvFcC4BYPU0oRAhE/AKCYknYgWHV3mXnTbJCFYO17t5gBqgCgkd5J
+4QRuzzP3dI7oLOTwsWynEWk=
+=4HyJ
 -----END PGP SIGNATURE-----
diff --git a/media-video/gpac/files/gpac-0.4.2-ffmpeg-errno.patch b/media-video/gpac/files/gpac-0.4.2-ffmpeg-errno.patch
new file mode 100644
index 000000000000..ec59cec5e881
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.4.2-ffmpeg-errno.patch
@@ -0,0 +1,20 @@
+Index: gpac/modules/ffmpeg_in/ffmpeg_demux.c
+===================================================================
+--- gpac.orig/modules/ffmpeg_in/ffmpeg_demux.c
++++ gpac/modules/ffmpeg_in/ffmpeg_demux.c
+@@ -23,6 +23,7 @@
+  */
+ 
+ #include "ffmpeg_in.h"
++#include <errno.h>
+ 
+ /*default buffer is 200 ms per channel*/
+ #define FFD_DATA_BUFFER		800
+@@ -285,7 +286,6 @@ static GF_ESD *FFD_GetESDescriptor(FFDem
+ 		case CODEC_ID_MP3:
+ 			esd->decoderConfig->objectTypeIndication = 0x69;
+ 			break;
+-		case CODEC_ID_MPEG4AAC:
+ 		case CODEC_ID_AAC:
+ 			if (!dec->extradata_size) goto opaque_audio;
+ 			esd->decoderConfig->objectTypeIndication = 0x40;
diff --git a/media-video/gpac/gpac-0.4.2-r1.ebuild b/media-video/gpac/gpac-0.4.2-r1.ebuild
index 06847d9ceb4c..e338fa892218 100644
--- a/media-video/gpac/gpac-0.4.2-r1.ebuild
+++ b/media-video/gpac/gpac-0.4.2-r1.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-video/gpac/gpac-0.4.2-r1.ebuild,v 1.9 2007/02/07 21:06:10 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2-r1.ebuild,v 1.10 2007/04/11 20:53:40 aballier Exp $
 
 inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs
 
@@ -101,6 +101,7 @@ src_unpack() {
 
 	epatch "${WORKDIR}/${P}-pic.patch"
 	epatch "${FILESDIR}/${P}-bsd.patch"
+	epatch "${FILESDIR}/${P}-ffmpeg-errno.patch"
 }
 
 src_compile() {