Fix build with latest ffmpegs, stick deps to latest ffmpeg version as ac3_decoder...

Package-Manager: portage-2.1.2.3

diff --git a/media-video/dvbcut/ChangeLog b/media-video/dvbcut/ChangeLog
index 78ed58b8a8e9c2bfdd77f925c9120444d1e32475..96dbb5fd345e120e59ca43af9124d332018e3ea0 100644 (file)
--- a/media-video/dvbcut/ChangeLog
+++ b/media-video/dvbcut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/dvbcut
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/ChangeLog,v 1.3 2007/03/12 07:59:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/ChangeLog,v 1.4 2007/04/14 22:08:59 aballier Exp $
+
+  14 Apr 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/dvbcut-0.5.3-ffmpeg-compat.patch, dvbcut-0.5.3-r1.ebuild:
+  Fix build with latest ffmpegs, stick deps to latest ffmpeg version as
+  ac3_decoder has been renamed in this version, bug #174623
 
   12 Mar 2007; Alexis Ballier <aballier@gentoo.org>
   +files/dvbcut-0.5.3-sconstruct.patch, dvbcut-0.5.3-r1.ebuild:

diff --git a/media-video/dvbcut/Manifest b/media-video/dvbcut/Manifest
index 32335d2091f85cfded89ef358c94a2bba2e13ac0..d0b8f4ef0016810591fcc30ac5df634e36a15e2b 100644 (file)
--- a/media-video/dvbcut/Manifest
+++ b/media-video/dvbcut/Manifest
@@ -5,19 +5,23 @@ AUX dvbcut-0.5.3-ac3-buffer.patch 559 RMD160 ff6b4e36f3b1b4ff0a6d9836bad556dd19e
 MD5 7da72c7c16171d36d60bf36625eed002 files/dvbcut-0.5.3-ac3-buffer.patch 559
 RMD160 ff6b4e36f3b1b4ff0a6d9836bad556dd19ef36a2 files/dvbcut-0.5.3-ac3-buffer.patch 559
 SHA256 f3054c13b3d250ac2e082ab880a9017926b745e83876d884be3c233485212a1d files/dvbcut-0.5.3-ac3-buffer.patch 559
+AUX dvbcut-0.5.3-ffmpeg-compat.patch 1380 RMD160 3c52b5997d0c25eebdbe32161074504b05aa710b SHA1 84e5ff8d2137aad5fe5a7eb74af20590eeb722ff SHA256 0fe452450ac506b4660324e1e1b038844fce79821c0df7f3580969a3b9171f4a
+MD5 4d61534a8bf9a907a68a4a672babc6d6 files/dvbcut-0.5.3-ffmpeg-compat.patch 1380
+RMD160 3c52b5997d0c25eebdbe32161074504b05aa710b files/dvbcut-0.5.3-ffmpeg-compat.patch 1380
+SHA256 0fe452450ac506b4660324e1e1b038844fce79821c0df7f3580969a3b9171f4a files/dvbcut-0.5.3-ffmpeg-compat.patch 1380
 AUX dvbcut-0.5.3-sconstruct.patch 1070 RMD160 07b7fd7b0e4c38fd03600eabbeff83465afcbe7a SHA1 db40b6bc0cb5972fa576384ac3ee0a01a811f854 SHA256 8626581fa0d461da4616c565b4a773580b091f1c37c6d0921c7819948eb9c3db
 MD5 a64f2250e5179420c54c8fea137c75e4 files/dvbcut-0.5.3-sconstruct.patch 1070
 RMD160 07b7fd7b0e4c38fd03600eabbeff83465afcbe7a files/dvbcut-0.5.3-sconstruct.patch 1070
 SHA256 8626581fa0d461da4616c565b4a773580b091f1c37c6d0921c7819948eb9c3db files/dvbcut-0.5.3-sconstruct.patch 1070
 DIST dvbcut_0.5.3.tar.bz2 791953 RMD160 8a51c528a2274db44c864b1315b25e7cff7bb12d SHA1 728352121d00b862b2104162385ecd1c5ced69c9 SHA256 6496e5a9fe9a4313a480a3b21f075ea17e07451499d2c8e27559f1c4878b5238
