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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 25 insertions, 116 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/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)
- ##############