commit: 95c1bdc571f49363a2e8c3acc9c65cb3d51131e3 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Dec 21 08:16:46 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Dec 21 09:56:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c1bdc5
media-libs/x265: always build as PIC Linkers are getting stricter. Closes: https://bugs.gentoo.org/913412 Signed-off-by: Sam James <sam <AT> gentoo.org> .../x265/{x265-9999.ebuild => x265-3.5-r3.ebuild} | 23 ++++++++++------------ media-libs/x265/x265-9999.ebuild | 15 ++++++-------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-3.5-r3.ebuild similarity index 90% copy from media-libs/x265/x265-9999.ebuild copy to media-libs/x265/x265-3.5-r3.ebuild index d7587145d46d..83b194908714 100644 --- a/media-libs/x265/x265-9999.ebuild +++ b/media-libs/x265/x265-3.5-r3.ebuild @@ -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 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" fi DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" @@ -19,8 +19,8 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"; LICENSE="GPL-2" # subslot = libx265 soname -SLOT="0/207" -IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test" +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}] )" @@ -31,9 +31,9 @@ BDEPEND=" abi_x86_64? ( ${ASM_DEPEND} )" PATCHES=( - "${FILESDIR}/${PN}-9999-arm.patch" - #"${FILESDIR}/neon.patch" - "${FILESDIR}/${PN}-9999-ppc64.patch" + "${FILESDIR}/arm-r1.patch" + "${FILESDIR}/neon.patch" + "${FILESDIR}/x265-3.3-ppc64.patch" "${FILESDIR}/tests.patch" "${FILESDIR}/test-ns.patch" ) @@ -166,18 +166,15 @@ multilib_src_configure() { -DLIB_INSTALL_DIR="$(get_libdir)" ) + # Unfortunately, the asm for x86/x32/arm isn't PIC-safe. 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 + # 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=$(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." + myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild index d7587145d46d..38c1dc82e324 100644 --- a/media-libs/x265/x265-9999.ebuild +++ b/media-libs/x265/x265-9999.ebuild @@ -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 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" fi DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" @@ -20,7 +20,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"; LICENSE="GPL-2" # subslot = libx265 soname SLOT="0/207" -IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test" +IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test" RESTRICT="!test? ( test )" RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" @@ -166,18 +166,15 @@ multilib_src_configure() { -DLIB_INSTALL_DIR="$(get_libdir)" ) + # Unfortunately, the asm for x86/x32/arm isn't PIC-safe. 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 + # 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=$(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." + myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
