summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Boeck <hanno@gentoo.org>2008-06-23 23:43:16 +0000
committerHanno Boeck <hanno@gentoo.org>2008-06-23 23:43:16 +0000
commit7011c213d71f088e79ea6f2510ce223e7b4c5a78 (patch)
treeeb45d33790e906624da36dacf6c7d7fa479b1242 /media-video
parentVersion bumps (#224737). (diff)
downloadhistorical-7011c213d71f088e79ea6f2510ce223e7b4c5a78.tar.gz
historical-7011c213d71f088e79ea6f2510ce223e7b4c5a78.tar.bz2
historical-7011c213d71f088e79ea6f2510ce223e7b4c5a78.zip
cinelerra: fix libtool 2.2 build
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686
Diffstat (limited to 'media-video')
-rw-r--r--media-video/cinelerra-cvs/ChangeLog6
-rw-r--r--media-video/cinelerra-cvs/Manifest11
-rw-r--r--media-video/cinelerra-cvs/cinelerra-cvs-20080602.ebuild3
-rw-r--r--media-video/cinelerra-cvs/files/cinelerra-libtool22.diff15
4 files changed, 28 insertions, 7 deletions
diff --git a/media-video/cinelerra-cvs/ChangeLog b/media-video/cinelerra-cvs/ChangeLog
index 0712db24f18d..bae0ebe3d24d 100644
--- a/media-video/cinelerra-cvs/ChangeLog
+++ b/media-video/cinelerra-cvs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/cinelerra-cvs
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.46 2008/06/21 13:11:16 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.47 2008/06/23 23:43:15 hanno Exp $
+
+ 23 Jun 2008; Hanno Boeck <hanno@gentoo.org>
+ +files/cinelerra-libtool22.diff, cinelerra-cvs-20080602.ebuild:
+ Fix build with libtool 2.2.
21 Jun 2008; Hanno Boeck <hanno@gentoo.org>
-files/cinelerra-cvs-gcc-4.3.patch, -files/cinelerra-compilewarnings.diff,
diff --git a/media-video/cinelerra-cvs/Manifest b/media-video/cinelerra-cvs/Manifest
index c1e9a39e29c4..0e17a4ef5c9c 100644
--- a/media-video/cinelerra-cvs/Manifest
+++ b/media-video/cinelerra-cvs/Manifest
@@ -2,14 +2,15 @@
Hash: SHA1
AUX cinelerra-cvs-defaultx264tocqp.patch 405 RMD160 a89e2be0b15581d880a4cc086fcd9f233ee97391 SHA1 88810ed033a030f48e0264b48dd28526ad517698 SHA256 13082a69d87805cd743fc2fe7eae66e16a87eba763e17524da3b03a23d1483ac
+AUX cinelerra-libtool22.diff 459 RMD160 cfd28e029a7fcffc9597f3937f06134dcd3ec6cd SHA1 b5abe5e73aea61d27e3700c61f67a0a734fc9f1a SHA256 805a0ed8dc5923e2ceb2bdcbe0210eaada1a92dc77821d6301329fd0edad39a5
DIST cinelerra-cvs-20080602.tar.bz2 31256213 RMD160 968c32120c259e12707848763ea90f4030beb3ef SHA1 75d34bdac01e6f5f6702d3d2321fd43c4788029f SHA256 686ce3f100f8e01d5b1eac67cef59dcc5e6be4953f8dc16f756bd94217be145a
-EBUILD cinelerra-cvs-20080602.ebuild 2875 RMD160 7c64f19c80af35777b4ec12a00daaea443f4bca3 SHA1 e08d9b9fc58909b0f92686481aa0fc2717e4325c SHA256 d0a15626fb86460c194ed37b9b1263e24887ec7f261317ed29ba0e7e7968dc06
-MISC ChangeLog 7793 RMD160 109acbf3b0088b0c96e9fc01ed4c43ad51c253b1 SHA1 bb2bba5425057f0ec145db8a448ef06904643003 SHA256 5e6b34615884efe423a4ca7416d36349881a0f2632d9de617ffd5a5b0cccfed3
+EBUILD cinelerra-cvs-20080602.ebuild 2922 RMD160 995456e0e1c293a22d92f014a76b9f4fdd811177 SHA1 39d07b3a65bdc347823cf29d6af8c8fce0cd90b4 SHA256 fee8fb54775b3d9bbbc16214a667ab5ca5a38e08f878d9a93f587503f5064f54
+MISC ChangeLog 7936 RMD160 e23e28b724ef361355419c3d4a216a7dc6696aa7 SHA1 2df3b21a10958ec5f924f9bbb3957b98112ac3fc SHA256 a0347034271ebf77309a4c1d6070df26bf379e9f460f0574750ae9d0175193b2
MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkhc/gAACgkQr2QksT29OyBuKgCdHNPUNYtdIBnV7td/8f0luEOy
-sacAn0W2KlP3dygRYVqZbgM969alhSX6
-=CxqV
+iEYEARECAAYFAkhgNR0ACgkQr2QksT29OyAwugCdHA0id1fJkvkIga461VIwvXTT
+geEAn2RCElZBtUOUqjqUATEV5mEV4Dn5
+=R2m5
-----END PGP SIGNATURE-----
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20080602.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20080602.ebuild
index 217e89a59cf4..9db6073cffcf 100644
--- a/media-video/cinelerra-cvs/cinelerra-cvs-20080602.ebuild
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20080602.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20080602.ebuild,v 1.1 2008/06/03 13:31:17 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20080602.ebuild,v 1.2 2008/06/23 23:43:16 hanno Exp $
WANT_AUTOMAKE=1.9
WANT_AUTOCONF=2.5
@@ -65,6 +65,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}/${PN}-defaultx264tocqp.patch"
+ epatch "${FILESDIR}/cinelerra-libtool22.diff"
AT_M4DIR="m4" eautoreconf
}
diff --git a/media-video/cinelerra-cvs/files/cinelerra-libtool22.diff b/media-video/cinelerra-cvs/files/cinelerra-libtool22.diff
new file mode 100644
index 000000000000..48e8a0085dc9
--- /dev/null
+++ b/media-video/cinelerra-cvs/files/cinelerra-libtool22.diff
@@ -0,0 +1,15 @@
+--- hvirtual/configure.in.1 2008-06-23 23:32:05.000000000 +0200
++++ hvirtual/configure.in 2008-06-23 23:32:48.000000000 +0200
+@@ -20,10 +20,8 @@
+ AC_PROG_LIBTOOL
+
+ # hack for libtool 1.5 -- this is ugly and probably wrong, but works
+-if test `libtool --version | grep ltmain.sh | cut -b 25-27` = "1.5"; then
+- LTC_FLAGS="--tag=CC"
+- LTCXX_FLAGS="--tag=CXX"
+-fi
++LTC_FLAGS="--tag=CC"
++LTCXX_FLAGS="--tag=CXX"
+ AC_SUBST(LTC_FLAGS)
+ AC_SUBST(LTCXX_FLAGS)
+