gentoo Easter resync : 12.04.2020

5 files changed, 20 insertions, 12 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 5935ffe48b3d..a8ae1858c4b6 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,11 +5,13 @@ DIST ffmpeg-3.4.6.tar.bz2 10190001 BLAKE2B 4c7842900171cf871f8524f08f435797b1a16
 DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1feaa4f292f14021e0b6bfb3957b13ddacfa87db361e677ae0583cc2bd1d402a66b0c8507cbed79a001c9b8462100bf SHA512 d0f8b3ee7b55e67b1c7ad9610a7b19a15acfc35dc843683502e536ebcc2e8678b55325532c0039b764cc978e95f83afb48bd24304abaee26f26d3247a8310bfe
 DIST ffmpeg-4.1.4.tar.bz2 10691784 BLAKE2B 5f1f0b3c78cdd913e44bef448ff4d26fc5ea01e1a002baf98461fe0d8870bc2b0f29a1770377df8ff4f0c45febd532d6436c6627f5d1fb97125e92d9929f9284 SHA512 0c2d5bf4873b2bf12aff8c8b576d58dc3c5984ca727f48e1247293cbebda382e9070e8b7fac99870ec2ae0cef3be0a187d5ec5d58ee3e861cd673cae961b5947
 DIST ffmpeg-4.2.1.tar.bz2 10953293 BLAKE2B efc60a7e4a185d48a9ae7a5737fa930dea35ca19f1e2505fc4355815a8216f365134a018fb7a5eb7be8709989d27c2c0a56f7783e3f27eb12795e005fd6dc28d SHA512 5bd556546716ccb5292289c3092c11f216e573d0b09a015fdb568dee7544878d057d922a63758867f0343a09262d7b51023e862b70cefc529875f2319e716de4
+DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418448c5b9b54fd8c803c3f0ab517c6fa7990be08098dd6f6a2b1b3e77a1bed31a069c702366aba79ef9141ff9e23cd8c1b6e2885 SHA512 6653975017de3f7bde420860419fbdddb50ae41dbb811b819f4b5b13807bf885a4c01736f05a684515f97b0d63bd8896d5951a3276af90cc74abfe32dc2e2407
+DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275
 DIST ffmpeg-4.2.2.tar.bz2 10953320 BLAKE2B 53293d01bf0bb15de9a56c11195d6448ac8cad5fae2821d7e61d8fbb13894681a1a73dff44b2d46fda5c14e444c94dde6bcef219ad9d1cfebfb21d7d63318ed2 SHA512 6920bf2efb6ed665ea84c31ff3b28a0e9dc0ba3e0c8dfe4ceee4d8b8172328334490a28dbac93b0f9839d0c90ea588cb79141d88bdd3bf4bbf43fd22deb6a5e6
-EBUILD ffmpeg-3.4.6-r1.ebuild 15655 BLAKE2B ac16782cced35bec1e3e527e27ff88c3b032da023df033917dd581225783a5c2f94b2b64f7394d159f0ccb0edf9fcf4fd3055cbd3cfb8eb448a0c7e2b7c50a7d SHA512 5c311a2abd35b29fac8d35087d6d7d39c4db85aef0417c86ddbbbd20e199974142941f26fd4a74bdf49bdd01cbfadb9615b8adaeff5af96dd7dd4ea602d49661
-EBUILD ffmpeg-4.1.3.ebuild 17099 BLAKE2B e98fb11ee839f28297ad5306d5e0c05594a4757d50c68102a617befdaffce19684f057d2bc06dd913d53884abaca298220dc3cb6687ab639492f476b07969050 SHA512 0df05cb23666ffc9fea8cec6952c12c13a9060b767f7f5eb60cbfc0a48027f80542b291a15145f83d9213ae9e9377d050543fe4cf35f8a847d5adeebc181b39c
+EBUILD ffmpeg-3.4.6-r1.ebuild 15657 BLAKE2B 0f6636c1504758869e598b5ac889db781721993635e6e38be0e5519684147976f8ca425262548605f61e950c7be5e3eb02cf59f0984422f70f8e602244e6cfd3 SHA512 5c65848c645f8c22ea077b4a77a4ee4d43cacbe133d6600a8b8b9cfddd1db49ed64ab7fc3363fb912ffb21183f60ea9b38f0861f1761b8400c613ba17687096b
+EBUILD ffmpeg-4.1.3.ebuild 17100 BLAKE2B eb1485d6a751e04dd592af939ae401347d58d51805d4ff31b6f3857754b3544ffaf370ad3748a3d02af52907a9d10ed86cb71f8f53f45fbc580e76efecff2d49 SHA512 ce3b57ef2a0f867173c32bc012d364657e01fccee1ca099aff8f7f5ee0768f646357730436755d5e70368ce701b960ba227700fcafc28e97a00d19c7fefa4d32
 EBUILD ffmpeg-4.1.4.ebuild 17106 BLAKE2B e1935375a52038b6a3c06570fded41a858bb484b4d33e5237fbd843728074712066bc04baab87c711e6cdeb5d45bcc434ae29b92a2a42e754a6bbc08caa1b562 SHA512 f84db133fa01cdf91cd5c60dc3ca410545493d0b9903751c9636ab7210e3bd19f69bc51e2237c80c213c68562dcced2a431c0fc7082214bf1edc7d3ea69217c2
 EBUILD ffmpeg-4.2.1.ebuild 17780 BLAKE2B be10a290333454fdb75b531b9055559667fcc1441a695bc5df78f980a739823001d3e18a599b7e276dd44e6be5fadaeeb2507c6b36604ac0b5a540c5392b01b6 SHA512 0f56840c9d916cc74a19e06d8bfd7711b2db34974f89bed23247b9e5924244bb4c544889c5ef3d31851d0e53d04763e4ba1b60f86b01e2ed9a0efe6fea451fcd
