diff options
| author |   Martin Väth <martin@mvath.de> | 2017-12-09 23:43:04 +0100 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2017-12-09 23:43:04 +0100 |
| commit | 5bbc3118fbde82609b5948311756c96afaec4fd8 (patch) | |
| tree | 3e34d43ff98ac9e9dfe31646b37d64b74dcbd609 /media-video/avidemux | |
| parent | app-text/djview: Remove since qt5 version is now in gentoo repository (diff) | |
| download | mv-5bbc3118fbde82609b5948311756c96afaec4fd8.tar.gz mv-5bbc3118fbde82609b5948311756c96afaec4fd8.tar.bz2 mv-5bbc3118fbde82609b5948311756c96afaec4fd8.zip | |
Drop last remaining optional qt4 dependencies
Diffstat (limited to 'media-video/avidemux')
| -rw-r--r-- | media-video/avidemux/avidemux-2.7.0-r1.ebuild | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/media-video/avidemux/avidemux-2.7.0-r1.ebuild b/media-video/avidemux/avidemux-2.7.0-r1.ebuild index 97dc9d3c..982a925f 100644 --- a/media-video/avidemux/avidemux-2.7.0-r1.ebuild +++ b/media-video/avidemux/avidemux-2.7.0-r1.ebuild @@ -13,8 +13,7 @@ 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" -IUSE="debug opengl nls nvenc qt4 qt5 sdl vaapi vdpau xv" -REQUIRED_USE="qt5? ( !qt4 ) " +IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv" QA_DT_NEEDED=".*/libADM_UI_Cli6\.so" if [[ ${PV} == *9999* ]] ; then @@ -33,7 +32,6 @@ fi DEPEND=" ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] opengl? ( virtual/opengl:0 ) - qt4? ( >=dev-qt/qtgui-4.8.3:4 ) qt5? ( dev-qt/qtgui:5 ) vaapi? ( x11-libs/libva:0 ) nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) @@ -41,7 +39,7 @@ DEPEND=" RDEPEND="$DEPEND nls? ( virtual/libintl:0 ) " -PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?,qt5?]" +PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]" S="${WORKDIR}/${MY_P}" @@ -51,7 +49,7 @@ src_prepare() { default processes="buildCli:avidemux/cli" - if use qt4 || use qt5 ; then + if use qt5 ; then processes+=" buildQt4:avidemux/qt4" fi @@ -87,7 +85,7 @@ src_configure() { append-cxxflags -std=c++14 elif test-flags-CXX -std=c++11 ; then append-cxxflags -std=c++11 - elif use qt4 || use qt5 ; then + elif use qt5 ; then die "For qt support a compiler with c++11 support is needed" fi @@ -111,23 +109,15 @@ src_configure() { -DXVIDEO="$(usex xv)" ) - if use qt5 ; then - mycmakeargs+=( -DENABLE_QT5=True ) - QT_SELECT=5 - qt_ext=Qt5 - export qt_ext - elif use qt4 ; then - QT_SELECT=4 - fi - ! use debug || mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 ) - if use qt4 || use qt5 ; then - export QT_SELECT + if use qt5 ; then + mycmakeargs+=( -DENABLE_QT5=True ) + export qt_ext=Qt5 QT_SELECT=5 processes+=" buildQt4:avidemux/qt4" fi @@ -168,10 +158,6 @@ src_install() { cd "${S}" || die "Can't enter source folder." newicon ${PN}_icon.png ${PN}-2.6.png - if use qt4; then - fperms +x /usr/bin/avidemux3_qt4 - domenu ${PN}-2.6.desktop - fi if use qt5; then fperms +x /usr/bin/avidemux3_qt5 domenu ${PN}-2.6.desktop |