avidemux: Version bump. USE system libs. Remove patches. Exclude ninja

6 files changed, 60 insertions, 30 deletions

diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index ab8553b4..e57eb521 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1 +1 @@
-DIST avidemux_2.6.16.tar.gz 20089266 SHA256 ec6d6ce038d2454c51ad7f0f2236117cb99d18ce394fef2784381cc4f7dd374a
+DIST avidemux_2.6.17.tar.gz 20089405 SHA256 2d2b512bb599c04f4f0458a4a24f86a5c02a9038f4f3b75bbec656f1ef4ecbe9
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.16.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.17.ebuild
index 01407e3a..67814060 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.16.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.17.ebuild
@@ -58,6 +58,10 @@ BUILD_DIR="${S}/buildCore"
 
 DOCS=( AUTHORS README )
 
+src_setup() {
+	CMAKE_MAKEFILE_GENERATOR=emake # ninja does not work, currently
+}
+
 src_prepare() {
 	mkdir "${BUILD_DIR}" || die "Can't create build folder."
 
diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml
index 422c7c72..93bf10b7 100644
--- a/media-libs/avidemux-core/metadata.xml
+++ b/media-libs/avidemux-core/metadata.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-    <name>Gentoo Video project</name>
-  </maintainer>
-  <use>
-    <flag name="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">avidemux</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>martin@mvath.de</email>
+		<name>Martin Väth</name>
+		<description>maintainer of the updates in the mv overlay</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<use>
+		<flag name="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">avidemux</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index ab8553b4..e57eb521 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1 +1 @@
-DIST avidemux_2.6.16.tar.gz 20089266 SHA256 ec6d6ce038d2454c51ad7f0f2236117cb99d18ce394fef2784381cc4f7dd374a
+DIST avidemux_2.6.17.tar.gz 20089405 SHA256 2d2b512bb599c04f4f0458a4a24f86a5c02a9038f4f3b75bbec656f1ef4ecbe9
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.16.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.17.ebuild
index 74c99053..11f6e073 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.16.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.17.ebuild
@@ -15,7 +15,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"
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt4 qt5 vorbis truetype twolame xv xvid x264 x265 vdpau vpx"
+IUSE="aac aften a52 alsa amr debug dts +system-a52dec +system-libass +system-libmad +system-libmp4v2 fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt4 qt5 vorbis truetype twolame xv xvid x264 x265 vdpau vpx"
 KEYWORDS="~amd64 ~x86"
 
 MY_PN="${PN/-plugins/}"
@@ -69,6 +69,10 @@ RDEPEND="
 	xvid? ( media-libs/xvid:0 )
 	vorbis? ( media-libs/libvorbis:0 )
 	vpx? ( media-libs/libvpx:0 )
+	system-a52dec? ( media-libs/a52dec:0 )
+	system-libass? ( media-libs/libass:0= )
+	system-libmad? ( media-libs/libmad:0 )
+	system-libmp4v2? ( media-libs/libmp4v2:0 )
 "
 DEPEND="$RDEPEND
 	${PYTHON_DEPS}"
@@ -81,6 +85,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.14-optional-pulse.patch
 )
 
+src_setup() {
+	CMAKE_MAKEFILE_GENERATOR=emake # ninja does not work, currently
+}
+
 src_prepare() {
 	default
 }
@@ -136,6 +144,10 @@ src_configure() {
 			-DVORBIS="$(usex vorbis)"
 			-DLIBVORBIS="$(usex vorbis)"
 			-DVPXDEC="$(usex vpx)"
+			-DUSE_EXTERNAL_LIBA52="$(usex system-a52dec)"
+			-DUSE_EXTERNAL_LIBASS="$(usex system-libass)"
+			-DUSE_EXTERNAL_LIBMAD="$(usex system-libmad)"
+			-DUSE_EXTERNAL_LIBMP4V2="$(usex system-libmp4v2)"
 		)
 		if use qt5 ; then
 			mycmakeargs+=( -DENABLE_QT5=True )
diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml
index 44edff11..67bb4176 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -1,21 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-    <name>Gentoo Video project</name>
-  </maintainer>
-  <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="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>
-  </upstream>
+	<maintainer type="person">
+		<email>martin@mvath.de</email>
+		<name>Martin Väth</name>
+		<description>maintainer of the updates in the mv overlay</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
+	<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="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="system-a52dec">Use system <pkg>media-libs/a52dec</pkg> instead of bundled library.</flag>
+		<flag name="system-libass">Use system <pkg>media-libs/libass</pkg> instead of bundled library.</flag>
+		<flag name="system-libmad">Use system <pkg>media-libs/libmad</pkg> instead of bundled library.</flag>
+		<flag name="system-libmp4v2">Use system <pkg>media-libs/libmp4v2</pkg> instead of bundled library.</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>
+	</upstream>
 </pkgmetadata>