-EBUILD ffmpeg-4.2.2.ebuild 17743 BLAKE2B b11082b207aea1fad93b1947d4d7ad281fe846e223542784629d4edfe49e8d5f5d1b4933a71260ddbc6e5eb5039b32b0f695518deba8c8cb6d64a36167421f25 SHA512 16ccb1d98bcf5d5654c7944712f35c91a0cfef45d00f44cd289551f5b2f7bf0dc46e106147156b96c6e320acfc370fd4b8b148aef6f5a362204b2328946297ad
-EBUILD ffmpeg-9999.ebuild 17749 BLAKE2B fde84160d721e643d76c6cc1479b97693facdb62b62fc0dacdc020201efac93c6f658a374bb1fc1c9a980405d3b6b29cc023e614636d84ae277b05cc958703fd SHA512 f600c14d1dba2848db59300bd969a14accd521b2851315ae8121084fef443d99d5fb7a808583615695a0c0d02a082d46d4ea074ffe5ab731488c7ea9a9ae534d
+EBUILD ffmpeg-4.2.2.ebuild 18053 BLAKE2B fe4744e2e965ecf94cfb0bab8e9944fd5ccf4d46550ae7252d97d48c436688712055e8a529f0f1f4ac3a3f96366ddecd5568ea832a878ef7003ae3c94de05756 SHA512 e89b6c4618d28400da643420413b5651476cbc71e71f0d0423f6cff4a78c949a00cf7a6e6f8e713a798b8eb269d6d38e1e59eab692ad0a3d36dffd0634cef1ea
+EBUILD ffmpeg-9999.ebuild 17878 BLAKE2B 73cc0f5f90b7f27a516c604c5c5bf25e933bfd772f7b5a02e8ea107a42fea3042738d556a2ba48b28a99789fbe08945c77228971a81853c28a537adeaec23c1b SHA512 5319a1998d5abd2c33edc62f6c52765671ac3cd29db4a9f909251d4cf0b3f7015f1de064a52452e47a0fd94bfaa9a80300a17bae36d62f4cb8eb2dc378bdec56
 MISC metadata.xml 5820 BLAKE2B 01cde597d11525602c97167c405cbcc2b42c28bcf074c3d035e6994ad7cead68e5256aea89d10680a9e4b61057a69a6dd66ead329b41685d206937e20761f475 SHA512 8a8a4fc714ba566024960eeada731ba71f30577cccd9fc1b775ac86f1093568cfc3f0f204129f65aec2d921838d1372fa5a9410223a44e60b83a759c07d632cc
diff --git a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
index 9612483a0783..b8575f84c87d 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.6-r1.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
index b527b69cff94..bfc0b6cb8710 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild
index 96cd4122b9ff..d6b8dbd286a4 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild
@@ -30,7 +30,10 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 else # Release
-	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2
+		https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-4.2.2-ppc64-altivec.patch.gz
+		https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-4.2.2-ppc64-gcc.patch.gz
+	"
 fi
 FFMPEG_REVISION="${PV#*_p}"
 
@@ -59,7 +62,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
@@ -260,7 +263,6 @@ RDEPEND="
 	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
 	postproc? ( !media-libs/libpostproc )
 "
 
@@ -319,6 +321,9 @@ S=${WORKDIR}/${P/_/-}
 
 PATCHES=(
 	"${FILESDIR}"/chromium-r1.patch
+	"${WORKDIR}/${PN}"-4.2.2-ppc64-gcc.patch     # both ppc patches from
+	"${WORKDIR}/${PN}"-4.2.2-ppc64-altivec.patch # https://trac.ffmpeg.org/ticket/7861
+
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index fb6ebfa18866..9328f10bb9b6 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
@@ -127,7 +127,8 @@ ARM_CPU_REQUIRED_USE="
 	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
 "
 MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
+PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx )
+PPC_CPU_REQUIRED_USE="cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec )"
 X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
 X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
 X86_CPU_REQUIRED_USE="
@@ -159,6 +160,7 @@ IUSE="${IUSE}
 
 CPU_REQUIRED_USE="
 	${ARM_CPU_REQUIRED_USE}
+	${PPC_CPU_REQUIRED_USE}
 	${X86_CPU_REQUIRED_USE}
 "
 
@@ -260,7 +262,6 @@ RDEPEND="
 	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
 	postproc? ( !media-libs/libpostproc )
 "