From 96e36da799705c03a1400148ad89fd3f86d729f1 Mon Sep 17 00:00:00 2001 From: kth5 Date: Sat, 28 Sep 2024 23:47:40 +0200 Subject: [PATCH] * update ffmpeg to 2:7.0.2-3 --- ffmpeg/.SRCINFO | 207 +++++++++++++++++++++++++++++++++++++++++ ffmpeg/.nvchecker.toml | 5 + ffmpeg/PKGBUILD | 68 ++++++++------ 3 files changed, 252 insertions(+), 28 deletions(-) create mode 100644 ffmpeg/.SRCINFO create mode 100644 ffmpeg/.nvchecker.toml diff --git a/ffmpeg/.SRCINFO b/ffmpeg/.SRCINFO new file mode 100644 index 0000000000..46ff982828 --- /dev/null +++ b/ffmpeg/.SRCINFO @@ -0,0 +1,207 @@ +pkgbase = ffmpeg + pkgdesc = Complete solution to record, convert and stream audio and video + pkgver = 7.0.2 + pkgrel = 3 + epoch = 2 + url = https://ffmpeg.org + arch = x86_64 + arch = powerpc64le + arch = powerpc64 + arch = powerpc + arch = riscv64 + license = GPL-3.0-only + makedepends = amf-headers + makedepends = avisynthplus + makedepends = clang + makedepends = ffnvcodec-headers + makedepends = frei0r-plugins + makedepends = git + makedepends = ladspa + makedepends = mesa + makedepends = opencl-headers + makedepends = vulkan-headers + depends = alsa-lib + depends = aom + depends = bzip2 + depends = cairo + depends = dav1d + depends = fontconfig + depends = freetype2 + depends = fribidi + depends = glib2 + depends = glibc + depends = gmp + depends = gnutls + depends = gsm + depends = harfbuzz + depends = jack + depends = lame + depends = libass + depends = libavc1394 + depends = libbluray + depends = libbs2b + depends = libdrm + depends = libdvdnav + depends = libdvdread + depends = libgl + depends = libiec61883 + depends = libjxl + depends = libmodplug + depends = libopenmpt + depends = libplacebo + depends = libpulse + depends = libraw1394 + depends = librsvg + depends = libsoxr + depends = libssh + depends = libtheora + depends = libva + depends = libvdpau + depends = libvorbis + depends = libvpx + depends = libwebp + depends = libx11 + depends = libxcb + depends = libxext + depends = libxml2 + depends = libxv + depends = ocl-icd + depends = onevpl + depends = opencore-amr + depends = openjpeg2 + depends = opus + depends = rav1e + depends = rubberband + depends = sdl2 + depends = snappy + depends = speex + depends = srt + depends = svt-av1 + depends = v4l-utils + depends = vapoursynth + depends = vid.stab + depends = vmaf + depends = vulkan-icd-loader + depends = x264 + depends = x265 + depends = xvidcore + depends = xz + depends = zeromq + depends = zimg + depends = zlib + optdepends = avisynthplus: AviSynthPlus support + optdepends = frei0r-plugins: Frei0r video effects support + optdepends = intel-media-sdk: Intel QuickSync support (legacy) + optdepends = ladspa: LADSPA filters + optdepends = nvidia-utils: Nvidia NVDEC/NVENC support + optdepends = onevpl-intel-gpu: Intel QuickSync support + provides = libavcodec.so + provides = libavdevice.so + provides = libavfilter.so + provides = libavformat.so + provides = libavutil.so + provides = libpostproc.so + provides = libswresample.so + provides = libswscale.so + options = debug + source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=a18b979d17fa169a6f93c5be8732533c8e06337d + source = add-av_stream_get_first_dts-for-chromium.patch + validpgpkeys = DD1EC9E8DE085C629B3E1846B18E8928B3948D64 + b2sums = bcc0fb367d2822665f0918292a0cf581e0119d6ba6d2e3d0b6e794b6f74d30c118b5c47e26b5687473f01b346f8ec7e885f80729ce6115e18003b2371ff4553f + b2sums = 555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de + makedepends_x86_64 = nasm + +pkgname = ffmpeg + depends = alsa-lib + depends = aom + depends = bzip2 + depends = cairo + depends = dav1d + depends = fontconfig + depends = freetype2 + depends = fribidi + depends = glib2 + depends = glibc + depends = gmp + depends = gnutls + depends = gsm + depends = harfbuzz + depends = jack + depends = lame + depends = libass + depends = libavc1394 + depends = libbluray + depends = libbs2b + depends = libdrm + depends = libdvdnav + depends = libdvdread + depends = libgl + depends = libiec61883 + depends = libjxl + depends = libmodplug + depends = libopenmpt + depends = libplacebo + depends = libpulse + depends = libraw1394 + depends = librsvg + depends = libsoxr + depends = libssh + depends = libtheora + depends = libva + depends = libvdpau + depends = libvorbis + depends = libvpx + depends = libwebp + depends = libx11 + depends = libxcb + depends = libxext + depends = libxml2 + depends = libxv + depends = ocl-icd + depends = onevpl + depends = opencore-amr + depends = openjpeg2 + depends = opus + depends = rav1e + depends = rubberband + depends = sdl2 + depends = snappy + depends = speex + depends = srt + depends = svt-av1 + depends = v4l-utils + depends = vapoursynth + depends = vid.stab + depends = vmaf + depends = vulkan-icd-loader + depends = x264 + depends = x265 + depends = xvidcore + depends = xz + depends = zeromq + depends = zimg + depends = zlib + depends = libass.so + depends = libbluray.so + depends = libbs2b.so + depends = libdav1d.so + depends = libfreetype.so + depends = libharfbuzz.so + depends = libjxl.so + depends = libopenmpt.so + depends = libplacebo.so + depends = librav1e.so + depends = librsvg-2.so + depends = librubberband.so + depends = libva.so + depends = libva-drm.so + depends = libva-x11.so + depends = libvidstab.so + depends = libvorbisenc.so + depends = libvorbis.so + depends = libvpx.so + depends = libx264.so + depends = libx265.so + depends = libxvidcore.so + depends = libzimg.so + depends = libzmq.so diff --git a/ffmpeg/.nvchecker.toml b/ffmpeg/.nvchecker.toml new file mode 100644 index 0000000000..5c1cbbe01a --- /dev/null +++ b/ffmpeg/.nvchecker.toml @@ -0,0 +1,5 @@ +[ffmpeg] +source = "git" +git = "https://git.ffmpeg.org/ffmpeg.git" +prefix = "n" +exclude_regex = ".*v.*" diff --git a/ffmpeg/PKGBUILD b/ffmpeg/PKGBUILD index 1e69784cca..9dae7da3a5 100644 --- a/ffmpeg/PKGBUILD +++ b/ffmpeg/PKGBUILD @@ -5,8 +5,8 @@ # Contributor: Paul Mattal pkgname=ffmpeg -pkgver=7.0.1 -pkgrel=2 +pkgver=7.0.2 +pkgrel=3 epoch=2 pkgdesc='Complete solution to record, convert and stream audio and video' arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) @@ -34,6 +34,8 @@ depends=( libbluray libbs2b libdrm + libdvdnav + libdvdread libgl libiec61883 libjxl @@ -76,6 +78,7 @@ depends=( x265 xvidcore xz + zeromq zimg zlib ) @@ -118,47 +121,52 @@ provides=( options=( debug ) +_tag=a18b979d17fa169a6f93c5be8732533c8e06337d source=( - git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=n${pkgver} + 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 ) -b2sums=('d2d6a645509e697932dc8f7a57719e069299e53eb37cda7bf01fd94c9e9956e5532dc5c923fa86d72d0e3a051a7f405e768c73c66ca8aea29271923a17222e03' - '555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de' - 'b82fc06a7eee0c7ab68ef78f3ac205f45a68a7799dc241f0a574afa48e4dbd477c0d67f7c5a7ff46971adc821ef1507f4957156200167a2c59f8c7f7867ac048') +b2sums=('bcc0fb367d2822665f0918292a0cf581e0119d6ba6d2e3d0b6e794b6f74d30c118b5c47e26b5687473f01b346f8ec7e885f80729ce6115e18003b2371ff4553f' + '555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de') validpgpkeys=(DD1EC9E8DE085C629B3E1846B18E8928B3948D64) # Michael Niedermayer prepare() { cd ffmpeg patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779 - #FIXES: - #libavutil/hwcontext_vaapi.c: In function ‘vaapi_map_from_drm’: - #libavutil/hwcontext_vaapi.c:1238:34: error: assignment to ‘uintptr_t *’ {aka ‘unsigned int *’} from incompatible pointer type ‘long unsigned int *’ [-Wincompatible-pointer-types] - patch -Np1 -i ../ffmpeg-6.1-gcc-14.patch + # Fix VAAPI AV1 performance with Mesa + git cherry-pick -n fe9d889dcd79ea18d4dfaa39df4ddbd4c8c3b15c + git cherry-pick -n d2d911eb9a2fc6eb8d86b3ae025a56c1a2692fba + +} + +pkgver() { + cd ffmpeg + git describe --tags | sed 's/^n//' } build() { + export PKG_CONFIG_PATH='/usr/lib/mbedtls2/pkgconfig' cd ffmpeg - case "${CARCH}" in - powerpc|powerpc64) _configure_flags=( - --disable-asm - --disable-altivec # altivec support on 32/64be is broken - --disable-power8 # buildbot may be a power9 - --disable-vsx # later SIMD, disable them forcefully - ) - ;; - x86_64) _configure_flags=( - --enable-cuda-llvm - --enable-nvdec - --enable-nvenc - --enable-libvpl - ) - ;; - esac + case "${CARCH}" in + powerpc|powerpc64) _configure_flags=( + --disable-asm + --disable-altivec # altivec support on 32/64be is broken + --disable-power8 # buildbot may be a power9 + --disable-vsx # later SIMD, disable them forcefully + ) + ;; + x86_64) _configure_flags=( + --enable-cuda-llvm + --enable-nvdec + --enable-nvenc + --enable-libvpl + ) + ;; + esac - [[ "${CARCH}" == 'powerpc' ]] && _configure_flags+=(--disable-ffplay) + [[ "${CARCH}" == 'powerpc' ]] && _configure_flags+=(--disable-ffplay) ./configure \ --prefix=/usr \ @@ -180,6 +188,8 @@ build() { --enable-libbs2b \ --enable-libdav1d \ --enable-libdrm \ + --enable-libdvdnav \ + --enable-libdvdread \ --enable-libfreetype \ --enable-libfribidi \ --enable-libgsm \ @@ -218,6 +228,7 @@ build() { --enable-libxml2 \ --enable-libxvid \ --enable-libzimg \ + --enable-libzmq \ --enable-opencl \ --enable-opengl \ --enable-shared \ @@ -254,6 +265,7 @@ package() { libx265.so libxvidcore.so libzimg.so + libzmq.so ) make DESTDIR="${pkgdir}" -C ffmpeg install install-man