gentoo resync : 20.03.2022

4 files changed, 6 insertions, 225 deletions

diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index a5f0d76424f5..127879685599 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -8,7 +8,6 @@ AUX x265-9999-ppc64.patch 385 BLAKE2B c75bd6e0e7c1ded2b4858f4cbacc337d6015a0387a
 DIST x265_3.4.tar.gz 1469365 BLAKE2B 1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e SHA512 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e
 DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
 EBUILD x265-3.4.ebuild 6377 BLAKE2B 8cc509d9a0d7c8d4b0ed2226f3eae682035f725648d0c43b3083c6db50ae8afb3351855f38204a55bd1b5dd8fec3d6f6e11c5f12a0b3533f051e16983cef10f2 SHA512 d634f733615b5c2abbb3ced26c867e18a997172869e7991066d9f7ca18486f2140ee8195edd2f3584a3479f5a556ddb7e4e428d5a2bf963b56c9fde993853843
-EBUILD x265-3.5-r2.ebuild 6350 BLAKE2B 0b952a0dc4f51ad94c34ce61afd4a89c4d581157016680ef2825b729e94f28dbeb4273052ac37dcc3ad66479b6369e771c6d678e63197e79ff132731a120080e SHA512 13821133cc698549521bc92cbe5644176db63a43c79b2f91ccdb373f5eec0b6384624ce50498978031e973c5eab3cb98a4ed814ed5651ff0f63b1839057eab5d
-EBUILD x265-3.5.ebuild 6295 BLAKE2B a27b1827080b93140f8a8548633a62682a68aca0b9bb9311306ed2d22dd012020e4ed39882a7d0025f1b31c253d769abedc620fb5889417d8bd44222494377a6 SHA512 4438c74042c8eaa5c9a153344fb28a1ac99b7f07b4d3db763db3904eba10774097c2b56a4892f67ac89ea82b6ab28f12ac84c6d532416e4cda8a5ca1e46dcf85
-EBUILD x265-9999.ebuild 6361 BLAKE2B b48741992dbfbf59f5e67a2bfd0ffa0bb81aeea05ed27fe113e56d0ed3a713c6ddd686699b36539b8b7ef687ebeddfe519e117a25782eea229b8ac8eaa07ebd1 SHA512 d6f6a7b9562cf546f7baf7eee64ae93f9e25b5e17d264484487bdf88f217ef6b1f7b88cb5ef42350ae4e2085eadaa01443a32689410f2a97e1fe4d6f8d028375
+EBUILD x265-3.5-r2.ebuild 6351 BLAKE2B 6bbcb1a6e42a385fae266066290dabf0971e725fb4884a9bbb662f61d8720a931436579ada22b7b83c7b421965823a80501be90e7e7d1c3c3d9ebeda90921816 SHA512 eadd94dff032b4cd302fe714a0b07ee1caeed95b117ca7b21812e6e7656153579a6d88b7e96dcef89c325d7be0085774662c8c21e406e68999c127c37f4525cf
+EBUILD x265-9999.ebuild 6368 BLAKE2B 7949eef144fe0630957c7ee8d687c263ac50b9becf78833e9a5d8ea9db040cf3c574da7515458220b449145ed41cc5ec75a09c86bc5935900d38910e8ced9916 SHA512 b7766c09d856ecf39e604537c46a3d66ab4540d66e7ca6bc8e311b86674fecc1fd2495f01660dd6cafa4825bb8cc1b94d86e98cbd66b3c63800c98ddba2acfe4
 MISC metadata.xml 622 BLAKE2B 337e399c3be2dfc52c2f422a76ae80faad2424d221e074041e06cc0a10403bea1aca3975ae6afaf9bb4b50cc5069db8413928e8697458014c6f96d1856421f79 SHA512 be4f7c57f732fa836cda726da9426a0e4bdac2a681a4be3bb157e7cf7b8f517e3002653d9ee7a58ba81601d34fb6168680453bbdaa10389b65945f7b4d1a492c
