Version bump to 2.6.8; fixes bug #504780, reported by Frank Krömmelbein.

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

3 files changed, 125 insertions, 9 deletions

diff --git a/media-libs/avidemux-core/ChangeLog b/media-libs/avidemux-core/ChangeLog
index c7d4423933d4..48d9bb0bbee8 100644
--- a/media-libs/avidemux-core/ChangeLog
+++ b/media-libs/avidemux-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/avidemux-core
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.20 2014/03/10 14:13:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.21 2014/03/17 23:45:24 tomwij Exp $
+
+*avidemux-core-2.6.8 (17 Mar 2014)
+
+  17 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +avidemux-core-2.6.8.ebuild:
+  Version bump to 2.6.8; fixes bug #504780, reported by Frank Krömmelbein.
 
   10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
   avidemux-core-2.6.2-r1.ebuild, avidemux-core-2.6.3.ebuild,
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 0d834e0f4d03..17c3b188213f 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -6,22 +6,24 @@ DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913
 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
+DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6
 EBUILD avidemux-core-2.6.2-r1.ebuild 3902 SHA256 a2cd70c5b909d3f2ec2ec0d1e3107cee70bb7011a0f8194ab9c5d89e2a7ac214 SHA512 db2eed49bc7516c84d50901fefe693346b49898dfe57e439db4ba59a51d2bc49cde1958ae1048b1ec51ca3f38c095fc21514fe2d3edfdb46d58c5b44ef7117ba WHIRLPOOL d03b46ff81436eda42f9cb02728ca8e66579f7b8016fdc9a2956b420a0e4c7df082ae39947b454371bf0e1439828ba0902a551c45d39e8e633b75689302ff6fc
 EBUILD avidemux-core-2.6.3.ebuild 3283 SHA256 bcbdc13e485de4a9bf51a70c5a39d78cf9a9b6b9b79ecd1bc6ae7477098115fe SHA512 5ff125161b28791bab1dc1b9a5b971e2a514b0aca762ef9c10ff63f163823a8e054215d69f08904f9ea96060cf896bb2caf16ac3221abe24501d63845cc7b947 WHIRLPOOL e5a0ebbd3a915f31f9e79a858eaac5e1a2568dd288849d929e6fb5ff182b040514553619fe67bd4409d3c5661aa6f270bd5429e80a2646cd04e3e86a51127b69
 EBUILD avidemux-core-2.6.4.ebuild 3255 SHA256 c1f7de5ff7e2767e1d4c6857b3b84c9760d41000295b29390ec3ea1de26ea175 SHA512 cc2650f50831a936f0ebbd465429b1c57a4a588c429aa3436875bc8b665a0f8169e47a98d7e08c672f5e000fb557da73ea5093992c5d027a3d7efab8d770cd70 WHIRLPOOL ab661c867600eab40ff6b5aea5de4140c3b11e4d36d5ebd62f7d38b6c4fdd149fdca1771671529db183f6b0d80a226d18ca092e96dfa6eb67f747eabb13141d5
 EBUILD avidemux-core-2.6.5.ebuild 3257 SHA256 a3622658a022d5ff6187fbb7c56f1df2dbe153787fc46da2a30469f7435aee71 SHA512 f47a888ea5108610b0baaa75db0e6d2a4b03c68822fb5a1429c4b2c8ff495db89a9744cb32fa3fc401dd74de3823e3d233f56fcf7d9f5bf4b95991307c5cac2d WHIRLPOOL 5fb7077bd5be0b09e7d10377a71f158a616227b1fed3d977ea6be5411bc0225a519af72f61e5575bfe1a783ae1754969d92da0a002657102d93d1ac408378f43
 EBUILD avidemux-core-2.6.7.ebuild 3266 SHA256 746b48d93a15f302cee49f08b22d044ca86ee5619e8df6841661884df0248cd6 SHA512 bc9acdb1dea4c3a1aad478ae75ab1cc6f4173dd2e28d70e0db0e9696215241ea108b36ec43b22cee16a98adeba485ffc9465219119d3f0383c5dee374be285bd WHIRLPOOL 7adc7f9ad52eac48e7139508e65c1e0f408f6229035e7ecfa1a22f7c03e63fce1dcda32d45c7088ebaea4ca3aeeeec9b983dda09d1c8ecc9c1d1afc5b76da963
