Version bump to 2.6.3. Reworked USE flags to be more specific to each avidemux package, the way its meant to be; introduced additional support for some libraries through USE flags as a conseuence.

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

4 files changed, 120 insertions, 12 deletions

diff --git a/media-libs/avidemux-core/ChangeLog b/media-libs/avidemux-core/ChangeLog
index 78244ef1c063..8087b86c4cae 100644
--- a/media-libs/avidemux-core/ChangeLog
+++ b/media-libs/avidemux-core/ChangeLog
@@ -1,6 +1,14 @@
 # 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.2 2013/03/16 22:00:45 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.3 2013/03/29 15:10:12 tomwij Exp $
+
+*avidemux-core-2.6.3 (29 Mar 2013)
+
+  29 Mar 2013; Tom Wijsman <TomWij@gentoo.org> +avidemux-core-2.6.3.ebuild,
+  metadata.xml:
+  Version bump to 2.6.3. Reworked USE flags to be more specific to each avidemux
+  package, the way its meant to be; introduced additional support for some
+  libraries through USE flags as a conseuence.
 
   16 Mar 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-core-2.6.2.ebuild:
   Made avidemux-core block old versions of avidemux that had the core libraries,
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 4b7e50cf5421..9ca4a321fe64 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA256
 
 DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3 WHIRLPOOL 0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7
+DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc WHIRLPOOL 899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
 EBUILD avidemux-core-2.6.2-r1.ebuild 3836 SHA256 4f368961e548a1a918c3ad2a8e618bf44940d4e1e1ee292c5e979ed1b9fea0e5 SHA512 a0e47c7d2d313343ab81f85f4d89c30a659ed9a4d0d6df04848a110a8fb72da0a7ebb87230b9d012702fddc88fae0ae02b58df640d23b60846011192f50f2dcf WHIRLPOOL f8388de0b478f6381f4ce2b523c10e1a87f58da90f00b497034179d684286efc0de97f845716a45364701e7b32635ab5975b47ab6ac54104ac85432e6c327312
