commit: 280653614f39fe2b719d6130751b1b27e9516c28 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Dec 28 15:56:30 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Dec 28 16:59:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28065361
media-libs/x265: drop 3.5-r3, 3.5-r4, 3.5-r6 Closes: https://bugs.gentoo.org/943178 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/x265/Manifest | 1 - media-libs/x265/files/arm-r1.patch | 68 ------- media-libs/x265/files/x265-3.3-ppc64.patch | 15 -- media-libs/x265/files/x265-3.5-r5-test-ns_2.patch | 11 -- media-libs/x265/x265-3.5-r3.ebuild | 223 ---------------------- media-libs/x265/x265-3.5-r4.ebuild | 223 ---------------------- media-libs/x265/x265-3.5-r6.ebuild | 202 -------------------- 7 files changed, 743 deletions(-) diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest index 2ea6fb64ce0a..6a038e209d17 100644 --- a/media-libs/x265/Manifest +++ b/media-libs/x265/Manifest @@ -1,2 +1 @@ DIST x265-3.6.tar.gz 1655889 BLAKE2B 2598421e2e21974998b0b20895dc7e12dbf6ebe1b6c23bb5a7710b575d3db773335cd1f0b3ef110b79cf4d6dd01e543e9807a0509963497edc25f617f80c29f3 SHA512 570429c3f0b560b2f946ac9baba97d66d7d6485e46eb695b17003b5913028f62d35822477633e911cd3ea60e6ce0ecc7d9d82de7d8257272f9ca7b43761438be -DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997 diff --git a/media-libs/x265/files/arm-r1.patch b/media-libs/x265/files/arm-r1.patch deleted file mode 100644 index 69aa3036eff3..000000000000 --- a/media-libs/x265/files/arm-r1.patch +++ /dev/null @@ -1,68 +0,0 @@ -More aliases for ARM. -Do not force CFLAGS for ARM. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_ - # System architecture detection - string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) - set(X86_ALIASES x86 i386 i686 x86_64 amd64) --set(ARM_ALIASES armv6l armv7l aarch64) -+set(ARM_ALIASES armv6l armv6l armv7l armv7a aarch64) - list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) - list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) - set(POWER_ALIASES ppc64 ppc64le) -@@ -239,11 +239,7 @@ if(GCC) - endif() - endif() - if(ARM AND CROSS_COMPILE_ARM) -- if(ARM64) -- set(ARM_ARGS -fPIC) -- else() -- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) -- endif() -+ set(ARM_ARGS -fPIC) - message(STATUS "cross compile arm") - elseif(ARM) - if(ARM64) -@@ -252,10 +248,10 @@ if(GCC) - else() - find_package(Neon) - if(CPU_HAS_NEON) -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) -+ set(ARM_ARGS -mfpu=neon -fPIC) - add_definitions(-DHAVE_NEON) - else() -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) -+ set(ARM_ARGS -fPIC) - endif() - endif() - endif() ---- a/dynamicHDR10/CMakeLists.txt -+++ b/dynamicHDR10/CMakeLists.txt -@@ -43,14 +43,14 @@ if(GCC) - endif() - endif() - if(ARM AND CROSS_COMPILE_ARM) -- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) -+ set(ARM_ARGS -fPIC) - elseif(ARM) - find_package(Neon) - if(CPU_HAS_NEON) -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) -+ set(ARM_ARGS -fPIC) - add_definitions(-DHAVE_NEON) - else() -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) -+ set(ARM_ARGS -fPIC) - endif() - endif() - add_definitions(${ARM_ARGS}) -@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables") - option(ENABLE_SHARED "Build shared library" OFF) - - install(FILES hdr10plus.h DESTINATION include) --endif() -\ No newline at end of file -+endif() - diff --git a/media-libs/x265/files/x265-3.3-ppc64.patch b/media-libs/x265/files/x265-3.3-ppc64.patch deleted file mode 100644 index 8e739e3fab1b..000000000000 --- a/media-libs/x265/files/x265-3.3-ppc64.patch +++ /dev/null @@ -1,15 +0,0 @@ -More complete ppc64 matches. - -Index: x265_2.2/source/CMakeLists.txt -=================================================================== ---- old/CMakeLists.txt -+++ new/CMakeLists.txt -@@ -44,7 +44,7 @@ set(X86_ALIASES x86 i386 i686 x86_64 amd - set(ARM_ALIASES armv6l armv6j armv7l armv7a) - list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) - list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) --set(POWER_ALIASES ppc64 ppc64le) -+set(POWER_ALIASES ppc64 ppc64le powerpc64 powerpc64le) - list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH) - if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1") - set(X86 1) diff --git a/media-libs/x265/files/x265-3.5-r5-test-ns_2.patch b/media-libs/x265/files/x265-3.5-r5-test-ns_2.patch deleted file mode 100644 index eec119f7f923..000000000000 --- a/media-libs/x265/files/x265-3.5-r5-test-ns_2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- source.orig/encoder/encoder.cpp -+++ source/encoder/encoder.cpp -@@ -1592,7 +1592,7 @@ int Encoder::encode(const x265_picture* - if (m_exportedPic) - { - if (!m_param->bUseAnalysisFile && m_param->analysisSave) -- x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData); -+ PARAM_NS::x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData); - ATOMIC_DEC(&m_exportedPic->m_countRefEncoders); - m_exportedPic = NULL; - m_dpb->recycleUnreferenced(); diff --git a/media-libs/x265/x265-3.5-r3.ebuild b/media-libs/x265/x265-3.5-r3.ebuild deleted file mode 100644 index 7dae9a86bfa8..000000000000 --- a/media-libs/x265/x265-3.5-r3.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic multilib-minimal multibuild - -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 ~loong ~mips ppc ppc64 ~riscv 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_ppc_vsx2 numa 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" - "${FILESDIR}/${PN}-3.5-r5-test-ns_2.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 - -DENABLE_HDR10_PLUS=ON - ) - 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() { - # -Werror=odr - # https://bugs.gentoo.org/875854 - # https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto - filter-lto - - 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) - -DGIT_ARCHETYPE=1 #814116 - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - - # Unfortunately, the asm for x86/x32/arm isn't PIC-safe. - if [[ ${ABI} = x86 ]] ; then - # Bug #528202, bug #913412 - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - elif [[ ${ABI} = x32 ]] ; then - # bug #510890 - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - elif [[ ${ABI} = arm ]] ; then - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - 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-3.5-r4.ebuild b/media-libs/x265/x265-3.5-r4.ebuild deleted file mode 100644 index 762fbb6bd7f4..000000000000 --- a/media-libs/x265/x265-3.5-r4.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic multilib-minimal multibuild - -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 ~loong ~mips ~ppc ~ppc64 ~riscv ~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_ppc_vsx2 numa 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" - "${FILESDIR}/${PN}-3.5-r5-test-ns_2.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 - -DENABLE_HDR10_PLUS=ON - ) - 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() { - # -Werror=odr - # https://bugs.gentoo.org/875854 - # https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto - filter-lto - - 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) - -DGIT_ARCHETYPE=1 #814116 - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - - # Unfortunately, the asm for x86/x32/arm isn't PIC-safe. - if [[ ${ABI} = x86 ]] ; then - # Bug #528202, bug #913412 - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - elif [[ ${ABI} = x32 ]] ; then - # bug #510890 - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - elif [[ ${ABI} = arm ]] ; then - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - 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-3.5-r6.ebuild b/media-libs/x265/x265-3.5-r6.ebuild deleted file mode 100644 index f38a58ad7981..000000000000 --- a/media-libs/x265/x265-3.5-r6.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic multilib-minimal multibuild - -DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="https://www.x265.org/ https://bitbucket.org/multicoreware/x265_git/"; - -if [[ ${PV} = 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"; - MY_P="${PN}-${PV}" -else - SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" - MY_P="${PN}_${PV}" -fi - -S="${WORKDIR}/${MY_P}/source" -unset MY_P - -LICENSE="GPL-2" -# subslot = libx265 soname -SLOT="0/199" -IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa 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}/tests.patch" - "${FILESDIR}/test-ns.patch" - "${FILESDIR}/${PN}-3.5-r5-cpp-std.patch" - "${FILESDIR}/${PN}-3.5-r5-gcc15.patch" - "${FILESDIR}/${PN}-3.5-r5-test-ns_2.patch" - "${FILESDIR}/${PN}-3.6-cmake-cleanup.patch" - "${FILESDIR}/${PN}-3.6-code-cleanup.patch" -) - -pkg_setup() { - variants=( - $(usev 12bit "main12") - $(usev 10bit "main10") - ) -} - -# 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 - -x265_variant_src_configure() { - einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}" - - local mycmakeargs=( - "${mycmakeargs[@]}" - -DHIGH_BIT_DEPTH=ON - -DEXPORT_C_API=OFF - -DENABLE_SHARED=OFF - -DENABLE_CLI=OFF - ) - - case "${MULTIBUILD_VARIANT}" in - "main12") - mycmakeargs+=( - -DMAIN12=ON - ) - ;; - "main10") - mycmakeargs+=( - -DENABLE_HDR10_PLUS=ON - ) - ;; - *) - die "Unknown variant: ${MULTIBUILD_VARIANT}";; - esac - cmake_src_configure -} - -multilib_src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/875854 - # https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto - filter-lto - - local mycmakeargs=( - -DENABLE_PIC=ON - -DENABLE_LIBNUMA="$(usex numa)" - -DENABLE_SVT_HEVC="no" # missing - -DENABLE_VTUNE="no" # missing - -DGIT_ARCHETYPE=1 #814116 - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - if ! multilib_is_native_abi; then - mycmakeargs+=( - -DENABLE_CLI="no" - ) - fi - - # Unfortunately, the asm for x86/x32/arm isn't PIC-safe. - # x86 # Bug #528202, bug #913412 - # x32 # bug #510890 - if [[ ${ABI} = x86 ]] || [[ ${ABI} = x32 ]] || [[ ${ABI} = arm ]] ; then - mycmakeargs+=( - -DENABLE_ASSEMBLY=OFF - # ENABLE_TESTS requires ENABLE_ASSEMBLY=ON to be visible - # source/CMakeLists.txt:858 - # -DENABLE_TESTS="no" #728748 - ) - else - mycmakeargs+=( - -DENABLE_TESTS="$(usex test)" - ) - fi - - 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)" - -DENABLE_ALTIVEC="$(usex cpu_flags_ppc_vsx2)" - ) - fi - - local MULTIBUILD_VARIANTS=( "${variants[@]}" ) - if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then - multibuild_foreach_variant x265_variant_src_configure - - local liblist="" v= - for v in "${MULTIBUILD_VARIANTS[@]}" ; do - ln -s "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR}/libx265_${v}.a" || die - liblist+="libx265_${v}.a;" - done - - mycmakeargs+=( - -DEXTRA_LIB="${liblist}" - -DEXTRA_LINK_FLAGS="-L${BUILD_DIR}" - -DLINKED_10BIT"=$(usex 10bit)" - -DLINKED_12BIT="$(usex 12bit)" - ) - fi - - cmake_src_configure -} - -multilib_src_compile() { - local MULTIBUILD_VARIANTS=( "${variants[@]}" ) - if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then - multibuild_foreach_variant cmake_src_compile - fi - 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=( "${variants[@]}" ) - if [[ "${#MULTIBUILD_VARIANTS[@]}" -gt 1 ]] ; then - multibuild_foreach_variant x265_variant_src_test - fi - x265_variant_src_test -} - -multilib_src_install() { - 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 -}
