mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
extra/ffmpeg to 7.0.2-1
This commit is contained in:
Kevin Mihelich
parent
d797edcec3
commit
698db923f5
5 changed files with 18 additions and 59 deletions
|
|
@ -1,7 +1,7 @@
|
|||
pkgbase = ffmpeg
|
||||
pkgdesc = Complete solution to record, convert and stream audio and video
|
||||
pkgver = 7.0.1
|
||||
pkgrel = 2
|
||||
pkgver = 7.0.2
|
||||
pkgrel = 1
|
||||
epoch = 2
|
||||
url = https://ffmpeg.org
|
||||
arch = x86_64
|
||||
|
|
@ -28,6 +28,7 @@ pkgbase = ffmpeg
|
|||
depends = glib2
|
||||
depends = glibc
|
||||
depends = gmp
|
||||
depends = gnutls
|
||||
depends = gsm
|
||||
depends = harfbuzz
|
||||
depends = jack
|
||||
|
|
@ -61,7 +62,6 @@ pkgbase = ffmpeg
|
|||
depends = libxext
|
||||
depends = libxml2
|
||||
depends = libxv
|
||||
depends = mbedtls2
|
||||
depends = ocl-icd
|
||||
depends = onevpl
|
||||
depends = opencore-amr
|
||||
|
|
@ -100,10 +100,10 @@ pkgbase = ffmpeg
|
|||
provides = libswresample.so
|
||||
provides = libswscale.so
|
||||
options = debug
|
||||
source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=47f70eda3e2ff003a787e512afd07b0c266f7a70
|
||||
source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=a18b979d17fa169a6f93c5be8732533c8e06337d
|
||||
source = add-av_stream_get_first_dts-for-chromium.patch
|
||||
validpgpkeys = DD1EC9E8DE085C629B3E1846B18E8928B3948D64
|
||||
b2sums = d2d6a645509e697932dc8f7a57719e069299e53eb37cda7bf01fd94c9e9956e5532dc5c923fa86d72d0e3a051a7f405e768c73c66ca8aea29271923a17222e03
|
||||
b2sums = bcc0fb367d2822665f0918292a0cf581e0119d6ba6d2e3d0b6e794b6f74d30c118b5c47e26b5687473f01b346f8ec7e885f80729ce6115e18003b2371ff4553f
|
||||
b2sums = 555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de
|
||||
|
||||
pkgname = ffmpeg
|
||||
|
|
@ -118,6 +118,7 @@ pkgname = ffmpeg
|
|||
depends = glib2
|
||||
depends = glibc
|
||||
depends = gmp
|
||||
depends = gnutls
|
||||
depends = gsm
|
||||
depends = harfbuzz
|
||||
depends = jack
|
||||
|
|
@ -151,7 +152,6 @@ pkgname = ffmpeg
|
|||
depends = libxext
|
||||
depends = libxml2
|
||||
depends = libxv
|
||||
depends = mbedtls2
|
||||
depends = ocl-icd
|
||||
depends = onevpl
|
||||
depends = opencore-amr
|
||||
|
|
|
|||
5
extra/ffmpeg/.nvchecker.toml
Normal file
5
extra/ffmpeg/.nvchecker.toml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
[ffmpeg]
|
||||
source = "git"
|
||||
git = "https://git.ffmpeg.org/ffmpeg.git"
|
||||
prefix = "n"
|
||||
exclude_regex = ".*v.*"
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 1e1f10b8b95dcbc6521c391d4e9d4cb62943899f Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Fri, 21 Jun 2024 19:05:03 -0600
|
||||
Subject: [PATCH] ffmpeg-wint.patch
|
||||
|
||||
---
|
||||
fftools/ffplay_renderer.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/fftools/ffplay_renderer.c b/fftools/ffplay_renderer.c
|
||||
index 73072a2851..fbb68b2376 100644
|
||||
--- a/fftools/ffplay_renderer.c
|
||||
+++ b/fftools/ffplay_renderer.c
|
||||
@@ -765,7 +765,7 @@ static void destroy(VkRenderer *renderer)
|
||||
vkDestroySurfaceKHR = (PFN_vkDestroySurfaceKHR)
|
||||
ctx->get_proc_addr(ctx->inst, "vkDestroySurfaceKHR");
|
||||
vkDestroySurfaceKHR(ctx->inst, ctx->vk_surface, NULL);
|
||||
- ctx->vk_surface = NULL;
|
||||
+ ctx->vk_surface = VK_NULL_HANDLE;
|
||||
}
|
||||
|
||||
av_buffer_unref(&ctx->hw_device_ref);
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
|
@ -13,12 +13,10 @@
|
|||
# - remove depends on rav1e, remove --enable-librav1e
|
||||
# - remove depends on svt-av1, remove --enable-libsvtav1
|
||||
# - remove --enable-lto
|
||||
# - patch from gentoo to fix 32-bit FTBFS
|
||||
# - patch to fix 32-bit FTBFS
|
||||
|
||||
pkgname=ffmpeg
|
||||
pkgver=7.0.1
|
||||
pkgrel=2
|
||||
pkgver=7.0.2
|
||||
pkgrel=1
|
||||
epoch=2
|
||||
pkgdesc='Complete solution to record, convert and stream audio and video'
|
||||
arch=(x86_64)
|
||||
|
|
@ -35,6 +33,7 @@ depends=(
|
|||
glib2
|
||||
glibc
|
||||
gmp
|
||||
gnutls
|
||||
gsm
|
||||
harfbuzz
|
||||
jack
|
||||
|
|
@ -68,7 +67,6 @@ depends=(
|
|||
libxext
|
||||
libxml2
|
||||
libxv
|
||||
mbedtls2
|
||||
ocl-icd
|
||||
opencore-amr
|
||||
openjpeg2
|
||||
|
|
@ -119,24 +117,18 @@ provides=(
|
|||
options=(
|
||||
debug
|
||||
)
|
||||
_tag=47f70eda3e2ff003a787e512afd07b0c266f7a70
|
||||
_tag=a18b979d17fa169a6f93c5be8732533c8e06337d
|
||||
source=(
|
||||
git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=${_tag}
|
||||
add-av_stream_get_first_dts-for-chromium.patch
|
||||
ffmpeg-6.1-gcc-14.patch
|
||||
0001-ffmpeg-wint.patch.patch
|
||||
)
|
||||
b2sums=('d2d6a645509e697932dc8f7a57719e069299e53eb37cda7bf01fd94c9e9956e5532dc5c923fa86d72d0e3a051a7f405e768c73c66ca8aea29271923a17222e03'
|
||||
'555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de'
|
||||
'b82fc06a7eee0c7ab68ef78f3ac205f45a68a7799dc241f0a574afa48e4dbd477c0d67f7c5a7ff46971adc821ef1507f4957156200167a2c59f8c7f7867ac048'
|
||||
'7855c938a9462bb2224236f779bb8863277551375253d6a67ec5feac047f0460d9fd571b37ebc3e8dab79471ee58b3bd2003e7e3b79c060738fb3ce49ebb0f61')
|
||||
b2sums=('bcc0fb367d2822665f0918292a0cf581e0119d6ba6d2e3d0b6e794b6f74d30c118b5c47e26b5687473f01b346f8ec7e885f80729ce6115e18003b2371ff4553f'
|
||||
'555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de')
|
||||
validpgpkeys=(DD1EC9E8DE085C629B3E1846B18E8928B3948D64) # Michael Niedermayer <michael@niedermayer.cc>
|
||||
|
||||
prepare() {
|
||||
cd ffmpeg
|
||||
patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
|
||||
patch -Np1 -i ../ffmpeg-6.1-gcc-14.patch
|
||||
patch -Np1 -i ../0001-ffmpeg-wint.patch.patch
|
||||
}
|
||||
|
||||
pkgver() {
|
||||
|
|
@ -159,6 +151,7 @@ build() {
|
|||
--enable-fontconfig \
|
||||
--enable-frei0r \
|
||||
--enable-gmp \
|
||||
--enable-gnutls \
|
||||
--enable-gpl \
|
||||
--enable-ladspa \
|
||||
--enable-libass \
|
||||
|
|
@ -207,7 +200,6 @@ build() {
|
|||
--enable-opengl \
|
||||
--enable-shared \
|
||||
--enable-vapoursynth \
|
||||
--enable-mbedtls \
|
||||
--enable-version3 \
|
||||
--enable-vulkan $CONFIG
|
||||
make
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
|
||||
index 29fc8bd648..1f85fac7f4 100644
|
||||
--- a/libavutil/hwcontext_vaapi.c
|
||||
+++ b/libavutil/hwcontext_vaapi.c
|
||||
@@ -1203,7 +1203,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst,
|
||||
|
||||
if (!use_prime2 || vas != VA_STATUS_SUCCESS) {
|
||||
int k;
|
||||
- unsigned long buffer_handle;
|
||||
+ uintptr_t buffer_handle;
|
||||
VASurfaceAttribExternalBuffers buffer_desc;
|
||||
VASurfaceAttrib buffer_attrs[2] = {
|
||||
{
|
||||
Loading…
Reference in a new issue