diff --git a/media-libs/x265/x265-3.5-r2.ebuild b/media-libs/x265/x265-3.5-r2.ebuild
index 58018488f52c..8ccbefead9ac 100644
--- a/media-libs/x265/x265-3.5-r2.ebuild
+++ b/media-libs/x265/x265-3.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	S=${WORKDIR}/${P}/source
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
diff --git a/media-libs/x265/x265-3.5.ebuild b/media-libs/x265/x265-3.5.ebuild
deleted file mode 100644
index e956de4eab01..000000000000
--- a/media-libs/x265/x265-3.5.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal multilib multibuild flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
-	S=${WORKDIR}/${P}/source
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/199"
-IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-ASM_DEPEND=">=dev-lang/nasm-2.13"
-BDEPEND="
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}/arm-r1.patch"
-	"${FILESDIR}/neon.patch"
-	"${FILESDIR}/x265-3.3-ppc64.patch"
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/test-ns.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
-	fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
-	local variants=""
-	use 12bit && variants+="main12 "
-	use 10bit && variants+="main10 "
-	variants+="main"
-	echo "${variants}"
-}
-
-x265_variant_src_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-
-	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
-
-	local mycmakeargs=( "${myabicmakeargs[@]}" )
-	case "${MULTIBUILD_VARIANT}" in
-		"main12")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-				-DMAIN12=ON
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm* ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			# disable altivec for 12bit build #607802#c5
-			if [[ ${ABI} = ppc* ]] ; then
-				mycmakeargs+=(
-					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-				)
-			fi
-			;;
-		"main10")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			if [[ ${ABI} = arm* ]] ; then
-				# 589674
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			# disable altivec for 10bit build #607802#c5
-			if [[ ${ABI} = ppc* ]] ; then
-				mycmakeargs+=(
-					-DENABLE_ALTIVEC=OFF
-					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-				)
-			fi
-			;;
-		"main")
-			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
-				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
-				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
-				local liblist="" v=
-				for v in "${myvariants[@]}" ; do
-					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
-					liblist+="libx265_${v}.a;"
-				done
-				mycmakeargs+=(
-					-DEXTRA_LIB="${liblist}"
-					-DEXTRA_LINK_FLAGS=-L.
-					-DLINKED_10BIT=$(usex 10bit)
-					-DLINKED_12BIT=$(usex 12bit)
-				)
-				if [[ ${ABI} = ppc* ]] ; then
-					# upstream uses mix of altivec + power8 vectors
-					# it's impossible to enable altivec without CPU_POWER8
-					# and it does not work on ppc32
-					# so we toggle both variables together
-					mycmakeargs+=(
-						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
-						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
-					)
-				fi
-			fi
-			;;
-		*)
-			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
-	esac
-	cmake_src_configure
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	local myabicmakeargs=(
-		-DENABLE_TESTS=$(usex test ON OFF)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DENABLE_PIC=ON
-		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-
-	if [[ ${ABI} = x86 ]] ; then
-		# Bug #528202
-		if use pic ; then
-			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
-			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-		fi
-	elif [[ ${ABI} = x32 ]] ; then
-		# bug #510890
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	elif [[ ${ABI} = arm ]] ; then
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
-		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
-	fi
-
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant cmake_src_compile
-}
-
-x265_variant_src_test() {
-	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
-		"${BUILD_DIR}/test/TestBench" || die
-	else
-		einfo "Unit tests check only assembly."
-		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
-		einfo "Skipping tests."
-	fi
-}
-
-multilib_src_test() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
-	# Install only "main" variant since the others are already linked into it.
-	local MULTIBUILD_VARIANTS=( "main" )
-	multibuild_foreach_variant cmake_src_install
-}
-
-multilib_src_install_all() {
-	dodoc -r "${S}/../doc/"*
-
-	# we don't install *.a files for all variants,
-	# so just delete these files instead of pretending
-	# real USE=static-libs support
-	find "${ED}" -name "*.a" -delete || die
-}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index d686f028c1da..4f853abbc5bd 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	S=${WORKDIR}/${P}/source
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"