commit: c357a86ab2d9d62974bead3b7dc5ad9ebd4820e7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Sep 7 21:19:06 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=c357a86a
media-video/x264-encoder: drop 0.0.20220222, 0.0.20231114 Bug: https://bugs.gentoo.org/936825 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/x264-encoder/Manifest | 2 - .../x264-encoder/x264-encoder-0.0.20220222.ebuild | 74 --------------------- .../x264-encoder/x264-encoder-0.0.20231114.ebuild | 77 ---------------------- 3 files changed, 153 deletions(-) diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest index df3438c35d15..c38c1dbe10e8 100644 --- a/media-video/x264-encoder/Manifest +++ b/media-video/x264-encoder/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-video/x264-encoder/x264-encoder-0.0.20220222.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild deleted file mode 100644 index 7be6d065c869..000000000000 --- a/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="A free commandline encoder for 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"; - SRC_URI="" -else - # Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2 - SRC_URI="https://dev.gentoo.org/~aballier/distfiles/x264-${PV}.tar.bz2"; - KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" - S="${WORKDIR}/x264-master" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" - -REQUIRED_USE="ffmpegsource? ( ffmpeg )" - -RDEPEND=" - ~media-libs/x264-${PV}[interlaced=,threads=] - ffmpeg? ( media-video/ffmpeg:= ) - ffmpegsource? ( media-libs/ffmpegsource ) - mp4? ( >=media-video/gpac-0.5.2:= )" - -ASM_DEP=">=dev-lang/nasm-2.13" -DEPEND="${RDEPEND} - amd64? ( ${ASM_DEP} ) - x86? ( ${ASM_DEP} )" -BDEPEND="virtual/pkgconfig" - -src_configure() { - tc-export CC - - if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then - export AS="nasm" - else - export AS="${CC}" - fi - - # let upstream pick the optimization level by default - use custom-cflags || filter-flags -O? - - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --system-libx264 \ - --host="${CHOST}" \ - --disable-lsmash \ - $(usex avs "" "--disable-avs") \ - $(usex ffmpeg "" "--disable-lavf --disable-swscale") \ - $(usex ffmpegsource "" "--disable-ffms") \ - $(usex interlaced "" "--disable-interlaced") \ - $(usex mp4 "" "--disable-gpac") \ - $(usex threads "" "--disable-thread") || die - - # this is a nasty workaround for bug #376925 for x264 that also applies - # here, needed because as upstream doesn't like us fiddling with their CFLAGS - if use custom-cflags; then - local cflags - cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" - cflags="${cflags//$(get-flag O)/}" - cflags="${cflags//-O? /$(get-flag O) }" - cflags="${cflags//-g /}" - sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak - fi -} diff --git a/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild deleted file mode 100644 index 14aa1ea30410..000000000000 --- a/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Bump with media-libs/x264 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="A free commandline encoder for 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/-encoder}.tar.bz2" - KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" - S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" -REQUIRED_USE="ffmpegsource? ( ffmpeg )" - -RDEPEND=" - ~media-libs/x264-${PV}[interlaced=,threads=] - ffmpeg? ( media-video/ffmpeg:= ) - ffmpegsource? ( media-libs/ffmpegsource ) - mp4? ( >=media-video/gpac-0.5.2:= ) -" -ASM_DEP=">=dev-lang/nasm-2.13" -DEPEND=" - ${RDEPEND} - amd64? ( ${ASM_DEP} ) - x86? ( ${ASM_DEP} ) -" -BDEPEND="virtual/pkgconfig" - -src_configure() { - tc-export CC - - if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then - export AS="nasm" - else - export AS="${CC}" - fi - - # let upstream pick the optimization level by default - use custom-cflags || filter-flags -O? - - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --system-libx264 \ - --host="${CHOST}" \ - --disable-lsmash \ - $(usex avs "" "--disable-avs") \ - $(usex ffmpeg "" "--disable-lavf --disable-swscale") \ - $(usex ffmpegsource "" "--disable-ffms") \ - $(usex interlaced "" "--disable-interlaced") \ - $(usex mp4 "" "--disable-gpac") \ - $(usex threads "" "--disable-thread") || die - - # this is a nasty workaround for bug #376925 for x264 that also applies - # here, needed because as upstream doesn't like us fiddling with their CFLAGS - if use custom-cflags; then - local cflags - cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" - cflags="${cflags//$(get-flag O)/}" - cflags="${cflags//-O? /$(get-flag O) }" - cflags="${cflags//-g /}" - sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak - fi -}
