From: Alexis Ballier Date: Mon, 12 Mar 2007 07:59:36 +0000 (+0000) Subject: Fix build with scons dev-util/scons-0.96.94, thanks to Castagnola Roberto for portin... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=24cfcb783e0d4ebb01ed5d7c82e0355e629da4df;p=gentoo.git Fix build with scons dev-util/scons-0.96.94, thanks to Castagnola Roberto for porting this patch, bug #159373, add ~amd64, die if ffmpeg is not built with a52 useflag, bug #159212 Package-Manager: portage-2.1.2.2 --- diff --git a/media-video/dvbcut/ChangeLog b/media-video/dvbcut/ChangeLog index 226b3eefabe3..78ed58b8a8e9 100644 --- a/media-video/dvbcut/ChangeLog +++ b/media-video/dvbcut/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/dvbcut -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/dvbcut/ChangeLog,v 1.2 2006/11/29 09:14:22 zzam Exp $ +# 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 $ + + 12 Mar 2007; Alexis Ballier + +files/dvbcut-0.5.3-sconstruct.patch, dvbcut-0.5.3-r1.ebuild: + Fix build with scons dev-util/scons-0.96.94, thanks to Castagnola Roberto + for porting this patch, bug #159373, add ~amd64, die if ffmpeg is not built + with a52 useflag, bug #159212 *dvbcut-0.5.3-r1 (29 Nov 2006) diff --git a/media-video/dvbcut/Manifest b/media-video/dvbcut/Manifest index 515ea2034117..32335d2091f8 100644 --- a/media-video/dvbcut/Manifest +++ b/media-video/dvbcut/Manifest @@ -5,15 +5,19 @@ 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-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 921 RMD160 fbf99c8ee20b320c0134798d92c542af7d25f8ca SHA1 c2d472fd97197d0cfac0ec9d10a0c647ee15c169 SHA256 3a73a97e1c7d4140a7f61fa5e5e2ad7360b11c385acda00f5e1d60085c320b09 -MD5 edb411e9440bebd7605e57ca9972ab83 dvbcut-0.5.3-r1.ebuild 921 -RMD160 fbf99c8ee20b320c0134798d92c542af7d25f8ca dvbcut-0.5.3-r1.ebuild 921 -SHA256 3a73a97e1c7d4140a7f61fa5e5e2ad7360b11c385acda00f5e1d60085c320b09 dvbcut-0.5.3-r1.ebuild 921 -MISC ChangeLog 698 RMD160 116b932fa8bf4cb8dff3c03e37d783861108bfb3 SHA1 733dde2f111aba04b7f4636fefd413efff24b269 SHA256 625d8017d8d367d8ebbc36766b4dd534ecf80e42988c6e354c3e63bbd6f9aa03 -MD5 da6b0e356930870b34e456a247298911 ChangeLog 698 -RMD160 116b932fa8bf4cb8dff3c03e37d783861108bfb3 ChangeLog 698 -SHA256 625d8017d8d367d8ebbc36766b4dd534ecf80e42988c6e354c3e63bbd6f9aa03 ChangeLog 698 +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 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223 @@ -22,9 +26,9 @@ MD5 d350c2d3c5dea9371cc348d60a0c420e files/digest-dvbcut-0.5.3-r1 241 RMD160 c90e75d2143ad42f17f7759e3152d689060f715b files/digest-dvbcut-0.5.3-r1 241 SHA256 3c9870abcd62417e6efdd993d49022b7ddb4cc49d28e8869988ee96732ead925 files/digest-dvbcut-0.5.3-r1 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFbU90t2vP6XvVdOcRAr2UAJ9sNwmx3tdlFl0L6RutGGdg+AolkwCbBU4J -A8Vg25Uvnn4S8Ev/WvK69Fs= -=WZND +iD8DBQFF9QhuvFcC4BYPU0oRAk4OAKCcEd57mc8knXDcFXhzcRoy67hHogCeIXPQ ++t7ImScZAgckFsRbh7pm8Lc= +=jk4a -----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 8c6f8e83d9ac..05d5f4658f03 100644 --- 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-2006 Gentoo Foundation +# 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.1 2006/11/29 09:14:22 zzam Exp $ +# $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 $ inherit qt3 eutils @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~amd64 ~x86" RDEPEND="$(qt_min_version 3) media-libs/libao @@ -24,10 +24,19 @@ RDEPEND="$(qt_min_version 3) DEPEND="${RDEPEND} dev-util/scons" +pkg_setup() { + if ! built_with_use media-video/ffmpeg a52; then + eerror "This package requires media-video/ffmpeg compiled with A/52 (a.k.a. AC-3) support." + eerror "Please reemerge media-video/ffmpeg with USE=\"a52\"." + die "Please reemerge media-video/ffmpeg with USE=\"a52\"." + fi +} + src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-ac3-buffer.patch" + epatch "${FILESDIR}/${P}-sconstruct.patch" } src_compile() { diff --git a/media-video/dvbcut/files/dvbcut-0.5.3-sconstruct.patch b/media-video/dvbcut/files/dvbcut-0.5.3-sconstruct.patch new file mode 100644 index 000000000000..a4382ca08d2a --- /dev/null +++ b/media-video/dvbcut/files/dvbcut-0.5.3-sconstruct.patch @@ -0,0 +1,34 @@ +--- trunk/SConstruct 2006/09/04 19:40:35 1 ++++ trunk/SConstruct 2007/01/28 11:09:32 21 +@@ -48,7 +48,7 @@ + + env.Replace(CXXFILESUFFIX=".cpp") + +-env.Append(CPPDEFINES={"_FILE_OFFSET_BITS": "64", "_LARGEFILE_SOURCE": None}) ++env.Append(CPPDEFINES=[("_FILE_OFFSET_BITS", "64"), "_LARGEFILE_SOURCE"]) + + for v in ("CXX","LINK"): + if (v in os.environ): +@@ -62,11 +62,11 @@ + + if (not env.GetOption('clean')): + if (conf.TryAction('pkg-config --exists ao')[0]): +- conf.env.Append(CPPDEFINES={"HAVE_LIB_AO":None}) ++ conf.env.Append(CPPDEFINES="HAVE_LIB_AO") + conf.env.ParseConfig('pkg-config --cflags --libs ao') + print "Checking for libao... found" + elif (conf.CheckLibWithHeader('ao', 'ao/ao.h', 'C')): +- conf.env.Append(CPPDEFINES={"HAVE_LIB_AO":None}) ++ conf.env.Append(CPPDEFINES="HAVE_LIB_AO") + conf.env.Append(LIBS=['ao']) + print "Checking for libao... found" + else: +@@ -85,7 +85,7 @@ + env.Replace(QT_LIB=qtlib) + + if (debug<=0): +- env.Append(CPPDEFINES={"QT_NO_DEBUG": None}) ++ env.Append(CPPDEFINES="QT_NO_DEBUG") + + ### FFMPEG +