+EBUILD avidemux-core-2.6.8.ebuild 3263 SHA256 0292025dbe8c133822e2055e6b340a3e6f2245991f8095452154159ea9085906 SHA512 d5e3ae67382e6f8890952e6c1383585025aa24fdb056f10074adc3168d4e5176d1fa2a46e467788e1fde6309e544cc3db47595ee9cb967cf9eb6a09ad8d06a5d WHIRLPOOL 0655fb998b0e5492538485dc92d482f8e584bd5484ba75d88e0e3a50bebce0573fde7c8a407bd7ea6facbdd7d21a0360141912082f0b16f02cdb33e17df5f9b4
 EBUILD avidemux-core-9999.ebuild 3265 SHA256 9b7d2e3ae62771c1f2ae41b8a5b2f08d0f938a096adf302ffa0b5afe28567ad3 SHA512 009e059fed3378fc986c1939268b81073984793ea1ff5e18ce23f923b692184827eb009e662af5efab710bbcd0426ac4e2fc6c5937ee46678b88cf5108033a83 WHIRLPOOL 1d344d97b548eaea30f8b523cf1ec627dbb5b18e119c8cff8c2b2870539a5b8c192ad5a2a558f0b5afd7c59dbf343f2c79bbec035ae87da5783e09c5cde0d0ef
-MISC ChangeLog 3754 SHA256 23ea8cbde610278fa4f82d1fb4b679d4bb6ce9d5e4803f0e21402b347ba34bda SHA512 defc3dab10fca3885db68d84da05fe5593783e741b95b8b81d43ec5137b13cd4de65af9b994f9d87351fc7130f3b225f100bd7e058a9da3cdb62d3212470107c WHIRLPOOL 0745b5abb3df8a156d69c38459ffe0ea5e024bb385ff4dbb9987875adfcec56889ae918c1300ece549b8325475d221925642c684072cd8b9737f33a70d508dc9
+MISC ChangeLog 3940 SHA256 f81d6f491afc9d98e088e844d1fb80704a508d82c2711fce2856e16399cba1e2 SHA512 8a5d24e1e95f711f6fd1559cfb0ed8ae512080828149c8f2b3e049f2797a6ddd33ec9fc3e7a5af1288144307b28e4f14d582b2aca009d8a65f517f6ac7007f8a WHIRLPOOL 95432ae5dcbc050a23dd270cd6e66fcd6d736c9797b7c16616191ba57a4574659acf3fd012c17de17cf407ce69148c0a15c9a715155b1874130bb5810c4ebfdc
 MISC metadata.xml 624 SHA256 550481a411c00ae6bd01c8a46a40fb95e20fe6e53b6bbcc211918f4c6d6dd0ba SHA512 9e926ac638042fa102a5e1d0eb28bac0116d8d32f2bb1799f6b6ef00aef41e3f0145758cf0a1d617bfc725edc58bc35154d24ea441949676236aabc684ec2c59 WHIRLPOOL 1314633af632413b73954d92144104a737d1383fa6254cba8b0607cd31090d43107bbc76154c67b08dda6c852e17a581bfefdd66147fce789fe8dea196787d60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTHcfHAAoJEEdUh39IaPFNUdoIAKCWtMHgdHJdM/y7j1EdB5cU
-VVgMARZXjnQX1z7LBmPxjSZFC7B3nJMkCnIj2OZC+eRr4/i/pKLMJlXtHLHuRCrW
-fl5wwxcJ5psfLir4EmaCDVgD1rnvJPsMOjTodWjnL85K6wufuePBt+j3IRz9NFJj
-HdY50IIj65Nl+g+mEBCecqQzWd1qtkLiH+gODu+dkGknFKnP7NsPkXdEqR4fAZuk
-HzwdEvUjZBLvsUxHsC+b6PbUJyrablatP2zZWakJTeQOvXpfwETGxYWMEJ3E0rtw
-gMDKFRd1yj91P0y9BiupZkFJGF6HHRI1RtrxMU+Jfc3ds/C+7/OQaycX5F3JgTk=
-=vrNw
+iQEcBAEBCAAGBQJTJ4kWAAoJEJWyH81tNOV914MIAKcIoLY7LEzngP2XMzVI83K2
+3+HSW+2YTBiA5kkQq6drH2UIszyHguhff98AIHxSJETNV36aZtWJ4n5zUbcQ1G3h
+TVOQlERIK5iO3MALdHoSpWTtROEmWi5ZKK91kEZTsa5Ae0YCSIC/C6nXIJwxL7dr
+WoZaH/P2YIbv4BR8AHaejJLrpcjmpekduEgf3SvfoxYsVtZgZTzDeVuTXG5zE1uI
+w4Td2Sp4TzdYQMeL8VWh461477SMe0tjwqcdRwWzH5HA/N2eWOhN15cTXGllElA+
+ZMX/PqSpf9jZ5r5oCNl1Oe2oIHZoiYnW7cWfr7l49jtVFcpwh0RAqXNTk7VOAX4=
+=U0al
 -----END PGP SIGNATURE-----
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
new file mode 100644
index 000000000000..5b156042c9e5
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 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.8.ebuild,v 1.1 2014/03/17 23:45:24 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
+	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
+	nls? ( virtual/libintl:0 )
+"
+DEPEND="
+	$DEPEND
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	!system-ffmpeg? ( dev-lang/yasm[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
+}