Version bump to 2.6.7; fixes bug #493730, reported by Frank Krömmelbein. Added USE flag vdpau; fixes bug #490260, reported by Nikoli.

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

4 files changed, 170 insertions, 14 deletions

diff --git a/media-libs/avidemux-plugins/ChangeLog b/media-libs/avidemux-plugins/ChangeLog
index 354de64a811b..d5743b4f0d0a 100644
--- a/media-libs/avidemux-plugins/ChangeLog
+++ b/media-libs/avidemux-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/avidemux-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/ChangeLog,v 1.17 2013/09/01 20:33:56 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/ChangeLog,v 1.18 2013/12/17 23:28:48 tomwij Exp $
+
+*avidemux-plugins-2.6.7 (17 Dec 2013)
+
+  17 Dec 2013; Tom Wijsman <TomWij@gentoo.org> +avidemux-plugins-2.6.7.ebuild,
+  avidemux-plugins-9999.ebuild, metadata.xml:
+  Version bump to 2.6.7; fixes bug #493730, reported by Frank Krömmelbein. Added
+  USE flag vdpau; fixes bug #490260, reported by Nikoli.
 
 *avidemux-plugins-2.6.5-r1 (01 Sep 2013)
 
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 55d6c20c5c3d..b54df2558aa9 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -6,23 +6,25 @@ DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d
 DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc WHIRLPOOL 899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
 DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9 WHIRLPOOL a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
 DIST avidemux_2.6.5.tar.gz 17322253 SHA256 428e1f6d99e2d854ccdcb68f2260d853c47c809eee6bd92f151cb298d98b1861 SHA512 e7f8be29812ca787a1ec2cfddb1c611e1032ed94f24f41c0684f106970085bb6d219c822f3e713c472508a3f7b306540d2cabeb665bdbac061a49bccf8c23a80 WHIRLPOOL 192ce60afe4634319567cd7a1440ba212d83e02c054d6625ad738955fde02d0e722eba948c60932f520bb5e76c46ebbab0001230c1da50d893fb99a18f1da76f
