From 456dbeaab3e2f71f527eae542ab44d1e372b0655 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jan 2018 05:25:01 +0000 Subject: gentoo resync : 10.01.2018 --- media-video/2mandvd/Manifest | 2 +- media-video/2mandvd/metadata.xml | 7 + media-video/Manifest.gz | Bin 30075 -> 30085 bytes media-video/avidemux/Manifest | 6 +- media-video/avidemux/avidemux-2.6.20-r1.ebuild | 166 ++++++++++++++++++++++++ media-video/avidemux/avidemux-2.6.20.ebuild | 163 ----------------------- media-video/avidemux/avidemux-2.7.0.ebuild | 173 +++++++++++++++++++++++++ media-video/avidemux/avidemux-9999.ebuild | 68 +++++----- media-video/devedeng/Manifest | 8 +- media-video/devedeng/devedeng-4.8.11.ebuild | 38 ++++++ media-video/devedeng/devedeng-4.8.7.ebuild | 30 ----- media-video/devedeng/devedeng-4.8.8.ebuild | 30 ----- media-video/devedeng/devedeng-9999.ebuild | 12 +- 13 files changed, 441 insertions(+), 262 deletions(-) create mode 100644 media-video/avidemux/avidemux-2.6.20-r1.ebuild delete mode 100644 media-video/avidemux/avidemux-2.6.20.ebuild create mode 100644 media-video/avidemux/avidemux-2.7.0.ebuild create mode 100644 media-video/devedeng/devedeng-4.8.11.ebuild delete mode 100644 media-video/devedeng/devedeng-4.8.7.ebuild delete mode 100644 media-video/devedeng/devedeng-4.8.8.ebuild (limited to 'media-video') diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest index 8718cdbd0da5..90322dbd92a5 100644 --- a/media-video/2mandvd/Manifest +++ b/media-video/2mandvd/Manifest @@ -4,4 +4,4 @@ AUX 2mandvd-1.8.5-gcc6.patch 531 BLAKE2B 9dde4b57e38c34bc43ba259e6d9f8e136f542c0 AUX 2mandvd-1.8.5-libavformat54.patch 819 BLAKE2B 415f614476cba867ded3c148e8e88fc9b00dd96c37fc9476a16d4aec25b910ba69dccd6f906ca0558b1558ec78335ed5c26de79e21cb779dfbc8d38f2adbfcb9 SHA512 ff1500e95646966258890983a37abdd42eb4509d1bb084fd901cc9ab420be1108cb2b7fe3d3db1c92c453c8ae3a2ebc60218fe4994ca7f3fc91feaffcdc23b61 DIST 2ManDVD-1.8.5.tar.gz 29525071 BLAKE2B 7d1a4f8942fe29e29703ea9a13953f587cd482945676ee85dd8643291c3c680e280b12dbd7fe9eabecf2883251ce4ebede6a66154859ae5f65f7b83d8bbb642f SHA512 1e43034cab310ce0a642afdfcb2b4ddbc47b16b0f353adebd1fd2ec5f8445add41226390c6656e7cb520d9900e1b482adee7adb6f784d2fbfbaff2334feb3284 EBUILD 2mandvd-1.8.5.ebuild 1482 BLAKE2B 38e560cb330aa86c7029853ae91fba2990ccc48dc659364f5fe220c43449495e3488cda0ddb8d6715a3a704f2bd01efdb92ad0e87f8e401118b8e86cd27ca6c4 SHA512 81377876f32a2ada7f81731dbf6f9d0d93a6e0e3b23bff50b0da4498de229d8b1e8ec4bb156a78818b55dbbc26cf150ed28919d1bb2cc3ec7e653517575bac2a -MISC metadata.xml 243 BLAKE2B 62402a9efa915237fe628c64d7f86b5f50b86761152a67e78115054ff61475d1ae71ee62e9922abca7db47c89488a99b8c8162cd79683e0a69540e946f8fec0a SHA512 fc40891d1d0c8526f7ac87f25fbdb63e927494f972894e0006fe85eab8eef60ae79761cbc42febd202172da040283a2daa432908bf02ef83d27454660f20e72b +MISC metadata.xml 488 BLAKE2B 53a04b2d5e86186f120e6976cb1997057bf1d5c2e03cbd87e1b5da3ffed2b610ffe5dcf195703a6005d3e90f8703b6c84be124ff8e3de94c5a1d5f39b3491bcf SHA512 dae3fe802d60f26713643abbdf7fdbcb42abf1d188c0a4160aae5fc10cb3dda72b32a63148f7946b38b57c73af756b1ad2ac78757077e1e74a168e6a5fa708a5 diff --git a/media-video/2mandvd/metadata.xml b/media-video/2mandvd/metadata.xml index 32fe1293e9a9..21d7a2254405 100644 --- a/media-video/2mandvd/metadata.xml +++ b/media-video/2mandvd/metadata.xml @@ -5,4 +5,11 @@ qt@gentoo.org Gentoo Qt Project + + Czech locale + German locale + English locale + Italian locale + Russian locale + diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index e5bf9f6407e5..9a15fdb16a20 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest index f84d7b00b3a6..8448909f9b9f 100644 --- a/media-video/avidemux/Manifest +++ b/media-video/avidemux/Manifest @@ -1,4 +1,6 @@ DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 -EBUILD avidemux-2.6.20.ebuild 4354 BLAKE2B 252e87ca51d8ebad542e1c9e076be1665c9fdffcbcfd0d0c38bb0f79b0f32cf177fde668c2d04bcec7134e71da1392e2f2461f90b49ee7d8f8e383f5210f67f6 SHA512 21cd18dc642aa76bc77f012080f4ef2ca1b1d0b7dfe7b8a2f074edece99a21a8ab326fa31529848f03c6a438c5d0916c26a68cb24e312a6832968ccd6d4534bf -EBUILD avidemux-9999.ebuild 4354 BLAKE2B ef29833baf7b3d04525760aa77beeb55ded9cbc8211d0cad69f38da95c28853dcc50c4785e3d817bc3002f46f89b1dd4013f68b366c049550ae1907f3987b6f4 SHA512 56db353d29f01d2b1bf1ab237fe2e51db7f0f98b465d6d9aaf214da318cbb10e6f5f61f14f006e8fce4e029a32e7f2bda79a427c786dcda34694fb67252e2542 +DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015 +EBUILD avidemux-2.6.20-r1.ebuild 4366 BLAKE2B cf89350d867c09eb88d6efa63c1ef56d28eba7cb7b137b599d2431c9c129957296536d96438bc1d5f627110ef7cfa9b62fa29fdadd0b8eb287407e03251aad80 SHA512 7fb00801367a6c0adbe85641c28b4e09dc1ffcc8493e8066ae734a85e75cd957afb6b0366526e1fae1d072c6bc6c05b8fb1622491d97cfeedea0f715f9bd7988 +EBUILD avidemux-2.7.0.ebuild 4415 BLAKE2B 75d837d2175350a08465dbebbc13a078be84e5fd6119fd9848bdde06aa0e13bc81e0c15082be9980f1afa5ef088cd00a587c51857bd85daa53929d5374062cf0 SHA512 ca6a0baaffc0c84e4bcdae1d7f4c535f5039acad043cc9aaada764a90c213aebaf20c23c39c8eb51845afbd64fa035a92fab39657c6a0392fc46b2abed14a5cd +EBUILD avidemux-9999.ebuild 4415 BLAKE2B 75d837d2175350a08465dbebbc13a078be84e5fd6119fd9848bdde06aa0e13bc81e0c15082be9980f1afa5ef088cd00a587c51857bd85daa53929d5374062cf0 SHA512 ca6a0baaffc0c84e4bcdae1d7f4c535f5039acad043cc9aaada764a90c213aebaf20c23c39c8eb51845afbd64fa035a92fab39657c6a0392fc46b2abed14a5cd MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d diff --git a/media-video/avidemux/avidemux-2.6.20-r1.ebuild b/media-video/avidemux/avidemux-2.6.20-r1.ebuild new file mode 100644 index 000000000000..0dfaecb51eaf --- /dev/null +++ b/media-video/avidemux/avidemux-2.6.20-r1.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils qmake-utils xdg-utils + +DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks" +HOMEPAGE="http://fixounet.free.fr/${PN}" + +# Multiple licenses because of all the bundled stuff. +LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" +SLOT="2.6" +IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv" + +if [[ ${PV} == *9999* ]] ; then + MY_P="${P}" + EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" + + inherit git-r3 +else + MY_P="${PN}_${PV}" + SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +COMMON_DEPEND=" + ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] + opengl? ( virtual/opengl:0 ) + qt5? ( dev-qt/qtgui:5 ) + vaapi? ( x11-libs/libva:0 ) + nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) +" +DEPEND="${COMMON_DEPEND} + qt5? ( dev-qt/linguist-tools:5 ) +" +RDEPEND="${COMMON_DEPEND} + nls? ( virtual/libintl:0 ) +" +PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + processes="buildCli:avidemux/cli" + if use qt5 ; then + processes+=" buildQt4:avidemux/qt4" + fi + + for process in ${processes} ; do + 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 || 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." + if use qt5; then + sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' ${PN}2.desktop || \ + die "Desktop file fix failed." + fi + + # 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." +} + +src_configure() { + # 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 + + # 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. + append-cxxflags -std=c++14 + + local mycmakeargs=( + -DAVIDEMUX_SOURCE_DIR='${S}' + -DGETTEXT="$(usex nls)" + -DSDL="$(usex sdl)" + -DLibVA="$(usex vaapi)" + -DVDPAU="$(usex vdpau)" + -DXVIDEO="$(usex xv)" + ) + + if use qt5 ; then + mycmakeargs+=( + -DENABLE_QT5="$(usex qt5)" + -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" + ) + fi + + if use debug ; then + mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) + fi + + for process in ${processes} ; do + local build="${WORKDIR}/${P}_build/${process%%:*}" + CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure + done +} + +src_compile() { + for process in ${processes} ; do + local build="${WORKDIR}/${P}_build/${process%%:*}" + BUILD_DIR="${build}" cmake-utils_src_compile + done +} + +src_test() { + for process in ${processes} ; do + local build="${WORKDIR}/${P}_build/${process%%:*}" + BUILD_DIR="${build}" cmake-utils_src_test + done +} + +src_install() { + for process in ${processes} ; do + local build="${WORKDIR}/${P}_build/${process%%:*}" + BUILD_DIR="${build}" 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 [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then + fperms +x /usr/bin/avidemux3_qt5 + fi + + if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then + fperms +x /usr/bin/avidemux3_jobs_qt5 + fi + + if use qt5 ; then + domenu ${PN}-2.6.desktop + fi +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild deleted file mode 100644 index 59807f056433..000000000000 --- a/media-video/avidemux/avidemux-2.6.20.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils qmake-utils xdg-utils - -DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks" -HOMEPAGE="http://fixounet.free.fr/${PN}" - -# Multiple licenses because of all the bundled stuff. -LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" -SLOT="2.6" -IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv" - -if [[ ${PV} == *9999* ]] ; then - MY_P="${P}" - EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" - - inherit git-r3 -else - MY_P="${PN}_${PV}" - SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -COMMON_DEPEND=" - ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] - opengl? ( virtual/opengl:0 ) - qt5? ( dev-qt/qtgui:5 ) - vaapi? ( x11-libs/libva:0 ) - nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) -" -DEPEND="${COMMON_DEPEND} - qt5? ( dev-qt/linguist-tools:5 ) -" -RDEPEND="${COMMON_DEPEND} - nls? ( virtual/libintl:0 ) -" -PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - processes="buildCli:avidemux/cli" - if use qt5 ; then - processes+=" buildQt4:avidemux/qt4" - fi - - for process in ${processes} ; do - 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 || 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." -} - -src_configure() { - # 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 - - # 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. - append-cxxflags -std=c++14 - - local mycmakeargs=( - -DAVIDEMUX_SOURCE_DIR='${S}' - -DGETTEXT="$(usex nls)" - -DSDL="$(usex sdl)" - -DLIBVA="$(usex vaapi)" - -DVDPAU="$(usex vdpau)" - -DXVIDEO="$(usex xv)" - ) - - if use qt5 ; then - mycmakeargs+=( - -DENABLE_QT5="$(usex qt5)" - -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" - ) - fi - - if use debug ; then - mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) - fi - - for process in ${processes} ; do - local build="${WORKDIR}/${P}_build/${process%%:*}" - CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure - done -} - -src_compile() { - for process in ${processes} ; do - local build="${WORKDIR}/${P}_build/${process%%:*}" - BUILD_DIR="${build}" cmake-utils_src_compile - done -} - -src_test() { - for process in ${processes} ; do - local build="${WORKDIR}/${P}_build/${process%%:*}" - BUILD_DIR="${build}" cmake-utils_src_test - done -} - -src_install() { - for process in ${processes} ; do - local build="${WORKDIR}/${P}_build/${process%%:*}" - BUILD_DIR="${build}" 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 [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then - fperms +x /usr/bin/avidemux3_qt5 - fi - - if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then - fperms +x /usr/bin/avidemux3_jobs_qt5 - fi - - if use qt5 ; then - domenu ${PN}-2.6.desktop - fi -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/media-video/avidemux/avidemux-2.7.0.ebuild b/media-video/avidemux/avidemux-2.7.0.ebuild new file mode 100644 index 000000000000..d1ae46fc0768 --- /dev/null +++ b/media-video/avidemux/avidemux-2.7.0.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} == *9999* ]] ; then + MY_P="${P}" + EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" + inherit git-r3 +else + MY_P="${PN}_${PV}" + SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi +inherit cmake-utils qmake-utils xdg-utils + +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" +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/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 ) +" +RDEPEND="${COMMON_DEPEND} + nls? ( virtual/libintl:0 ) +" +PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + processes="buildCli:avidemux/cli" + if use qt5 ; then + processes+=" buildQt4:avidemux/qt4" + fi + + for process in ${processes} ; do + CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare + done + + # 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.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 + sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' ${PN}2.desktop || \ + die "Desktop file fix failed." + fi + + # QA warnings: missing trailing ';' 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.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) + sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \ + die "Couldn't remove \"Build Option\" dialog." +} + +src_configure() { + # 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 + + # 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. + append-cxxflags -std=c++14 + + local mycmakeargs=( + -DGETTEXT="$(usex nls)" + -DSDL="$(usex sdl)" + -DLibVA="$(usex vaapi)" + -DVDPAU="$(usex vdpau)" + -DXVIDEO="$(usex xv)" + ) + + if use qt5 ; then + mycmakeargs+=( + -DENABLE_QT5="$(usex qt5)" + -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" + ) + fi + + if use debug ; then + mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) + fi + + for process in ${processes} ; do + local build="${WORKDIR}/${P}_build/${process%%:*}" + CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure + done +} + +src_compile() { + for process in ${processes} ; do + local build="${WORKDIR}/${P}_build/${process%%:*}" + BUILD_DIR="${build}" cmake-utils_src_compile + done +} + +src_test() { + for process in ${processes} ; do + local build="${WORKDIR}/${P}_build/${process%%:*}" + BUILD_DIR="${build}" cmake-utils_src_test + done +} + +src_install() { + for process in ${processes} ; do + local build="${WORKDIR}/${P}_build/${process%%:*}" + BUILD_DIR="${build}" 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}-${SLOT}.png + + if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then + fperms +x /usr/bin/avidemux3_qt5 + fi + + if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then + fperms +x /usr/bin/avidemux3_jobs_qt5 + fi + + if use qt5 ; then + domenu ${PN}-${SLOT}.desktop + fi +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild index 2e985fe5726f..d1ae46fc0768 100644 --- a/media-video/avidemux/avidemux-9999.ebuild +++ b/media-video/avidemux/avidemux-9999.ebuild @@ -3,33 +3,36 @@ EAPI=6 -inherit cmake-utils qmake-utils xdg-utils - -DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks" -HOMEPAGE="http://fixounet.free.fr/${PN}" - -# Multiple licenses because of all the bundled stuff. -LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" -SLOT="2.6" -IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv" - if [[ ${PV} == *9999* ]] ; then MY_P="${P}" EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" - inherit git-r3 else MY_P="${PN}_${PV}" SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~x86" fi +inherit cmake-utils qmake-utils xdg-utils + +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" +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 ) @@ -53,22 +56,30 @@ 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 || die "Icon name fix failed." + # 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. - 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." + # 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 + sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' ${PN}2.desktop || \ + die "Desktop file fix failed." + fi - # 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." + # QA warnings: missing trailing ';' 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." + # 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) - sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog." + # 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." } src_configure() { @@ -81,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)" ) @@ -139,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 @@ -150,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/devedeng/Manifest b/media-video/devedeng/Manifest index 4b245aaed6e2..589a2e78fb92 100644 --- a/media-video/devedeng/Manifest +++ b/media-video/devedeng/Manifest @@ -1,8 +1,6 @@ -DIST devedeng-4.8.7.tar.gz 1883405 BLAKE2B 74e1b44744ba8eea92d9c70637f47d6be9779b81b1a301fdab792486e2d7d80435b499228c2fcb32c8490921c9c04ec64b19fc5eb6d20a1bfd52c8420175d406 SHA512 30e40f93c51b576e283de15d2526d686d3b8e3f04795aac6aa25ee4b418e1d44c2b80e880446f66494197f26e8f036e7def0c26e168a0553c454ccd859876ba6 -DIST devedeng-4.8.8.tar.gz 1883468 BLAKE2B 1f6fa4108f478b46981926030a8a85d5d550b10db78ad443cb4afd25e96714557ab2dda873c7f4e0d30811ac36dc7a4745f761f5db9e32234d276d6794b26006 SHA512 b4ab241a0cf5e1bfd2da4709528fa361ceed660688384a0f2cf965c45bb865d94aa19f8e282477e8e0d3fc43213fb42da2dd75dbe9e26e4811593d7b773386df +DIST devedeng-4.8.11.tar.gz 1883961 BLAKE2B 6687ec3a73cc96ae7ab3eba499ebffc9f41cab5767c65e38ce85a506c7415e18ebf3cf68510542c65260decd1de9a05415b9a1843da632bc9d896ca47797df4b SHA512 275d70882ca6a7b7de75d44f4bfef83a4f5eea92dea1c2f69b99bfdefd1066761b5a46d1c8ea6262a659665165552c242eeda238d327a8695654d584820d439b DIST devedeng-4.8.9.tar.gz 1883507 BLAKE2B 4b973b13d8dc1bdb08c2a057769246426ae6c8bf7947474446c4a1440e3828292d8fe69f66fd3010ff895a518b5a89e063a955fe58175d26c016fb55454de7c3 SHA512 224a10886ea7f8a0e2cd3fdeed9c7b0ef5413892f4b800194d957a764b90220fed7b2f3d6bfa416798acb89024a95d678604f3d23fb19cccb8a11e2734a92b7a -EBUILD devedeng-4.8.7.ebuild 813 BLAKE2B 99ec1c072813916cf9aa7b8c768132e0190f0e33d38c06986c4f47893f26d846c68831de34789b7f94bdd08139e8e81bdacc29a79fdbb9c7488d3650712471be SHA512 7d7574be3df9e4128e6fa278dfd6ea1af8805dd42c12734073dc4adb720c38054e751a20078d7f90f25c0d607a642d0a69950b0839963e66a8bb1f5969372773 -EBUILD devedeng-4.8.8.ebuild 813 BLAKE2B 99ec1c072813916cf9aa7b8c768132e0190f0e33d38c06986c4f47893f26d846c68831de34789b7f94bdd08139e8e81bdacc29a79fdbb9c7488d3650712471be SHA512 7d7574be3df9e4128e6fa278dfd6ea1af8805dd42c12734073dc4adb720c38054e751a20078d7f90f25c0d607a642d0a69950b0839963e66a8bb1f5969372773 +EBUILD devedeng-4.8.11.ebuild 918 BLAKE2B 3b94f4f0bb8c1d5a1bfcf293b39ed2878098b5bac39e40c282071b58caba2078dfe623eeff5ca19a9b4a1a14bd8cfad3ca75e8df81cf24ef286a98c7f4f7c58f SHA512 b6c6857fbbc3288f1aec19387150ad933c7591dd507357df80c0d8b34a79375d75e1d473956b77e2f40bda613516f9f1cfac7b85042e0b9588deaeabe9c7929d EBUILD devedeng-4.8.9.ebuild 813 BLAKE2B 99ec1c072813916cf9aa7b8c768132e0190f0e33d38c06986c4f47893f26d846c68831de34789b7f94bdd08139e8e81bdacc29a79fdbb9c7488d3650712471be SHA512 7d7574be3df9e4128e6fa278dfd6ea1af8805dd42c12734073dc4adb720c38054e751a20078d7f90f25c0d607a642d0a69950b0839963e66a8bb1f5969372773 -EBUILD devedeng-9999.ebuild 794 BLAKE2B 5b792c9d470cdb7a25888ee64b37c4b019f2345a9233957bd2fa131c2c0e41830fc064faae7e673e98f2b2fcd6c0a849b9be10c2b1267bec95c55c031b172e5a SHA512 7fcfd9993cf94a377fa0fe593dfb8f6d67dbc10be27adebb60ef3e88a889dae7e899df89df847858adf272f0ca99a32bb4b5ed393fd841eea81a5eb0cad6b227 +EBUILD devedeng-9999.ebuild 897 BLAKE2B b14e5fa2489f2c2c210ebb17367150ea877eb204a544cc9294fd6cfb30dbee38044581aa1149aa8a0d5dc7bdbd17b1c611773ec9488d8586f848c793995d82d8 SHA512 71ec9ae8b6aafe81c4289af480af88ff6fd2bb4e6fa24c1215365f392097584f458cc3d8509643e1af774f04177223d3512db86296cab44ff3dd7531fc9ec0c8 MISC metadata.xml 943 BLAKE2B e1e02dde0b9b21f3d398d1b38cb302842b6f5748405709ba2066dc5497c699f3d7daae40c4daf00eec37a739b5f3ab9d54a78c7e2d700f677abfaeceae75ed09 SHA512 9c5cf515b958e7125d383fc9513546f9a663ea45e4c60308fb20e85eb6eedf22c71a94561721ebffd156ee5b61d5ac309c66c9a7782d905b98a95c2ad8b7b545 diff --git a/media-video/devedeng/devedeng-4.8.11.ebuild b/media-video/devedeng/devedeng-4.8.11.ebuild new file mode 100644 index 000000000000..d1ed266804d6 --- /dev/null +++ b/media-video/devedeng/devedeng-4.8.11.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{4,5,6} ) + +inherit distutils-r1 gnome2-utils + +DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)" +HOMEPAGE="http://www.rastersoft.com/programas/devede.html" +SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libav" + +RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + x11-libs/gtk+:3 + || ( media-video/vlc media-video/mpv media-video/mplayer ) + !libav? ( media-video/ffmpeg ) + libav? ( media-video/libav ) + media-video/dvdauthor + media-video/vcdimager + virtual/cdrtools + || ( app-cdr/brasero kde-apps/k3b )" + +DEPEND="${PYTHON_DEPS}" + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/media-video/devedeng/devedeng-4.8.7.ebuild b/media-video/devedeng/devedeng-4.8.7.ebuild deleted file mode 100644 index d10522edca24..000000000000 --- a/media-video/devedeng/devedeng-4.8.7.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5} ) - -inherit distutils-r1 - -DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)" -HOMEPAGE="http://www.rastersoft.com/programas/devede.html" -SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libav" - -RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/gtk+:3 - || ( media-video/vlc media-video/mpv media-video/mplayer ) - !libav? ( media-video/ffmpeg ) - libav? ( media-video/libav ) - media-video/dvdauthor - media-video/vcdimager - virtual/cdrtools - || ( app-cdr/brasero kde-apps/k3b )" - -DEPEND="${PYTHON_DEPS}" diff --git a/media-video/devedeng/devedeng-4.8.8.ebuild b/media-video/devedeng/devedeng-4.8.8.ebuild deleted file mode 100644 index d10522edca24..000000000000 --- a/media-video/devedeng/devedeng-4.8.8.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5} ) - -inherit distutils-r1 - -DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)" -HOMEPAGE="http://www.rastersoft.com/programas/devede.html" -SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libav" - -RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/gtk+:3 - || ( media-video/vlc media-video/mpv media-video/mplayer ) - !libav? ( media-video/ffmpeg ) - libav? ( media-video/libav ) - media-video/dvdauthor - media-video/vcdimager - virtual/cdrtools - || ( app-cdr/brasero kde-apps/k3b )" - -DEPEND="${PYTHON_DEPS}" diff --git a/media-video/devedeng/devedeng-9999.ebuild b/media-video/devedeng/devedeng-9999.ebuild index 59d0a358e669..22bde64514d2 100644 --- a/media-video/devedeng/devedeng-9999.ebuild +++ b/media-video/devedeng/devedeng-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python3_{4,5} ) -inherit distutils-r1 git-r3 +inherit distutils-r1 git-r3 gnome2-utils DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)" HOMEPAGE="http://www.rastersoft.com/programas/devede.html" @@ -29,3 +29,11 @@ RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}] || ( app-cdr/brasero kde-apps/k3b )" DEPEND="${PYTHON_DEPS}" + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} -- cgit v1.2.3