gentoo resync : 18.08.2019

4 files changed, 121 insertions, 2 deletions

diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 2beb18b970d3..0722d0810566 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,3 +1,6 @@
+AUX avidemux-core-2.7.3-permissions.patch 1079 BLAKE2B 64e4b1718ef91051253b0d09a69acbd11fb2467d48a62443b4ccd2ca89feee454d1ed35542c49fbf94c217397bd363e6aefc6a3bf13498af9a57eb6fdf32b5ba SHA512 d9c316b76cedd2119a3fdae1810846358f7addf21258021ba896f0e1dd7d68d27db5f7e97b53e284806482334ccd016833a2f8b24f50cddd28ac6cfdf28dfce3
+DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
 DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
 EBUILD avidemux-core-2.7.0.ebuild 2527 BLAKE2B 549e0e7a6d68296215452e813468dcf511c5b46115c0e51e9e369fe3f119fa11542ed28dd2a336123776b773bcbc83ff95896a24b7769aeb1e4249cfddbd0f78 SHA512 f20b5c6c6956998f6164e4d72d40e1acd54d8a926c03158dd7131733eab421170deb356bef16f6fa7e0311bb2e21d0598120fe526870114c63db872fdba8d8e5
-MISC metadata.xml 566 BLAKE2B 4298f411df7407c11de8f5c2cb6bc012223ae9c4e2a302823ee243309510510ad72da5b362265567ba8786476702d42c45c68077c84d9a6929f4d6cc44a29037 SHA512 031ee8ca49399bfb081d3aa2417604de938b701ba671f1de77df1c6f0abdb558d49ebf1ff9d3776f77757236ce05e981bc4a44fc2d1f164e0b499ae6b1b52b6a
+EBUILD avidemux-core-2.7.3.ebuild 2291 BLAKE2B 913b26cac99698593a555fe360896f0c158bc8e17e4658694525eea6f37570c4aa39e6465cf4a3a1394a42d4762eb570b7771cf926649ea1523648d36810a634 SHA512 432d8cf723d97a360b7a1a702e61bcb64760edd7391a23cea1e3784133514538b31283716049b1cc9de1addc187bddb4f0a7c07a48f84287467551db5d6b9d50
+MISC metadata.xml 569 BLAKE2B 19e9f892bf6e5c63f2054dfd44beef6b394fcdeecbb2e91edf01e7e9370b7a32c21529ad566921d46992f14d00943ac69e5f0f55cff8406d48ee84dc6515619c SHA512 58e100ccdc3e1145703d4feef2776bdf4ccfcc44dc9e04f1e79f5ea1b89f6ae59c386794028328f27d8715cd00abb410cb6970f1b72c1646750babf742fe3270
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
new file mode 100644
index 000000000000..5f88c831da3c
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils
+
+DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
+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 MIT PSF-2 public-domain"
+SLOT="2.7"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
+
+# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
+DEPEND="dev-db/sqlite:3
+	nvenc? ( media-video/nvidia_video_sdk )
+	sdl? ( media-libs/libsdl:0 )
+	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
+	vaapi? ( x11-libs/libva:0= )
+	vdpau? ( x11-libs/libvdpau:0 )
+	xv? ( x11-libs/libXv:0 )
+"
+RDEPEND="${DEPEND}
+	!<media-libs/avidemux-core-${PV}
+	!<media-video/avidemux-${PV}
+	nls? ( virtual/libintl:0 )
+"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	!system-ffmpeg? ( dev-lang/yasm[nls=] )
+"
+
+S="${WORKDIR}/avidemux2-${PV}"
+CMAKE_USE_DIR="${S}/${PN/-/_}"
+
+PATCHES=( "${FILESDIR}"/${P}-permissions.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-ffmpeg ; then
+		# Preparations to support the system ffmpeg. Currently fails because
+		# it depends on files the system ffmpeg doesn't install.
+		local error="Failed to remove bundled ffmpeg."
+
+		rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
+			buildCore/ffmpeg || die "${error}"
+		sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
+			-i avidemux/commonCmakeApplication.cmake || die "${error}"
+		sed -e 's/include(admFFmpegBuild)//g' \
+			-i avidemux_core/CMakeLists.txt || die "${error}"
+	fi
+}
+
+src_configure() {
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	local mycmakeargs=(
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		-DGETTEXT="$(usex nls)"
+		-DNVENC="$(usex nvenc)"
+		-DSDL="$(usex sdl)"
+		-DLIBVA="$(usex vaapi)"
+		-DVDPAU="$(usex vdpau)"
+		-DXVIDEO="$(usex xv)"
+	)
+
+	if use debug ; then
+		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch b/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch
new file mode 100644
index 000000000000..0f8ee21632e5
--- /dev/null
+++ b/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch
@@ -0,0 +1,28 @@
+From 7c5c267987b90cf0b61ca98e9f8b6db2c0cdb84f Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 14 Aug 2019 03:35:01 +0300
+Subject: [PATCH] [cmake] Fix library permissions
+
+Upstream-Status: Submitted
+[https://github.com/mean00/avidemux2/pull/179]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ cmake/admInstallDir.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/admInstallDir.cmake b/cmake/admInstallDir.cmake
+index ab16f283d..5af762626 100644
+--- a/cmake/admInstallDir.cmake
++++ b/cmake/admInstallDir.cmake
+@@ -55,7 +55,7 @@ ENDMACRO(ADM_INSTALL_LIB )
+ MACRO (ADM_INSTALL_LIB_FILES files)
+         INSTALL(FILES ${files} 
+                         DESTINATION ${AVIDEMUX_LIB_DIR}
+-                        PERMISSIONS WORLD_READ WORLD_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE
++                        PERMISSIONS WORLD_READ WORLD_EXECUTE GROUP_READ GROUP_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE
+                         COMPONENT  runtime
+                 )
+ ENDMACRO (ADM_INSTALL_LIB_FILES)
+-- 
+2.22.0
+
diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml
index efad95d31008..1f4fd12a3a7b 100644
--- a/media-libs/avidemux-core/metadata.xml
+++ b/media-libs/avidemux-core/metadata.xml
@@ -10,6 +10,6 @@
     <flag name="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
   </use>
   <upstream>
-    <remote-id type="sourceforge">avidemux</remote-id>
+    <remote-id type="github">mean00/avidemux2</remote-id>
   </upstream>
 </pkgmetadata>