summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2019-03-23 18:07:21 +0000
committerDaniel Bermond2019-03-23 18:07:21 +0000
commit26a5471e0d7d7f2d0b64b32f829e6c3d65d5ccde (patch)
treee67cfbbea71a944e6af161b9561f4eeef4539209
parent9e84255b479a90af59c4d1c5e490121a7964c182 (diff)
downloadaur-26a5471e0d7d7f2d0b64b32f829e6c3d65d5ccde.tar.gz
Remove libndi_newtek, add libaribb24, switch cuda-sdk to cuda-nvcc
- new upstream option: --enable-libaribb24[1] - remove --enable-libndi_newtek (removed by upstream[2]) - switch --enable-cuda-sdk to --enable-cuda-nvcc (switched by upstream[3][4]) - depends: switch dav1d to dav1d-git, now needed by the latest upstream git master code[5] References ---------- [1] https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/100bfac6d6ecb3447dc3ac4b9d2c41085da59a8b [2] https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/4b32f8b3ebfa011fcc5991bcaa97c3f5b61b49ad [3] https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/5f47bfd50ac46fb18b23a212a53bea0feacc1bb0 [4] https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/114ead9735f226e5824a15b94b32344436c96a71 [5] https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/dcf64b599d3132bec3a9f52139de716d70f0fb4e
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD26
2 files changed, 16 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a572468a876..e4543f5cea2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ffmpeg-full-git
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)
- pkgver = 4.2.r93293.gdb332832a1
+ pkgver = 4.2.r93447.g5252d594a1
pkgrel = 1
url = https://www.ffmpeg.org/
arch = i686
@@ -23,12 +23,12 @@ pkgbase = ffmpeg-full-git
depends = ladspa
depends = libass
depends = aom
+ depends = aribb24
depends = libbluray
depends = libbs2b
depends = libcaca
depends = celt
depends = libcdio-paranoia
- depends = dav1d
depends = libdc1394
depends = libavc1394
depends = libfdk-aac
@@ -89,6 +89,7 @@ pkgbase = ffmpeg-full-git
depends = libdrm
depends = libvdpau
depends = chromaprint-fftw
+ depends = dav1d-git
depends = codec2
depends = davs2
depends = flite1-patched
@@ -101,7 +102,6 @@ pkgbase = ffmpeg-full-git
depends = vo-amrwbenc
depends = xavs
depends = xavs2
- depends = ndi-sdk
depends = libmysofa-git
depends = rockchip-mpp
provides = libavcodec.so
diff --git a/PKGBUILD b/PKGBUILD
index 665cd822ef4..9931e8d1671 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=ffmpeg-full-git
_srcname=ffmpeg
-pkgver=4.2.r93293.gdb332832a1
+pkgver=4.2.r93447.g5252d594a1
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)'
arch=('i686' 'x86_64')
@@ -12,19 +12,19 @@ depends=(
# official repositories:
'glibc' 'alsa-lib' 'jack' 'libpng'
'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass' 'aom'
- 'libbluray' 'libbs2b' 'libcaca' 'celt' 'libcdio-paranoia' 'dav1d' 'libdc1394'
+ 'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt' 'libcdio-paranoia' 'libdc1394'
'libavc1394' 'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi' 'libgme' 'gsm'
'libiec61883' 'lensfun' 'libmodplug' 'lame' 'opencore-amr' 'openjpeg2' 'opus'
- 'pulseaudio' 'librsvg' 'rubberband' 'rtmpdump' 'snappy' 'libsoxr'
- 'speex' 'srt' 'libssh' 'tensorflow' 'tesseract' 'libtheora' 'twolame'
- 'v4l-utils' 'vid.stab' 'libvorbis' 'libvpx' 'wavpack' 'libwebp' 'libx264.so'
- 'x265' 'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2' 'lilv' 'xz'
- 'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth' 'libxv' 'libx11'
- 'libxext' 'zlib' 'libomxil-bellagio' 'libva' 'libdrm' 'libvdpau'
+ 'pulseaudio' 'librsvg' 'rubberband' 'rtmpdump' 'snappy' 'libsoxr' 'speex' 'srt'
+ 'libssh' 'tensorflow' 'tesseract' 'libtheora' 'twolame' 'v4l-utils' 'vid.stab'
+ 'libvorbis' 'libvpx' 'wavpack' 'libwebp' 'libx264.so' 'x265' 'libxcb'
+ 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2' 'lilv' 'xz' 'openal'
+ 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth' 'libxv' 'libx11' 'libxext'
+ 'zlib' 'libomxil-bellagio' 'libva' 'libdrm' 'libvdpau'
# AUR:
- 'chromaprint-fftw' 'codec2' 'davs2' 'flite1-patched' 'libilbc' 'libklvanc-git'
- 'kvazaar' 'openh264' 'libopenmpt-svn' 'shine' 'vo-amrwbenc' 'xavs' 'xavs2'
- 'ndi-sdk' 'libmysofa-git' 'rockchip-mpp'
+ 'chromaprint-fftw' 'dav1d-git' 'codec2' 'davs2' 'flite1-patched' 'libilbc'
+ 'libklvanc-git' 'kvazaar' 'openh264' 'libopenmpt-svn' 'shine' 'vo-amrwbenc'
+ 'xavs' 'xavs2' 'libmysofa-git' 'rockchip-mpp'
)
depends_x86_64=(
# official repositories:
@@ -72,7 +72,7 @@ build() {
if [ "$CARCH" = 'x86_64' ]
then
local _libvmaf='--enable-libvmaf'
- local _cudasdk='--enable-cuda-sdk'
+ local _cudasdk='--enable-cuda-nvcc'
local _libmfx='--enable-libmfx'
local _libnpp='--enable-libnpp'
@@ -117,6 +117,7 @@ build() {
--enable-iconv \
--enable-ladspa \
--enable-libaom \
+ --enable-libaribb24 \
--enable-libass \
--enable-libbluray \
--enable-libbs2b \
@@ -189,7 +190,6 @@ build() {
--enable-lv2 \
--enable-lzma \
--enable-decklink \
- --enable-libndi_newtek \
--disable-mbedtls \
--enable-libmysofa \
--enable-openal \