public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-plugins/, media-libs/avidemux-plugins/files/
@ 2017-06-30  5:28 Alexis Ballier
  0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2017-06-30  5:28 UTC (permalink / raw
  To: gentoo-commits

commit:     b24c9de87042c1edc0aad661ac651243d1f960c7
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Thu Jun 29 06:26:28 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 05:22:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b24c9de8

media-libs/avidemux-plugins: Bump avidemux-plugins-2.6.20 and update to EAPI 6

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-libs/avidemux-plugins/Manifest               |   1 +
 ...-9999.ebuild => avidemux-plugins-2.6.20.ebuild} | 127 +++++++++++++--------
 .../avidemux-plugins/avidemux-plugins-9999.ebuild  | 127 +++++++++++++--------
 .../avidemux-plugins-2.6.20-optional-pulse.patch   |  20 ++++
 media-libs/avidemux-plugins/metadata.xml           |   5 +
 5 files changed, 182 insertions(+), 98 deletions(-)

diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 418a7523584..6f017f59f92 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1 +1,2 @@
+DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38
 DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6

diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.20.ebuild
similarity index 51%
copy from media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
copy to media-libs/avidemux-plugins/avidemux-plugins-2.6.20.ebuild
index 215b8e16ef2..8ec82b2f23d 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.20.ebuild
@@ -1,39 +1,42 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils eutils flag-o-matic python-single-r1
-
-SLOT="2.6"
+inherit cmake-utils python-single-r1
 
 DESCRIPTION="Plugins for the video editor media-video/avidemux"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-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"
+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}"
-KEYWORDS="~amd64 ~x86"
 
-MY_PN="${PN/-plugins/}"
 if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-	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"
+	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}
 
-	inherit git-2
+	inherit git-r3
 else
+	MY_PN="${PN/-plugins/}"
 	MY_P="${MY_PN}_${PV}"
 	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 RDEPEND="
 	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
-	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?]
+	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?,qt5?]
 	>=dev-lang/spidermonkey-1.5-r2:0=
 	dev-libs/libxml2:2
+	media-libs/a52dec:0
+	media-libs/libass:0=
+	media-libs/libmad:0
+	media-libs/libmp4v2:0
 	media-libs/libpng:0=
 	virtual/libiconv:0
 	aac? (
@@ -43,7 +46,9 @@ RDEPEND="
 	aften? ( media-libs/aften:0 )
 	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 )
 	amr? ( media-libs/opencore-amr:0 )
+	dcaenc? ( media-sound/dcaenc:0 )
 	dts? ( media-libs/libdca:0 )
