summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@gmx.de>2017-01-05 15:01:42 +0100
committerSven Eden <sven.eden@gmx.de>2017-01-05 15:01:42 +0100
commit48cbb34cf1969d3dcb7d5a5dbaad3fd4883f26b1 (patch)
tree5f97757c32fbe1bdbc5a90417e77965aa9a00a84
parentavidemux: version bump to 2.6.16 (diff)
downloadseden-48cbb34cf1969d3dcb7d5a5dbaad3fd4883f26b1.tar.gz
seden-48cbb34cf1969d3dcb7d5a5dbaad3fd4883f26b1.tar.bz2
seden-48cbb34cf1969d3dcb7d5a5dbaad3fd4883f26b1.zip
avidemux-2.6.16-r2 : Fix missing CLI libs bug
-rw-r--r--media-libs/avidemux-plugins/avidemux-plugins-2.6.16-r2.ebuild (renamed from media-libs/avidemux-plugins/avidemux-plugins-2.6.16-r1.ebuild)19
-rw-r--r--media-video/avidemux/avidemux-2.6.16-r2.ebuild (renamed from media-video/avidemux/avidemux-2.6.16-r1.ebuild)1
2 files changed, 10 insertions, 10 deletions
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.16-r1.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.16-r2.ebuild
index 8d69cd5..28175a1 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.16-r1.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.16-r2.ebuild
@@ -100,8 +100,16 @@ src_configure() {
processes="buildPluginsCommon:avidemux_plugins
buildPluginsCLI:avidemux_plugins"
if use qt4 || use qt5 ; then
- export QT_SELECT
processes+=" buildPluginsQt4:avidemux_plugins"
+ if use qt5 ; then
+ mycmakeargs+=( -DENABLE_QT5=True )
+ export QT_SELECT=5
+ append-cxxflags $(test-flags-CXX -std=gnu++11)
+ else
+ export QT_SELECT=4
+ # Needed for gcc-6
+ append-cxxflags $(test-flags-CXX -std=gnu++98)
+ fi
fi
for process in ${processes} ; do
@@ -137,15 +145,6 @@ src_configure() {
-DLIBVORBIS="$(usex vorbis)"
-DVPXDEC="$(usex vpx)"
)
- if use qt5 ; then
- mycmakeargs+=( -DENABLE_QT5=True )
- export QT_SELECT=5
- append-cxxflags $(test-flags-CXX -std=gnu++11)
- elif use qt4 ; then
- export QT_SELECT=4
- # Needed for gcc-6
- append-cxxflags $(test-flags-CXX -std=gnu++98)
- fi
if use debug ; then
mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 )
diff --git a/media-video/avidemux/avidemux-2.6.16-r1.ebuild b/media-video/avidemux/avidemux-2.6.16-r2.ebuild
index 8dd9fc3..a44704b 100644
--- a/media-video/avidemux/avidemux-2.6.16-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.6.16-r2.ebuild
@@ -84,6 +84,7 @@ src_configure() {
-DXVBA="$(usex video_cards_fglrx)"
-DXVIDEO="$(usex xv)"
)
+ processes="buildCLI:avidemux/cli"
if use qt5 ; then
mycmakeargs+=( -DENABLE_QT5=True )
export QT_SELECT=5