gentoo auto-resync : 25:11:2023 - 10:31:10

3 files changed, 89 insertions, 11 deletions

diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 4352089c9f56..b58973d3b9bd 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,4 +1,6 @@
 DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
+DIST x264-0.0.20231114.tar.bz2 833229 BLAKE2B e8e60767d16ea11e55f9dd56f1c74535a06b07a498b91d4372872925915563b67fb917c5856e2e40e1f58acbab3142509d036cae8d56820bef0e16ee7bc35196 SHA512 7705c2827c6b280afc7403bce206f82ee94c1ba76c582d3e6ae017b9c4f08c4475ac70373f8a0bcda73046221456efc3f338c57aaf03c11f4d8e63f69bb94db5
 EBUILD x264-0.0.20220222.ebuild 2101 BLAKE2B e31719349399dfa83e5d0c97b3684b2f9484d051951f740e12d478b1a57448add56c5d5ff9e461f05d89cb9012205074d7a3e9246af65079cbbe5a88c191ed22 SHA512 ea9bb23667b27e6b14a1b0d3b751509c2fdd5dab93de26d1f4c2a73067bddbec2d76edf839a6bf096338b97f3e17b8866163950e2b99af7c3f1e4e64cda46cd1
-EBUILD x264-9999.ebuild 2101 BLAKE2B b76303887637392892b9393168c9d1d40e7d822c4f3cac83f7bfc580903e60c5cd79b7da72b286a82bfa59639bac66b29ab65e09d466319eb31afd68421ca125 SHA512 a05ba23fb57a423e7c9a6bf424a2c8a604a2e1b479567be1fb8ebf761e6542f977dbca077bb2fb39ed1d7e6466ccf22244f49ece34b7c5f85cfc890f3658f910
+EBUILD x264-0.0.20231114.ebuild 2137 BLAKE2B 52fd9c1d3fd59454498fcb75a39f930e91fc27588e7f649530acc04b3d3b975e4721948c170c7cd34e2f32245a2fc5e6b2f8bcf5114d3171f8336ee8e2ec3fd4 SHA512 0e1f1ab79148090f34f80bd4eb2456c98a9f3c895098123d90e0afa059f5197270f6c0b6b6d4c85011d32acca4cedd7a5e5d85990d7725e7add5e0fa6bcb753b
+EBUILD x264-9999.ebuild 2137 BLAKE2B 52fd9c1d3fd59454498fcb75a39f930e91fc27588e7f649530acc04b3d3b975e4721948c170c7cd34e2f32245a2fc5e6b2f8bcf5114d3171f8336ee8e2ec3fd4 SHA512 0e1f1ab79148090f34f80bd4eb2456c98a9f3c895098123d90e0afa059f5197270f6c0b6b6d4c85011d32acca4cedd7a5e5d85990d7725e7add5e0fa6bcb753b
 MISC metadata.xml 489 BLAKE2B b9c1e67f7b3bce14a0d3330717204b25bfccc55d77343dba21b8a4d01b915dd690627a7affea0de0e7940c42ac2378e2e06dff243099b70b5c6a1805095d5fd1 SHA512 1416496833de2a3e28ad0f407701c0a08b6d3435a3ba65c159beac19c7a64d0f5f04d5200cbaf9217846cef0a101827bf50824eedc2b6ae7414a7fc6fc10b250
diff --git a/media-libs/x264/x264-0.0.20231114.ebuild b/media-libs/x264/x264-0.0.20231114.ebuild
new file mode 100644
index 000000000000..7317a87e9e6a
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20231114.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 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-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index cef3a4d4053a..7317a87e9e6a 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -1,31 +1,33 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multilib-minimal toolchain-funcs flag-o-matic
 
-DESCRIPTION="A free library for encoding X264/AVC streams"
+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
-	# 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 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-	S="${WORKDIR}/${PN}-master"
+	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
 
-SLOT="0/164" # SONAME
-
 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} )
+DEPEND="
+	abi_x86_32? ( ${ASM_DEP} )
 	abi_x86_64? ( ${ASM_DEP} )
-	opencl? ( dev-lang/perl )"
+	opencl? ( dev-lang/perl )
+"
 RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
 
 DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )