summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2022-09-06 08:31:25 -0600
committerMark Wagie2022-09-06 08:31:25 -0600
commita104ffd964c3edb1b669d3703d3146d3262fc4ac (patch)
tree8bcc293445d9702bb3b965a5e14f1b00a5c8c65a
parent9d7244669f6bcc61bcdda07c9afbca6670bcc373 (diff)
downloadaur-a104ffd964c3edb1b669d3703d3146d3262fc4ac.tar.gz
verify tag signature and remove unneeded cherry-pick, add bs2b, opencl, opengl and vulkan support
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD24
2 files changed, 30 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0b95c056096a..2e7ccb0ea53a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-cuda
pkgdesc = Complete solution to record, convert and stream audio and video. Includes cuda support.
pkgver = 5.1.1
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://ffmpeg.org/
arch = x86_64
@@ -12,7 +12,10 @@ pkgbase = ffmpeg-cuda
makedepends = ffnvcodec-headers
makedepends = git
makedepends = ladspa
+ makedepends = mesa
makedepends = nasm
+ makedepends = opencl-headers
+ makedepends = vulkan-headers
depends = alsa-lib
depends = aom
depends = bzip2
@@ -27,9 +30,11 @@ pkgbase = ffmpeg-cuda
depends = libass.so
depends = libavc1394
depends = libbluray.so
+ depends = libbs2b.so
depends = libdav1d.so
depends = libdrm
depends = libfreetype.so
+ depends = libgl
depends = libiec61883
depends = libmfx
depends = libmodplug
@@ -48,6 +53,7 @@ pkgbase = ffmpeg-cuda
depends = libvorbisenc.so
depends = libvorbis.so
depends = libvpx.so
+ depends = libvulkan.so
depends = libwebp
depends = libx11
depends = libx264.so
@@ -58,6 +64,7 @@ pkgbase = ffmpeg-cuda
depends = libxv
depends = libxvidcore.so
depends = libzimg.so
+ depends = ocl-icd
depends = opencore-amr
depends = openjpeg2
depends = opus
@@ -70,7 +77,9 @@ pkgbase = ffmpeg-cuda
depends = xz
depends = zlib
optdepends = avisynthplus: AviSynthPlus support
+ optdepends = intel-media-sdk: Intel QuickSync support
optdepends = ladspa: LADSPA filters
+ optdepends = nvidia-utils: Nvidia NVDEC/NVENC support
provides = libavcodec.so
provides = libavdevice.so
provides = libavfilter.so
@@ -81,8 +90,9 @@ pkgbase = ffmpeg-cuda
provides = libswscale.so
provides = ffmpeg
conflicts = ffmpeg
- source = git+https://git.ffmpeg.org/ffmpeg.git#tag=1bad30dbe34f2d100b43e8f773d3fe0b5eb23523
+ source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=8536e629f0c35c0e8a2b67e65d3bc60a088fe413
source = add-av_stream_get_first_dts-for-chromium.patch
+ validpgpkeys = DD1EC9E8DE085C629B3E1846B18E8928B3948D64
b2sums = SKIP
b2sums = 555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de
diff --git a/PKGBUILD b/PKGBUILD
index 47811f4d13b6..a74d3605e6fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
pkgname=ffmpeg-cuda
pkgver=5.1.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video. Includes cuda support.'
arch=(x86_64)
@@ -32,9 +32,11 @@ depends=(
libass.so
libavc1394
libbluray.so
+ libbs2b.so
libdav1d.so
libdrm
libfreetype.so
+ libgl
libiec61883
libmfx
libmodplug
@@ -53,6 +55,7 @@ depends=(
libvorbisenc.so
libvorbis.so
libvpx.so
+ libvulkan.so
libwebp
libx11
libx264.so
@@ -63,6 +66,7 @@ depends=(
libxv
libxvidcore.so
libzimg.so
+ ocl-icd
opencore-amr
openjpeg2
opus
@@ -82,11 +86,16 @@ makedepends=(
ffnvcodec-headers
git
ladspa
+ mesa
nasm
+ opencl-headers
+ vulkan-headers
)
optdepends=(
'avisynthplus: AviSynthPlus support'
+ 'intel-media-sdk: Intel QuickSync support'
'ladspa: LADSPA filters'
+ 'nvidia-utils: Nvidia NVDEC/NVENC support'
)
provides=(
libavcodec.so
@@ -100,13 +109,14 @@ provides=(
ffmpeg
)
conflicts=('ffmpeg')
-_tag=1bad30dbe34f2d100b43e8f773d3fe0b5eb23523
+_tag=8536e629f0c35c0e8a2b67e65d3bc60a088fe413
source=(
- "git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}"
+ "git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=${_tag}"
'add-av_stream_get_first_dts-for-chromium.patch'
)
b2sums=('SKIP'
'555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de')
+validpgpkeys=(DD1EC9E8DE085C629B3E1846B18E8928B3948D64) # Michael Niedermayer <michael@niedermayer.cc>
pkgver() {
cd ffmpeg
@@ -115,7 +125,6 @@ pkgver() {
prepare() {
cd ffmpeg
- git cherry-pick -n 412922cc6fa790897ef6bb2be5d6f9a5f030754d # remove default IPFS gateway
patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
}
@@ -148,6 +157,7 @@ build() {
--enable-libaom \
--enable-libass \
--enable-libbluray \
+ --enable-libbs2b \
--enable-libdav1d \
--enable-libdrm \
--enable-libfreetype \
@@ -185,9 +195,11 @@ build() {
--enable-libzimg \
--enable-nvdec \
--enable-nvenc \
+ --enable-opencl \
+ --enable-opengl \
--enable-shared \
- --enable-version3
-
+ --enable-version3 \
+ --enable-vulkan
make
make tools/qt-faststart
make doc/ff{mpeg,play}.1