Fix building with GCC 4.5+ wrt #317991 by Kacper Kowalik.

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

6 files changed, 28 insertions, 121 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 4532711edeb4..43150d3c435e 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,10 @@
 # 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.40 2010/03/20 15:00:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.41 2010/05/01 16:04:07 ssuominen Exp $
+
+  01 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  cinelerra-20100320.ebuild, +files/cinelerra-20100320-gcc45.patch:
+  Fix building with GCC 4.5+ wrt #317991 by Kacper Kowalik.
 
 *cinelerra-20100320 (20 Mar 2010)
 
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 374b52ffb9aa..0e26770b3318 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,12 +1,10 @@
+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
 AUX cinelerra-jpeg-7.patch 1131 RMD160 128d7cf423843eeaae8a1a334a3166e9ce5295cd SHA1 8803c6d90ac76404d8151f2011eb2982f0d27fda SHA256 e6dfc3c95e8e6a21cc9b23aee2ee967b2a52a0ee208e70af0ed0814a919bb0df
 AUX cinelerra-libavutil50.patch 2140 RMD160 95720943d2bee3a7f5c5a864aef5631655a65120 SHA1 6fa5d1024adde249fe026837061ceace11b06532 SHA256 f29284a0e8b629c1ff22090c03c9fe3947adbd024dd2c05d925775c8f96f8eda
-AUX cinelerra-pkgconfig-x264.patch 649 RMD160 29d4e37c6ffb11128281a6f49e614e32b7af6510 SHA1 62817baa7a633ec568b79dd5f02bd918eb14ff55 SHA256 eaf8f936b41dd998b6a793ffad37e98c840ea3225adf61419ff7e0610f61e92e
 AUX cinelerra-x264.patch 679 RMD160 27c0bb325268a3523887d3d10da94090119247f1 SHA1 f59faeeca021a70ad41887b7ccc0278c8c29472d SHA256 a4a561def29c25d087cab8fceabba1dfed4c712c493dc2c8411cbf6d6226cd2b
-DIST cinelerra-20090210.tar.lzma 21049396 RMD160 346353eec1a796698cb95b3066058344b244416c SHA1 68e40b1de7d17da70d1087af339146be3d00fd0f SHA256 35daee11a42dec974ac45de54773022463b3daeb61da4590a9e9d57fce3298ea
 DIST cinelerra-20100320.tar.bz2 32670992 RMD160 96c47cf5d9f57b88ad7e3ddee42e61cfe9ccb421 SHA1 ecf4c728e149556e4725a84d460f8a0b8dad6277 SHA256 8b1b057f77283c95d728e9b848d71e938756f6deea0102ca69b618753231c9f3
