commit: fec3f2578abf812dbe59f279318fc68683c94c95 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Sep 7 21:18:37 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Sep 7 21:20:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec3f257
media-libs/x264: drop 0.0.20220222, 0.0.20231114, 0.0.20231114-r1 Bug: https://bugs.gentoo.org/936825 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/x264/Manifest | 2 - media-libs/x264/metadata.xml | 1 - media-libs/x264/x264-0.0.20220222.ebuild | 72 --------------------------- media-libs/x264/x264-0.0.20231114-r1.ebuild | 76 ----------------------------- media-libs/x264/x264-0.0.20231114.ebuild | 74 ---------------------------- 5 files changed, 225 deletions(-) diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest index df3438c35d15..c38c1dbe10e8 100644 --- a/media-libs/x264/Manifest +++ b/media-libs/x264/Manifest @@ -1,3 +1 @@ -DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9 -DIST x264-0.0.20231114.tar.bz2 833229 BLAKE2B e8e60767d16ea11e55f9dd56f1c74535a06b07a498b91d4372872925915563b67fb917c5856e2e40e1f58acbab3142509d036cae8d56820bef0e16ee7bc35196 SHA512 7705c2827c6b280afc7403bce206f82ee94c1ba76c582d3e6ae017b9c4f08c4475ac70373f8a0bcda73046221456efc3f338c57aaf03c11f4d8e63f69bb94db5 DIST x264-0.0.20240513.tar.bz2 841594 BLAKE2B fe88195c52d90e635a0aedef7d18886160147ba41cd1a692ae9a661b76608ac11e05aa5bc4628030f833d6a822cee187f3fbc4c015e094eb1b30c96783147124 SHA512 6d0d9e079d6c7650abb5c00ad60cf3cfe72a220b3ee7cd030d4daeefdd9feeb4d056cf2e01b2f8d2fb0a66ccc15cdde860237f8ac5eac42ede6e5444a81346f8 diff --git a/media-libs/x264/metadata.xml b/media-libs/x264/metadata.xml index ac93dbce1cad..311728b84a7d 100644 --- a/media-libs/x264/metadata.xml +++ b/media-libs/x264/metadata.xml @@ -6,6 +6,5 @@ </maintainer> <use> <flag name="interlaced">enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag> - <flag name="pic">disable optimized assembly code that is not PIC friendly</flag> </use> </pkgmetadata> diff --git a/media-libs/x264/x264-0.0.20220222.ebuild b/media-libs/x264/x264-0.0.20220222.ebuild deleted file mode 100644 index c806ef4b233a..000000000000 --- a/media-libs/x264/x264-0.0.20220222.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs flag-o-matic - -DESCRIPTION="A 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 - # Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2 - SRC_URI="https://dev.gentoo.org/~aballier/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" - S="${WORKDIR}/${PN}-master" -fi - -SLOT="0/164" # SONAME - -LICENSE="GPL-2" -IUSE="cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +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* ]] && { use pic || use !cpu_flags_x86_sse ; } \ - || [[ ${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-0.0.20231114-r1.ebuild b/media-libs/x264/x264-0.0.20231114-r1.ebuild deleted file mode 100644 index e7903442c2eb..000000000000 --- a/media-libs/x264/x264-0.0.20231114-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please bump with media-video/x264-encoder - -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 ~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-0.0.20231114.ebuild b/media-libs/x264/x264-0.0.20231114.ebuild deleted file mode 100644 index 01fd9e6af099..000000000000 --- a/media-libs/x264/x264-0.0.20231114.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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 ~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 pic static-libs cpu_flags_x86_sse +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* ]] && { use pic || use !cpu_flags_x86_sse ; } \ - || [[ ${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 -}
