aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2023-03-26 15:19:19 +0000
committerpsykose <alice@ayaya.dev>2023-03-26 17:19:19 +0200
commit26007887568286d9e7e754d66e1b934fc7723ee2 (patch)
tree270bd7bb58dc68ec33f5595d798843598ccde32b
parent355b03be759ac89ed641d306bde5a739556128c7 (diff)
downloadaports-26007887568286d9e7e754d66e1b934fc7723ee2.tar.gz
aports-26007887568286d9e7e754d66e1b934fc7723ee2.tar.bz2
aports-26007887568286d9e7e754d66e1b934fc7723ee2.tar.xz
community/ffmpeg5: upgrade to 5.1.3
-rw-r--r--community/ffmpeg5/APKBUILD11
-rw-r--r--community/ffmpeg5/hwcontext_vulkan-remove-optional-encode-decode-extensions.patch33
2 files changed, 6 insertions, 38 deletions
diff --git a/community/ffmpeg5/APKBUILD b/community/ffmpeg5/APKBUILD
index 3dbb65f0d81..421ee61ba73 100644
--- a/community/ffmpeg5/APKBUILD
+++ b/community/ffmpeg5/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
# Maintainer: psykose <alice@ayaya.dev>
pkgname=ffmpeg5
-pkgver=5.1.2
-pkgrel=10
+pkgver=5.1.3
+pkgrel=0
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
url="https://ffmpeg.org/"
arch="all"
@@ -67,12 +67,14 @@ source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
0001-ffbuild-libversion.sh-add-shebang.patch
add-av_stream_get_first_dts-for-chromium.patch
flto-auto.patch
- hwcontext_vulkan-remove-optional-encode-decode-extensions.patch
"
builddir="$srcdir/ffmpeg-$pkgver"
options="!check" # tests/data/hls-lists.append.m3u8 fails
# secfixes:
+# 5.1.3-r0:
+# - CVE-2022-3964
+# - CVE-2022-3965
# 5.1-r1:
# - ALPINE-14094
# 4.4.1-r0:
@@ -299,10 +301,9 @@ libswscale() {
}
sha512sums="
-04d9ae2a0e9238c469941d2bb9929d59b58f4be3830846cf91b02a440da17803a04b147a4e0168c9ffd6f62ca82187508bc7b53255de9787a97168278e903b9b ffmpeg-5.1.2.tar.xz
+4310f27fe0c7b4363207e1535115e0ad266a45772bdb5445f5c8658f35b0f3216d8f2cf70d1d2baa71b12069fbdccf418a774b353ddf092d4f66829ef391508a ffmpeg-5.1.3.tar.xz
1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
38443b570cf32b2ba8ffa9ecc5480425c7da9f93f9773fbb3f9ec5f603b369b6225f4329a1b1f34d0ef30b2c9730f25ff9cff31315ed0a89a600df8e53bd54bf 0001-ffbuild-libversion.sh-add-shebang.patch
2804a3317a9c5fbc793af1dc7b9c13113bf8fd232f14a580ad98f25d848edf93015fd08c0aad0316e3a5439aef88ef15be3520dcbfe844791a5f03490a4c7f0b add-av_stream_get_first_dts-for-chromium.patch
47dda03ef3fddac1f79998bd07044dd907f9ac311737071546cb5cf6b6c51e29dd39cc4458bb07cab049e8ed497358c1e03a4fab07c6c66d7cfeb782ab752e63 flto-auto.patch
-9fec574848c9ac90f51f6bca18120f40a22f6f737677a57d21bd07867f9e6619c146d8aa1cdac8d11ec53de87e7119316369874d3492b256f295b98b1b5df762 hwcontext_vulkan-remove-optional-encode-decode-extensions.patch
"
diff --git a/community/ffmpeg5/hwcontext_vulkan-remove-optional-encode-decode-extensions.patch b/community/ffmpeg5/hwcontext_vulkan-remove-optional-encode-decode-extensions.patch
deleted file mode 100644
index d7ce57350e4..00000000000
--- a/community/ffmpeg5/hwcontext_vulkan-remove-optional-encode-decode-extensions.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 f1db1c7291f1..2a9b5f4aac62 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 */