Made 9999 ebuild that uses upstream's git, applied various cmake related ebuild fixes to simplify maintenance; thanks to Nikoli for the suggestion.

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 120 insertions, 9 deletions

diff --git a/media-libs/avidemux-core/ChangeLog b/media-libs/avidemux-core/ChangeLog
index ad8973091bea..87400ede2011 100644
--- a/media-libs/avidemux-core/ChangeLog
+++ b/media-libs/avidemux-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/avidemux-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.9 2013/07/12 22:58:35 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.10 2013/07/16 19:41:10 tomwij Exp $
+
+*avidemux-core-9999 (16 Jul 2013)
+
+  16 Jul 2013; Tom Wijsman <TomWij@gentoo.org> +avidemux-core-9999.ebuild:
+  Made 9999 ebuild that uses upstream's git, applied various cmake related
+  ebuild fixes to simplify maintenance; thanks to Nikoli for the suggestion.
 
   12 Jul 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-core-2.6.4.ebuild:
   Cleaned up ebuild to make it shorter, use the eclass more and lowercase
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 05782ea51455..ef3dce270f9a 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -7,16 +7,17 @@ DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272
 EBUILD avidemux-core-2.6.2-r1.ebuild 3838 SHA256 42b11e4b741fc63679098f4be83bfa620e795bd454bc02f41b380174109f2229 SHA512 08cfa1c71fa00dd9a7c70bd8e1e8642d15a1ef1540eb1c0a1e08980ae67a9b8502604540e7ba0c18fb028dfd737b339a979d43e6194556dc46d12f032fc0feb3 WHIRLPOOL c7b1e0f95468d31ea501e06655c58fde6d8f64c46e8aeec108b5ec8a98a0946ec12fe3cf59688f7cff625adabd44b3a12ad26fcebd5998f80625459b7338b1a1
 EBUILD avidemux-core-2.6.3.ebuild 3242 SHA256 2051e97fd1d184afb9c305d0f68d9e886a5735e7254993a80f27bf0e89a7a0d3 SHA512 0f08660b696c2bc5faccd76d910d8bfff16b1dc1eaa492813c5915dbbbcdbd5a33b43285826c9c35d5c2016d67c8cca6e0f933b65f1122ab82b9499987bd5f4a WHIRLPOOL a61d9ba9ba28beb2d4087c573d2ccfefb78fcfd17906699fcb7d950b1a77dd205d18a9b83180f85accb1671bd3a3b6cfd27dd2188dd1c70df3d6b6c5062a1e82
 EBUILD avidemux-core-2.6.4.ebuild 3214 SHA256 8675a3d7184ff01efafdd86a658f869abe8c0b6a79f658a842dd5f1be13de847 SHA512 9476260e34fab24c143107560fe1848f2c1e79175df9875e43e28376e19b248fa6ba1403c98c0de1f098940d88ac27a897487574f38e3cde86e10d2b9fc5f516 WHIRLPOOL 21fa4489f94ba4fc4b9027ca932b8ce04c169bb45f588a8a96af9634bdd57e4d6183858e2ea8a23028f80321af8e886c38526e055e4561e2d4113152fe487c6c
-MISC ChangeLog 1644 SHA256 b7d932bca7bde14dd04ef05d22574c0f5f9980bbdc3818fb9b8c83cca9fba1a2 SHA512 664a8ca34d5ead65dd8782cbb8eec84e9d72dd1245af50f0eebb011638cdfca4c1f0d63075e2e40687064386f06e9cfe318fb6e3d304770bd6fab26c9ff44db6 WHIRLPOOL fa9772d699d696c9dc15a88a76527c373ea7b00b7d9bdca15059cc29d353c64f7e365fd1d615f10f6958bdb79c9e3580be7a3425277580b68621740e2d0cfa9e
+EBUILD avidemux-core-9999.ebuild 3045 SHA256 10bfcf30f04b81044bde0c07c9517f33e0d3bf88be1ef540db9af33ad6d70e8c SHA512 bfe42848e1761a2302f9cb690ec16c013c94a5b6dcc6ab525b50fc78b2f273904e7b6d01de647e57cefd5ea7117f21b7aab13830e8a96bc56937bbaa3ec25e91 WHIRLPOOL da7ad242eb1f210c984256c13b52937f1c908b79ca9e7a6bd466d2a38e45adffdeb44744ee5d27ec2d123c44301f9b9f0e1df8bfe5b30ec8007fa4e434c8b422
+MISC ChangeLog 1908 SHA256 9e9e92e4598f56a0462e4339035bd6e2392dd350d85c5e522d28f90e79877224 SHA512 6535ffd641738693d9121fba33db0b3a688bc3f3adc7ee16e72ad77ccf231f9f0339757cb64262f1ca34906209175f93e019ebce9616d037811e68f719c0d31a WHIRLPOOL d5d3d2000ed9801547b84e8a157017d9839c2ec1a26b9d06983466437ca53f97df6af4a104204272d69d442777b626e5381cd99460a14ea5556b53ef50549826
 MISC metadata.xml 533 SHA256 e699a1cc65faf166948081bae861e86850ca561fcbb5e3ea392b51bd91e472a7 SHA512 87b8f1b0ceb54f05ce4e50652709e2b4634763e954f6978fad3e3155ac1a04c0ce42b42bdd5e7045fe1a5dbde116411c08a6f9a56a5b9401bca20f661c061abb WHIRLPOOL 8c210345b5f4d2f8dd6d8d4b0e5b7192f3a9a7bbc1dd7f8f040ee73f0eaf5ac6aff9a41f1e644d5e63913a8bcb5e0486ff949a76d6e24b4902c3ddc0dcf0ad89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR4IldAAoJEJWyH81tNOV9zJUIAIu+yij1t+nB9nKGXKzqN4D1
