diff options
| author |   Sam James <sam@gentoo.org> | 2023-12-21 08:06:11 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-12-21 09:56:23 +0000 |
| commit | 1c5afef162837b40b0c2099eb5d3f8cb68d3d8ed (patch) | |
| tree | 6932d762eea7740c5878d569113bd9abe8b10da9 | |
| parent | metadata/stabilization-groups: add rust group (diff) | |
| download | gentoo-1c5afef1.tar.gz gentoo-1c5afef1.tar.bz2 gentoo-1c5afef1.zip | |
media-libs/x264: always build as PIC
Linkers are getting stricter. The SSE part wasn't really used anyway,
just as a hack wrt the incompatibility with pic/asm/sse for x86.
Closes: https://bugs.gentoo.org/917583
Closes: https://bugs.gentoo.org/918105
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | media-libs/x264/x264-0.0.20231114-r1.ebuild | 74 | ||||
| -rw-r--r-- | media-libs/x264/x264-9999.ebuild | 4 |
2 files changed, 76 insertions, 2 deletions
diff --git a/media-libs/x264/x264-0.0.20231114-r1.ebuild b/media-libs/x264/x264-0.0.20231114-r1.ebuild new file mode 100644 index 000000000000..dc042c20d5c5 --- /dev/null +++ b/media-libs/x264/x264-0.0.20231114-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal toolchain-funcs flag-o-matic + +DESCRIPTION="Free library for encoding X264/AVC streams" +HOMEPAGE="https://www.videolan.org/developers/x264.html" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git" +else + X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7" + SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + S="${WORKDIR}/${PN}-${X264_COMMIT}" +fi + +LICENSE="GPL-2" +SLOT="0/164" # SONAME +IUSE="cpu_flags_ppc_altivec +interlaced opencl static-libs +threads" + +ASM_DEP=">=dev-lang/nasm-2.13" +DEPEND=" + abi_x86_32? ( ${ASM_DEP} ) + abi_x86_64? ( ${ASM_DEP} ) + opencl? ( dev-lang/perl ) +" +RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )" + +DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt ) + +multilib_src_configure() { + tc-export CC + + if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then + export AS="nasm" + else + export AS="${CC}" + fi + + local asm_conf="" + + if \ + [[ ${ABI} == x86* ]] \ + || [[ ${ABI} == "x32" ]] \ + || [[ ${CHOST} == armv5* ]] \ + || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; } \ + || use mips && { ! test-compile 'c' 'int main(void){__asm__("addvi.b $w0, $w1, 1");return 0;}' ; } + then + asm_conf=" --disable-asm" + fi + + "${S}/configure" \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --disable-cli \ + --disable-avs \ + --disable-lavf \ + --disable-swscale \ + --disable-ffms \ + --disable-gpac \ + --enable-pic \ + --enable-shared \ + --host="${CHOST}" \ + --cross-prefix="${CHOST}-" \ + $(usex interlaced "" "--disable-interlaced") \ + $(usex opencl "" "--disable-opencl") \ + $(usex static-libs "--enable-static" "") \ + $(usex threads "" "--disable-thread") \ + ${asm_conf} || die +} diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild index 7317a87e9e6a..dc042c20d5c5 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-9999.ebuild @@ -20,7 +20,7 @@ fi LICENSE="GPL-2" SLOT="0/164" # SONAME -IUSE="cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads" +IUSE="cpu_flags_ppc_altivec +interlaced opencl static-libs +threads" ASM_DEP=">=dev-lang/nasm-2.13" DEPEND=" @@ -44,7 +44,7 @@ multilib_src_configure() { local asm_conf="" if \ - [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } \ + [[ ${ABI} == x86* ]] \ || [[ ${ABI} == "x32" ]] \ || [[ ${CHOST} == armv5* ]] \ || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; } \ |