gentoo resync : 25.08.2020

4 files changed, 157 insertions, 22 deletions

diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 8f54ad2f0ed9..65a8ee47a126 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,6 +1,8 @@
 AUX libde265-1.0.2-qtbindir.patch 1798 BLAKE2B 22e15a1d4dfe7f602c9b13611c17d4d6be396b1cb9d4d4690c43cb85cf6c21f64cde98e01b52551216612cf349f2fe74d59252b99a202cce7041d3c2b6a33dde SHA512 34b6efa56943e50d76c21e6911afff9c45e97d5608cfa5d3a53432bf2bf40f4fc6873d8c426b1a714542a6468670be2a710190191e5e1fe01c5e7dedf75f567c
 AUX libde265-1.0.3-use-new-FFMPEG-enum-names.patch 933 BLAKE2B 50f4f65a7c73365bd6f803c4fe85e029188a184dfe8dce5768e47af15cb489705129a5054aaf6bb12d8822de588c6ed10cf8384db7baeb2b4a6fee1a8a96494d SHA512 cf88bd2d40d9726dbe8bd8c3cddacccfef065635cf20751efd30dd30ac706d640be3b06a284a5bc11b457de63206d699405a6da8fb39cd0d5425371f5d538549
 DIST libde265-1.0.3.tar.gz 399996 BLAKE2B 988b21085f82d3b33b0480542677be96db5219c1b767aae3674f89862fdaf3355dcfea3fa99699798a4fcc6b72a63a3a6f61a3fd8d2ea8483231205cd6d87175 SHA512 0153632afcc9733950e8354997ccd93eddad90e8e0f7362bfe49b93b11cb1756cf803d0ba5c07042aee80e18227613af768ca82baf7891c687edf5e253a129c4
+DIST libde265-1.0.5.tar.gz 381041 BLAKE2B d561a0e5f308bed557237b88317985912537f76701783bc30d81305cf9026a853746449ece5b3092534466ea13d67bac10b3258580c8de07489844bbef0395db SHA512 3ff7310fc4621cac0ef1cb9bbc4df61724f8943d57f5263a3663a77f4d90d84716b2a708ee9fec306e909dc8b5e7fe645a641b6a6db795a89a01799be910831e
 EBUILD libde265-1.0.3.ebuild 1590 BLAKE2B 48de41d7133072b75f48b2fb954390915085931ec6f90daa56d6d437d130795039c682f36a8b053783e29bdbd4faedda8e15d48f0c50df57ba6b754462ca0360 SHA512 431fdd0871422199e7d9278fb21857e5a9a27cb34ba949767526d9f9ada57e65efe5abe3c4fae464e2bf3f021981a786cdeb84a9917032528cf08de4e30b8ac1
