From c8fffa5ac6f43efa3ed07c8a190396df940de014 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Sat, 20 May 2017 12:56:48 +0200
Subject: media-video/cinelerra: Use upstream versionning now that we stopped
 using snapshots

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --force
---
 media-video/cinelerra/Manifest                  |   2 +-
 media-video/cinelerra/cinelerra-2.3.ebuild      | 116 +++++++++++++++++++++++
 media-video/cinelerra/cinelerra-20150908.ebuild | 118 ------------------------
 3 files changed, 117 insertions(+), 119 deletions(-)
 create mode 100644 media-video/cinelerra/cinelerra-2.3.ebuild
 delete mode 100644 media-video/cinelerra/cinelerra-20150908.ebuild

(limited to 'media-video/cinelerra')

diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index df61687f60f2..f909f9419aa4 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1 +1 @@
-DIST cinelerra-20150908.tar.xz 25705608 SHA256 4bcb450347de5eccea0ed6d49d6d70e4b065905516e4416f9a788d0d7ccc926f SHA512 908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e WHIRLPOOL 52a74c74cfeacbebd3cf3e2aced7a0054b68ce3ec04309ac608c4e1e5779a9ced8d9ea50a0898b610288aef588b613455b38b46af3ab67c44f3581ef3676b79e
+DIST CinelerraCV-2.3.tar.xz 25705608 SHA256 4bcb450347de5eccea0ed6d49d6d70e4b065905516e4416f9a788d0d7ccc926f SHA512 908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e WHIRLPOOL 52a74c74cfeacbebd3cf3e2aced7a0054b68ce3ec04309ac608c4e1e5779a9ced8d9ea50a0898b610288aef588b613455b38b46af3ab67c44f3581ef3676b79e
diff --git a/media-video/cinelerra/cinelerra-2.3.ebuild b/media-video/cinelerra/cinelerra-2.3.ebuild
new file mode 100644
index 000000000000..812eb75dbb32
--- /dev/null
+++ b/media-video/cinelerra/cinelerra-2.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils multilib flag-o-matic
+
+DESCRIPTION="The most advanced non-linear video editor and compositor"
+HOMEPAGE="http://www.cinelerra.org/"
+SRC_URI="https://cinelerra-cv.org/releases/CinelerraCV-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="cpu_flags_x86_3dnow alsa altivec css debug ieee1394 cpu_flags_x86_mmx opengl oss"
+
+RDEPEND="media-libs/a52dec:=
+	media-libs/faac:=
+	media-libs/faad2:=
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	media-libs/libdv:=
+	>=media-libs/libogg-1.2:=
+	media-libs/libpng:0=
+	media-libs/libsndfile:=
+	>=media-libs/libtheora-1.1:=
+	>=media-libs/libvorbis-1.3:=
+	>=media-libs/openexr-1.5:=
+	media-libs/tiff:0=
+	media-libs/x264:=
+	media-sound/lame:=
+	>=media-video/mjpegtools-2
+	>=sci-libs/fftw-3
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXft:=
+	x11-libs/libXv:=
+	x11-libs/libXvMC:=
+	x11-libs/libXxf86vm:=
+	virtual/ffmpeg
+	|| ( media-video/ffmpeg:0[postproc(-)] media-libs/libpostproc )
+	virtual/jpeg:0
+	alsa? ( media-libs/alsa-lib:= )
+	ieee1394? (
+		media-libs/libiec61883:=
+		>=sys-libs/libraw1394-1.2.0:=
+		>=sys-libs/libavc1394-0.5.0:=
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( dev-lang/nasm )"
+
+S="${WORKDIR}/CinelerraCV-${PV}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-20140710-validate_desktop_entry.patch \
+		"${FILESDIR}"/${PN}-ffmpeg.patch \
+		"${FILESDIR}"/${PN}-20140710-underlinking.patch \
+		"${FILESDIR}"/${PN}-20140710-ffmpeg-0.11.patch \
+		"${FILESDIR}"/${PN}-libav9.patch \
+		"${FILESDIR}"/${PN}-pngtoh.patch \
+		"${FILESDIR}"/${PN}-putbits-gcc52.patch \
+		"${FILESDIR}"/${PN}-implicit_decls.patch \
+		"${FILESDIR}"/${PN}-includes.patch
+
+	if has_version '>=media-video/ffmpeg-2' ; then
+		epatch "${FILESDIR}"/${PN}-ffmpeg2.patch
+	fi
+
+	if has_version '>=media-video/ffmpeg-2.9' ; then
+		epatch "${FILESDIR}"/${PN}-ffmpeg29.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D__STDC_CONSTANT_MACROS #321945
+	append-ldflags -Wl,-z,noexecstack #212959
+
+	local myconf
+	use debug && myconf='--enable-x-error-output'
+
+	econf \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		--disable-esd \
+		$(use_enable ieee1394 firewire) \
+		$(use_enable css) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_3dnow 3dnow) \
+		$(use_enable altivec) \
+		$(use_enable opengl) \
+		--with-plugindir=/usr/$(get_libdir)/${PN} \
+		--with-buildinfo=cust/"Gentoo - ${PV}" \
+		--with-external-ffmpeg \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dohtml -a png,html,texi,sdw -r doc/*
+
+	rm -rf "${D}"/usr/include
+	mv -vf "${D}"/usr/bin/mpeg3cat{,.hv} || die
+	mv -vf "${D}"/usr/bin/mpeg3dump{,.hv} || die
+	mv -vf "${D}"/usr/bin/mpeg3toc{,.hv} || die
+	dosym /usr/bin/mpeg2enc /usr/$(get_libdir)/${PN}/mpeg2enc.plugin
+
+	prune_libtool_files --all
+}
diff --git a/media-video/cinelerra/cinelerra-20150908.ebuild b/media-video/cinelerra/cinelerra-20150908.ebuild
deleted file mode 100644
index 7bd4259d0ebc..000000000000
--- a/media-video/cinelerra/cinelerra-20150908.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib flag-o-matic
-
-CINCV_VER=2.3
-
-DESCRIPTION="The most advanced non-linear video editor and compositor"
-HOMEPAGE="http://www.cinelerra.org/"
-SRC_URI="https://cinelerra-cv.org/releases/CinelerraCV-${CINCV_VER}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="cpu_flags_x86_3dnow alsa altivec css debug ieee1394 cpu_flags_x86_mmx opengl oss"
-
-RDEPEND="media-libs/a52dec:=
-	media-libs/faac:=
-	media-libs/faad2:=
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	media-libs/libdv:=
-	>=media-libs/libogg-1.2:=
-	media-libs/libpng:0=
-	media-libs/libsndfile:=
-	>=media-libs/libtheora-1.1:=
-	>=media-libs/libvorbis-1.3:=
-	>=media-libs/openexr-1.5:=
-	media-libs/tiff:0=
-	media-libs/x264:=
-	media-sound/lame:=
-	>=media-video/mjpegtools-2
-	>=sci-libs/fftw-3
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXft:=
-	x11-libs/libXv:=
-	x11-libs/libXvMC:=
-	x11-libs/libXxf86vm:=
-	virtual/ffmpeg
-	|| ( media-video/ffmpeg:0[postproc(-)] media-libs/libpostproc )
-	virtual/jpeg:0
-	alsa? ( media-libs/alsa-lib:= )
-	ieee1394? (
-		media-libs/libiec61883:=
-		>=sys-libs/libraw1394-1.2.0:=
-		>=sys-libs/libavc1394-0.5.0:=
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-		)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	cpu_flags_x86_mmx? ( dev-lang/nasm )"
-
-S="${WORKDIR}/CinelerraCV-${CINCV_VER}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-20140710-validate_desktop_entry.patch \
-		"${FILESDIR}"/${PN}-ffmpeg.patch \
-		"${FILESDIR}"/${PN}-20140710-underlinking.patch \
-		"${FILESDIR}"/${PN}-20140710-ffmpeg-0.11.patch \
-		"${FILESDIR}"/${PN}-libav9.patch \
-		"${FILESDIR}"/${PN}-pngtoh.patch \
-		"${FILESDIR}"/${PN}-putbits-gcc52.patch \
-		"${FILESDIR}"/${PN}-implicit_decls.patch \
-		"${FILESDIR}"/${PN}-includes.patch
-
-	if has_version '>=media-video/ffmpeg-2' ; then
-		epatch "${FILESDIR}"/${PN}-ffmpeg2.patch
-	fi
-
-	if has_version '>=media-video/ffmpeg-2.9' ; then
-		epatch "${FILESDIR}"/${PN}-ffmpeg29.patch
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -D__STDC_CONSTANT_MACROS #321945
-	append-ldflags -Wl,-z,noexecstack #212959
-
-	local myconf
-	use debug && myconf='--enable-x-error-output'
-
-	econf \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		--disable-esd \
-		$(use_enable ieee1394 firewire) \
-		$(use_enable css) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_3dnow 3dnow) \
-		$(use_enable altivec) \
-		$(use_enable opengl) \
-		--with-plugindir=/usr/$(get_libdir)/${PN} \
-		--with-buildinfo=cust/"Gentoo - ${PV}" \
-		--with-external-ffmpeg \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dohtml -a png,html,texi,sdw -r doc/*
-
-	rm -rf "${D}"/usr/include
-	mv -vf "${D}"/usr/bin/mpeg3cat{,.hv} || die
-	mv -vf "${D}"/usr/bin/mpeg3dump{,.hv} || die
-	mv -vf "${D}"/usr/bin/mpeg3toc{,.hv} || die
-	dosym /usr/bin/mpeg2enc /usr/$(get_libdir)/${PN}/mpeg2enc.plugin
-
-	prune_libtool_files --all
-}
-- 
cgit v1.2.3-65-gdbad