From def5aff91f0a55f84ebd7122453bc2d21307a47d Mon Sep 17 00:00:00 2001
From: Sven Eden <sven.eden@gmx.de>
Date: Thu, 5 Jan 2017 13:56:10 +0100
Subject: avidemux: version bump to 2.6.16

---
 media-video/avidemux/Manifest                  |   2 +-
 media-video/avidemux/avidemux-2.6.15-r2.ebuild | 155 -------------------------
 media-video/avidemux/avidemux-2.6.16-r1.ebuild | 155 +++++++++++++++++++++++++
 3 files changed, 156 insertions(+), 156 deletions(-)
 delete mode 100644 media-video/avidemux/avidemux-2.6.15-r2.ebuild
 create mode 100644 media-video/avidemux/avidemux-2.6.16-r1.ebuild

(limited to 'media-video')

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.15-r2.ebuild
deleted file mode 100644
index 55562ed..0000000
--- a/media-video/avidemux/avidemux-2.6.15-r2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="mirror"
-
-PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
-
-inherit cmake-utils eutils flag-o-matic l10n
-
-SLOT="2.6"
-
-DESCRIPTION="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 opengl nls qt4 qt5 sdl vaapi vdpau video_cards_fglrx xv"
-KEYWORDS="~amd64 ~x86"
-
-if [[ ${PV} == *9999* ]] ; then
-	MY_P=$P
-	KEYWORDS=""
-	PROPERTIES="live"
-	EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_P}2-6.git https://git.gitorious.org/${MY_P}2-6/${MY_P}2-6.git"
-	EGIT_REPO_URI="https://github.com/mean00/${MY_P}2"
-	inherit git-r3
-else
-	MY_P="${PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-DEPEND="
-	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,qt5?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?]
-	opengl? ( virtual/opengl:0 )
-	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
-	qt5? ( dev-qt/qtgui:5 )
-	vaapi? ( x11-libs/libva:0 )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3
-			x11-libs/xvba-video:0 )
-		)"
-RDEPEND="$DEPEND"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?,qt5?]"
-
-REQUIRED_USE="qt5? ( !qt4 ) "
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	#cmake-utils_src_prepare
-
-	# Fix icon name -> avidemux-2.6.png
-	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
-
-	# The desktop file is broken. It uses avidemux2 instead of avidemux3
-	# so it will actually launch avidemux-2.5 if it is installed.
-	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
-	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed."
-
-	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
-	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
-
-	# Now rename the desktop file to not collide with 2.5.
-	mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed."
-
-	# Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628)
-	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
-
-	# Fix underlinking to work with gold linker
-	sed -i -e 's/\( ADM_core6\)/ Xext\1/' avidemux/common/ADM_render/CMakeLists.txt || die "Couldn't fix underlinking"
-
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs
-	mycmakeargs=(
-		-DAVIDEMUX_SOURCE_DIR="'${S}'"
-		-DGETTEXT="$(usex nls)"
-		-DSDL="$(usex sdl)"
-		-DLIBVA="$(usex vaapi)"
-		-DVDPAU="$(usex vdpau)"
-		-DXVBA="$(usex video_cards_fglrx)"
-		-DXVIDEO="$(usex xv)"
-	)
-	if use qt5 ; then
-		mycmakeargs+=( -DENABLE_QT5=True )
-		export QT_SELECT=5
-		processes+=" buildQt5:avidemux/qt4"
-		append-cxxflags $(test-flags-CXX -std=gnu++11)
-	elif use qt4 ; then
-		export QT_SELECT=4
-		processes+=" buildQt4:avidemux/qt4"
-		# Needed for gcc-6
-		append-cxxflags $(test-flags-CXX -std=gnu++98)
-	fi
-
-	if use debug ; then
-		mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 )
-	fi
-
-	# Filter problematic flags
-	filter-flags -fwhole-program -flto -ftracer
-
-	# 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%%:*}"
-
-		mkdir "${S}"/${build} || die "Can't create build folder."
-		cd "${S}"/${build} || die "Can't enter 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
-}
-
-DOCS=( AUTHORS README )
-
-src_install() {
-	for process in ${processes} ; do
-		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_install
-	done
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
-		fperms +x /usr/bin/avidemux3_cli
-	fi
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
-		fperms +x /usr/bin/avidemux3_jobs
-	fi
-
-	cd "${S}" || die "Can't enter source folder."
-	newicon ${PN}_icon.png ${PN}-2.6.png
-
-	if use qt4; then
-		fperms +x /usr/bin/avidemux3_qt4
-		domenu ${PN}-2.6.desktop
-	fi
-	if use qt5; then
-		fperms +x /usr/bin/avidemux3_qt5
-		domenu ${PN}-2.6.desktop
-	fi
-}
diff --git a/media-video/avidemux/avidemux-2.6.16-r1.ebuild b/media-video/avidemux/avidemux-2.6.16-r1.ebuild
new file mode 100644
index 0000000..8dd9fc3
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.6.16-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+RESTRICT="mirror"
+
+PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
+
+inherit cmake-utils eutils flag-o-matic l10n
+
+SLOT="2.6"
+
+DESCRIPTION="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 opengl nls qt4 qt5 sdl vaapi vdpau video_cards_fglrx xv"
+KEYWORDS="~amd64 ~x86"
+
+if [[ ${PV} == *9999* ]] ; then
+	MY_P=$P
+	KEYWORDS=""
+	PROPERTIES="live"
+	EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_P}2-6.git https://git.gitorious.org/${MY_P}2-6/${MY_P}2-6.git"
+	EGIT_REPO_URI="https://github.com/mean00/${MY_P}2"
+	inherit git-r3
+else
+	MY_P="${PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,qt5?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?]
+	opengl? ( virtual/opengl:0 )
+	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
+	qt5? ( dev-qt/qtgui:5 )
+	vaapi? ( x11-libs/libva:0 )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3
+			x11-libs/xvba-video:0 )
+		)"
+RDEPEND="$DEPEND"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?,qt5?]"
+
+REQUIRED_USE="qt5? ( !qt4 ) "
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	#cmake-utils_src_prepare
+
+	# Fix icon name -> avidemux-2.6.png
+	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
+
+	# The desktop file is broken. It uses avidemux2 instead of avidemux3
+	# so it will actually launch avidemux-2.5 if it is installed.
+	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed."
+	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed."
+
+	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
+	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed."
+
+	# Now rename the desktop file to not collide with 2.5.
+	mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed."
+
+	# Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628)
+	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog."
+
+	# Fix underlinking to work with gold linker
+	sed -i -e 's/\( ADM_core6\)/ Xext\1/' avidemux/common/ADM_render/CMakeLists.txt || die "Couldn't fix underlinking"
+
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs
+	mycmakeargs=(
+		-DAVIDEMUX_SOURCE_DIR="'${S}'"
+		-DGETTEXT="$(usex nls)"
+		-DSDL="$(usex sdl)"
+		-DLIBVA="$(usex vaapi)"
+		-DVDPAU="$(usex vdpau)"
+		-DXVBA="$(usex video_cards_fglrx)"
+		-DXVIDEO="$(usex xv)"
+	)
+	if use qt5 ; then
+		mycmakeargs+=( -DENABLE_QT5=True )
+		export QT_SELECT=5
+		processes+=" buildQt5:avidemux/qt4"
+		append-cxxflags $(test-flags-CXX -std=gnu++11)
+	elif use qt4 ; then
+		export QT_SELECT=4
+		processes+=" buildQt4:avidemux/qt4"
+		# Needed for gcc-6
+		append-cxxflags $(test-flags-CXX -std=gnu++98)
+	fi
+
+	if use debug ; then
+		mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 )
+	fi
+
+	# Filter problematic flags
+	filter-flags -ftracer -flto
+
+	# 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%%:*}"
+
+		mkdir "${S}"/${build} || die "Can't create build folder."
+		cd "${S}"/${build} || die "Can't enter 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
+}
+
+DOCS=( AUTHORS README )
+
+src_install() {
+	for process in ${processes} ; do
+		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_install
+	done
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
+		fperms +x /usr/bin/avidemux3_cli
+	fi
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
+		fperms +x /usr/bin/avidemux3_jobs
+	fi
+
+	cd "${S}" || die "Can't enter source folder."
+	newicon ${PN}_icon.png ${PN}-2.6.png
+
+	if use qt4; then
+		fperms +x /usr/bin/avidemux3_qt4
+		domenu ${PN}-2.6.desktop
+	fi
+	if use qt5; then
+		fperms +x /usr/bin/avidemux3_qt5
+		domenu ${PN}-2.6.desktop
+	fi
+}
-- 
cgit v1.2.3-65-gdbad