-+T/c8qIqk+WZTksQ8lhivEgVmyuMfCJiodYbdOs5kQyu1gJU/cZ3BrGwDwkUhg5C
-f1vZ3Uj+K+t8fBk/EttvaAvX9yEcZDVxDEbJxT9vXu7QTgSAnpJspGuBd0xLeeV1
-XkuLOIIULTsZ7rouGN6Mxc4cE9JNX8BfXBFIbky7S1vzUaXdcjxGWg9RgC3bm0Z8
-RtLqT0h7HiOIsvuWLIu3DJOd2863O0vMXcmz60RsgPcnmEQFRGf3V1/D5q7pgRHu
-itm23R6S7IQwvAImYi8cmtkmimiY3OfIPPOu7Xfo8f1vb0aGgvEMDmnRkMeNmNM=
-=UKWP
+iQEcBAEBCAAGBQJR5aEUAAoJEJWyH81tNOV9MJAIAIyOqLiL2hG0/Ns86a5absmX
+k/kkYqXkx8IT2RO1g6/d/e5G0eYKzZqZq2JMEl3Z7yyH+GKCf2S3tSBGhCA2GM25
+/4ng/YFvDILrgWRiDXvcexn3Vt8BMJp5PEOtsGCbeCDTHoBK1Ftb+90WB58VH4OL
+vYEOTw5fTL2vTssj8dEpsFJ5MNe7BrymA2sWf7k6j0vVO4Ag5aBlO8Z4wqt0Y15d
+Y9T9WcINtIE0FJ0w5/uSB980Va4KaOyPc79az1jDKyLiTUHT7QZeu3EH1lHP3d/Z
+CtY6kvN1R7as4nx8SXZGBfVdTeggfGQ4CkLSW9/Iz7dx7gq9wox5EeHNCV2j/cE=
+=MwJT
 -----END PGP SIGNATURE-----
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
new file mode 100644
index 000000000000..9804264154fc
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-9999.ebuild,v 1.1 2013/07/16 19:41:10 tomwij Exp $
+
+EAPI="5"
+
+inherit cmake-utils eutils flag-o-matic
+
+SLOT="2.6"
+
+DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks."
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+IUSE="debug nls sdl system-ffmpeg vdpau xv"
+KEYWORDS="~amd64 ~x86"
+
+MY_PN="${PN/-core/}"
+if [[ ${PV} == *9999* ]] ; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git https://git.gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git"
+
+	inherit git-2
+else
+	MY_P="${MY_PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
+DEPEND="
+	!<media-video/avidemux-${PV}
+	dev-db/sqlite:3
+	nls? ( sys-devel/gettext:0 )
+	sdl? ( media-libs/libsdl:0 )
+	system-ffmpeg? ( >=virtual/ffmpeg-9[mp3,theora] )
+	xv? ( x11-libs/libXv:0 )
+	vdpau? ( x11-libs/libvdpau:0 )
+"
+RDEPEND="
+	$DEPEND
+"
+DEPEND="
+	$DEPEND
+	virtual/pkgconfig:0
+	!system-ffmpeg? ( dev-lang/yasm:0[nls=] )
+"
+
+S="${WORKDIR}/${MY_P}"
+BUILD_DIR="${S}/buildCore"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	mkdir "${BUILD_DIR}" || die "Can't create build folder."
+
+	cmake-utils_src_prepare
+
+	if use system-ffmpeg ; then
+		# Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install.
+		local error="Failed to remove ffmpeg."
+
+		rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}"
+		sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}"
+		sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}"
+		sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}"
+	else
+		# Avoid existing avidemux installations from making the build process fail, bug #461496.
+		sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \
+			|| die "Failed to avoid existing avidemux installation from making the build fail."
+	fi
+
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+}
+
+src_configure() {
+	local mycmakeargs="
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		$(cmake-utils_use nls GETTEXT)
+		$(cmake-utils_use sdl SDL)
+		$(cmake-utils_use vdpau VDPAU)
+		$(cmake-utils_use xv XVIDEO)
+	"
+
+	if use debug ; then
+		mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
+	fi
+
+	CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile -j1
+}
+
+src_install() {
+	cmake-utils_src_install -j1
+}