gentoo resync : 21.06.2020

4 files changed, 102 insertions, 1 deletions

diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 6018daea3896..af41ed210e05 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,6 +1,8 @@
+AUX x264-0.0.20190903-STRINGS.patch 1531 BLAKE2B 293a9efebca3914e9f03f5e6a9e8c22efc30e47a71e0ad2abb1206df937e989398a9426d772daa73a852383e1eee5c6a31dd76583e4571e2636a26be2bd85735 SHA512 7ff25afade4e1a47bb4cc17bd7a2da902eac554b3af29dbc50706ac876ae846665cb1d06a1293c0359e515f1b9cd08a0971ab197f06eb3eac4309893014aaceb
 DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
 EBUILD x264-0.0.20190214.ebuild 1795 BLAKE2B 4d2433753d997269c78f88b91f6342a077f31cc5d57b29282a21761016291771468898f49a34120d3a118bad45810226b077188f19c4f72a1f75b9bdb7743c93 SHA512 07df0bbe58003cabbad08363ec4f0f36223d9b6fa6fca69aa865099a8860994ff0fd89cf7ab0583f03fe7c1c71c2b0332fd4fc6974b0039b659370685a65c256
+EBUILD x264-0.0.20190903-r1.ebuild 1905 BLAKE2B 032fee7109566d43c7f1df5b27b48634b8beb8418c6f00d684bf7cc401c562473bb5332998aa662ac7504fc4e5312594f3458a879ac81183ea87123eab924985 SHA512 ba68920936237b2be3be0c8602db57c567e27d2a19701cfe933e5891d60c17170879179e2325b4cc71cef519410112fc60bb3701330f7ba6891a3d1acaa09c5e
 EBUILD x264-0.0.20190903.ebuild 1830 BLAKE2B 8c3dc73bf37e830e0c8601aa15acf60d87b209ebedf7de0e2c0cdbe11f1744f8ad061578fafb349704ec40bf8b2229533fbe4de753b4cabd063d88accbbdc0a5 SHA512 658c2e9cf82118b19628822d97430d1ae93a00fbd62a6c505c8d7aaa02603de71ed4b6d559288a621a26629ea44ac2ca9c4cba10ae2709c16b219fc21a31b2a0
-EBUILD x264-9999.ebuild 1830 BLAKE2B f8c5d5a10399aa4a55cd0ad1ea1ba0dbdcf0775c973e98e528fed8d8a9f08dd41b9021211d3181a8b8707ff158a6b44667c0b41fbc821baebe22428ba5d249b7 SHA512 3d28aeddd664f26ce3f0caf327f269c729579e4f17056d578e134eea47d2586f3c4c6484d4c9438c103dfc57633ed73fbd4c3e319c05a77a4abd12af5eb8669a
+EBUILD x264-9999.ebuild 1861 BLAKE2B 3abe3cfb710f96322a627d82f162105f28a0ae9cc9303462d7b584a147311568832d7b7e4f241c4df42eac5505a9b69196f10433bebab71365259019b633f003 SHA512 64f801345cf2f61f531448de4cda105b5cd1559a80bcda84a86a8699156c58f80cd8ed8807ebf7acf0ca95bf3a4cb1ec0695908eb126dec73f6c6a43e2f4da20
 MISC metadata.xml 488 BLAKE2B 3e6982e1bbd45194bb664ddb4b34e307ef4030f4fba9905d0a292c8a5ce73e27bc1c687758cc4fb18d38cc2c93ed21b64dfa35b2aaa63dc6fbd1110b9e1daf1f SHA512 2dc9d360de31770d2e8eebc3bab9662a00ad328ba41380052c3e7502a4da85c7b0ce29cf229670d917c93d7b508282dd9f1694a718da65f1110c785a2bc68394
diff --git a/media-libs/x264/files/x264-0.0.20190903-STRINGS.patch b/media-libs/x264/files/x264-0.0.20190903-STRINGS.patch
new file mode 100644
index 000000000000..952fd268005b
--- /dev/null
+++ b/media-libs/x264/files/x264-0.0.20190903-STRINGS.patch
@@ -0,0 +1,37 @@
+From 235ce6130168f4deee55c88ecda5ab84d81d125b Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@inbox.ru>
+Date: Fri, 5 Jun 2020 19:34:02 +0200
+Subject: [PATCH] configure: allow 'strings' override via STRINGS variable
+
+This allows building x264 on systems where 'strings' or
+'${HOST}-strings' does not exist, but llvm-strings exists.
+---
+ configure | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -541,6 +541,7 @@ done
+ 
+ CC="${CC-${cross_prefix}gcc}"
+ STRIP="${STRIP-${cross_prefix}strip}"
++STRINGS="${STRINGS-${cross_prefix}strings}"
+ INSTALL="${INSTALL-install}"
+ PKGCONFIG="${PKGCONFIG-${cross_prefix}pkg-config}"
+ 
+@@ -1017,10 +1018,10 @@ CPU_ENDIAN="little-endian"
+ if [ $compiler = GNU ]; then
+     echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c
+     $CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
+-    if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix}strings -a conftest.o | grep -q FPendian) ; then
++    if (${STRINGS} -a conftest.o | grep -q BIGE) && (${STRINGS} -a conftest.o | grep -q FPendian) ; then
+         define WORDS_BIGENDIAN
+         CPU_ENDIAN="big-endian"
+-    elif !(${cross_prefix}strings -a conftest.o | grep -q EGIB && ${cross_prefix}strings -a conftest.o | grep -q naidnePF) ; then
++    elif !(${STRINGS} -a conftest.o | grep -q EGIB && ${STRINGS} -a conftest.o | grep -q naidnePF) ; then
+         die "endian test failed"
+     fi
+ fi
+-- 
+2.27.0
+
diff --git a/media-libs/x264/x264-0.0.20190903-r1.ebuild b/media-libs/x264/x264-0.0.20190903-r1.ebuild
new file mode 100644
index 000000000000..452ddd0f1835
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20190903-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+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
+	MY_P="x264-snapshot-$(ver_cut 3)-2245"
+	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+SLOT="0/157" # 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 )
+
+PATCHES=("${FILESDIR}"/${P}-STRINGS.patch)
+
+multilib_src_configure() {
+	tc-export CC
+	local asm_conf=""
+
+	if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; }; 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 2ddcd7e513cd..6aca6aa96dd3 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -50,6 +50,7 @@ multilib_src_configure() {
 		--enable-pic \
 		--enable-shared \
 		--host="${CHOST}" \
+		--cross-prefix="${CHOST}-" \
 		$(usex interlaced "" "--disable-interlaced") \
 		$(usex opencl "" "--disable-opencl") \
 		$(usex static-libs "--enable-static" "") \