+DIST avidemux_2.6.7.tar.gz 17337193 SHA256 d28202273d23be85c748c12d6e4df5e013bb861ea52b9bac7e0f90ba3d23249f SHA512 deea9811a0b6f618fab2ecf63c675b37dac12ea0ab09136a6b251e13601cd62cdc1c97d032762ea54f38e07275380106026541243bc87e230ce302fb821f2e5c WHIRLPOOL a41c338fc51e14d2c900dcef86a3887f94164548e8b904945d47915a78db907d152fda4ae53e5c37bf368348ff9912b529005a271f85d993776f042b5b997553
 EBUILD avidemux-plugins-2.6.2-r2.ebuild 2819 SHA256 b8c9abaa39d61935b1d160d727faea686336f8733cb24e37be38b0705f06acaf SHA512 6d93ac535f168d241a9fa86627b154d828ea836ab057578edf3d434934106108aad1246ea1676236b2647241ddcb7878771f8b48718a84524b9dcda525cf1647 WHIRLPOOL 0f7af0fac61957dda46bdb61d04f8a727f8fa6bc8a5032b417a8ccf97202db0df75fe0b5c32fc35ae0a3928e610fe6c3c094a479b441737ce7ebed5237d2001f
 EBUILD avidemux-plugins-2.6.3.ebuild 3633 SHA256 1edadd30b2587a4162d55b8b4fe0e1b59cba847ffa4cb65eb7935299b66ad4c5 SHA512 893725495937e11926f4e0b142906246d0e2e10b3cc82ea6e52d1ecaa781cacc47d276f3ab945b9daf8c134d067477cb7ae4a8d010fc7f80ab02aa4c57ce36e4 WHIRLPOOL 3e057616a6fafb47aab7fc8879b271d82cab5d8d055da7a1f0ced27b194229ed44cbc11f43cb511e77f313f842f565e58c508b74b7e391d76255dbc1c3d12cdc
 EBUILD avidemux-plugins-2.6.4-r1.ebuild 3931 SHA256 7cced579e4afbda8ac2f5b1f041a3fba4925455262098052bea528f8bf4458e6 SHA512 c8c275dc6fec88aa3f018dcfe145fefdc8e9afb83505f8d3832ed16b73311f5712e96ae8f3f5047fc343f17e9375101c43762f8520b8096cd2395106a8700671 WHIRLPOOL d4b96932f63e74bbf5fa8fae5b792a8cfc4805d12119a958eaeee00efa75e21d3907cba7a6af7d0fb16ece88bed6b40a1eb98ae0ce06885aaa96ed84de3a50ec
 EBUILD avidemux-plugins-2.6.4.ebuild 3633 SHA256 50d868604078efd304f79e43fa8dcd5e7d969b0446f99a9ed139906674038da5 SHA512 ee471340283ab532518b7477ebf72d45088453994be214e06ba1e822a5444ab59f951e9cfb3c23e9d11538baea9a0456cb6a00a8f751fe7908ff6696b59755c6 WHIRLPOOL 84264297da387a809a72a91c101167b1fce5b9338a8536e0e32d36452eb280fb8951c61bd4e35eaac65318640b46456da1397418e194d850214a10425232661f
 EBUILD avidemux-plugins-2.6.5-r1.ebuild 4102 SHA256 7f3211b1532024ddc41c9ee0304b0a15f2276b67b2ed88985125cefb30a13237 SHA512 a2ac928d5b8cde0a4e6f74a3a3857c03887a26566f92bdae489ab5e5cea2bfac302e27bcf6fdc8e413ea83e951ea8f5c4c0ce52a461ad8bb5459212d9e0cb6ed WHIRLPOOL f6ef010aba92bcc0c26e7f2bdb63d108f48a4707f5bb00af13e816cce38691423e13aae4c4c42245ed5a84745fa3c14e82a44f9c1a120d06c07076d73bd32a12
 EBUILD avidemux-plugins-2.6.5.ebuild 4099 SHA256 2ddfb5c12304d19c7a36a12c4463482bef1d8e2af74512e69d05bb68f79b4551 SHA512 e7e589f1e0b2765ee67059c09250b2baca3e36cdbbed89217f0b3acb9442c7f260d84c876b3e6cde5253e32e3f36dca83d18fb9c592871cc52903786e0b3079b WHIRLPOOL 78ddd2a9dd966efe8dc00571a6eca453d03b9aeec18c13ef99e09938622f07465a6e9e680800dc63da553f50d844501a962ad2c5192f715549cd740717da2e0a