-EBUILD libde265-9999.ebuild 1521 BLAKE2B c3795a5d80124f4208d96e1901b69f1286074ce0dbf360b520e6d6e15b40d844980556e8f4da1b0e325712270b816940c680143fea650562637f7f0bc66ad64c SHA512 f2cb046e270197eb0ef2cd4f3e1fbaeac5c089c21fb119c650fa53ca7a85e74c9281e6cb4dd09256e07f94db55569e231a6d58901c6689ed9ff0322e37ec5ba6
-MISC metadata.xml 307 BLAKE2B 785344dd93b51d9103d01c68ba80c44821c36a1f61eeefb0dff56d708da5f6f1991ba142f44b6b652366e320410967deadcf537beaf256995a3a768fce7bee05 SHA512 27b883ff65471f49c87c1b21911172f82058a0492bec54290534fc5229f193a94675223a6b3064c84115eda4035fea6e6f5b5477f924adede2c2a72e55ece273
+EBUILD libde265-1.0.5.ebuild 2501 BLAKE2B cfef427281d76c9b1c0a7a6d8e8d7c813cd6132408effdfa5f55060724735e4110de822908bdbfa102299c6cbc9e4af42605b1ac5568b45ce02ffef670565887 SHA512 6b911086a255f7061e9fe2d6207e345d9c7a8d6218bd5e12440d95c5c4a836894d0e28cf4e68a583740e7e9b05418801f22ceefaf528b8a79fdbcb6ed7560de8
+EBUILD libde265-9999.ebuild 2496 BLAKE2B 645c7f8d7d267eee7b3cbf376ccc12463ca3fb0f3fd823f1a91016021b047f3b60726886e711006640f28843ac8883b64662740c0cbdd0820e44400b72b0f191 SHA512 b33524c9cc21c9cce9b71b29c2de42b248725aff4d790f8bcd2a2da517584b3b9ca641ab51e5a3bae5ce365b3cb6695d624c01db4ac706d70a96c5cf0ee37df7
+MISC metadata.xml 691 BLAKE2B 24cf4f5585ca49df6aa5fbed6ab8daa55451446b1ab2d47953e05ce726b22457f1f2adc18774b745206a2f7342996b210edf83867578f86049e23823e43c1788 SHA512 c121ebe35ce66deb54c5d046fb74fb8096d134348b15607f7bc7f0b7239ce76a2ecc43ecee72382adb6078ac6f50859d0ac3a60bd8a3daf52f6cd04c9a56ecf9
diff --git a/media-libs/libde265/libde265-1.0.5.ebuild b/media-libs/libde265/libde265-1.0.5.ebuild
new file mode 100644
index 000000000000..ff9f2f98af53
--- /dev/null
+++ b/media-libs/libde265/libde265-1.0.5.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.2-qtbindir.patch" )
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Open h.265 video codec implementation"
+HOMEPAGE="https://github.com/strukturag/libde265"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="enc265 dec265 sdl tools debug static-libs cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb"
+# IUSE+=" sherlock265" # Require libvideogfx or libswscale
+
+RDEPEND="
+	dec265? (
+		sdl? ( media-libs/libsdl )
+	)
+"
+# Sherlock265 require libvideogfx or libswscale
+#RDEPEND+="
+#	sherlock265? (
+#		media-libs/libsdl
+#		dev-qt/qtcore:5
+#		dev-qt/qtgui:5
+#		dev-qt/qtwidgets:5
+#		media-libs/libswscale
+#	)
+#"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dec265? ( virtual/pkgconfig )"
+
+# Sherlock265 require libvideogfx or libswscale
+#BDEPEND+=" sherlock265? ( virtual/pkgconfig )"
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# without this, headers would be missing and make would fail
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		ax_cv_check_cflags___msse4_1=$(usex cpu_flags_x86_sse4_1)
+		ax_cv_check_cflags___mfpu_neon=$(usex cpu_flags_arm_neon)
+		$(use_enable cpu_flags_arm_thumb thumb)
+		$(use_enable static-libs static)
+		$(use_enable debug log-info)
+		$(use_enable debug log-debug)
+		$(use_enable debug log-trace)
+		$(multilib_native_use_enable enc265 encoder)
+		$(multilib_native_use_enable dec265)
+		--enable-log-error
+	)
+
+	# myeconfargs+=( $(multilib_native_use_enable sherlock265) ) # Require libvideogfx or libswscale
+	myeconfargs+=( --disable-sherlock265 )
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		# Remove useless, unready and test tools (Why package ever tried to install them??)
+		rm -f "${ED}/usr/bin/"{tests,gen-enc-table,yuv-distortion} || die
+		if ! use tools; then
+			rm -f "${ED}/usr/bin/"{bjoentegaard,block-rate-estim,rd-curves} || die
+			rm -f "${ED}/usr/bin/acceleration_speed" || die
+		fi
+	else
+		# Remove all non-native binary tools
+		rm -f "${ED}/usr/bin/"* || die
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild
index 7f4f73fb81e2..1b591f16c364 100644
--- a/media-libs/libde265/libde265-9999.ebuild
+++ b/media-libs/libde265/libde265-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Open h.265 video codec implementation"
@@ -20,18 +20,31 @@ HOMEPAGE="https://github.com/strukturag/libde265"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cpu_flags_x86_sse debug qt5 static-libs"
-
-DEPEND="
-	media-libs/libsdl[${MULTILIB_USEDEP}]
-	media-video/ffmpeg:=[${MULTILIB_USEDEP}]
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
+IUSE="enc265 dec265 sdl tools debug static-libs cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb"
+# IUSE+=" sherlock265" # Require libvideogfx or libswscale
+
+RDEPEND="
+	dec265? (
+		sdl? ( media-libs/libsdl )
 	)
 "
