summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-06-27 23:23:57 +0000
committerDaniel Bermond2018-06-27 23:23:57 +0000
commit1de0dc345fae1b915a29cb02993c4759505b2a37 (patch)
treebfcd34fb888a6c0b876d017c0b4095a1a800e506
parentcaf030d7be5c23d4476e404763d8bd5cb99d3eb1 (diff)
downloadaur-1de0dc345fae1b915a29cb02993c4759505b2a37.tar.gz
depends: switch libaom to aom (aom is now in official repositories)
References ---------- https://www.archlinux.org/packages/extra/x86_64/aom/
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e815a5534c7b..c3b9a790d8a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-full
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)
pkgver = 4.0.1
- pkgrel = 2
+ pkgrel = 3
url = http://www.ffmpeg.org/
arch = i686
arch = x86_64
@@ -21,6 +21,7 @@ pkgbase = ffmpeg-full
depends = gnutls
depends = ladspa
depends = libass
+ depends = aom
depends = libbluray
depends = libbs2b
depends = libcaca
@@ -83,7 +84,6 @@ pkgbase = ffmpeg-full
depends = libdrm
depends = libvdpau
depends = chromaprint-fftw
- depends = libaom
depends = codec2
depends = flite1-patched
depends = libilbc
diff --git a/PKGBUILD b/PKGBUILD
index 854528d612ac..798869ae85fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=ffmpeg-full
_srcname=ffmpeg
pkgver=4.0.1
-pkgrel=2
+pkgrel=3
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)'
arch=('i686' 'x86_64')
url='http://www.ffmpeg.org/'
@@ -12,7 +12,7 @@ license=('custom: nonfree and unredistributable')
depends=(
# official repositories:
'glibc' 'alsa-lib' 'jack' 'libpng'
- 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass'
+ 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass' 'aom'
'libbluray' 'libbs2b' 'libcaca' 'celt' 'libcdio-paranoia' 'libdc1394'
'libavc1394' 'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi' 'libgme' 'gsm'
'libiec61883' 'libmodplug' 'lame' 'opencore-amr' 'openjpeg2' 'opus' 'pulseaudio'
@@ -23,8 +23,8 @@ depends=(
'libxv' 'libx11' 'libxext' 'zlib' 'libomxil-bellagio' 'libva' 'libdrm'
'libvdpau'
# AUR:
- 'chromaprint-fftw' 'libaom' 'codec2' 'flite1-patched' 'libilbc' 'kvazaar'
- 'openh264' 'libopenmpt-svn' 'shine' 'vo-amrwbenc' 'xavs' 'ndi-sdk' 'libmysofa'
+ 'chromaprint-fftw' 'codec2' 'flite1-patched' 'libilbc' 'kvazaar' 'openh264'
+ 'libopenmpt-svn' 'shine' 'vo-amrwbenc' 'xavs' 'ndi-sdk' 'libmysofa'
'rockchip-mpp'
)
depends_x86_64=(