avidemux: version bump to 2.6.16

6 files changed, 22 insertions, 10 deletions

diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 9bd4b58..50d61e5 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1 +1 @@
-DIST avidemux_2.6.15.tar.gz 19944806 SHA256 b0e59b3dc75878b0c00d9a2bc9412125e42a53a8904e64746829ce8028b52257 SHA512 42964509cb51133abe624631d07bd223a7cee9fcfd971655ce26193598a48428a2eb1ba0c43034477b60a626fd332431281217644baa82f935f4aeb945d4508a WHIRLPOOL a8ca73444a705e2459494805d13d2001002a3b5d241a09204def3a25c9053b60b4a5038fd964bf7e8b2600ae798a6f2ff7749801d6c692428ef3be3f507ddd12
+DIST avidemux_2.6.16.tar.gz 20089266 SHA256 ec6d6ce038d2454c51ad7f0f2236117cb99d18ce394fef2784381cc4f7dd374a SHA512 617c36f6f0557ac6c4bda140f4efb262a3bc4529f49d2d34eabd3a6aeff1fda800fd2bb1e4b5ac542d4be099d763ee006555db12d57e5e19d795ecb83e569fa6 WHIRLPOOL 3dc5a318f1bd2aa66c0f1629c1d85669b236f720583c8293cf680cbabb010552d8901a929212f75972046abec575d61b0dc6292b0fc5074199ba24704ea3625e
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.15.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.16-r1.ebuild
index ca96375..e127ab0 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.15.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016 Gentoo Foundation
+# Copyright 2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -68,9 +68,13 @@ src_prepare() {
 		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}"
+		sed -i \
+			-e 's/include(admFFmpegUtil)//g' \
+			-e '/registerFFmpeg/d' \
+			-- cmake/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 \
@@ -91,6 +95,10 @@ src_prepare() {
 		# Needed for gcc-6 (but incompatible with qt5!)
 		append-cxxflags $(test-flags-CXX -std=gnu++98)
 	fi
+
+	# Filter problematic flags
+	filter-flags -fwhole-program -flto
+
 	eapply_user
 }
 
@@ -102,6 +110,7 @@ src_configure() {
 		-DSDL="$(usex sdl)"
 		-DLIBVA="$(usex vaapi)"
 		-DVDPAU="$(usex vdpau)"
+		-DXVBA="$(usex video_cards_fglrx)"
 		-DXVIDEO="$(usex xv)"
 	)
 
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 9bd4b58..50d61e5 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1 +1 @@
-DIST avidemux_2.6.15.tar.gz 19944806 SHA256 b0e59b3dc75878b0c00d9a2bc9412125e42a53a8904e64746829ce8028b52257 SHA512 42964509cb51133abe624631d07bd223a7cee9fcfd971655ce26193598a48428a2eb1ba0c43034477b60a626fd332431281217644baa82f935f4aeb945d4508a WHIRLPOOL a8ca73444a705e2459494805d13d2001002a3b5d241a09204def3a25c9053b60b4a5038fd964bf7e8b2600ae798a6f2ff7749801d6c692428ef3be3f507ddd12
+DIST avidemux_2.6.16.tar.gz 20089266 SHA256 ec6d6ce038d2454c51ad7f0f2236117cb99d18ce394fef2784381cc4f7dd374a SHA512 617c36f6f0557ac6c4bda140f4efb262a3bc4529f49d2d34eabd3a6aeff1fda800fd2bb1e4b5ac542d4be099d763ee006555db12d57e5e19d795ecb83e569fa6 WHIRLPOOL 3dc5a318f1bd2aa66c0f1629c1d85669b236f720583c8293cf680cbabb010552d8901a929212f75972046abec575d61b0dc6292b0fc5074199ba24704ea3625e
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.15.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.16-r1.ebuild
index c4d1cd2..8d69cd5 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.15.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016 Gentoo Foundation
+# Copyright 2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -94,6 +94,9 @@ src_configure() {
 	# See bug 432322.
 	use x86 && replace-flags -O0 -O1
 
+	# Filter problematic flags
+	filter-flags -fwhole-program -flto
+
 	processes="buildPluginsCommon:avidemux_plugins
 		buildPluginsCLI:avidemux_plugins"
 	if use qt4 || use qt5 ; then
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 9bd4b58..50d61e5 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1 +1 @@
-DIST avidemux_2.6.15.tar.gz 19944806 SHA256 b0e59b3dc75878b0c00d9a2bc9412125e42a53a8904e64746829ce8028b52257 SHA512 42964509cb51133abe624631d07bd223a7cee9fcfd971655ce26193598a48428a2eb1ba0c43034477b60a626fd332431281217644baa82f935f4aeb945d4508a WHIRLPOOL a8ca73444a705e2459494805d13d2001002a3b5d241a09204def3a25c9053b60b4a5038fd964bf7e8b2600ae798a6f2ff7749801d6c692428ef3be3f507ddd12
+DIST avidemux_2.6.16.tar.gz 20089266 SHA256 ec6d6ce038d2454c51ad7f0f2236117cb99d18ce394fef2784381cc4f7dd374a SHA512 617c36f6f0557ac6c4bda140f4efb262a3bc4529f49d2d34eabd3a6aeff1fda800fd2bb1e4b5ac542d4be099d763ee006555db12d57e5e19d795ecb83e569fa6 WHIRLPOOL 3dc5a318f1bd2aa66c0f1629c1d85669b236f720583c8293cf680cbabb010552d8901a929212f75972046abec575d61b0dc6292b0fc5074199ba24704ea3625e
diff --git a/media-video/avidemux/avidemux-2.6.15-r2.ebuild b/media-video/avidemux/avidemux-2.6.16-r1.ebuild
index 55562ed..8dd9fc3 100644
--- a/media-video/avidemux/avidemux-2.6.15-r2.ebuild
+++ b/media-video/avidemux/avidemux-2.6.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016 Gentoo Foundation
+# Copyright 2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -101,7 +101,7 @@ src_configure() {
 	fi
 
 	# Filter problematic flags
-	filter-flags -fwhole-program -flto -ftracer
+	filter-flags -ftracer -flto
 
 	# Add lax vector typing for PowerPC.
 	if use ppc || use ppc64 ; then