Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ffmpeg: update to 5.1.2 #14591

Closed
wants to merge 1 commit into from
Closed

ffmpeg: update to 5.1.2 #14591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions mingw-w64-ffmpeg/0001-get_cabac_inline_x86-Dont-inline-if-32-bit-clang-on-windows.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions mingw-w64-ffmpeg/0005-Win32-Add-path-relocation-to-frei0r-plugins-search.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 03998dc064..c8c16a9332 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -19,6 +19,7 @@ OBJS = allfilters.o \
@@ -19,6 +19,7 @@
framequeue.o \
graphdump.o \
graphparser.o \
+ pathtools.o \
transform.o \
version.o \
video.o \

diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
Expand Down
14 changes: 4 additions & 10 deletions mingw-w64-ffmpeg/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
_realname=ffmpeg
pkgbase="mingw-w64-${_realname}"
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=4.4.3
pkgrel=3
pkgver=5.1.2
pkgrel=1
pkgdesc="Complete and free Internet live audio and video broadcasting solution (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
Expand Down Expand Up @@ -67,22 +67,18 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || echo "${MINGW_PACKAGE_PREFIX}-ffnvcodec-headers")
$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || echo "${MINGW_PACKAGE_PREFIX}-nasm"))
source=(https://ffmpeg.org/releases/${_realname}-${pkgver}.tar.xz{,.asc}
https://github.com/FFmpeg/FFmpeg/commit/c6fdbe26ef30fff817581e5ed6e078d96111248a.patch
"pathtools.c"
"pathtools.h"
"0005-Win32-Add-path-relocation-to-frei0r-plugins-search.patch"
# Backport from https://github.com/FFmpeg/FFmpeg/commit/8990c5869e27fcd43b53045f87ba251f42e7d293
"0001-get_cabac_inline_x86-Dont-inline-if-32-bit-clang-on-windows.patch"
"0002-gcc-12.patch"
"0003-fix-clang32-build.patch")
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
sha256sums=('6c5b6c195e61534766a0b5fe16acc919170c883362612816d0a1c7f4f947006e'
sha256sums=('619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc'
'SKIP'
'8de70945eeb6a998b9188494a242ba06847b475b9674fcfec48436d99fcbea7f'
'703cd0cb74e714f9e66d26de11c109dd76fab07e723af8dde56a35ea65102e5f'
'4f9d325265ef6f4e90ad637dea41afa6995388c921fe961ad5dc895aca10318b'
'63aa930515c10484a68cb8940f453cba01cf3f5d0d72c86b0bc03777acb704ba'
'b19edf64c3daff6acebeb2e45be4e13c5ee035fd24ba1bf9e77a5376efe83628'
'58f91fde8be7fa093b13275c37b0276de08537449749599e5a50f4f9c8b20926'
'84b9fcaa188eef15201a105a44c53d647e4fb800a5032336e0948d6bed2cbc1b'
'06481611d3449e2cc4f4759d2e0ad5b1ce2c4f313d0b63d4cb0a51d9fe02a424')

Expand All @@ -105,9 +101,7 @@ prepare() {
cp -fHv "${srcdir}"/pathtools.[ch] libavfilter/

apply_patch_with_msg \
c6fdbe26ef30fff817581e5ed6e078d96111248a.patch \
0005-Win32-Add-path-relocation-to-frei0r-plugins-search.patch \
0001-get_cabac_inline_x86-Dont-inline-if-32-bit-clang-on-windows.patch \
0002-gcc-12.patch \
0003-fix-clang32-build.patch
}
Expand Down