From d162ba1860a88062f4cd61f8b52fc303ba0b2991 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Aug 2021 00:16:33 +0100 Subject: gentoo resync : 07.08.2021 --- media-libs/x265/Manifest | 6 +- media-libs/x265/x265-3.4.ebuild | 4 +- media-libs/x265/x265-3.5.ebuild | 218 +++++++++++++++++++++++++++++++++++++++ media-libs/x265/x265-9999.ebuild | 8 +- 4 files changed, 228 insertions(+), 8 deletions(-) create mode 100644 media-libs/x265/x265-3.5.ebuild (limited to 'media-libs/x265') diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest index 065107d1c328..23e73f8be78e 100644 --- a/media-libs/x265/Manifest +++ b/media-libs/x265/Manifest @@ -4,6 +4,8 @@ AUX test-ns.patch 14677 BLAKE2B fa48d03bca5d72b7b3eac7f6ac98c93bde12ec845f9eecdd AUX tests.patch 650 BLAKE2B 21759b11966e12df1a72a1ed00935ff781ad8b912e734de65cf0872cf92400aef71d4aebbe067dd1059a1d445cd9819cef4dc4b1c7df63ca7b8e97b8e578045e SHA512 a4a3b69fa86e6910ff4f963b9667c8deaea4ff88f3396e8e426e61d036b12cbf550bff7867657da1ba98417f1ccae88db1887b94ea6271604060e01fb8698d79 AUX x265-3.3-ppc64.patch 590 BLAKE2B bbc6f18b8f192424450d2860e33ea6dbba14b46876f05cf9c499412d491127c877c342b1900bb9d06d66126aca2f383da1a4986ce69670ebc392fec0fe9b59a9 SHA512 bb4ace2c4bc899a0ccdd17fb78e63980354f41ff0f201812d47c5df16b23fea6fcdbde086e737d0efd5d8cb8fa571a131c03433bec31999c71ff51bccd754950 DIST x265_3.4.tar.gz 1469365 BLAKE2B 1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e SHA512 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e -EBUILD x265-3.4.ebuild 6370 BLAKE2B a3c2d028f58871382d8f2f8440bb8b3f4f88acd1573fbf319f7ffe786c4ff2ad007cde5e7ee5500ab297f3a69f3b3c1b0ae8f6f6dcbe599ef32ea5e000b6aa08 SHA512 2431ae3e83a6b35d709517f816b84a46c0141f411a9ff0435ce46073dbd280cbc92b2abeb27046d223ddc35c9f2a218982eafe78e1100387e60be2df6d64f47e -EBUILD x265-9999.ebuild 6296 BLAKE2B f1f2dfb04c6667c37dfd2681570237364441f73cc7325680376d0aa805581ed722970ea8060b9e4fee7e34b21dabed95da2cdedd62f130cff2a646747a7298a6 SHA512 55b83ca021856960b849dd893ad34d3153acc93f389a2185492cea8377657027f9bd89b0ff12823763f4e34b4d19f6a51b2abe04dc15ab1d70793486262dfe1a +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.ebuild 6295 BLAKE2B a27b1827080b93140f8a8548633a62682a68aca0b9bb9311306ed2d22dd012020e4ed39882a7d0025f1b31c253d769abedc620fb5889417d8bd44222494377a6 SHA512 4438c74042c8eaa5c9a153344fb28a1ac99b7f07b4d3db763db3904eba10774097c2b56a4892f67ac89ea82b6ab28f12ac84c6d532416e4cda8a5ca1e46dcf85 +EBUILD x265-9999.ebuild 6295 BLAKE2B a27b1827080b93140f8a8548633a62682a68aca0b9bb9311306ed2d22dd012020e4ed39882a7d0025f1b31c253d769abedc620fb5889417d8bd44222494377a6 SHA512 4438c74042c8eaa5c9a153344fb28a1ac99b7f07b4d3db763db3904eba10774097c2b56a4892f67ac89ea82b6ab28f12ac84c6d532416e4cda8a5ca1e46dcf85 MISC metadata.xml 621 BLAKE2B afdaa9cc6deae7cb65a9b3242abe446201ec8f53f0c19b866f63c8f26011b7f6f0ea5561ff56b0ea2c4832bfc5f6d95c14a8526f4bfaca2d7ee7fa807dfa1db8 SHA512 9862b540eca3b214ad9ba049c9f6721fbb6559bb00b82208eec63e05e81b1805e498357e8689be1b4042c51202030e4c62125599b0736358c4fb7e566dba1809 diff --git a/media-libs/x265/x265-3.4.ebuild b/media-libs/x265/x265-3.4.ebuild index 76b1480fcc04..feab1dee8c84 100644 --- a/media-libs/x265/x265-3.4.ebuild +++ b/media-libs/x265/x265-3.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" else SRC_URI="https://bitbucket.org/multicoreware/x265/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 new file mode 100644 index 000000000000..e956de4eab01 --- /dev/null +++ b/media-libs/x265/x265-3.5.ebuild @@ -0,0 +1,218 @@ +# 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 3bd31a5364ce..e956de4eab01 100644 --- a/media-libs/x265/x265-9999.ebuild +++ b/media-libs/x265/x265-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,16 +10,16 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/" S=${WORKDIR}/${P}/source else - SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz" + 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/wiki/Home" +HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/" LICENSE="GPL-2" # subslot = libx265 soname -SLOT="0/195" +SLOT="0/199" IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test" RESTRICT="!test? ( test )" -- cgit v1.2.3