extra/ffmpeg to 7.0.1-1

This commit is contained in:
Kevin Mihelich 2024-06-21 22:31:11 +00:00
parent abac5905f7
commit 2cfc1774a3
2 changed files with 21 additions and 26 deletions

View file

@ -1,7 +1,7 @@
pkgbase = ffmpeg
pkgdesc = Complete solution to record, convert and stream audio and video
pkgver = 6.1.1
pkgrel = 7
pkgver = 7.0.1
pkgrel = 1
epoch = 2
url = https://ffmpeg.org
arch = x86_64
@ -28,7 +28,6 @@ pkgbase = ffmpeg
depends = glib2
depends = glibc
depends = gmp
depends = gnutls
depends = gsm
depends = harfbuzz
depends = jack
@ -38,6 +37,8 @@ pkgbase = ffmpeg
depends = libbluray
depends = libbs2b
depends = libdrm
depends = libdvdnav
depends = libdvdread
depends = libgl
depends = libiec61883
depends = libjxl
@ -60,6 +61,7 @@ pkgbase = ffmpeg
depends = libxext
depends = libxml2
depends = libxv
depends = mbedtls2
depends = ocl-icd
depends = onevpl
depends = opencore-amr
@ -98,10 +100,10 @@ pkgbase = ffmpeg
provides = libswresample.so
provides = libswscale.so
options = debug
source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=6f4048827982a8f48f71f551a6e1ed2362816eec
source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=47f70eda3e2ff003a787e512afd07b0c266f7a70
source = add-av_stream_get_first_dts-for-chromium.patch
validpgpkeys = DD1EC9E8DE085C629B3E1846B18E8928B3948D64
b2sums = SKIP
b2sums = d2d6a645509e697932dc8f7a57719e069299e53eb37cda7bf01fd94c9e9956e5532dc5c923fa86d72d0e3a051a7f405e768c73c66ca8aea29271923a17222e03
b2sums = 555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de
pkgname = ffmpeg
@ -116,7 +118,6 @@ pkgname = ffmpeg
depends = glib2
depends = glibc
depends = gmp
depends = gnutls
depends = gsm
depends = harfbuzz
depends = jack
@ -126,6 +127,8 @@ pkgname = ffmpeg
depends = libbluray
depends = libbs2b
depends = libdrm
depends = libdvdnav
depends = libdvdread
depends = libgl
depends = libiec61883
depends = libjxl
@ -148,6 +151,7 @@ pkgname = ffmpeg
depends = libxext
depends = libxml2
depends = libxv
depends = mbedtls2
depends = ocl-icd
depends = onevpl
depends = opencore-amr

View file

@ -16,8 +16,8 @@
# - remove --enable-lto
pkgname=ffmpeg
pkgver=6.1.1
pkgrel=7
pkgver=7.0.1
pkgrel=1
epoch=2
pkgdesc='Complete solution to record, convert and stream audio and video'
arch=(x86_64)
@ -34,7 +34,6 @@ depends=(
glib2
glibc
gmp
gnutls
gsm
harfbuzz
jack
@ -44,6 +43,8 @@ depends=(
libbluray
libbs2b
libdrm
libdvdnav
libdvdread
libgl
libiec61883
libjxl
@ -66,6 +67,7 @@ depends=(
libxext
libxml2
libxv
mbedtls2
ocl-icd
opencore-amr
openjpeg2
@ -116,32 +118,18 @@ provides=(
options=(
debug
)
_tag=6f4048827982a8f48f71f551a6e1ed2362816eec
_tag=47f70eda3e2ff003a787e512afd07b0c266f7a70
source=(
git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=${_tag}
add-av_stream_get_first_dts-for-chromium.patch
)
b2sums=('SKIP'
b2sums=('d2d6a645509e697932dc8f7a57719e069299e53eb37cda7bf01fd94c9e9956e5532dc5c923fa86d72d0e3a051a7f405e768c73c66ca8aea29271923a17222e03'
'555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de')
validpgpkeys=(DD1EC9E8DE085C629B3E1846B18E8928B3948D64) # Michael Niedermayer <michael@niedermayer.cc>
prepare() {
cd ffmpeg
# FS#79281: fix assembling with binutil as >= 2.41
git cherry-pick -n effadce6c756247ea8bae32dc13bb3e6f464f0eb
# FS#77813: fix playing ogg files with mplayer
git cherry-pick -n cbcc817353a019da4332ad43deb7bbc4e695d02a
patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
# use non-deprecated nvenc GUID for conftest
git cherry-pick -n 03823ac0c6a38bd6ba972539e3203a592579792f
git cherry-pick -n d2b46c1ef768bc31ba9180f6d469d5b8be677500
# Fix VDPAU vo
git cherry-pick -n e9c93009fc34ca9dfcf0c6f2ed90ef1df298abf7
# Fix bug in av_fft_end
git cherry-pick -n a562cfee2e214252f8b3f516527272ae32ef9532
git cherry-pick -n 250471ea1745fc703eb346a2a662304536a311b1
# Fix build with latest vulkan headers
git cherry-pick -n fef22c87ada4517441701e6e61e062c9f4399c8e
}
pkgver() {
@ -150,6 +138,7 @@ pkgver() {
}
build() {
export PKG_CONFIG_PATH='/usr/lib/mbedtls2/pkgconfig'
cd ffmpeg
[[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && CONFIG='--host-cflags="-fPIC"'
@ -164,7 +153,6 @@ build() {
--enable-fontconfig \
--enable-frei0r \
--enable-gmp \
--enable-gnutls \
--enable-gpl \
--enable-ladspa \
--enable-libass \
@ -172,6 +160,8 @@ build() {
--enable-libbs2b \
--enable-libdav1d \
--enable-libdrm \
--enable-libdvdnav \
--enable-libdvdread \
--enable-libfreetype \
--enable-libfribidi \
--enable-libgsm \
@ -211,6 +201,7 @@ build() {
--enable-opengl \
--enable-shared \
--enable-vapoursynth \
--enable-mbedtls \
--enable-version3 \
--enable-vulkan $CONFIG
make