diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-17 14:32:10 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-17 14:32:10 +0100 |
commit | 51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch) | |
tree | 753b6b08624c34d1ed8414bbe22c45409f7741b9 /media-video/ffmpeg | |
parent | be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff) | |
parent | deba8115d2c2af26df42966b91ef04ff4dd79cde (diff) |
Merge branch 'edge' into next
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r-- | media-video/ffmpeg/Manifest | 10 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-4.1.3.ebuild | 2 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-4.1.4.ebuild | 4 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-4.2.1.ebuild | 4 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-4.2.2.ebuild | 4 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index a8ae1858c4b6..d73b4f50ab18 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -9,9 +9,9 @@ DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418 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 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 18053 BLAKE2B fe4744e2e965ecf94cfb0bab8e9944fd5ccf4d46550ae7252d97d48c436688712055e8a529f0f1f4ac3a3f96366ddecd5568ea832a878ef7003ae3c94de05756 SHA512 e89b6c4618d28400da643420413b5651476cbc71e71f0d0423f6cff4a78c949a00cf7a6e6f8e713a798b8eb269d6d38e1e59eab692ad0a3d36dffd0634cef1ea -EBUILD ffmpeg-9999.ebuild 17878 BLAKE2B 73cc0f5f90b7f27a516c604c5c5bf25e933bfd772f7b5a02e8ea107a42fea3042738d556a2ba48b28a99789fbe08945c77228971a81853c28a537adeaec23c1b SHA512 5319a1998d5abd2c33edc62f6c52765671ac3cd29db4a9f909251d4cf0b3f7015f1de064a52452e47a0fd94bfaa9a80300a17bae36d62f4cb8eb2dc378bdec56 +EBUILD ffmpeg-4.1.3.ebuild 17102 BLAKE2B 5a612a6e5c9cc154d0be68a636837f410bed2a195be9d4a802d07a4e5a4a76f7bff818f7d5ce4b7d2af020c26e3c045832fbe292b88e2a3041f25e1771456db7 SHA512 2033c084f4e3ce3eb76164368800e4d8b1cf4fa863f8877cab96f4d3540454570ca6f72daf231094916c9e2cf967be3115d6e5fa30e40bdecfa3c6d5fdc9621d +EBUILD ffmpeg-4.1.4.ebuild 17108 BLAKE2B cc8ed39c062c69568cb7fa4d7ce5ffb6ef7343cfe98e344e48deaf49726c6e6576d117f160d7f87c39f7609be4859c9ae0e6741605f04b8d5b8ae619bf419e49 SHA512 a62f5151d00b5d389fe111ba383f1d001659473ea20765e25f79eeceda57098fad1838ee5e8e164e9e324e2db506c1a55d130090cb2f37ea3a235f8a8c5dd338 +EBUILD ffmpeg-4.2.1.ebuild 17782 BLAKE2B 3254f46501887fd1d9de39091034d6ff72972e641bc38215326f6b72b215c6ac3ac6b2ddb4c68ded319ec1925216d1de2439c3a3649918535e4b2b55fa493328 SHA512 2016cdbc06e2b6c4adf76a93fde1f67267df6e145265db81fb54411d407713e854031eae0f243651f41418e56e07588d0bdbecfa9697f3c0bd3599f263fe4273 +EBUILD ffmpeg-4.2.2.ebuild 18051 BLAKE2B d9b38af293ea5347dab305f8885dd25f7b57ce7d2dd2a6946860fad2b3e1ef8c0c34bf40a2b4ff0d807522617fac2c05f4cb964d6d82a51a291a8e7c47312590 SHA512 3289338620b246e6d9da61567436df212937c20c8bcfb028eaef6cf7e1c525edd429292c60d822031f3a0e8118d45495178721f73268434b307d4703f7724b22 +EBUILD ffmpeg-9999.ebuild 17880 BLAKE2B 8a233a1d336257897f33bc2a54f3bca431f2f3f1d5343045e7976f873f4808697babf18dbb1d72bd688ddc0866c83108e5d3545fe90d31e7e40142d624e27f42 SHA512 5a9403fa1df8e1c4bff51446bcdba3a1ea4de76e58bb99dcf31305eb08d6aad120079d2a79d581f35def305ee6be5f7535e75d6289c8e01a284e27e67b80a022 MISC metadata.xml 5820 BLAKE2B 01cde597d11525602c97167c405cbcc2b42c28bcf074c3d035e6994ad7cead68e5256aea89d10680a9e4b61057a69a6dd66ead329b41685d206937e20761f475 SHA512 8a8a4fc714ba566024960eeada731ba71f30577cccd9fc1b775ac86f1093568cfc3f0f204129f65aec2d921838d1372fa5a9410223a44e60b83a759c07d632cc diff --git a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild index bfc0b6cb8710..8bec452d4ea6 100644 --- a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild @@ -208,7 +208,7 @@ RDEPEND=" ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) - libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] ) + libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild index 8130eda690a5..cc95a886113b 100644 --- a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -208,7 +208,7 @@ RDEPEND=" ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) - libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] ) + libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild index 1cdef0857c6c..a162e226c929 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -213,7 +213,7 @@ RDEPEND=" ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) - libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] ) + libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] ) libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild index d6b8dbd286a4..cf69d359c7ec 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild @@ -62,7 +62,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. @@ -216,7 +216,7 @@ RDEPEND=" ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) - libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] ) + libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] ) libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 9328f10bb9b6..7805600ea529 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -215,7 +215,7 @@ RDEPEND=" ) jack? ( virtual/jack[${MULTILIB_USEDEP}] ) jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) - libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] ) + libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] ) libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) |