Version bump to 2.6.7, fixes bug #493730.

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

4 files changed, 129 insertions, 13 deletions

diff --git a/media-libs/avidemux-core/ChangeLog b/media-libs/avidemux-core/ChangeLog
index 9b7b54450fb8..b310cd86e4ca 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.15 2013/09/01 11:53:12 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.16 2013/12/17 23:26:40 tomwij Exp $
+
+*avidemux-core-2.6.7 (17 Dec 2013)
+
+  17 Dec 2013; Tom Wijsman <TomWij@gentoo.org> +avidemux-core-2.6.7.ebuild,
+  avidemux-core-9999.ebuild:
+  Version bump to 2.6.7, fixes bug #493730.
 
 *avidemux-core-2.6.5 (01 Sep 2013)
 
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index abf4b10e5431..57ab96ed413a 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -5,21 +5,23 @@ 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-core-2.6.2-r1.ebuild 3852 SHA256 7e5b1d5498d7648624caa81d809cf1b17dc83e1b5a716098c85338bebf63f879 SHA512 92766622b1b662a854ccddf20aba58cd844e130c07da714cf42c52a9219f9d2d6dc76d074094664ed2c9389a474bef378ce789ed1a2e54c610d2a4b03ecb0708 WHIRLPOOL c915344c6658343485c4634010ada781d311ba11feda84f588e4f0df5474270e97915a9687477ce60c4f335abf8f9385d07c5895152cd291eab5bb771a25a903
 EBUILD avidemux-core-2.6.3.ebuild 3254 SHA256 a8a631be0968d6ebe1179f6a71470339df9db38c9c332f958b36d3e29f45e76c SHA512 fc1bdd71f947c743efd73d9960f5cc8d31c60a9f80123dd2df882e88f3d04ae1eb7322973ae01aaa4b64e1cef2c23b2b996d8c682196d56f66f0f9372bb8d83f WHIRLPOOL 6096763f124c7da8a3a72c79315853b6bcea7a591508bbbcf4c524894d62139088362aa4cd3805d1c9191a4a4d48bd068ac40398f33584d4e6a61a0ccb3b0356
 EBUILD avidemux-core-2.6.4.ebuild 3226 SHA256 7caf1f8345a95b529f02dc1092881f509aca955f91bf37f55342b3edaf1b2139 SHA512 f79e4cbf839d49904538f74ff81dcd5613ab0fc8af2f430f9420b70a2b3b070129c980171ee45d87aa09f5298e206eaf440fa49ef02de0f37f14ede980b320ec WHIRLPOOL dcf0e6fab0030ff50ec2582c60ca3decf6357c56c0b4a1dfad5ec53b85ad65bb32e6ffa6e369c181c37669798be4ded93573907dbc435eff4bca8c60af30886d
 EBUILD avidemux-core-2.6.5.ebuild 3232 SHA256 3b4f16fc85d60ed8367751c43b117a813ad6691409fd2319924cdda9834060b8 SHA512 cb4656385e14769c8835464194dd8fd4ae14612a22b6e6c8c2f9bd458335270dccaa7c594b44c4c2dbd44f2f2d7593571f6c06fd2ba2d119c8e4c60faf59b81e WHIRLPOOL a9b4aff62cd9253af81e3f1f4409cc944b4dbccd2d6e470b212667b9362eb6f924ed4d48650c6ef122d41afbcdc6853bac911c75ee4026e445a134cc9b8a537a