-MISC ChangeLog 600 SHA256 baf25056e8e013060c1c254716358cbd1c6621fa611196c81a1b5ec2cc4898be SHA512 a00c6c7b5bc11b695be92665d4b1665c33f75d971168147ec806e77f59bca9a911210ba6f852838d1fa81bd9c44b246a3d476ee91adfe533798412400495fa2e WHIRLPOOL 9e9a3253bce1bc162821be1d1615c4fe5192800d2c643229d73a6d2d6f841b490568628cac1ded5084c2868d7564c7cf3967577e6dceabb123a3f53d42db5d26
-MISC metadata.xml 531 SHA256 df76d8b7f4994551e675fecc89d6bf8212cc6df6fbf6a6076bd7b550216c112b SHA512 0278ba98d729ab620362485878cd7935c5d1d71c093d4a52777724235f765f049a3f0cae224a7d7da3a278126b93d85ec140c98f42baa2dc19ede7d57458dcdb WHIRLPOOL 15779ddc80f052e428820ed249c971ec4a43bc0dc4a495526c5b48a23bd71ae33283ff3e5c1e8105e9484ae264517f36704a462ff030f3ee35400c1982028d0e
+EBUILD avidemux-core-2.6.3.ebuild 3201 SHA256 5016d72dfb9eab198e3ef0c41b8686d06181e24d6ac8d7faf51fbb3cd613108f SHA512 211113578e11ca28205671e12ca4b11db25207b335a27873b0b84aa002cfadc9f0a2a3c604294595e462baa3cbe8814d4d982dab0836579e352a9e7418e5ba5a WHIRLPOOL e150c4f387ccb01ac074cff313a4e6429d9e6d55739395be96c4cb990c8ccd3a53e10f15f127408c1bff6279b4f68506d56e5c7919e0480287ee63de9482a616
+MISC ChangeLog 932 SHA256 603f28964e9d0cd2bf6946eaee906377c873ec7b3718ed2868a17589d7d02308 SHA512 67c9370a4de057b4218e3ab35575d2c71f3e52963dce238c8fd8b02ffaaa78983a3b9deacecf5af7c168698323eaf1691001a9b88934a4530fbf793dc4a33337 WHIRLPOOL 73202094ad24b42171d2c379e360a3e11a3b9d49b5a567bbb3485efa3922159175ecfc24cfb7d1874c2eb78c64489becae7f895073baac5c4d4781f1a25cd4b0
+MISC metadata.xml 533 SHA256 e699a1cc65faf166948081bae861e86850ca561fcbb5e3ea392b51bd91e472a7 SHA512 87b8f1b0ceb54f05ce4e50652709e2b4634763e954f6978fad3e3155ac1a04c0ce42b42bdd5e7045fe1a5dbde116411c08a6f9a56a5b9401bca20f661c061abb WHIRLPOOL 8c210345b5f4d2f8dd6d8d4b0e5b7192f3a9a7bbc1dd7f8f040ee73f0eaf5ac6aff9a41f1e644d5e63913a8bcb5e0486ff949a76d6e24b4902c3ddc0dcf0ad89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRScBYAAoJEJWyH81tNOV95sAH/AyV9Wqw/tgmvBGM1uutwVS7
-g2ZMwBI4ynLNO543P/pD8IcaFvojjVk2dmdn0SyqArQOYLXs3kwMpyC/F7u4Wioz
-xoVY3NXWE43NNsZHb9nn5S/9V2v9shTHzi7s9XO7lzuHr+kIv+/7w1z7JzB+KEnh
-s75uY2jyjksEQyGj6BGCrtn7/RL00wrCpmXeJMk3ep4y9xu7BTI5zcDZaTZP+FRL
-urKfTUqQ5wlXGlhumMParDIqnrTfWrpeaVoXCgEwULQoR3HBuxKiZ5qmYcWWW2xW
-ZQptqifBW/AzATtGIQfIcnbdeiKb//AoQnAEKoPAODLC5ms/Rfe9YN54dLWvJUw=
-=tlx1
+iQEcBAEBCAAGBQJRVa61AAoJEJWyH81tNOV9+CkH/jKM2DWwaih4691TAj+7TfhD
+fQZ27+/AJnAEkdEpA9h6iBDqK0wSV70Bw8eR8//IRb8YviXW88r+tGrDFpnqXP4P
+0//9TCRWwZcQrTZJF1NqQi+h6Sb/n+yrRHzvZmZ+JH6GUAyKDeSpoEVmITymTf/a
+9DQ38vpLkGu1qxifH62k4AOgSrhDw9xv+uDwuxHb2mdeIaWH8nVfQhZ7tSbr63gK
+M5+xHQaU6k7+/cCG/g0hj83TO9iJfw9iVAlYJBGQv0ynYQPntwmm7Fn3CSgapCK7
+NfHToGLh7XJuzTzXdPnPp3TPwpRcBwZ11wkqslE7b7z3hXWJseomMHXobSQmtGk=
+=pf8g
 -----END PGP SIGNATURE-----
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild
new file mode 100644
index 000000000000..e24f20cb6de3
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild
@@ -0,0 +1,98 @@
+# 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-2.6.3.ebuild,v 1.1 2013/03/29 15:10:12 tomwij Exp $
+
+EAPI="5"
+
+PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
+inherit cmake-utils eutils flag-o-matic l10n toolchain-funcs
+
+SLOT="2.6"
+MY_PN="${PN/-core/}"
+MY_P="${MY_PN}_${PV}"
+
+DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks."
+HOMEPAGE="http://fixounet.free.fr/${MY_PN}"
+SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls sdl system-ffmpeg vdpau xv"
+
+DEPEND="
+	!<media-video/avidemux-${PV}
+	dev-db/sqlite
+	nls? ( sys-devel/gettext )
+	sdl? ( media-libs/libsdl )
+	system-ffmpeg? ( >=media-video/ffmpeg-1.0[aac,cpudetection,mp3,theora] )
+	xv? ( x11-libs/libXv )
+	vdpau? ( x11-libs/libvdpau )
+"
+RDEPEND="
+	$DEPEND
+"
+DEPEND="
+	$DEPEND
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	if use system-ffmpeg ; then
+		# Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install.
+		rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "Failed to remove ffmpeg."
+
+		sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "Failed to remove ffmpeg."
+		sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "Failed to remove ffmpeg."
+		sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "Failed to remove ffmpeg."
+	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
+
+}
+
+src_configure() {
+	local x mycmakeargs
+
+	mycmakeargs="
+		$(cmake-utils_use nls GETTEXT)
+		$(cmake-utils_use sdl SDL)
+		$(cmake-utils_use vdpau VDPAU)
+		$(cmake-utils_use xv XVIDEO)
+	"
+	use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
+
+	mkdir "${S}"/buildCore || die "Can't create build folder."
+	cd "${S}"/buildCore || die "Can't enter build folder."
+
+	cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
+		-DCMAKE_INSTALL_PREFIX="/usr" \
+		${mycmakeargs} -G "Unix Makefiles" ../"avidemux_core${POSTFIX}/" || die "cmake failed."
+}
+
+src_compile() {
+	# 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
+
+	# TODO: Report -j1 problem upstream, seems to be within ffmpeg code.
+	cd "${S}"/buildCore || die "Can't enter build folder."
+	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	# TODO: Report -j1 problem upstream, seems to be within ffmpeg code.
+	cd "${S}"/buildCore || die "Can't enter build folder."
+	emake DESTDIR="${ED}" -j1 install
+
+	dodoc "${S}"/{AUTHORS,README}
+}
diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml
index 6f2bfe61299a..4b80e439b8c6 100644
--- a/media-libs/avidemux-core/metadata.xml
+++ b/media-libs/avidemux-core/metadata.xml
@@ -7,8 +7,8 @@
   </maintainer>
   <herd>video</herd>
   <use>
-    <flag name="aften">Enable A/52 (AC-3) audio encoder support</flag>
-    <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg></flag>
+    <flag name="aften">Enable A/52 (AC-3) audio encoder support.</flag>
+    <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
     <flag name="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
   </use>
 </pkgmetadata>