| 1 |
commit: 96b796563a365f4a8cc3cf62ede9fb280bde8e37 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 9 17:16:55 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 9 17:30:24 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b79656 |
| 7 |
|
| 8 |
media-libs/avidemux-plugins: 2.7.0 version bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
media-libs/avidemux-plugins/Manifest | 1 + |
| 13 |
...gins-9999.ebuild => avidemux-plugins-2.7.0.ebuild} | 19 ++++++++++++++----- |
| 14 |
.../avidemux-plugins/avidemux-plugins-9999.ebuild | 19 ++++++++++++++----- |
| 15 |
3 files changed, 29 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest |
| 18 |
index ae61dc9d907..c86d53e23df 100644 |
| 19 |
--- a/media-libs/avidemux-plugins/Manifest |
| 20 |
+++ b/media-libs/avidemux-plugins/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 |
| 23 |
+DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015 |
| 24 |
|
| 25 |
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild |
| 26 |
similarity index 94% |
| 27 |
copy from media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 28 |
copy to media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild |
| 29 |
index c39414c1f97..fb70ffe36c2 100644 |
| 30 |
--- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 31 |
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild |
| 32 |
@@ -21,11 +21,11 @@ HOMEPAGE="http://fixounet.free.fr/avidemux" |
| 33 |
|
| 34 |
# Multiple licenses because of all the bundled stuff. |
| 35 |
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" |
| 36 |
-SLOT="2.6" |
| 37 |
+SLOT="2.7" |
| 38 |
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" |
| 39 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 40 |
|
| 41 |
-RDEPEND="${PYTHON_DEPS} |
| 42 |
+COMMON_DEPEND="${PYTHON_DEPS} |
| 43 |
~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?] |
| 44 |
~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?] |
| 45 |
>=dev-lang/spidermonkey-1.5-r2:0= |
| 46 |
@@ -56,8 +56,15 @@ RDEPEND="${PYTHON_DEPS} |
| 47 |
nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) |
| 48 |
opus? ( media-libs/opus:0 ) |
| 49 |
pulseaudio? ( media-sound/pulseaudio:0 ) |
| 50 |
+ qt5? ( |
| 51 |
+ dev-qt/qtcore:5 |
| 52 |
+ dev-qt/qtgui:5 |
| 53 |
+ dev-qt/qtwidgets:5 |
| 54 |
+ ) |
| 55 |
truetype? ( media-libs/freetype:2 ) |
| 56 |
twolame? ( media-sound/twolame:0 ) |
| 57 |
+ vorbis? ( media-libs/libvorbis:0 ) |
| 58 |
+ vpx? ( media-libs/libvpx:0= ) |
| 59 |
x264? ( media-libs/x264:0= ) |
| 60 |
x265? ( media-libs/x265:0= ) |
| 61 |
xv? ( |
| 62 |
@@ -66,12 +73,13 @@ RDEPEND="${PYTHON_DEPS} |
| 63 |
x11-libs/libXv:0 |
| 64 |
) |
| 65 |
xvid? ( media-libs/xvid:0 ) |
| 66 |
- vorbis? ( media-libs/libvorbis:0 ) |
| 67 |
- vpx? ( media-libs/libvpx:0= ) |
| 68 |
" |
| 69 |
-DEPEND="${RDEPEND} |
| 70 |
+DEPEND="${COMMON_DEPEND} |
| 71 |
oss? ( virtual/os-headers:0 ) |
| 72 |
" |
| 73 |
+RDEPEND="${COMMON_DEPEND} |
| 74 |
+ !<media-libs/avidemux-plugins-${PV}:${SLOT} |
| 75 |
+" |
| 76 |
|
| 77 |
S="${WORKDIR}/${MY_P}" |
| 78 |
|
| 79 |
@@ -85,6 +93,7 @@ src_prepare() { |
| 80 |
|
| 81 |
processes="buildPluginsCommon:avidemux_plugins |
| 82 |
buildPluginsCLI:avidemux_plugins" |
| 83 |
+ use qt5 && processes+=" buildPluginsQt4:avidemux_plugins" |
| 84 |
|
| 85 |
for process in ${processes} ; do |
| 86 |
CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare |
| 87 |
|
| 88 |
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 89 |
index c39414c1f97..fb70ffe36c2 100644 |
| 90 |
--- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 91 |
+++ b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 92 |
@@ -21,11 +21,11 @@ HOMEPAGE="http://fixounet.free.fr/avidemux" |
| 93 |
|
| 94 |
# Multiple licenses because of all the bundled stuff. |
| 95 |
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" |
| 96 |
-SLOT="2.6" |
| 97 |
+SLOT="2.7" |
| 98 |
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" |
| 99 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 100 |
|
| 101 |
-RDEPEND="${PYTHON_DEPS} |
| 102 |
+COMMON_DEPEND="${PYTHON_DEPS} |
| 103 |
~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?] |
| 104 |
~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?] |
| 105 |
>=dev-lang/spidermonkey-1.5-r2:0= |
| 106 |
@@ -56,8 +56,15 @@ RDEPEND="${PYTHON_DEPS} |
| 107 |
nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) |
| 108 |
opus? ( media-libs/opus:0 ) |
| 109 |
pulseaudio? ( media-sound/pulseaudio:0 ) |
| 110 |
+ qt5? ( |
| 111 |
+ dev-qt/qtcore:5 |
| 112 |
+ dev-qt/qtgui:5 |
| 113 |
+ dev-qt/qtwidgets:5 |
| 114 |
+ ) |
| 115 |
truetype? ( media-libs/freetype:2 ) |
| 116 |
twolame? ( media-sound/twolame:0 ) |
| 117 |
+ vorbis? ( media-libs/libvorbis:0 ) |
| 118 |
+ vpx? ( media-libs/libvpx:0= ) |
| 119 |
x264? ( media-libs/x264:0= ) |
| 120 |
x265? ( media-libs/x265:0= ) |
| 121 |
xv? ( |
| 122 |
@@ -66,12 +73,13 @@ RDEPEND="${PYTHON_DEPS} |
| 123 |
x11-libs/libXv:0 |
| 124 |
) |
| 125 |
xvid? ( media-libs/xvid:0 ) |
| 126 |
- vorbis? ( media-libs/libvorbis:0 ) |
| 127 |
- vpx? ( media-libs/libvpx:0= ) |
| 128 |
" |
| 129 |
-DEPEND="${RDEPEND} |
| 130 |
+DEPEND="${COMMON_DEPEND} |
| 131 |
oss? ( virtual/os-headers:0 ) |
| 132 |
" |
| 133 |
+RDEPEND="${COMMON_DEPEND} |
| 134 |
+ !<media-libs/avidemux-plugins-${PV}:${SLOT} |
| 135 |
+" |
| 136 |
|
| 137 |
S="${WORKDIR}/${MY_P}" |
| 138 |
|
| 139 |
@@ -85,6 +93,7 @@ src_prepare() { |
| 140 |
|
| 141 |
processes="buildPluginsCommon:avidemux_plugins |
| 142 |
buildPluginsCLI:avidemux_plugins" |
| 143 |
+ use qt5 && processes+=" buildPluginsQt4:avidemux_plugins" |
| 144 |
|
| 145 |
for process in ${processes} ; do |
| 146 |
CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare |
Archives