From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 20 Mar 2022 00:40:44 +0000
Subject: gentoo resync : 20.03.2022

---
 media-video/x264-encoder/Manifest                  |  4 +-
 .../x264-encoder/x264-encoder-0.0.20220222.ebuild  | 74 ++++++++++++++++++++++
 media-video/x264-encoder/x264-encoder-9999.ebuild  |  8 +--
 3 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild

(limited to 'media-video/x264-encoder')

diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 79a5b0d3a019..8813eca28434 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,5 +1,7 @@
 AUX gpac.patch 507 BLAKE2B 7872c56ed87e96a247b63b92c6a23c094346fea9ee5127a6086a45efd064b4c00ddf2cd2191772bcbd54365c56ef550f3f5e0ecf2c2ab35a2e0c9dc3197ec9b9 SHA512 9da7a1ffe637e39863e5828547923424b9c072d194d3ddadcc9a6c31f7803f5456b3ba88d470458a84d37b0c07374983adc124f3710ae7122a81a13ea9b4ae0e
+DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
 EBUILD x264-encoder-0.0.20190903.ebuild 2142 BLAKE2B 422b29b0d4610eddd2148dfffce1aeba8a2c6fec4165d5d1df021fe886c27074d8b0c52d713c0e7b15afc3c8e730a89859a7644e6a449f8ef4d9cf684c1c6c3b SHA512 ed34d8f38c5513c6ef3fa30f941d40d58725cf75acfdbab182df86642c839e3ee041ec67425e961fe1b5053a4af8964ce971d4580777dccb842a03916360f796
-EBUILD x264-encoder-9999.ebuild 2144 BLAKE2B 2c3710d2bb615dd54d4ece098ae1f218c0ecb7c10601a7cc44b86eb2c83e609cbdc636bcc7683e45b58c30c91da7bc024da8a5f96b4ce13d5e1f629e2d1b7a9d SHA512 cd7d2dd2ac4505e91f7a7da9a31b3e33cd328c893f16828a945c1691816afe01798b2f11402ef74e05370a76e5537079a178b714a39fba13a4e8bc81fae45ed5
+EBUILD x264-encoder-0.0.20220222.ebuild 2148 BLAKE2B 3af75e2d3b63a9d6b74432673a76816cf351c6c9bbdc561ae813888287e8e05eb631727103f1a387e488883b1bd0dc875d0022c9d502d98d62649c2c1ef85739 SHA512 0a42a605a32defca7b835f47103f4851b8537627facdc1abc1c0855ef38e277f160995ae8d23a615bd25f6ee718449225b81e18e1b6e7b8912ad68bed4240a44
+EBUILD x264-encoder-9999.ebuild 2148 BLAKE2B 3af75e2d3b63a9d6b74432673a76816cf351c6c9bbdc561ae813888287e8e05eb631727103f1a387e488883b1bd0dc875d0022c9d502d98d62649c2c1ef85739 SHA512 0a42a605a32defca7b835f47103f4851b8537627facdc1abc1c0855ef38e277f160995ae8d23a615bd25f6ee718449225b81e18e1b6e7b8912ad68bed4240a44
 MISC metadata.xml 531 BLAKE2B fbf3d1b3460773bd6cb8deaa7df7d1da8bd9597d8c1c1da2ea19fc8ced206f3424b4f10af6d019941a2a1e2974c53f21db1dc47a2062c6dae401e514051c58a8 SHA512 1a36bbd77bb5e526a42fe35382fef906d741fd51b0569c2255191222c4cf006e12767228ae0fdda9bf32f72cdb24cc1f250b6bd7e57aadb50a3bc09624a2e0c0
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
new file mode 100644
index 000000000000..f9d72081e46e
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
@@ -0,0 +1,74 @@
+# 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-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 2596cb3a87e1..f9d72081e46e 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -12,10 +12,10 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
 	SRC_URI=""
 else
-	MY_P="x264-snapshot-$(ver_cut 3)-2245"
-	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+	# 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}/${MY_P}"
+	S="${WORKDIR}/x264-master"
 fi
 
 LICENSE="GPL-2"
@@ -36,8 +36,6 @@ DEPEND="${RDEPEND}
 	x86? ( ${ASM_DEP} )"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/gpac.patch" )
-
 src_configure() {
 	tc-export CC
 
-- 
cgit v1.2.3