+	fdk? ( media-libs/fdk-aac:0 )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	fribidi? ( dev-libs/fribidi:0 )
 	jack? (
@@ -51,10 +56,13 @@ RDEPEND="
 		libsamplerate? ( media-libs/libsamplerate:0 )
 	)
 	lame? ( media-sound/lame:0 )
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
+	opus? ( media-libs/opus:0 )
 	pulseaudio? ( media-sound/pulseaudio:0 )
 	truetype? ( media-libs/freetype:2 )
 	twolame? ( media-sound/twolame:0 )
 	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
 	xv? (
 		x11-libs/libX11:0
 		x11-libs/libXext:0
@@ -70,7 +78,22 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.6.4-optional-pulse.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
+
+src_prepare() {
+	default
+
+	#Don't reapply PATCHES during cmake-utils_src_prepare
+	unset PATCHES
+
+	processes="buildPluginsCommon:avidemux_plugins
+		buildPluginsCLI:avidemux_plugins"
+	use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+	done
+}
 
 src_configure() {
 	# Add lax vector typing for PowerPC.
@@ -81,53 +104,61 @@ src_configure() {
 	# See bug 432322.
 	use x86 && replace-flags -O0 -O1
 
-	processes="buildPluginsCommon:avidemux_plugins
-		buildPluginsCLI:avidemux_plugins"
-	use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
-
 	for process in ${processes} ; do
-		local build="${process%%:*}"
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
 
-		local mycmakeargs="
+		local mycmakeargs=(
 			-DAVIDEMUX_SOURCE_DIR='${S}'
 			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
-			$(cmake-utils_use aac FAAC)
-			$(cmake-utils_use aac FAAD)
-			$(cmake-utils_use alsa)
-			$(cmake-utils_use aften)
-			$(cmake-utils_use amr OPENCORE_AMRWB)
-			$(cmake-utils_use amr OPENCORE_AMRNB)
-			$(cmake-utils_use dts LIBDCA)
-			$(cmake-utils_use fontconfig)
-			$(cmake-utils_use jack)
-			$(cmake-utils_use lame)
-			$(cmake-utils_use oss)
-			$(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
-			$(cmake-utils_use qt4)
-			$(cmake-utils_use truetype FREETYPE2)
-			$(cmake-utils_use twolame)
-			$(cmake-utils_use x264)
-			$(cmake-utils_use xv XVIDEO)
-			$(cmake-utils_use xvid)
-			$(cmake-utils_use vdpau)
-			$(cmake-utils_use vorbis)
-			$(cmake-utils_use vorbis LIBVORBIS)
-			$(cmake-utils_use vpx VPXDEC)
-		"
+			-DFAAC="$(usex aac)"
+			-DFAAD="$(usex aac)"
+			-DALSA="$(usex alsa)"
+			-DAFTEN="$(usex aften)"
+			-DDCAENC="$(usex dcaenc)"
+			-DFDK_AAC="$(usex fdk)"
+			-DOPENCORE_AMRWB="$(usex amr)"
+			-DOPENCORE_AMRNB="$(usex amr)"
+			-DLIBDCA="$(usex dts)"
+			-DFONTCONFIG="$(usex fontconfig)"
+			-DJACK="$(usex jack)"
+			-DLAME="$(usex lame)"
+			-DNVENC="$(usex nvenc)"
+			-DOPUS="$(usex opus)"
+			-DOSS="$(usex oss)"
+			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
+			-DQT4="$(usex qt4)"
+			-DFREETYPE2="$(usex truetype)"
+			-DTWOLAME="$(usex twolame)"
+			-DX264="$(usex x264)"
+			-DX265="$(usex x265)"
+			-DXVIDEO="$(usex xv)"
+			-DXVID="$(usex xvid)"
+			-DVDPAU="$(usex vdpau)"
+			-DVORBIS="$(usex vorbis)"
+			-DLIBVORBIS="$(usex vorbis)"
+			-DVPXDEC="$(usex vpx)"
+			-DUSE_EXTERNAL_LIBA52=yes
+			-DUSE_EXTERNAL_LIBASS=yes
+			-DUSE_EXTERNAL_LIBMAD=yes
+			-DUSE_EXTERNAL_LIBMP4V2=yes
+		)
+
+		if use qt5 ; then
+			mycmakeargs+=( -DENABLE_QT5=True )
+		fi
 
 		if use debug ; then
-			mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
+			mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 		fi
 
-		mkdir "${S}"/${build} || die "Can't create build folder."
-
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
 	done
 }
 
 src_compile() {
 	for process in ${processes} ; do
-		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_compile
 	done
 }
 
@@ -135,11 +166,9 @@ src_install() {
 	for process in ${processes} ; do
 		# cmake-utils_src_install doesn't respect BUILD_DIR
 		# and there sometimes is a preinstall phase present.
-		pushd "${S}/${process%%:*}" > /dev/null || die
+		pushd "${WORKDIR}/${P}_build/${process%%:*}" > /dev/null || die
 			grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast
 			grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast
 		popd > /dev/null || die
 	done
-
-	python_fix_shebang "${D}"
 }

diff --git a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
index 215b8e16ef2..8ec82b2f23d 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-9999.ebuild
@@ -1,39 +1,42 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils eutils flag-o-matic python-single-r1
-
-SLOT="2.6"
+inherit cmake-utils python-single-r1
 
 DESCRIPTION="Plugins for the video editor media-video/avidemux"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-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"
+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}"
-KEYWORDS="~amd64 ~x86"
 
-MY_PN="${PN/-plugins/}"
 if [[ ${PV} == *9999* ]] ; then
-	KEYWORDS=""
-	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"
+	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}
 
-	inherit git-2
+	inherit git-r3
 else
+	MY_PN="${PN/-plugins/}"
 	MY_P="${MY_PN}_${PV}"
 	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 RDEPEND="
 	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
-	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?]
+	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?,qt5?]
 	>=dev-lang/spidermonkey-1.5-r2:0=
 	dev-libs/libxml2:2
+	media-libs/a52dec:0
+	media-libs/libass:0=
+	media-libs/libmad:0
+	media-libs/libmp4v2:0
 	media-libs/libpng:0=
 	virtual/libiconv:0
 	aac? (
@@ -43,7 +46,9 @@ RDEPEND="
 	aften? ( media-libs/aften:0 )
 	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 )
 	amr? ( media-libs/opencore-amr:0 )
+	dcaenc? ( media-sound/dcaenc:0 )
 	dts? ( media-libs/libdca:0 )
+	fdk? ( media-libs/fdk-aac:0 )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	fribidi? ( dev-libs/fribidi:0 )
 	jack? (
@@ -51,10 +56,13 @@ RDEPEND="
 		libsamplerate? ( media-libs/libsamplerate:0 )
 	)
 	lame? ( media-sound/lame:0 )
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
+	opus? ( media-libs/opus:0 )
 	pulseaudio? ( media-sound/pulseaudio:0 )
 	truetype? ( media-libs/freetype:2 )
 	twolame? ( media-sound/twolame:0 )
 	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
 	xv? (
 		x11-libs/libX11:0
 		x11-libs/libXext:0
@@ -70,7 +78,22 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.6.4-optional-pulse.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
+
+src_prepare() {
+	default
+
+	#Don't reapply PATCHES during cmake-utils_src_prepare
+	unset PATCHES
+
+	processes="buildPluginsCommon:avidemux_plugins
+		buildPluginsCLI:avidemux_plugins"
+	use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+	done
+}
 
 src_configure() {
 	# Add lax vector typing for PowerPC.
@@ -81,53 +104,61 @@ src_configure() {
 	# See bug 432322.
 	use x86 && replace-flags -O0 -O1
 
-	processes="buildPluginsCommon:avidemux_plugins
-		buildPluginsCLI:avidemux_plugins"
-	use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
-
 	for process in ${processes} ; do
-		local build="${process%%:*}"
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
 
-		local mycmakeargs="
+		local mycmakeargs=(
 			-DAVIDEMUX_SOURCE_DIR='${S}'
 			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
-			$(cmake-utils_use aac FAAC)
-			$(cmake-utils_use aac FAAD)
-			$(cmake-utils_use alsa)
-			$(cmake-utils_use aften)
-			$(cmake-utils_use amr OPENCORE_AMRWB)
-			$(cmake-utils_use amr OPENCORE_AMRNB)
-			$(cmake-utils_use dts LIBDCA)
-			$(cmake-utils_use fontconfig)
-			$(cmake-utils_use jack)
-			$(cmake-utils_use lame)
-			$(cmake-utils_use oss)
-			$(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
-			$(cmake-utils_use qt4)
-			$(cmake-utils_use truetype FREETYPE2)
-			$(cmake-utils_use twolame)
-			$(cmake-utils_use x264)
-			$(cmake-utils_use xv XVIDEO)
-			$(cmake-utils_use xvid)
-			$(cmake-utils_use vdpau)
-			$(cmake-utils_use vorbis)
-			$(cmake-utils_use vorbis LIBVORBIS)
-			$(cmake-utils_use vpx VPXDEC)
-		"
+			-DFAAC="$(usex aac)"
+			-DFAAD="$(usex aac)"
+			-DALSA="$(usex alsa)"
+			-DAFTEN="$(usex aften)"
+			-DDCAENC="$(usex dcaenc)"
+			-DFDK_AAC="$(usex fdk)"
+			-DOPENCORE_AMRWB="$(usex amr)"
+			-DOPENCORE_AMRNB="$(usex amr)"
+			-DLIBDCA="$(usex dts)"
+			-DFONTCONFIG="$(usex fontconfig)"
+			-DJACK="$(usex jack)"
+			-DLAME="$(usex lame)"
+			-DNVENC="$(usex nvenc)"
+			-DOPUS="$(usex opus)"
+			-DOSS="$(usex oss)"
+			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
+			-DQT4="$(usex qt4)"
+			-DFREETYPE2="$(usex truetype)"
+			-DTWOLAME="$(usex twolame)"
+			-DX264="$(usex x264)"
+			-DX265="$(usex x265)"
+			-DXVIDEO="$(usex xv)"
+			-DXVID="$(usex xvid)"
+			-DVDPAU="$(usex vdpau)"
+			-DVORBIS="$(usex vorbis)"
+			-DLIBVORBIS="$(usex vorbis)"
+			-DVPXDEC="$(usex vpx)"
+			-DUSE_EXTERNAL_LIBA52=yes
+			-DUSE_EXTERNAL_LIBASS=yes
+			-DUSE_EXTERNAL_LIBMAD=yes
+			-DUSE_EXTERNAL_LIBMP4V2=yes
+		)
+
+		if use qt5 ; then
+			mycmakeargs+=( -DENABLE_QT5=True )
+		fi
 
 		if use debug ; then
-			mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
+			mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 		fi
 
-		mkdir "${S}"/${build} || die "Can't create build folder."
-
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
 	done
 }
 
 src_compile() {
 	for process in ${processes} ; do
-		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_compile
 	done
 }
 
@@ -135,11 +166,9 @@ src_install() {
 	for process in ${processes} ; do
 		# cmake-utils_src_install doesn't respect BUILD_DIR
 		# and there sometimes is a preinstall phase present.
-		pushd "${S}/${process%%:*}" > /dev/null || die
+		pushd "${WORKDIR}/${P}_build/${process%%:*}" > /dev/null || die
 			grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast
 			grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast
 		popd > /dev/null || die
 	done
-
-	python_fix_shebang "${D}"
 }

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
new file mode 100644
index 00000000000..a75f1295235
--- /dev/null
+++ b/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch
@@ -0,0 +1,20 @@
+--- a/cmake/admCheckAudioDeviceLibs.cmake
++++ b/cmake/admCheckAudioDeviceLibs.cmake
+@@ -158,6 +158,7 @@
+ 
+ 	MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE")
+ 	MESSAGE(STATUS "*****************************")
++	IF (PULSEAUDIOSIMPLE)
+         IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
+         # in cache already
+          SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)
+@@ -191,6 +192,9 @@
+         MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)
+ 
+ 		APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}")
++	ELSE (PULSEAUDIOSIMPLE)
++		MESSAGE("${MSG_DISABLE_OPTION}")
++	ENDIF (PULSEAUDIOSIMPLE)
+ ELSE (UNIX AND NOT APPLE)
+ 	SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)
+ ENDIF (UNIX AND NOT APPLE)

diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml
index e43fb4825fd..410f705011c 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -8,9 +8,14 @@
   <use>
     <flag name="aften">Enable A/52 (AC-3) audio encoder support.</flag>
     <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
+    <flag name="dcaenc">Enable DTS Coherent Acoustics audio encoder support via <pkg>media-sound/dcaenc</pkg>.</flag>
+    <flag name="fdk">Adds support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
     <flag name="fribidi">Enable unicode bidirectional algorithm support via <pkg>dev-libs/fribidi</pkg>.</flag>
+    <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
+    <flag name="opus">Adds support for the Opus codec via <pkg>media-libs/opus</pkg>.</flag>
     <flag name="twolame">Enable TwoLAME support via <pkg>media-sound/twolame</pkg>, an optimised MPEG Audio Layer 2 (MP2) encoder.</flag>
     <flag name="vpx">Enable WebM VP8 Codec SDK support via <pkg>media-libs/libvpx</pkg>.</flag>
+    <flag name="x265">Enables HEVC support with <pkg>media-libs/x265</pkg>.</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">avidemux</remote-id>


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-plugins/, media-libs/avidemux-plugins/files/
@ 2023-01-07  7:17 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-01-07  7:17 UTC (permalink / raw
  To: gentoo-commits

commit:     f2e52c0d1fabc9b06e1da62f378f277701407b98
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 07:16:23 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 07:17:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e52c0d

media-libs/avidemux-plugins: add 2.8.1

Bug: https://bugs.gentoo.org/830464
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/avidemux-plugins/Manifest               |   1 +
 .../avidemux-plugins/avidemux-plugins-2.8.1.ebuild | 166 +++++++++++++++++++++
 .../avidemux-plugins-2.8.1-optional-pulse.patch    |  20 +++
 3 files changed, 187 insertions(+)

diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index f4c59a24eb9f..5e1a60fccafb 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1 +1,2 @@
 DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
+DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f SHA512 e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3

diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.8.1.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.8.1.ebuild
new file mode 100644
index 000000000000..3c95dfdc5b08
--- /dev/null
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.8.1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="Plugins for the video editor media-video/avidemux"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 LGPL-2.1 MIT OFL-1.1 PSF-2 public-domain"
+SLOT="2.7"
+IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio gui truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# dev-lang/spidermonkey is not required anymore
+# see https://github.com/mean00/avidemux2/blob/master/avidemux_plugins/ADM_scriptEngines/CMakeLists.txt
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
+	~media-video/avidemux-${PV}:${SLOT}[opengl?,gui?]
+	dev-libs/libxml2:2
+	media-libs/a52dec
+	media-libs/libass:0=
+	media-libs/libmad
+	media-libs/libmp4v2
+	media-libs/libpng:0=
+	virtual/libiconv
+	aac? (
+		media-libs/faac
+		media-libs/faad2
+	)
+	aften? ( media-libs/aften )
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	dcaenc? ( media-sound/dcaenc )
+	dts? ( media-libs/libdca )
+	fdk? ( media-libs/fdk-aac:0= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	fribidi? ( dev-libs/fribidi )
+	jack? (
+		virtual/jack
+		libsamplerate? ( media-libs/libsamplerate )
+	)
+	lame? ( media-sound/lame )
+	nvenc? ( amd64? ( media-libs/nv-codec-headers ) )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	truetype? ( media-libs/freetype:2 )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:0= )
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xv? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXv
+	)
+	xvid? ( media-libs/xvid )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	oss? ( virtual/os-headers )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	!<media-libs/avidemux-plugins-${PV}
+"
+
+S="${WORKDIR}/avidemux2-${PV}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.8.1-optional-pulse.patch" )
+
+src_prepare() {
+	default
+
+	# Don't reapply PATCHES during cmake_src_prepare
+	unset PATCHES
+
+	processes="buildPluginsCommon:avidemux_plugins
+		buildPluginsCLI:avidemux_plugins"
+	use gui && processes+=" buildPluginsQt4:avidemux_plugins"
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
+	done
+}
+
+src_configure() {
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+
+		local mycmakeargs=(
+			-DAVIDEMUX_SOURCE_DIR='${S}'
+			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
+			-DFAAC="$(usex aac)"
+			-DFAAD="$(usex aac)"
+			-DALSA="$(usex alsa)"
+			-DAFTEN="$(usex aften)"
+			-DDCAENC="$(usex dcaenc)"
+			-DFDK_AAC="$(usex fdk)"
+			-DOPENCORE_AMRWB="$(usex amr)"
+			-DOPENCORE_AMRNB="$(usex amr)"
+			-DLIBDCA="$(usex dts)"
+			-DFONTCONFIG="$(usex fontconfig)"
+			-DJACK="$(usex jack)"
+			-DLAME="$(usex lame)"
+			-DNVENC="$(usex nvenc)"
+			-DOPENGL="$(usex opengl)"
+			-DOPUS="$(usex opus)"
+			-DOSS="$(usex oss)"
+			-DPULSEAUDIO="$(usex pulseaudio)"
+			-DENABLE_QT4=OFF
+			-DENABLE_QT6=OFF
+			-DFREETYPE2="$(usex truetype)"
+			-DTWOLAME="$(usex twolame)"
+			-DX264="$(usex x264)"
+			-DX265="$(usex x265)"
+			-DXVIDEO="$(usex xv)"
+			-DXVID="$(usex xvid)"
+			-DVDPAU="$(usex vdpau)"
+			-DVORBIS="$(usex vorbis)"
+			-DLIBVORBIS="$(usex vorbis)"
+			-DVPXDEC="$(usex vpx)"
+			-DUSE_EXTERNAL_LIBA52=yes
+			-DUSE_EXTERNAL_LIBASS=yes
+			-DUSE_EXTERNAL_LIBMAD=yes
+			-DUSE_EXTERNAL_LIBMP4V2=yes
+		)
+
+		use gui && mycmakeargs+=( -DENABLE_QT5=True )
+		use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
+	done
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake_src_compile
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake_src_install
+	done
+}

diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1-optional-pulse.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1-optional-pulse.patch
new file mode 100644
index 000000000000..29926c59efde
--- /dev/null
+++ b/media-libs/avidemux-plugins/files/avidemux-plugins-2.8.1-optional-pulse.patch
@@ -0,0 +1,20 @@
+--- a/cmake/admCheckAudioDeviceLibs.cmake
++++ b/cmake/admCheckAudioDeviceLibs.cmake
+@@ -194,6 +194,7 @@
+ 		APPEND_SUMMARY_LIST("Audio Device" "PulseAudioS" "${USE_PULSE_SIMPLE}")
+ ]]
+     OPTION(PULSEAUDIO "" ON)
++    IF (PULSEAUDIO)
+     MESSAGE(STATUS "Checking for PulseAudio")
+     include(FindPkgConfig)
+     pkg_check_modules(PULSEAUDIO libpulse)
+@@ -203,6 +204,9 @@
+     ELSE (PULSEAUDIO_FOUND)
+         MESSAGE(STATUS "Could not find PulseAudio")
+     ENDIF (PULSEAUDIO_FOUND)
++    ELSE (PULSEAUDIO)
++	MESSAGE("${MSG_DISABLE_OPTION}")
++    ENDIF (PULSEAUDIO)
+     APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE}")
+ ELSE (UNIX AND NOT APPLE)
+ 	SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-01-07  7:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-30  5:28 [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-plugins/, media-libs/avidemux-plugins/files/ Alexis Ballier
  -- strict thread matches above, loose matches on Subject: below --
2023-01-07  7:17 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox