commit: 4404a6dab80b61ab4d99c1cb132884a9e3dbcb07 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jan 9 16:57:39 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jan 9 17:29:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4404a6da
media-video/avidemux: 2.7.0 version bump Add x11-libs/libva slot operator. Closes: https://bugs.gentoo.org/549818 Closes: https://bugs.gentoo.org/641636 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-video/avidemux/Manifest | 1 + media-video/avidemux/avidemux-2.6.20-r1.ebuild | 2 +- ...{avidemux-9999.ebuild => avidemux-2.7.0.ebuild} | 30 ++++++++++++---------- media-video/avidemux/avidemux-9999.ebuild | 30 ++++++++++++---------- 4 files changed, 36 insertions(+), 27 deletions(-) diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest index ae61dc9d907..c86d53e23df 100644 --- a/media-video/avidemux/Manifest +++ b/media-video/avidemux/Manifest @@ -1 +1,2 @@ DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 +DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015 diff --git a/media-video/avidemux/avidemux-2.6.20-r1.ebuild b/media-video/avidemux/avidemux-2.6.20-r1.ebuild index 75412c73705..0dfaecb51ea 100644 --- a/media-video/avidemux/avidemux-2.6.20-r1.ebuild +++ b/media-video/avidemux/avidemux-2.6.20-r1.ebuild @@ -91,7 +91,7 @@ src_configure() { -DAVIDEMUX_SOURCE_DIR='${S}' -DGETTEXT="$(usex nls)" -DSDL="$(usex sdl)" - -DLIBVA="$(usex vaapi)" + -DLibVA="$(usex vaapi)" -DVDPAU="$(usex vdpau)" -DXVIDEO="$(usex xv)" ) diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-2.7.0.ebuild similarity index 86% copy from media-video/avidemux/avidemux-9999.ebuild copy to media-video/avidemux/avidemux-2.7.0.ebuild index 6b3b95e51a5..d1ae46fc076 100644 --- a/media-video/avidemux/avidemux-9999.ebuild +++ b/media-video/avidemux/avidemux-2.7.0.ebuild @@ -19,15 +19,20 @@ HOMEPAGE="http://fixounet.free.fr/avidemux"; # Multiple licenses because of all the bundled stuff. LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" -SLOT="2.6" +SLOT="2.7" IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv" COMMON_DEPEND=" ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) - qt5? ( dev-qt/qtgui:5 ) - vaapi? ( x11-libs/libva:0 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + ) + vaapi? ( x11-libs/libva:0= ) " DEPEND="${COMMON_DEPEND} qt5? ( dev-qt/linguist-tools:5 ) @@ -51,12 +56,12 @@ src_prepare() { CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare done - # Fix icon name -> avidemux-2.6.png - sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || \ + # Fix icon name -> avidemux-2.7.png + sed -i -e "/^Icon/ s:${PN}:${PN}-${SLOT}:" ${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. + # so it will actually launch avidemux-2.7 if it is installed. sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || \ die "Desktop file fix failed." if use qt5; then @@ -68,8 +73,8 @@ src_prepare() { 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." + # Now rename the desktop file to not collide with 2.6. + mv ${PN}2.desktop ${PN}-${SLOT}.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) @@ -87,14 +92,13 @@ src_configure() { use x86 && replace-flags -O0 -O1 # The build relies on an avidemux-core header that uses 'nullptr' - # which is from >=C++11. Let's use the GCC-6 default C++ dialect. + # which is from >=C++11. Let's use the GCC-6 default C++ dialect. append-cxxflags -std=c++14 local mycmakeargs=( - -DAVIDEMUX_SOURCE_DIR='${S}' -DGETTEXT="$(usex nls)" -DSDL="$(usex sdl)" - -DLIBVA="$(usex vaapi)" + -DLibVA="$(usex vaapi)" -DVDPAU="$(usex vdpau)" -DXVIDEO="$(usex xv)" ) @@ -145,7 +149,7 @@ src_install() { fi cd "${S}" || die "Can't enter source folder." - newicon ${PN}_icon.png ${PN}-2.6.png + newicon ${PN}_icon.png ${PN}-${SLOT}.png if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then fperms +x /usr/bin/avidemux3_qt5 @@ -156,7 +160,7 @@ src_install() { fi if use qt5 ; then - domenu ${PN}-2.6.desktop + domenu ${PN}-${SLOT}.desktop fi } diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild index 6b3b95e51a5..d1ae46fc076 100644 --- a/media-video/avidemux/avidemux-9999.ebuild +++ b/media-video/avidemux/avidemux-9999.ebuild @@ -19,15 +19,20 @@ HOMEPAGE="http://fixounet.free.fr/avidemux"; # Multiple licenses because of all the bundled stuff. LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" -SLOT="2.6" +SLOT="2.7" IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv" COMMON_DEPEND=" ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) - qt5? ( dev-qt/qtgui:5 ) - vaapi? ( x11-libs/libva:0 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + ) + vaapi? ( x11-libs/libva:0= ) " DEPEND="${COMMON_DEPEND} qt5? ( dev-qt/linguist-tools:5 ) @@ -51,12 +56,12 @@ src_prepare() { CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare done - # Fix icon name -> avidemux-2.6.png - sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || \ + # Fix icon name -> avidemux-2.7.png + sed -i -e "/^Icon/ s:${PN}:${PN}-${SLOT}:" ${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. + # so it will actually launch avidemux-2.7 if it is installed. sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || \ die "Desktop file fix failed." if use qt5; then @@ -68,8 +73,8 @@ src_prepare() { 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." + # Now rename the desktop file to not collide with 2.6. + mv ${PN}2.desktop ${PN}-${SLOT}.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) @@ -87,14 +92,13 @@ src_configure() { use x86 && replace-flags -O0 -O1 # The build relies on an avidemux-core header that uses 'nullptr' - # which is from >=C++11. Let's use the GCC-6 default C++ dialect. + # which is from >=C++11. Let's use the GCC-6 default C++ dialect. append-cxxflags -std=c++14 local mycmakeargs=( - -DAVIDEMUX_SOURCE_DIR='${S}' -DGETTEXT="$(usex nls)" -DSDL="$(usex sdl)" - -DLIBVA="$(usex vaapi)" + -DLibVA="$(usex vaapi)" -DVDPAU="$(usex vdpau)" -DXVIDEO="$(usex xv)" ) @@ -145,7 +149,7 @@ src_install() { fi cd "${S}" || die "Can't enter source folder." - newicon ${PN}_icon.png ${PN}-2.6.png + newicon ${PN}_icon.png ${PN}-${SLOT}.png if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then fperms +x /usr/bin/avidemux3_qt5 @@ -156,7 +160,7 @@ src_install() { fi if use qt5 ; then - domenu ${PN}-2.6.desktop + domenu ${PN}-${SLOT}.desktop fi }