-RDEPEND="${DEPEND}"
+# Sherlock265 require libvideogfx or libswscale
+#RDEPEND+="
+#	sherlock265? (
+#		media-libs/libsdl
+#		dev-qt/qtcore:5
+#		dev-qt/qtgui:5
+#		dev-qt/qtwidgets:5
+#		media-libs/libswscale
+#	)
+#"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dec265? ( virtual/pkgconfig )"
+
+# Sherlock265 require libvideogfx or libswscale
+#BDEPEND+=" sherlock265? ( virtual/pkgconfig )"
 
 src_prepare() {
 	default
@@ -44,26 +57,40 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
-		$(use_enable cpu_flags_x86_sse sse)
+		ax_cv_check_cflags___msse4_1=$(usex cpu_flags_x86_sse4_1)
+		ax_cv_check_cflags___mfpu_neon=$(usex cpu_flags_arm_neon)
+		$(use_enable cpu_flags_arm_thumb thumb)
 		$(use_enable static-libs static)
 		$(use_enable debug log-info)
 		$(use_enable debug log-debug)
 		$(use_enable debug log-trace)
+		$(multilib_native_use_enable enc265 encoder)
+		$(multilib_native_use_enable dec265)
 		--enable-log-error
 	)
 
-	if ! multilib_is_native_abi; then
-		myeconfargs+=( --disable-dec265 --disable-sherlock265 )
-	else
-		myeconfargs+=(
-			$(use_enable qt5 dec265)
-			$(use_enable qt5 sherlock265)
-		)
-	fi
+	# myeconfargs+=( $(multilib_native_use_enable sherlock265) ) # Require libvideogfx or libswscale
+	myeconfargs+=( --disable-sherlock265 )
 
 	econf "${myeconfargs[@]}"
 }
 
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		# Remove useless, unready and test tools (Why package ever tried to install them??)
+		rm -f "${ED}/usr/bin/"{tests,gen-enc-table,yuv-distortion} || die
+		if ! use tools; then
+			rm -f "${ED}/usr/bin/"{bjoentegaard,block-rate-estim,rd-curves} || die
+			rm -f "${ED}/usr/bin/acceleration_speed" || die
+		fi
+	else
+		# Remove all non-native binary tools
+		rm -f "${ED}/usr/bin/"* || die
+	fi
+}
+
 multilib_src_install_all() {
 	find "${ED}" -name '*.la' -delete || die
 	if ! use static-libs ; then
diff --git a/media-libs/libde265/metadata.xml b/media-libs/libde265/metadata.xml
index 37489247c5ca..524e76641f5f 100644
--- a/media-libs/libde265/metadata.xml
+++ b/media-libs/libde265/metadata.xml
@@ -4,6 +4,13 @@
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="enc265">Enable build of enc265 tool</flag>
+		<flag name="dec265">Enable build of dec265 example program</flag>
+		<flag name="sdl">Enable video output of dec265 example program with <pkg>media-libs/libsdl</pkg></flag>
+		<flag name="tools">Enable installation of varous binary tools</flag>
+		<flag name="static-libs">Enable build of static libraries</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">strukturag/libde265</remote-id>
 	</upstream>