-EBUILD avidemux-plugins-9999.ebuild 4098 SHA256 1db76b56225b329d0e33b078d42d2183745d62df89db3bd228d84e561014c2dc SHA512 65521e394aecccd5340af649bd3defc689b0900d0f6e22ba501520dac81dc195f97be838246de20cf99fd37e7d0f3cf6ed13f0014d28cae648641a8b3b072a68 WHIRLPOOL 950e61ec0e23324a5ebcaaa7dd101dcefecd82716ea23b2db7613a4914ada3b6d52ecd30f348109d4d6ede9355ea8b128b78a54ef40c3b210200e16d1d662f1e
-MISC ChangeLog 4824 SHA256 c1b3af88113deb0edf31c9be450d8de7016b053336124c0b62d323b639e4a392 SHA512 0fea981caa56346c4d3310869d6e080e3eca2c9db2871c95786ad5e99a1b13e9615951a499a548cb99bc5c4029e0a086f4bcd28e774f5f9e7e5c48e8de741423 WHIRLPOOL 5668bd0c586fa19c7a4aec11984dc27be6b5de7fc04a8fde0a0002045861727e691941e83f15096b84441c093ba9aa36f625650d0908182a614df8d966dd7e84
+EBUILD avidemux-plugins-2.6.7.ebuild 4191 SHA256 7d3c40a3958fd359b2d021aa4b1a6fa7fda3418fd80cdc4420d498ce25f59b0d SHA512 0819fadf95f745f1e62d7a866b84e0c03981818cc94fec7ce0afd026904c1cecfc593c5ee83d02b5fd589d1549211b179ee80889d769618b0ff5877ea41007de WHIRLPOOL 2bff64756f68ba0ffee3cd8deccfc38d97937a89f385f81cc4da2175626a4a2966cb8b3541854b27b0966b4fc1826483ccbe1f8a333a4e69fdb9a8da99c4d4c0
+EBUILD avidemux-plugins-9999.ebuild 4190 SHA256 32854dcb842825449d0faa59ae0dcb3e3738b004f395f601e910bab80415267a SHA512 187f8ff0f39b87c471c2ffc9beba973c22a2ea58341be0d603b9a582b9c1b6ff820f04205ac8d9466ca2ae73cb7bf7c180a3397a279382031af689bb008e2bbb WHIRLPOOL ed45e20724c3e00a2bb76c691a495ab45b5a56f58bdeaa030a9ffa3ddf3184f41e905a4babdfbf031357ce7abff36207dbe4c18008e8c2978dfbc253441aad3e
+MISC ChangeLog 5128 SHA256 a3c4608ca605a97c415fb63e921f0445b6774dd46eed45b072e12290975e21bf SHA512 2fc7bcf71429cb989f100a5f1c0baafac96df6f2d087563ce10a02e3f9b1c4d93a12912aca7b328d8773d9cf79dc0fafdeb6b418ec792ac32a9b1010d9db65ab WHIRLPOOL 672d1f7ea43caf9aa0812be00b8eb53098db846aed601e20d2068b96c449520751687b955687afee7ae52123113a502565e5d76bf40863337681192e74b9af68
 MISC metadata.xml 1007 SHA256 1a4c911a631fca3bcc61f79eec9ea93c8a66390bfeca32ae4f06ab1f7707bf4a SHA512 1ebcd623ab08176143226f9544005953e2a7a08ca457f378bd083f0eaeef2d2f64f6c5e2d321ba4f67e34720804e03136d6749a2254ab2b92b2145604637adbd WHIRLPOOL 7da1e5d6ab98313b0dd79ec3f9a1e7c7699fbaecbbe8c4a938fcba8b3805337ed5605b71a586794f5b6bc231a0e6be3c182cc40216db2eeaf9c0f87e80e1f991
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSI6S5AAoJEJWyH81tNOV9yvAIAIVEFsAvnsUhWqWmA4Cg7GTW
-OXctrY8955Mn3OQzbvbA5Fy0J3ExyIwN234o0I0+dAcgRSm9yGMYFzGcglZhjawx
-YPiY24cjLL/uMGqz+MbYCnjOoabgStr4+L9kR3sWVBWuYZj0iy8JXDROfbBUL717
-Bso7HMDYcX5QaZgCl1QiIB15KZqwjfEwM8fI6z5tEqlYq889Yc6vD/QV3OjJgoUi
-BgJpu1nNrz5lSa3Esp2aDOJ2et6e0ywDX8VhZRn7cnPiHERt3qZJGIwibD7uuYQL
-IOloEUdF+Nz9bt8OR7GSlKWFPn1ZAIJ9t8BIztjy8DNCMHMqeweliqiuBMIzZVE=
-=VRo3
+iQEcBAEBCAAGBQJSsN40AAoJEJWyH81tNOV91loH/0PXZduM2VB2nLzRRnoMs/yf
+RYyRRSigp179bF6Tm1MmcC52PwbKJMiHw1D0UzJzvLLqgvWI277FQmrmdJpglQM+
+SPJj1t8XZ+NFzXygzON9xk1Zxe32RM1VZrio02F66LqOd988HKRY7fOz3cd6OS2d
+SBhhpDp5bU3WhX4tyQcBAN+HgLTCGUw6U4poi3D+kuYmGDrCnycam+sAFcJrpJ2T
+rH2580pwg0C3llRzTeU+o8FaFioOX0e+DbrHSJbTOU2c7URXnrEJbws9U8WjWlaw
+87PYpCLqPu/JMLHDnDS5lwHvy3JN2iGRYDEEnDLkaEOam0jGy5T3SMnbHWgrNcg=
+=NwWn
 -----END PGP SIGNATURE-----
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild
new file mode 100644
index 000000000000..e5e92bbdfeb5
--- /dev/null
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.7.ebuild,v 1.1 2013/12/17 23:28:48 tomwij Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils flag-o-matic python-single-r1
+
+SLOT="2.6"
+
+DESCRIPTION="Plugins for avidemux; 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="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
+KEYWORDS="~amd64 ~x86"
+
+MY_PN="${PN/-plugins/}"
+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}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
+	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?]
+	>=dev-lang/spidermonkey-1.5-r2:0=
+	dev-libs/libxml2:2
+	media-libs/libpng:0=
+	virtual/libiconv:0
+	aac? (
+		media-libs/faac:0
+		media-libs/faad2:0
+	)
+	aften? ( media-libs/aften:0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 )
+	amr? ( media-libs/opencore-amr:0 )
+	dts? ( media-libs/libdca:0 )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	fribidi? ( dev-libs/fribidi:0 )
+	jack? (
+		media-sound/jack-audio-connection-kit:0
+		libsamplerate? ( media-libs/libsamplerate:0 )
+	)
+	lame? ( media-sound/lame:0 )
+	oss? ( virtual/os-headers:0 )
+	pulseaudio? ( media-sound/pulseaudio:0 )
+	truetype? ( media-libs/freetype:2 )
+	twolame? ( media-sound/twolame:0 )
+	x264? ( media-libs/x264:0= )
+	xv? (
+		x11-libs/libX11:0
+		x11-libs/libXext:0
+		x11-libs/libXv:0
+	)
+	xvid? ( media-libs/xvid:0 )
+	vorbis? ( media-libs/libvorbis:0 )
+	vpx? ( media-libs/libvpx:0 )
+	${PYTHON_DEPS}
+"
+RDEPEND="$DEPEND"
+
+S="${WORKDIR}/${MY_P}"
+
+processes="buildPluginsCommon:avidemux_plugins
+	buildPluginsCLI:avidemux_plugins"
+use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.4-optional-pulse.patch )
+
+src_configure() {
+	# 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
+
+	for process in ${processes} ; do
+		local build="${process%%:*}"
+
+		local mycmakeargs="
+			-DAVIDEMUX_SOURCE_DIR='${S}'
+			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
+			$(cmake-utils_use aac FAAC)
+			$(cmake-utils_use aac FAAD)
+			$(cmake-utils_use alsa)
+			$(cmake-utils_use aften)
+			$(cmake-utils_use amr OPENCORE_AMRWB)
+			$(cmake-utils_use amr OPENCORE_AMRNB)
+			$(cmake-utils_use dts LIBDCA)
+			$(cmake-utils_use fontconfig)
+			$(cmake-utils_use jack)
+			$(cmake-utils_use lame)
+			$(cmake-utils_use oss)
+			$(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
+			$(cmake-utils_use qt4)
+			$(cmake-utils_use truetype FREETYPE2)
+			$(cmake-utils_use twolame)
+			$(cmake-utils_use x264)
+			$(cmake-utils_use xv XVIDEO)
+			$(cmake-utils_use xvid)
+			$(cmake-utils_use vdpau)
+			$(cmake-utils_use vorbis)
+			$(cmake-utils_use vorbis LIBVORBIS)
+			$(cmake-utils_use vpx VPXDEC)
+		"
+
+		if use debug ; then
+			mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
+		fi
+
+		mkdir "${S}"/${build} || die "Can't create build folder."
+
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
+	done
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		# cmake-utils_src_install doesn't respect BUILD_DIR
+		# and there sometimes is a preinstall phase present.
+		pushd "${S}/${process%%:*}" > /dev/null || die
+			grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast
+			grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast
+		popd > /dev/null || die
+	done
+
+	python_fix_shebang "${D}"
+}
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
index bdec18380703..ae78529d4d60 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild,v 1.3 2013/09/01 11:51:16 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild,v 1.4 2013/12/17 23:28:48 tomwij Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ 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="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vpx"
+IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
 KEYWORDS="~amd64 ~x86"
 
 MY_PN="${PN/-plugins/}"
@@ -26,10 +26,11 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-2
 else
 	MY_P="${MY_PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
+	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
 fi
 
 DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
 	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?]
 	>=dev-lang/spidermonkey-1.5-r2:0=
 	dev-libs/libxml2:2
@@ -108,6 +109,7 @@ src_configure() {
 			$(cmake-utils_use x264)
 			$(cmake-utils_use xv XVIDEO)
 			$(cmake-utils_use xvid)
+			$(cmake-utils_use vdpau)
 			$(cmake-utils_use vorbis)
 			$(cmake-utils_use vorbis LIBVORBIS)
 			$(cmake-utils_use vpx VPXDEC)