-EBUILD cinelerra-20090210-r1.ebuild 2631 RMD160 baeeeb15c7faf4876b24bc047c08c0ac1e6b15dd SHA1 973cf0bc3a55411df6c06078a9075b8964615e28 SHA256 a6c87960ba5cf0864217943f79d5fad968ac4a7b2c38a80d853c66fdecf7de70
-EBUILD cinelerra-20100320.ebuild 2291 RMD160 58e0562615465b738ea44dea36157a17ad0292ac SHA1 258d06056fb1a9b0cc1230bbb32d6279785bc002 SHA256 84066e45738ad849a38af721f6c48fc440de3f49a1e578eb07274036adec8ed6
-MISC ChangeLog 10147 RMD160 4453a6013902c85a3ad6d8f968f67bd98a42bdf1 SHA1 4e8a303f3e7e93c42d80d6bfeeee30bb1a29b38a SHA256 6c5051dfc2e3308b08bbdb5340bf2d10d5908c25302327d0ac1a7c763279f0ed
+EBUILD cinelerra-20100320.ebuild 2326 RMD160 60f09b147823fd382e25980b835646f854e2f0cd SHA1 1e5faefea11153ca9563963a091f29425d242d62 SHA256 8e3cbd787dae29a0048bb1f07d34068dc8185aa2b3b1252a1c6dce93d7924fbb
+MISC ChangeLog 10330 RMD160 caa97449da378d18961142ba35840764b3298217 SHA1 f0be5d9bbf17df73a2f534dc96ba4c4eb16224ef SHA256 1d726d35af5b1db341866fd27ff7eace662a7c57029f48f9262dd60ede754d34
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
diff --git a/media-video/cinelerra/cinelerra-20090210-r1.ebuild b/media-video/cinelerra/cinelerra-20090210-r1.ebuild
deleted file mode 100644
index 5d521bbcfe8d..000000000000
--- a/media-video/cinelerra/cinelerra-20090210-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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-20090210-r1.ebuild,v 1.1 2010/01/30 14:37:16 ssuominen Exp $
-
-inherit autotools multilib eutils
-
-DESCRIPTION="Cinelerra - Professional Video Editor - Unofficial CVS-version"
-HOMEPAGE="http://www.cinelerra.org/"
-SRC_URI="mirror://gentoo/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="3dnow alsa esd mmx oss static ieee1394 css altivec opengl"
-RDEPEND="media-libs/libpng
-	>=media-libs/libdv-1.0.0
-	media-libs/faad2
-	media-libs/faac
-	media-libs/a52dec
-	media-libs/libsndfile
-	media-libs/tiff
-	media-video/ffmpeg
-	media-sound/lame
-	>=sci-libs/fftw-3.0.1
-	media-libs/x264
-	ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 \
-		>=sys-libs/libavc1394-0.5.0 )
-	media-video/mjpegtools
-	alsa? ( media-libs/alsa-lib )
-	esd? ( >=media-sound/esound-0.2.34 )
-	>=media-libs/freetype-2.1.10
-	opengl? ( virtual/opengl )
-	>=media-libs/openexr-1.2.2
-	>=media-libs/libvorbis-1.1.0
-	>=media-libs/libogg-1.1
-	>=media-libs/libtheora-1.0_alpha4-r1
-	x11-libs/libX11
-	x11-libs/libXv
-	x11-libs/libXxf86vm
-	x11-libs/libXext
-	x11-libs/libXvMC
-	x11-libs/libXft"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	mmx? ( dev-lang/nasm )"
-
-pkg_setup() {
-	if [[ "$(gcc-major-version)" -lt "4" ]]; then
-		eerror "You need to have gcc 4 or better"
-		eerror "Please follow : http://www.gentoo.org/doc/en/gcc-upgrading.xml"
-		eerror "And have a look at bug #128659"
-		die "You must use gcc 4 or better."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-libavutil50.patch"
-	epatch "${FILESDIR}/${PN}-pkgconfig-x264.patch"
-	epatch "${FILESDIR}/${PN}-x264.patch"
-	epatch "${FILESDIR}/${PN}-jpeg-7.patch"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	econf \
-	`use_enable static` \
-	`use_enable alsa` \
-	`use_enable esd` \
-	`use_enable oss` \
-	`use_enable mmx` \
-	`use_enable 3dnow` \
-	--with-plugindir=/usr/$(get_libdir)/cinelerra \
-	`use_enable ieee1394 firewire` \
-	`use_enable css` \
-	`use_enable opengl` \
-	`use_enable altivec` \
-	--with-external-ffmpeg \
-	--with-buildinfo=cust/"Gentoo - SVN r1055" \
-	|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dohtml -a png,html,texi,sdw -r doc/*
-	# workaround
-	rm -fR "${D}/usr/include"
-	mv "${D}/usr/bin/mpeg3cat" "${D}/usr/bin/mpeg3cat.hv"
-	mv "${D}/usr/bin/mpeg3dump" "${D}/usr/bin/mpeg3dump.hv"
-	mv "${D}/usr/bin/mpeg3toc" "${D}/usr/bin/mpeg3toc.hv"
-	ln -s /usr/bin/mpeg2enc "${D}/usr/$(get_libdir)/cinelerra/mpeg2enc.plugin"
-}
diff --git a/media-video/cinelerra/cinelerra-20100320.ebuild b/media-video/cinelerra/cinelerra-20100320.ebuild
index ee6ced0aeec8..73a427b10f13 100644
--- a/media-video/cinelerra/cinelerra-20100320.ebuild
+++ b/media-video/cinelerra/cinelerra-20100320.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2010/03/27 16:16:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20100320.ebuild,v 1.4 2010/05/01 16:04:07 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils multilib
@@ -52,7 +52,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-pkgconfig-x264.patch \
 		"${FILESDIR}"/${PN}-x264.patch \
 		"${FILESDIR}"/${PN}-jpeg-7.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
+		"${FILESDIR}"/${P}-libpng14.patch \
+		"${FILESDIR}"/${P}-gcc45.patch
 	AT_M4DIR="m4" eautoreconf
 }
 
diff --git a/media-video/cinelerra/files/cinelerra-20100320-gcc45.patch b/media-video/cinelerra/files/cinelerra-20100320-gcc45.patch
new file mode 100644
index 000000000000..802f26a29e15
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-20100320-gcc45.patch
@@ -0,0 +1,17 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=317991
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- cinelerra/edits.C
++++ cinelerra/edits.C
+@@ -47,7 +47,7 @@
+ 	this->edl = edl;
+ 	this->track = track;
+ 
+-	List<Edit>::List<Edit>();
++	List<Edit>();
+ 	default_edit->edl = edl;
+ 	default_edit->track = track;
+ 	default_edit->startproject = 0;
diff --git a/media-video/cinelerra/files/cinelerra-pkgconfig-x264.patch b/media-video/cinelerra/files/cinelerra-pkgconfig-x264.patch
deleted file mode 100644
index 50b53dea1b78..000000000000
--- a/media-video/cinelerra/files/cinelerra-pkgconfig-x264.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: cinelerra-20090210/configure.in
-===================================================================
---- cinelerra-20090210.orig/configure.in
-+++ cinelerra-20090210/configure.in
-@@ -269,12 +269,7 @@ AC_ARG_ENABLE(css, 
- 
- ############## libx264
- LIBX264_LIBS=""
--AC_CHECK_LIB(x264, x264_encoder_open,
--	[libx264=yes LIBX264_LIBS=-lx264],,-lpthread -lm)
--if test "x$with_pic" = "xyes"; then
--	AC_CHECK_LIB(x264_pic, x264_encoder_open,
--		[libx264=yes LIBX264_LIBS=-lx264_pic],,-lpthread -lm)
--fi
-+PKG_CHECK_MODULES([LIBX264], [x264], [libx264=yes], [libx264=no])
- AC_CHECK_HEADER(x264.h, [libx264h=yes])
- AC_SUBST(LIBX264_LIBS)
- ##############