diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-02-12 09:56:54 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-12 09:56:54 +0000 |
| commit | ebc282ef4dfa408accac685565b8ee5f6faec119 (patch) | |
| tree | c0a4f713228cda0ab17eed46f0bb7ca8cb8be2f6 /media-video/ffmpeg-chromium | |
| parent | 6c8694a707151d59555b0e4e48235f085ce166c3 (diff) | |
gentoo auto-resync : 12:02:2023 - 09:56:54
Diffstat (limited to 'media-video/ffmpeg-chromium')
4 files changed, 41 insertions, 2 deletions
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest index 7361f5c3f4bd..5743dbe32311 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -1,7 +1,8 @@ AUX chromium.patch 1536 BLAKE2B 8caf1ff11f8da710138cbb857bd42e8679f98f3c30a3eaddb51611b7c39fb48c23890257997d3ddfee47244e6ffc0abb241e3118e0e8bcbf63442885445bcee3 SHA512 711b338178fe042aff92375d6593197337529986ea55ac6288df4c725145dd06c41fcfc11df4843e03eeaa4bad90ed558acf8f6945b9b96c9751fff92a41811a AUX ffmpeg-chromium-100.patch 1653 BLAKE2B 4d0b025b024aa9ce9e325487c09bb3a566b453198626a2178b119eab56adb73d392a8f4499735310108838f73d48c50f54c9c4b1b19db66c98ef15b39e38c3d4 SHA512 89cbf0cd5c4337e4633af7c814002cb4e909b4d4d385d5a3e265882cf1c4e24e4057512bffe7311e53b8a7886c882929221b07961ae86d115803f9b991ef6a05 +AUX ffmpeg-chromium-vk-headers.patch 1733 BLAKE2B 8d6e7b72d1dbfcd21d3549be4c54c76a0fa72c3b4bf9882e4e9baa7e69e00739ed9a6c65ff1e21cb6abc00fa09941713ee090b9538c7a4665cd79e4be4e5f4d9 SHA512 2f424c344fcfa24048dcefa082b6216375ff8fb28f830cdfaeb1e84dc84146640b0243741b3688b4ea614a0d91e2cb858cf3251baafbdc412bad595d2e71518e DIST ffmpeg-chromium-102.tar.gz 15165192 BLAKE2B ecf9b9ff538730d8a265e25e3d30900b119bfa5baa8e097e58151d744c95b3e768b96f477f6394015cd77a8ae35991c7cdaee5fb2f700d129b6c6d7ee87b34d9 SHA512 f5aa4c47e801d2547321c7995240e004706f9b5835610f9726ac45a63ac58a62de64d463ddeb8c1a001d31d89a4dbaee3a1be568c33316f29dc2b675b2f3161a DIST ffmpeg-chromium-106.tar.xz 9707176 BLAKE2B 8ab9b006328e15faa38b8014f2870e7a9fd9eaacc723cd6079bfaadc05db4d1f8c542dff5a331e1f93c9c877eea6d2ed0dc2bf567c77680227b22b2a9baf8834 SHA512 9f04feee42bf548cbda542be16f186bfe0d8179289a1512cf77ec492a8608b2c9d5c758f93fb6d229be67c20762075dd266fa4b203556f8b7ec4bf66579f2b6b -EBUILD ffmpeg-chromium-102.ebuild 6557 BLAKE2B 3dd2c75d0ee28bd0295e77b3ba0aecd0034ab00a75e38c086b2238c1d3469778e48249e668197aa4e2c6e92e5c9dfa88021c34f17bd98b64de9917ac8fc0a2e5 SHA512 4b5404bdf2711fc405b36f90af0045bcf0a5374a3eec4ca3a3da86a0461b295f8823874e9988c49c6c3ea3f3da8a3eb2d3655bf08742e8aed813e09ef442d615 -EBUILD ffmpeg-chromium-106.ebuild 6353 BLAKE2B e844bff83020ce72e4f7f8013b782277593f40f8e603d39b197a50f6e4c09816cca102ee5ee23f253b20ac609ad331679fedc29d87e37719c66b8265efbb8690 SHA512 e4a2d3e6e1c618ad653af7257e2d8f3c5c801a68f6bfd095247dc6ac724ba62a8691ecec0ca2aa01af16ab2e002ec47cd8217f9305c6c79675b6ec0c15fc54b4 +EBUILD ffmpeg-chromium-102.ebuild 6595 BLAKE2B 2470806a5aaaff46584f4fbceb00354455f3469380cf0078503774326cb0517801c1f00787ff5264a5b7f601d64c03fe2c460b43b021b918b135169cdc49cfd1 SHA512 43daadcde541fd9bcc53b49299dae69f560a23b961bed4e626f2df794523f16077b7812a61c205a8b6584cb3ddca48481d735b6508e8a81c54f29b773fce143c +EBUILD ffmpeg-chromium-106.ebuild 6391 BLAKE2B c4a9a8bed4ad5cf0c0d9d278256d13dab81400d5ecf31ce397a9482bccfb8203bf48a3791c2e758a50b5e71901202e0a675cbf8c5e65e707a3d42f2a24515f2f SHA512 9fe6f096d9264e7efbe5d266e7bdcd2ce07d5554803c5a97818ca0dd694904f2d5704dc3c76b1ac70a5b030d2b3908b4eb5972c7d3fdd45e55fe196c72999647 MISC metadata.xml 669 BLAKE2B 3e1b3934b51d07a5620026f2d24e027d217380a9ef7819b3ee54e09b12b0d3ed377cef911989d63a6ab65bd7cb92752997fdd90afb0e6f29dc9496a9035daf4c SHA512 556601bbb7357eb7b8be23a93268b8f173bf16b42518f4b931e97d13880b5e0642546c1ead253a625a8938a9c7020cf52f69eaa629e65de47dfa010af6299674 diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild index 73cbdcc5ebc1..6f9eaaeb8883 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild @@ -115,6 +115,7 @@ S="${WORKDIR}" PATCHES=( "${FILESDIR}"/${PN}-100.patch + "${FILESDIR}"/${PN}-vk-headers.patch "${FILESDIR}"/chromium.patch ) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild index c344db389d2a..61f550be5940 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-106.ebuild @@ -113,6 +113,7 @@ RESTRICT=" PATCHES=( "${FILESDIR}"/${PN}-100.patch + "${FILESDIR}"/${PN}-vk-headers.patch "${FILESDIR}"/chromium.patch ) diff --git a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-vk-headers.patch b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-vk-headers.patch new file mode 100644 index 000000000000..f3c3c0128920 --- /dev/null +++ b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-vk-headers.patch @@ -0,0 +1,36 @@ +From eb0455d64690eed0068e5cb202f72ecdf899837c Mon Sep 17 00:00:00 2001 +From: Lynne <dev@lynne.ee> +Date: Sun, 25 Dec 2022 01:03:30 +0100 +Subject: [PATCH] hwcontext_vulkan: remove optional encode/decode extensions + from the list + +They're not currently used, so they don't need to be there. +Vulkan stabilized the decode extensions less than a week ago, and their +name prefixes were changed from EXT to KHR. It's a bit too soon to be +depending on it, so rather than bumping, just remove these for now. +--- + libavutil/hwcontext_vulkan.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c +index f1db1c7291..2a9b5f4aac 100644 +--- a/libavutil/hwcontext_vulkan.c ++++ b/libavutil/hwcontext_vulkan.c +@@ -358,14 +358,6 @@ static const VulkanOptExtension optional_device_exts[] = { + { VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_MEMORY }, + { VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_SEM }, + #endif +- +- /* Video encoding/decoding */ +- { VK_KHR_VIDEO_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, +- { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, +- { VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, +- { VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, +- { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, +- { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, + }; + + /* Converts return values to strings */ +-- +2.39.1 + |