[gentoo-commits] gentoo-x86 commit in media-video/cinelerra: ChangeLog cinelerra-20090210-r1.ebuild cinelerra-20090210.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    10/01/30 14:37:16

  Modified:             ChangeLog
  Added:                cinelerra-20090210-r1.ebuild
  Removed:              cinelerra-20090210.ebuild
  Log:
  Fix crash with jpeg >= 7 wrt #292575 by Salah Coronya.
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.39                 media-video/cinelerra/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/cinelerra/ChangeLog?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/cinelerra/ChangeLog?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/cinelerra/ChangeLog?r1=1.38&r2=1.39

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog	26 Oct 2009 13:30:53 -0000	1.38
+++ ChangeLog	30 Jan 2010 14:37:16 -0000	1.39
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/cinelerra
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.38 2009/10/26 13:30:53 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.39 2010/01/30 14:37:16 ssuominen Exp $
+
+*cinelerra-20090210-r1 (30 Jan 2010)
+
+  30 Jan 2010; Samuli Suominen <ssuominen@g.o>
+  +files/cinelerra-jpeg-7.patch, +cinelerra-20090210-r1.ebuild:
+  Fix crash with jpeg >= 7 wrt #292575 by Salah Coronya.
 
   26 Oct 2009; Alexis Ballier <aballier@g.o>
   +files/cinelerra-x264.patch, cinelerra-20090210.ebuild:



1.1                  media-video/cinelerra/cinelerra-20090210-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/cinelerra/cinelerra-20090210-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/cinelerra/cinelerra-20090210-r1.ebuild?rev=1.1&content-type=text/plain

Index: cinelerra-20090210-r1.ebuild
===================================================================
# 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"
}