commit: 96b796563a365f4a8cc3cf62ede9fb280bde8e37 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jan 9 17:16:55 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jan 9 17:30:24 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b79656
media-libs/avidemux-plugins: 2.7.0 version bump Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-libs/avidemux-plugins/Manifest | 1 + ...gins-9999.ebuild => avidemux-plugins-2.7.0.ebuild} | 19 ++++++++++++++----- .../avidemux-plugins/avidemux-plugins-9999.ebuild | 19 ++++++++++++++----- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest index ae61dc9d907..c86d53e23df 100644 --- a/media-libs/avidemux-plugins/Manifest +++ b/media-libs/avidemux-plugins/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-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild similarity index 94% copy from media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild copy to media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild index c39414c1f97..fb70ffe36c2 100644 --- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild +++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild @@ -21,11 +21,11 @@ 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="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS} +COMMON_DEPEND="${PYTHON_DEPS} ~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?] ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?] >=dev-lang/spidermonkey-1.5-r2:0= @@ -56,8 +56,15 @@ RDEPEND="${PYTHON_DEPS} nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opus? ( media-libs/opus:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame:0 ) + vorbis? ( media-libs/libvorbis:0 ) + vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( @@ -66,12 +73,13 @@ RDEPEND="${PYTHON_DEPS} x11-libs/libXv:0 ) xvid? ( media-libs/xvid:0 ) - vorbis? ( media-libs/libvorbis:0 ) - vpx? ( media-libs/libvpx:0= ) " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} oss? ( virtual/os-headers:0 ) " +RDEPEND="${COMMON_DEPEND} + !<media-libs/avidemux-plugins-${PV}:${SLOT} +" S="${WORKDIR}/${MY_P}" @@ -85,6 +93,7 @@ src_prepare() { processes="buildPluginsCommon:avidemux_plugins buildPluginsCLI:avidemux_plugins" + use qt5 && processes+=" buildPluginsQt4:avidemux_plugins" for process in ${processes} ; do CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild index c39414c1f97..fb70ffe36c2 100644 --- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild +++ b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild @@ -21,11 +21,11 @@ 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="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS} +COMMON_DEPEND="${PYTHON_DEPS} ~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?] ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?] >=dev-lang/spidermonkey-1.5-r2:0= @@ -56,8 +56,15 @@ RDEPEND="${PYTHON_DEPS} nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opus? ( media-libs/opus:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame:0 ) + vorbis? ( media-libs/libvorbis:0 ) + vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( @@ -66,12 +73,13 @@ RDEPEND="${PYTHON_DEPS} x11-libs/libXv:0 ) xvid? ( media-libs/xvid:0 ) - vorbis? ( media-libs/libvorbis:0 ) - vpx? ( media-libs/libvpx:0= ) " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} oss? ( virtual/os-headers:0 ) " +RDEPEND="${COMMON_DEPEND} + !<media-libs/avidemux-plugins-${PV}:${SLOT} +" S="${WORKDIR}/${MY_P}" @@ -85,6 +93,7 @@ src_prepare() { processes="buildPluginsCommon:avidemux_plugins buildPluginsCLI:avidemux_plugins" + use qt5 && processes+=" buildPluginsQt4:avidemux_plugins" for process in ${processes} ; do CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