-EBUILD avidemux-core-9999.ebuild 3231 SHA256 71bf48471d46007b1c0072465a5d166b73fec3e42df2252e5ebb2ea8e6fa2686 SHA512 549ec7190bea851d8cbd7c0526bc21e3223b9f1832b38962de3f557100a69608f9e1784167ce2360d062d95f5319cceb247569c4ce001397e2b5a1b6c68989f6 WHIRLPOOL 614e8747daf042d7ec7aad01403df5902fc79d1f0520ce784d461cdf719752f3029802085d2769bbe775ad1f23c2337987f76ab6ad7194a5870e91a5363cbd37
-MISC ChangeLog 2744 SHA256 bcb10c4c8c837b19eeceb53d7f59c2b991826ace15078b0d50562f3aae37b661 SHA512 040eebf1fbe93ecfa4a70b51b1abee812c1b34f48728fb28d8e69dece7c72d746a3900d99c446c37815792c43b1ea6ffeb1dd3aa48e8a2fa1a9e8e640ea30e00 WHIRLPOOL 822d89078f41124d9b9a8a9ea28f1cbf678dc1d51f49555bd24a2eb55f1f914bccadc184807cd6b2e6361fe1eda59cc48c664a81e821a702a24a12287c720900
+EBUILD avidemux-core-2.6.7.ebuild 3241 SHA256 9d90239b604cfcb498616082c1982934f99fb717161b0f4eb8e7657b358de79d SHA512 ce750b9407b18b34c979789f3e0078deae7a55119b36b62692cdc80e6a1633bffa01a6b247d96859af3c58903e368c481b4722c09c8a6a0e84631a2b01dabc7c WHIRLPOOL 0e918b68a9908f9ab1faadee9e8f632f7004f6c9b371849120a2e64e6178c0749b9e58b73fa19630e6a4096a0d5581d9097bbb5e748f884939d47e60aab05cd8
+EBUILD avidemux-core-9999.ebuild 3240 SHA256 287ce4a6fd5443ca4dfbc01a3a7f56985196f877e7b569437ec4de03df09426b SHA512 abcfd522ad629c9aae6fae8913eebd805b8b608b2423d7d1aa9b33a3528f0ed113992f26b433d214bc1a000e3b320dc6388b04e3eefe7a3a530995dcb3697d84 WHIRLPOOL 736394e87be243338b770b91886651306148ae1bbdfe5fdcbd376f2add4725f7b6903a4be303714c4a0dba168d4a1831a491ee24ee867f7f2cd0f6233f253649
+MISC ChangeLog 2930 SHA256 a53d5a3875aab7b4e0248d0b4d0ec3a2fc3b237d8e6f0a007f7ade205d7001a9 SHA512 a11cade408532558f6ee2c2d557788b14911ffbf103a5ffbd839989a4e63085bfd5e5d3b0e2ee6d02c11e4459f06d488fcfde9bf7f16d1a87b5b1bb9eeaacf95 WHIRLPOOL 91e33877b34f23236475c1ed26aac7c9d448ef5a2eaa7db4f175c37be075ed17fdebccf553d7ccecf3f10873fa7b8f21e2ff760fa643ea646d814bcbfcad826e
 MISC metadata.xml 624 SHA256 550481a411c00ae6bd01c8a46a40fb95e20fe6e53b6bbcc211918f4c6d6dd0ba SHA512 9e926ac638042fa102a5e1d0eb28bac0116d8d32f2bb1799f6b6ef00aef41e3f0145758cf0a1d617bfc725edc58bc35154d24ea441949676236aabc684ec2c59 WHIRLPOOL 1314633af632413b73954d92144104a737d1383fa6254cba8b0607cd31090d43107bbc76154c67b08dda6c852e17a581bfefdd66147fce789fe8dea196787d60
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSIyq5AAoJEJWyH81tNOV9YdQIAJUkhQ2mN6l3ShNmsk92TMtC
-0ko7I633LIHKevherNS5b8MgRMnmNceoWwd3Dxr4RWnkF0HIVwoJI2IsKsu53A8u
-G+dRpqeDqOHFVo93ujpx6CcZBKcITbxKGNE6FhdGUwQhZBxKGKQwsBAtlC+cYCDU
-891y1my2fhONbmr3woyQ7L9uWTgAdd2yKAB4RFxvY2DtcvSDbenCfjly1WFXa86+
-B467Q7h4KcZIsU6Um+thxZe1mavuzWAZt7xu+MaTWTjwt6FAPE9Ci3kzB2jpHnEs
-ccmaA3jmmry3l4+MuD7719KWdn2UCJNybKcvOnGIqNgkNSNf3uXhjgoa0B7bzw0=
-=FHIu
+iQEcBAEBCAAGBQJSsN2zAAoJEJWyH81tNOV9DXgIAJfJ77NsBKcDm8bwX0qSG3Aq
+qXYFGtbHSCvqrEIy4mUvnEhsgukgZszVeg7z/iVL52w/dQv3LJA2j7uDua3cNo4T
+yx5mVMDdrG5pytPOgKyg6d2qezMEHa/N2fXTe+9hRed1EPdni/ebk9GAiSNWDTq8
+EfyNWNT+JtPP2AGARSGb9h6DLKadVwfkYpSJOwhbpJt5/Tfh0qZdCo05H0eDLrmt
+WY3xEMJkOMfCs+1HoffwKx80jq8kzOGW101rMMs79yC83V5u4snpeHfBRSrK2oTx
+F6t+qzoNaw572DGBAJo3QKdhllpPw6IEle2HbpK9YBQuC6Whe4rdWYmEVE9p9YU=
+=KteB
 -----END PGP SIGNATURE-----
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild
new file mode 100644
index 000000000000..bd6be6861857
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild
@@ -0,0 +1,108 @@
+# 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.7.ebuild,v 1.1 2013/12/17 23:26:40 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 vaapi vdpau video_cards_fglrx 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}/${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}:${SLOT}
+	dev-db/sqlite:3
+	nls? ( sys-devel/gettext:0 )
+	sdl? ( media-libs/libsdl:0 )
+	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
+	xv? ( x11-libs/libXv:0 )
+	vaapi? ( x11-libs/libva:0 )
+	vdpau? ( x11-libs/libvdpau:0 )
+	video_cards_fglrx? ( x11-libs/xvba-video: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 vaapi LIBVA)
+		$(cmake-utils_use vdpau VDPAU)
+		$(cmake-utils_use video_cards_fglrx XVBA)
+		$(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
+}
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 3d29e08d2ce5..d851a490d4b0 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-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-core/avidemux-core-9999.ebuild,v 1.3 2013/08/31 09:29:52 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-9999.ebuild,v 1.4 2013/12/17 23:26:40 tomwij Exp $
 
 EAPI="5"
 
@@ -24,7 +24,7 @@ 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
 
 # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?