-EBUILD dvbcut-0.5.3-r1.ebuild 1268 RMD160 74f735bdf8f47835946b6fd27f7f39045b1bf868 SHA1 7fd78bb7a94e0d35dd744678a23c70a831262393 SHA256 58984ad068b50cd72b9fe6c74922085d51cf05d51731d5348ec2d6edf51c75d6
-MD5 c818421c5bbd31c25c2fd153be2b1f15 dvbcut-0.5.3-r1.ebuild 1268
-RMD160 74f735bdf8f47835946b6fd27f7f39045b1bf868 dvbcut-0.5.3-r1.ebuild 1268
-SHA256 58984ad068b50cd72b9fe6c74922085d51cf05d51731d5348ec2d6edf51c75d6 dvbcut-0.5.3-r1.ebuild 1268
-MISC ChangeLog 1005 RMD160 eee905dd4053e9e05292c6e9725d1451d0ef6e63 SHA1 580843de2290e3fbc4a4fe5bd383c73dd19d8efc SHA256 7b07cd2a5dd77da0d9b1685ee14b5dbdbb7ed9f66a136ec46a2c9139764c39e4
-MD5 ba618cc6b67f861dca546d0b21626db0 ChangeLog 1005
-RMD160 eee905dd4053e9e05292c6e9725d1451d0ef6e63 ChangeLog 1005
-SHA256 7b07cd2a5dd77da0d9b1685ee14b5dbdbb7ed9f66a136ec46a2c9139764c39e4 ChangeLog 1005
+EBUILD dvbcut-0.5.3-r1.ebuild 1333 RMD160 533169cd23fc24a6f613cff7332eebeed8abafbc SHA1 58c20ce3fc2463ae08a4606f3e9f77944d87e28e SHA256 dba94773f8b15e0cdc21f83d10c6adba940cdb62c054e86eab367935c935981b
+MD5 11333a45afa0bf7dbcc7971ec4bd8837 dvbcut-0.5.3-r1.ebuild 1333
+RMD160 533169cd23fc24a6f613cff7332eebeed8abafbc dvbcut-0.5.3-r1.ebuild 1333
+SHA256 dba94773f8b15e0cdc21f83d10c6adba940cdb62c054e86eab367935c935981b dvbcut-0.5.3-r1.ebuild 1333
+MISC ChangeLog 1257 RMD160 23f3f623d57a0193f837cf74272143a311c785fb SHA1 4d38c90aa9bd469c94dc5c9c00e4e3f3857c731c SHA256 730913492e1c7509e123a34be73fa5cd96d8cd17cd20ffc27da00f3cd916683f
+MD5 ff9b7e8b7a7eafad3f6929728d2b47f0 ChangeLog 1257
+RMD160 23f3f623d57a0193f837cf74272143a311c785fb ChangeLog 1257
+SHA256 730913492e1c7509e123a34be73fa5cd96d8cd17cd20ffc27da00f3cd916683f ChangeLog 1257
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -28,7 +32,7 @@ SHA256 3c9870abcd62417e6efdd993d49022b7ddb4cc49d28e8869988ee96732ead925 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9QhuvFcC4BYPU0oRAk4OAKCcEd57mc8knXDcFXhzcRoy67hHogCeIXPQ
-+t7ImScZAgckFsRbh7pm8Lc=
-=jk4a
+iD8DBQFGIVC6vFcC4BYPU0oRAtdFAJ9W/Gky51g9tf03UsIefdxHU987LACdEof3
+NCENWlHEq+9MrJPKZzgaVLo=
+=aNcr
 -----END PGP SIGNATURE-----

diff --git a/media-video/dvbcut/dvbcut-0.5.3-r1.ebuild b/media-video/dvbcut/dvbcut-0.5.3-r1.ebuild
index 05d5f4658f03905acbe6deba5f0d04c77ceffbb5..8ca18f15f6b9fbd91eed58687bf36b8ce4a08776 100644 (file)
--- a/media-video/dvbcut/dvbcut-0.5.3-r1.ebuild
+++ b/media-video/dvbcut/dvbcut-0.5.3-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/dvbcut/dvbcut-0.5.3-r1.ebuild,v 1.2 2007/03/12 07:59:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/dvbcut-0.5.3-r1.ebuild,v 1.3 2007/04/14 22:08:59 aballier Exp $
 
 inherit qt3 eutils
 
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="$(qt_min_version 3)
        media-libs/libao
-       media-video/ffmpeg"
+       >=media-video/ffmpeg-0.4.9_p20070330"
 
 DEPEND="${RDEPEND}
        dev-util/scons"
@@ -37,6 +37,7 @@ src_unpack() {
        cd "${S}"
        epatch "${FILESDIR}/${P}-ac3-buffer.patch"
        epatch "${FILESDIR}/${P}-sconstruct.patch"
+       epatch "${FILESDIR}/${P}-ffmpeg-compat.patch"
 }
 
 src_compile() {

diff --git a/media-video/dvbcut/files/dvbcut-0.5.3-ffmpeg-compat.patch b/media-video/dvbcut/files/dvbcut-0.5.3-ffmpeg-compat.patch
new file mode 100644 (file)
index 0000000..fdb8a4e
--- /dev/null
+++ b/media-video/dvbcut/files/dvbcut-0.5.3-ffmpeg-compat.patch
@@ -0,0 +1,38 @@
+Index: dvbcut-0.5.3/SConstruct
+===================================================================
+--- dvbcut-0.5.3.orig/SConstruct
++++ dvbcut-0.5.3/SConstruct
+@@ -101,6 +101,7 @@ if (ffmpegpath!='/usr'): 
+   env.Append(LIBPATH=os.path.join(str(ffmpegpath),'lib'))
+ env.Append(LIBS=['avformat','avcodec','avutil'])
+   
++env.Append(CPPDEFINES="__STDC_CONSTANT_MACROS")
+ ###### WORK
+ 
+ env.bin_targets=[]
+Index: dvbcut-0.5.3/src/psfile.cpp
+===================================================================
+--- dvbcut-0.5.3.orig/src/psfile.cpp
++++ dvbcut-0.5.3/src/psfile.cpp
+@@ -100,7 +100,7 @@ psfile::psfile(const std::string &filena
+       streamnumber[sid]=audiostream(audiostreams);
+       stream *S=&s[audiostream(audiostreams++)];
+       S->id=sid;
+-      S->dec=&ac3_decoder;
++      S->dec=&liba52_decoder;
+       S->type=streamtype::ac3audio;
+       if (audiostreams>=MAXAUDIOSTREAMS)
+         break;
+Index: dvbcut-0.5.3/src/tsfile.cpp
+===================================================================
+--- dvbcut-0.5.3.orig/src/tsfile.cpp
++++ dvbcut-0.5.3/src/tsfile.cpp
+@@ -73,7 +73,7 @@ tsfile::tsfile(const std::string &filena
+     stream *S=&s[audiostream(audiostreams++)];
+     S->id=it->second;
+     if (it->first==0xbd) {
+-      S->dec=&ac3_decoder;
++      S->dec=&liba52_decoder;
+       S->enc=&ac3_encoder;
+       S->type=streamtype::ac3audio;
+       } else {