[patch] simplified patch for ebuilds

avidemux-2.6.20.ebuild.patch (text/plain), 2.77 KB, created by Petr Zima on 2017-08-01 15:59:15 UTC

diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.20.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.20.ebuild
index 8ec82b2..cc4219a 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.20.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.20.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://fixounet.free.fr/avidemux"
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 SLOT="2.6"
 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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE} qt5? ( !qt4 )"
 
 if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
@@ -88,7 +88,9 @@ src_prepare() {
 
 	processes="buildPluginsCommon:avidemux_plugins
 		buildPluginsCLI:avidemux_plugins"
-	use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
+	if use qt4 || use qt5 ; then
+		processes+=" buildPluginsQt4:avidemux_plugins"
+	fi
 
 	for process in ${processes} ; do
 		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
@@ -96,6 +98,8 @@ src_prepare() {
 }
 
 src_configure() {
+	use qt5 && append-cxxflags -std=c++11
+
 	# Add lax vector typing for PowerPC.
 	if use ppc || use ppc64 ; then
 		append-cflags -flax-vector-conversions
@@ -126,7 +130,6 @@ src_configure() {
 			-DOPUS="$(usex opus)"
 			-DOSS="$(usex oss)"
 			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
-			-DQT4="$(usex qt4)"
 			-DFREETYPE2="$(usex truetype)"
 			-DTWOLAME="$(usex twolame)"
 			-DX264="$(usex x264)"
diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild
index 2ad1ffe..b5c384b 100644
--- a/media-video/avidemux/avidemux-2.6.20.ebuild
+++ b/media-video/avidemux/avidemux-2.6.20.ebuild
@@ -14,6 +14,7 @@ HOMEPAGE="http://fixounet.free.fr/${PN}"
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 SLOT="2.6"
 IUSE="debug opengl nls nvenc qt4 qt5 sdl vaapi vdpau video_cards_fglrx xv"
+REQUIRED_USE="qt5? ( !qt4 )"
 
 if [[ ${PV} == *9999* ]] ; then
 	MY_P="${P}"
@@ -49,7 +50,9 @@ src_prepare() {
 	default
 
 	processes="buildCli:avidemux/cli"
-	use qt4 && processes+=" buildQt4:avidemux/qt4"
+	if use qt4 || use qt5 ; then
+		processes+=" buildQt4:avidemux/qt4"
+	fi
 
 	for process in ${processes} ; do
 		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
@@ -74,6 +77,8 @@ src_prepare() {
 }
 
 src_configure() {
+	use qt5 && append-cxxflags -std=c++11
+
 	# Add lax vector typing for PowerPC.
 	if use ppc || use ppc64 ; then
 		append-cflags -flax-vector-conversions
@@ -93,7 +98,7 @@ src_configure() {
 	)
 
 	if use qt5 ; then
-		mycmakeargs+=( -DENABLE_QT5="$(usex qt5)" )
+		mycmakeargs+=( -DENABLE_QT5=True )
 	fi
 
 	if use debug ; then