fix build with ffmpeg trunk, by DaggyStyle <stompdagger1@yahoo.com>, bug #321945

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 43150d3c435e322784141cda888963cba4e879f3..d81c438603cdf98d978c98ad469a0d676a025ca9 100644 (file)
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cinelerra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.41 2010/05/01 16:04:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.42 2010/06/11 08:57:48 aballier Exp $
+
+  11 Jun 2010; Alexis Ballier <aballier@gentoo.org>
+  cinelerra-20100320.ebuild:
+  fix build with ffmpeg trunk, by DaggyStyle <stompdagger1@yahoo.com>, bug
+  #321945
 
   01 May 2010; Samuli Suominen <ssuominen@gentoo.org>
   cinelerra-20100320.ebuild, +files/cinelerra-20100320-gcc45.patch:

diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 0e26770b3318ca93352c829031a46482b70656ed..63d8e8d92c7ab2876896397ba300ba6a7aa617da 100644 (file)
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cinelerra-20100320-gcc45.patch 375 RMD160 17cd3088918204ace155774885263cdfe2b2e2ae SHA1 598eb7275439ba3f73fc4cdf083b87e559ad43df SHA256 2cdcceffb7f2ba1909126e99e735cb39b29e45934dbcc386b0cafb6fb4f3df27
 AUX cinelerra-20100320-libpng14.patch 1082 RMD160 43a09cb00718a4cecbdb175d32b90539703ebc09 SHA1 f57287f451c2e380c0f83b86589f7dc43f5d2bdb SHA256 d214ad3ade6f51fce92db1b0c3889fff1c5c55634d5adfdb05257e5393f34972
 AUX cinelerra-20100320-pkgconfig-x264.patch 480 RMD160 3746b9f0e2b85888e2ffe7e7ccb8a4f2cc53c129 SHA1 643d1568e3a7cb66018e507632e8bc10b5e66aec SHA256 d569d0c6f1bf52a37d3a96d2753c4847aad1c5cf91ea14d2449ec6f527f2110f
@@ -5,6 +8,13 @@ AUX cinelerra-jpeg-7.patch 1131 RMD160 128d7cf423843eeaae8a1a334a3166e9ce5295cd
 AUX cinelerra-libavutil50.patch 2140 RMD160 95720943d2bee3a7f5c5a864aef5631655a65120 SHA1 6fa5d1024adde249fe026837061ceace11b06532 SHA256 f29284a0e8b629c1ff22090c03c9fe3947adbd024dd2c05d925775c8f96f8eda
 AUX cinelerra-x264.patch 679 RMD160 27c0bb325268a3523887d3d10da94090119247f1 SHA1 f59faeeca021a70ad41887b7ccc0278c8c29472d SHA256 a4a561def29c25d087cab8fceabba1dfed4c712c493dc2c8411cbf6d6226cd2b
 DIST cinelerra-20100320.tar.bz2 32670992 RMD160 96c47cf5d9f57b88ad7e3ddee42e61cfe9ccb421 SHA1 ecf4c728e149556e4725a84d460f8a0b8dad6277 SHA256 8b1b057f77283c95d728e9b848d71e938756f6deea0102ca69b618753231c9f3
-EBUILD cinelerra-20100320.ebuild 2326 RMD160 60f09b147823fd382e25980b835646f854e2f0cd SHA1 1e5faefea11153ca9563963a091f29425d242d62 SHA256 8e3cbd787dae29a0048bb1f07d34068dc8185aa2b3b1252a1c6dce93d7924fbb
-MISC ChangeLog 10330 RMD160 caa97449da378d18961142ba35840764b3298217 SHA1 f0be5d9bbf17df73a2f534dc96ba4c4eb16224ef SHA256 1d726d35af5b1db341866fd27ff7eace662a7c57029f48f9262dd60ede754d34
+EBUILD cinelerra-20100320.ebuild 2420 RMD160 d6030641fd181c30b4ab8c443125a7ec3e78312b SHA1 2953bdd95adccab7ac22f276482f1ce28815b2d8 SHA256 f348577c559cc0c2966b125853840c97e960621f4960c65eba7acfe194f3c0e9
+MISC ChangeLog 10496 RMD160 ba528aab1062d6175b4307dcf9933c8c4bd9f233 SHA1 33c109162cbe5ef305e4b1e29ce1bd65f6286eaa SHA256 5fd4dd93042eee80627062261517da9f906b4d8b21b39cc6b75022dbfe1c7d9a
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwR+pIACgkQvFcC4BYPU0o4BACgxdvxbWM9RsqYKfs78yhydSOw
+KjoAnilnHWGD96KwtTSeScxihebxFunc
+=Dn3A
+-----END PGP SIGNATURE-----

diff --git a/media-video/cinelerra/cinelerra-20100320.ebuild b/media-video/cinelerra/cinelerra-20100320.ebuild
index 73a427b10f13a93ba02db16656dff72436310a24..929a015eda0e33900482e1315998a4a79ae645ac 100644 (file)
--- a/media-video/cinelerra/cinelerra-20100320.ebuild
+++ b/media-video/cinelerra/cinelerra-20100320.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20100320.ebuild,v 1.4 2010/05/01 16:04:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20100320.ebuild,v 1.5 2010/06/11 08:57:48 aballier Exp $
 
 EAPI=2
-inherit autotools eutils multilib
+inherit autotools eutils multilib flag-o-matic
 
 DESCRIPTION="Cinelerra - Professional Video Editor - Unofficial GIT-version"
 HOMEPAGE="http://www.cinelerra.org/"
@@ -58,6 +58,8 @@ src_prepare() {
 }
 
 src_configure() {
+       #bug #321945 (UINT64_C vs ffmpeg headers)
+       append-flags -D__STDC_CONSTANT_MACROS
        econf \
                --disable-dependency-tracking \
                $(use_enable oss) \