| 1 |
commit: b24c9de87042c1edc0aad661ac651243d1f960c7 |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jun 29 06:26:28 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 30 05:22:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b24c9de8 |
| 7 |
|
| 8 |
media-libs/avidemux-plugins: Bump avidemux-plugins-2.6.20 and update to EAPI 6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
media-libs/avidemux-plugins/Manifest | 1 + |
| 13 |
...-9999.ebuild => avidemux-plugins-2.6.20.ebuild} | 127 +++++++++++++-------- |
| 14 |
.../avidemux-plugins/avidemux-plugins-9999.ebuild | 127 +++++++++++++-------- |
| 15 |
.../avidemux-plugins-2.6.20-optional-pulse.patch | 20 ++++ |
| 16 |
media-libs/avidemux-plugins/metadata.xml | 5 + |
| 17 |
5 files changed, 182 insertions(+), 98 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest |
| 20 |
index 418a7523584..6f017f59f92 100644 |
| 21 |
--- a/media-libs/avidemux-plugins/Manifest |
| 22 |
+++ b/media-libs/avidemux-plugins/Manifest |
| 23 |
@@ -1 +1,2 @@ |
| 24 |
+DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38 |
| 25 |
DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6 |
| 26 |
|
| 27 |
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.20.ebuild |
| 28 |
similarity index 51% |
| 29 |
copy from media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 30 |
copy to media-libs/avidemux-plugins/avidemux-plugins-2.6.20.ebuild |
| 31 |
index 215b8e16ef2..8ec82b2f23d 100644 |
| 32 |
--- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 33 |
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.20.ebuild |
| 34 |
@@ -1,39 +1,42 @@ |
| 35 |
# Copyright 1999-2017 Gentoo Foundation |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
-EAPI="5" |
| 39 |
+EAPI="6" |
| 40 |
|
| 41 |
PYTHON_COMPAT=( python2_7 ) |
| 42 |
|
| 43 |
-inherit cmake-utils eutils flag-o-matic python-single-r1 |
| 44 |
- |
| 45 |
-SLOT="2.6" |
| 46 |
+inherit cmake-utils python-single-r1 |
| 47 |
|
| 48 |
DESCRIPTION="Plugins for the video editor media-video/avidemux" |
| 49 |
HOMEPAGE="http://fixounet.free.fr/avidemux" |
| 50 |
|
| 51 |
# Multiple licenses because of all the bundled stuff. |
| 52 |
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" |
| 53 |
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx" |
| 54 |
+SLOT="2.6" |
| 55 |
+IUSE="aac aften a52 alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl nvenc opus oss pulseaudio qt4 qt5 vorbis truetype twolame xv xvid x264 x265 vdpau vpx" |
| 56 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 57 |
-KEYWORDS="~amd64 ~x86" |
| 58 |
|
| 59 |
-MY_PN="${PN/-plugins/}" |
| 60 |
if [[ ${PV} == *9999* ]] ; then |
| 61 |
- KEYWORDS="" |
| 62 |
- EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git https://git.gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git" |
| 63 |
+ EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" |
| 64 |
+ EGIT_CHECKOUT_DIR=${WORKDIR} |
| 65 |
|
| 66 |
- inherit git-2 |
| 67 |
+ inherit git-r3 |
| 68 |
else |
| 69 |
+ MY_PN="${PN/-plugins/}" |
| 70 |
MY_P="${MY_PN}_${PV}" |
| 71 |
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz" |
| 72 |
+ KEYWORDS="~amd64 ~x86" |
| 73 |
fi |
| 74 |
|
| 75 |
RDEPEND=" |
| 76 |
~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?] |
| 77 |
- ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?] |
| 78 |
+ ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?,qt5?] |
| 79 |
>=dev-lang/spidermonkey-1.5-r2:0= |
| 80 |
dev-libs/libxml2:2 |
| 81 |
+ media-libs/a52dec:0 |
| 82 |
+ media-libs/libass:0= |
| 83 |
+ media-libs/libmad:0 |
| 84 |
+ media-libs/libmp4v2:0 |
| 85 |
media-libs/libpng:0= |
| 86 |
virtual/libiconv:0 |
| 87 |
aac? ( |
| 88 |
@@ -43,7 +46,9 @@ RDEPEND=" |
| 89 |
aften? ( media-libs/aften:0 ) |
| 90 |
alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 ) |
| 91 |
amr? ( media-libs/opencore-amr:0 ) |
| 92 |
+ dcaenc? ( media-sound/dcaenc:0 ) |
| 93 |
dts? ( media-libs/libdca:0 ) |
| 94 |
+ fdk? ( media-libs/fdk-aac:0 ) |
| 95 |
fontconfig? ( media-libs/fontconfig:1.0 ) |
| 96 |
fribidi? ( dev-libs/fribidi:0 ) |
| 97 |
jack? ( |
| 98 |
@@ -51,10 +56,13 @@ RDEPEND=" |
| 99 |
libsamplerate? ( media-libs/libsamplerate:0 ) |
| 100 |
) |
| 101 |
lame? ( media-sound/lame:0 ) |
| 102 |
+ nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) |
| 103 |
+ opus? ( media-libs/opus:0 ) |
| 104 |
pulseaudio? ( media-sound/pulseaudio:0 ) |
| 105 |
truetype? ( media-libs/freetype:2 ) |
| 106 |
twolame? ( media-sound/twolame:0 ) |
| 107 |
x264? ( media-libs/x264:0= ) |
| 108 |
+ x265? ( media-libs/x265:0= ) |
| 109 |
xv? ( |
| 110 |
x11-libs/libX11:0 |
| 111 |
x11-libs/libXext:0 |
| 112 |
@@ -70,7 +78,22 @@ DEPEND="${RDEPEND} |
| 113 |
|
| 114 |
S="${WORKDIR}/${MY_P}" |
| 115 |
|
| 116 |
-PATCHES=( "${FILESDIR}"/${PN}-2.6.4-optional-pulse.patch ) |
| 117 |
+PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch ) |
| 118 |
+ |
| 119 |
+src_prepare() { |
| 120 |
+ default |
| 121 |
+ |
| 122 |
+ #Don't reapply PATCHES during cmake-utils_src_prepare |
| 123 |
+ unset PATCHES |
| 124 |
+ |
| 125 |
+ processes="buildPluginsCommon:avidemux_plugins |
| 126 |
+ buildPluginsCLI:avidemux_plugins" |
| 127 |
+ use qt4 && processes+=" buildPluginsQt4:avidemux_plugins" |
| 128 |
+ |
| 129 |
+ for process in ${processes} ; do |
| 130 |
+ CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare |
| 131 |
+ done |
| 132 |
+} |
| 133 |
|
| 134 |
src_configure() { |
| 135 |
# Add lax vector typing for PowerPC. |
| 136 |
@@ -81,53 +104,61 @@ src_configure() { |
| 137 |
# See bug 432322. |
| 138 |
use x86 && replace-flags -O0 -O1 |
| 139 |
|
| 140 |
- processes="buildPluginsCommon:avidemux_plugins |
| 141 |
- buildPluginsCLI:avidemux_plugins" |
| 142 |
- use qt4 && processes+=" buildPluginsQt4:avidemux_plugins" |
| 143 |
- |
| 144 |
for process in ${processes} ; do |
| 145 |
- local build="${process%%:*}" |
| 146 |
+ local build="${WORKDIR}/${P}_build/${process%%:*}" |
| 147 |
|
| 148 |
- local mycmakeargs=" |
| 149 |
+ local mycmakeargs=( |
| 150 |
-DAVIDEMUX_SOURCE_DIR='${S}' |
| 151 |
-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]') |
| 152 |
- $(cmake-utils_use aac FAAC) |
| 153 |
- $(cmake-utils_use aac FAAD) |
| 154 |
- $(cmake-utils_use alsa) |
| 155 |
- $(cmake-utils_use aften) |
| 156 |
- $(cmake-utils_use amr OPENCORE_AMRWB) |
| 157 |
- $(cmake-utils_use amr OPENCORE_AMRNB) |
| 158 |
- $(cmake-utils_use dts LIBDCA) |
| 159 |
- $(cmake-utils_use fontconfig) |
| 160 |
- $(cmake-utils_use jack) |
| 161 |
- $(cmake-utils_use lame) |
| 162 |
- $(cmake-utils_use oss) |
| 163 |
- $(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE) |
| 164 |
- $(cmake-utils_use qt4) |
| 165 |
- $(cmake-utils_use truetype FREETYPE2) |
| 166 |
- $(cmake-utils_use twolame) |
| 167 |
- $(cmake-utils_use x264) |
| 168 |
- $(cmake-utils_use xv XVIDEO) |
| 169 |
- $(cmake-utils_use xvid) |
| 170 |
- $(cmake-utils_use vdpau) |
| 171 |
- $(cmake-utils_use vorbis) |
| 172 |
- $(cmake-utils_use vorbis LIBVORBIS) |
| 173 |
- $(cmake-utils_use vpx VPXDEC) |
| 174 |
- " |
| 175 |
+ -DFAAC="$(usex aac)" |
| 176 |
+ -DFAAD="$(usex aac)" |
| 177 |
+ -DALSA="$(usex alsa)" |
| 178 |
+ -DAFTEN="$(usex aften)" |
| 179 |
+ -DDCAENC="$(usex dcaenc)" |
| 180 |
+ -DFDK_AAC="$(usex fdk)" |
| 181 |
+ -DOPENCORE_AMRWB="$(usex amr)" |
| 182 |
+ -DOPENCORE_AMRNB="$(usex amr)" |
| 183 |
+ -DLIBDCA="$(usex dts)" |
| 184 |
+ -DFONTCONFIG="$(usex fontconfig)" |
| 185 |
+ -DJACK="$(usex jack)" |
| 186 |
+ -DLAME="$(usex lame)" |
| 187 |
+ -DNVENC="$(usex nvenc)" |
| 188 |
+ -DOPUS="$(usex opus)" |
| 189 |
+ -DOSS="$(usex oss)" |
| 190 |
+ -DPULSEAUDIOSIMPLE="$(usex pulseaudio)" |
| 191 |
+ -DQT4="$(usex qt4)" |
| 192 |
+ -DFREETYPE2="$(usex truetype)" |
| 193 |
+ -DTWOLAME="$(usex twolame)" |
| 194 |
+ -DX264="$(usex x264)" |
| 195 |
+ -DX265="$(usex x265)" |
| 196 |
+ -DXVIDEO="$(usex xv)" |
| 197 |
+ -DXVID="$(usex xvid)" |
| 198 |
+ -DVDPAU="$(usex vdpau)" |
| 199 |
+ -DVORBIS="$(usex vorbis)" |
| 200 |
+ -DLIBVORBIS="$(usex vorbis)" |
| 201 |
+ -DVPXDEC="$(usex vpx)" |
| 202 |
+ -DUSE_EXTERNAL_LIBA52=yes |
| 203 |
+ -DUSE_EXTERNAL_LIBASS=yes |
| 204 |
+ -DUSE_EXTERNAL_LIBMAD=yes |
| 205 |
+ -DUSE_EXTERNAL_LIBMP4V2=yes |
| 206 |
+ ) |
| 207 |
+ |
| 208 |
+ if use qt5 ; then |
| 209 |
+ mycmakeargs+=( -DENABLE_QT5=True ) |
| 210 |
+ fi |
| 211 |
|
| 212 |
if use debug ; then |
| 213 |
- mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1" |
| 214 |
+ mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) |
| 215 |
fi |
| 216 |
|
| 217 |
- mkdir "${S}"/${build} || die "Can't create build folder." |
| 218 |
- |
| 219 |
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure |
| 220 |
+ CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure |
| 221 |
done |
| 222 |
} |
| 223 |
|
| 224 |
src_compile() { |
| 225 |
for process in ${processes} ; do |
| 226 |
- BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile |
| 227 |
+ local build="${WORKDIR}/${P}_build/${process%%:*}" |
| 228 |
+ BUILD_DIR="${build}" cmake-utils_src_compile |
| 229 |
done |
| 230 |
} |
| 231 |
|
| 232 |
@@ -135,11 +166,9 @@ src_install() { |
| 233 |
for process in ${processes} ; do |
| 234 |
# cmake-utils_src_install doesn't respect BUILD_DIR |
| 235 |
# and there sometimes is a preinstall phase present. |
| 236 |
- pushd "${S}/${process%%:*}" > /dev/null || die |
| 237 |
+ pushd "${WORKDIR}/${P}_build/${process%%:*}" > /dev/null || die |
| 238 |
grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast |
| 239 |
grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast |
| 240 |
popd > /dev/null || die |
| 241 |
done |
| 242 |
- |
| 243 |
- python_fix_shebang "${D}" |
| 244 |
} |
| 245 |
|
| 246 |
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 247 |
index 215b8e16ef2..8ec82b2f23d 100644 |
| 248 |
--- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 249 |
+++ b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild |
| 250 |
@@ -1,39 +1,42 @@ |
| 251 |
# Copyright 1999-2017 Gentoo Foundation |
| 252 |
# Distributed under the terms of the GNU General Public License v2 |
| 253 |
|
| 254 |
-EAPI="5" |
| 255 |
+EAPI="6" |
| 256 |
|
| 257 |
PYTHON_COMPAT=( python2_7 ) |
| 258 |
|
| 259 |
-inherit cmake-utils eutils flag-o-matic python-single-r1 |
| 260 |
- |
| 261 |
-SLOT="2.6" |
| 262 |
+inherit cmake-utils python-single-r1 |
| 263 |
|
| 264 |
DESCRIPTION="Plugins for the video editor media-video/avidemux" |
| 265 |
HOMEPAGE="http://fixounet.free.fr/avidemux" |
| 266 |
|
| 267 |
# Multiple licenses because of all the bundled stuff. |
| 268 |
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" |
| 269 |
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx" |
| 270 |
+SLOT="2.6" |
| 271 |
+IUSE="aac aften a52 alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl nvenc opus oss pulseaudio qt4 qt5 vorbis truetype twolame xv xvid x264 x265 vdpau vpx" |
| 272 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 273 |
-KEYWORDS="~amd64 ~x86" |
| 274 |
|
| 275 |
-MY_PN="${PN/-plugins/}" |
| 276 |
if [[ ${PV} == *9999* ]] ; then |
| 277 |
- KEYWORDS="" |
| 278 |
- EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git https://git.gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git" |
| 279 |
+ EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" |
| 280 |
+ EGIT_CHECKOUT_DIR=${WORKDIR} |
| 281 |
|
| 282 |
- inherit git-2 |
| 283 |
+ inherit git-r3 |
| 284 |
else |
| 285 |
+ MY_PN="${PN/-plugins/}" |
| 286 |
MY_P="${MY_PN}_${PV}" |
| 287 |
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz" |
| 288 |
+ KEYWORDS="~amd64 ~x86" |
| 289 |
fi |
| 290 |
|
| 291 |
RDEPEND=" |
| 292 |
~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?] |
| 293 |
- ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?] |
| 294 |
+ ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?,qt5?] |
| 295 |
>=dev-lang/spidermonkey-1.5-r2:0= |
| 296 |
dev-libs/libxml2:2 |
| 297 |
+ media-libs/a52dec:0 |
| 298 |
+ media-libs/libass:0= |
| 299 |
+ media-libs/libmad:0 |
| 300 |
+ media-libs/libmp4v2:0 |
| 301 |
media-libs/libpng:0= |
| 302 |
virtual/libiconv:0 |
| 303 |
aac? ( |
| 304 |
@@ -43,7 +46,9 @@ RDEPEND=" |
| 305 |
aften? ( media-libs/aften:0 ) |
| 306 |
alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 ) |
| 307 |
amr? ( media-libs/opencore-amr:0 ) |
| 308 |
+ dcaenc? ( media-sound/dcaenc:0 ) |
| 309 |
dts? ( media-libs/libdca:0 ) |
| 310 |
+ fdk? ( media-libs/fdk-aac:0 ) |
| 311 |
fontconfig? ( media-libs/fontconfig:1.0 ) |
| 312 |
fribidi? ( dev-libs/fribidi:0 ) |
| 313 |
jack? ( |
| 314 |
@@ -51,10 +56,13 @@ RDEPEND=" |
| 315 |
libsamplerate? ( media-libs/libsamplerate:0 ) |
| 316 |
) |
| 317 |
lame? ( media-sound/lame:0 ) |
| 318 |
+ nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) |
| 319 |
+ opus? ( media-libs/opus:0 ) |
| 320 |
pulseaudio? ( media-sound/pulseaudio:0 ) |
| 321 |
truetype? ( media-libs/freetype:2 ) |
| 322 |
twolame? ( media-sound/twolame:0 ) |
| 323 |
x264? ( media-libs/x264:0= ) |
| 324 |
+ x265? ( media-libs/x265:0= ) |
| 325 |
xv? ( |
| 326 |
x11-libs/libX11:0 |
| 327 |
x11-libs/libXext:0 |
| 328 |
@@ -70,7 +78,22 @@ DEPEND="${RDEPEND} |
| 329 |
|
| 330 |
S="${WORKDIR}/${MY_P}" |
| 331 |
|
| 332 |
-PATCHES=( "${FILESDIR}"/${PN}-2.6.4-optional-pulse.patch ) |
| 333 |
+PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch ) |
| 334 |
+ |
| 335 |
+src_prepare() { |
| 336 |
+ default |
| 337 |
+ |
| 338 |
+ #Don't reapply PATCHES during cmake-utils_src_prepare |
| 339 |
+ unset PATCHES |
| 340 |
+ |
| 341 |
+ processes="buildPluginsCommon:avidemux_plugins |
| 342 |
+ buildPluginsCLI:avidemux_plugins" |
| 343 |
+ use qt4 && processes+=" buildPluginsQt4:avidemux_plugins" |
| 344 |
+ |
| 345 |
+ for process in ${processes} ; do |
| 346 |
+ CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare |
| 347 |
+ done |
| 348 |
+} |
| 349 |
|
| 350 |
src_configure() { |
| 351 |
# Add lax vector typing for PowerPC. |
| 352 |
@@ -81,53 +104,61 @@ src_configure() { |
| 353 |
# See bug 432322. |
| 354 |
use x86 && replace-flags -O0 -O1 |
| 355 |
|
| 356 |
- processes="buildPluginsCommon:avidemux_plugins |
| 357 |
- buildPluginsCLI:avidemux_plugins" |
| 358 |
- use qt4 && processes+=" buildPluginsQt4:avidemux_plugins" |
| 359 |
- |
| 360 |
for process in ${processes} ; do |
| 361 |
- local build="${process%%:*}" |
| 362 |
+ local build="${WORKDIR}/${P}_build/${process%%:*}" |
| 363 |
|
| 364 |
- local mycmakeargs=" |
| 365 |
+ local mycmakeargs=( |
| 366 |
-DAVIDEMUX_SOURCE_DIR='${S}' |
| 367 |
-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]') |
| 368 |
- $(cmake-utils_use aac FAAC) |
| 369 |
- $(cmake-utils_use aac FAAD) |
| 370 |
- $(cmake-utils_use alsa) |
| 371 |
- $(cmake-utils_use aften) |
| 372 |
- $(cmake-utils_use amr OPENCORE_AMRWB) |
| 373 |
- $(cmake-utils_use amr OPENCORE_AMRNB) |
| 374 |
- $(cmake-utils_use dts LIBDCA) |
| 375 |
- $(cmake-utils_use fontconfig) |
| 376 |
- $(cmake-utils_use jack) |
| 377 |
- $(cmake-utils_use lame) |
| 378 |
- $(cmake-utils_use oss) |
| 379 |
- $(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE) |
| 380 |
- $(cmake-utils_use qt4) |
| 381 |
- $(cmake-utils_use truetype FREETYPE2) |
| 382 |
- $(cmake-utils_use twolame) |
| 383 |
- $(cmake-utils_use x264) |
| 384 |
- $(cmake-utils_use xv XVIDEO) |
| 385 |
- $(cmake-utils_use xvid) |
| 386 |
- $(cmake-utils_use vdpau) |
| 387 |
- $(cmake-utils_use vorbis) |
| 388 |
- $(cmake-utils_use vorbis LIBVORBIS) |
| 389 |
- $(cmake-utils_use vpx VPXDEC) |
| 390 |
- " |
| 391 |
+ -DFAAC="$(usex aac)" |
| 392 |
+ -DFAAD="$(usex aac)" |
| 393 |
+ -DALSA="$(usex alsa)" |
| 394 |
+ -DAFTEN="$(usex aften)" |
| 395 |
+ -DDCAENC="$(usex dcaenc)" |
| 396 |
+ -DFDK_AAC="$(usex fdk)" |
| 397 |
+ -DOPENCORE_AMRWB="$(usex amr)" |
| 398 |
+ -DOPENCORE_AMRNB="$(usex amr)" |
| 399 |
+ -DLIBDCA="$(usex dts)" |
| 400 |
+ -DFONTCONFIG="$(usex fontconfig)" |
| 401 |
+ -DJACK="$(usex jack)" |
| 402 |
+ -DLAME="$(usex lame)" |
| 403 |
+ -DNVENC="$(usex nvenc)" |
| 404 |
+ -DOPUS="$(usex opus)" |
| 405 |
+ -DOSS="$(usex oss)" |
| 406 |
+ -DPULSEAUDIOSIMPLE="$(usex pulseaudio)" |
| 407 |
+ -DQT4="$(usex qt4)" |
| 408 |
+ -DFREETYPE2="$(usex truetype)" |
| 409 |
+ -DTWOLAME="$(usex twolame)" |
| 410 |
+ -DX264="$(usex x264)" |
| 411 |
+ -DX265="$(usex x265)" |
| 412 |
+ -DXVIDEO="$(usex xv)" |
| 413 |
+ -DXVID="$(usex xvid)" |
| 414 |
+ -DVDPAU="$(usex vdpau)" |
| 415 |
+ -DVORBIS="$(usex vorbis)" |
| 416 |
+ -DLIBVORBIS="$(usex vorbis)" |
| 417 |
+ -DVPXDEC="$(usex vpx)" |
| 418 |
+ -DUSE_EXTERNAL_LIBA52=yes |
| 419 |
+ -DUSE_EXTERNAL_LIBASS=yes |
| 420 |
+ -DUSE_EXTERNAL_LIBMAD=yes |
| 421 |
+ -DUSE_EXTERNAL_LIBMP4V2=yes |
| 422 |
+ ) |
| 423 |
+ |
| 424 |
+ if use qt5 ; then |
| 425 |
+ mycmakeargs+=( -DENABLE_QT5=True ) |
| 426 |
+ fi |
| 427 |
|
| 428 |
if use debug ; then |
| 429 |
- mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1" |
| 430 |
+ mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) |
| 431 |
fi |
| 432 |
|
| 433 |
- mkdir "${S}"/${build} || die "Can't create build folder." |
| 434 |
- |
| 435 |
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure |
| 436 |
+ CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure |
| 437 |
done |
| 438 |
} |
| 439 |
|
| 440 |
src_compile() { |
| 441 |
for process in ${processes} ; do |
| 442 |
- BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile |
| 443 |
+ local build="${WORKDIR}/${P}_build/${process%%:*}" |
| 444 |
+ BUILD_DIR="${build}" cmake-utils_src_compile |
| 445 |
done |
| 446 |
} |
| 447 |
|
| 448 |
@@ -135,11 +166,9 @@ src_install() { |
| 449 |
for process in ${processes} ; do |
| 450 |
# cmake-utils_src_install doesn't respect BUILD_DIR |
| 451 |
# and there sometimes is a preinstall phase present. |
| 452 |
- pushd "${S}/${process%%:*}" > /dev/null || die |
| 453 |
+ pushd "${WORKDIR}/${P}_build/${process%%:*}" > /dev/null || die |
| 454 |
grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast |
| 455 |
grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast |
| 456 |
popd > /dev/null || die |
| 457 |
done |
| 458 |
- |
| 459 |
- python_fix_shebang "${D}" |
| 460 |
} |
| 461 |
|
| 462 |
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch |
| 463 |
new file mode 100644 |
| 464 |
index 00000000000..a75f1295235 |
| 465 |
--- /dev/null |
| 466 |
+++ b/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch |
| 467 |
@@ -0,0 +1,20 @@ |
| 468 |
+--- a/cmake/admCheckAudioDeviceLibs.cmake |
| 469 |
++++ b/cmake/admCheckAudioDeviceLibs.cmake |
| 470 |
+@@ -158,6 +158,7 @@ |
| 471 |
+ |
| 472 |
+ MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE") |
| 473 |
+ MESSAGE(STATUS "*****************************") |
| 474 |
++ IF (PULSEAUDIOSIMPLE) |
| 475 |
+ IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES) |
| 476 |
+ # in cache already |
| 477 |
+ SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE) |
| 478 |
+@@ -191,6 +192,9 @@ |
| 479 |
+ MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES) |
| 480 |
+ |
| 481 |
+ APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}") |
| 482 |
++ ELSE (PULSEAUDIOSIMPLE) |
| 483 |
++ MESSAGE("${MSG_DISABLE_OPTION}") |
| 484 |
++ ENDIF (PULSEAUDIOSIMPLE) |
| 485 |
+ ELSE (UNIX AND NOT APPLE) |
| 486 |
+ SET(PULSEAUDIOSIMPLE_CAPABLE FALSE) |
| 487 |
+ ENDIF (UNIX AND NOT APPLE) |
| 488 |
|
| 489 |
diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml |
| 490 |
index e43fb4825fd..410f705011c 100644 |
| 491 |
--- a/media-libs/avidemux-plugins/metadata.xml |
| 492 |
+++ b/media-libs/avidemux-plugins/metadata.xml |
| 493 |
@@ -8,9 +8,14 @@ |
| 494 |
<use> |
| 495 |
<flag name="aften">Enable A/52 (AC-3) audio encoder support.</flag> |
| 496 |
<flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag> |
| 497 |
+ <flag name="dcaenc">Enable DTS Coherent Acoustics audio encoder support via <pkg>media-sound/dcaenc</pkg>.</flag> |
| 498 |
+ <flag name="fdk">Adds support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag> |
| 499 |
<flag name="fribidi">Enable unicode bidirectional algorithm support via <pkg>dev-libs/fribidi</pkg>.</flag> |
| 500 |
+ <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag> |
| 501 |
+ <flag name="opus">Adds support for the Opus codec via <pkg>media-libs/opus</pkg>.</flag> |
| 502 |
<flag name="twolame">Enable TwoLAME support via <pkg>media-sound/twolame</pkg>, an optimised MPEG Audio Layer 2 (MP2) encoder.</flag> |
| 503 |
<flag name="vpx">Enable WebM VP8 Codec SDK support via <pkg>media-libs/libvpx</pkg>.</flag> |
| 504 |
+ <flag name="x265">Enables HEVC support with <pkg>media-libs/x265</pkg>.</flag> |
| 505 |
</use> |
| 506 |
<upstream> |
| 507 |
<remote-id type="sourceforge">avidemux</remote-id> |
Archives