summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Widawsky2016-10-30 22:23:43 -0700
committerBen Widawsky2016-10-30 22:23:43 -0700
commit56d324ab98ef6b104f85ba96cbec8ec417c4123d (patch)
tree8f645c10f494ccdf061d18a93d0756ba0a2eafae
parent5fec2e4b43948bcc1acce6c3f25e350e483771c5 (diff)
downloadaur-56d324ab98ef6b104f85ba96cbec8ec417c4123d.tar.gz
upgpkg: ffmpeg 1:3.2-1
Pull in a few missed upstream changes
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD10
2 files changed, 14 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ce35df5d8600..358c44582852 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Oct 25 22:46:38 UTC 2016
+# Mon Oct 31 05:23:37 UTC 2016
pkgbase = ffmpeg-libfdk_aac
pkgdesc = Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)
- pkgver = 3.1.5
- pkgrel = 2
+ pkgver = 3.2
+ pkgrel = 1
epoch = 1
url = http://ffmpeg.org/
arch = i686
@@ -34,9 +34,8 @@ pkgbase = ffmpeg-libfdk_aac
depends = libva
depends = libvdpau
depends = libwebp
- depends = netcdf
depends = opencore-amr
- depends = openjpeg
+ depends = openjpeg2
depends = opus
depends = schroedinger
depends = sdl
@@ -50,6 +49,7 @@ pkgbase = ffmpeg-libfdk_aac
depends = libvpx.so
depends = libx264.so
depends = libx265.so
+ depends = libnetcdf.so
depends = libfdk-aac
optdepends = ladspa: LADSPA filters
provides = libavcodec.so
@@ -61,11 +61,11 @@ pkgbase = ffmpeg-libfdk_aac
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so
- provides = ffmpeg=3.1.5
+ provides = ffmpeg=3.2
conflicts = ffmpeg
- source = https://ffmpeg.org/releases/ffmpeg-3.1.5.tar.xz
- source = https://ffmpeg.org/releases/ffmpeg-3.1.5.tar.xz.asc
- sha256sums = 49cc3105f7891c5637f8fabb1b75ebb19c9b5123b311a3ccc6182aa35d58b89a
+ source = https://ffmpeg.org/releases/ffmpeg-3.2.tar.xz
+ source = https://ffmpeg.org/releases/ffmpeg-3.2.tar.xz.asc
+ sha256sums = 88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da
sha256sums = SKIP
pkgname = ffmpeg-libfdk_aac
diff --git a/PKGBUILD b/PKGBUILD
index 7486973343b6..e86efdcedb47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
_name=ffmpeg
pkgname=ffmpeg-libfdk_aac
-pkgver=3.1.5
-pkgrel=2
+pkgver=3.2
+pkgrel=1
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)'
arch=('i686' 'x86_64')
@@ -18,10 +18,10 @@ license=('GPL3' 'custom:libfdk-aac')
depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gmp' 'gnutls' 'gsm' 'lame'
'libass' 'libavc1394' 'libbluray' 'libiec61883' 'libmodplug'
'libpulse' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' 'libwebp'
- 'netcdf' 'opencore-amr' 'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex'
+ 'opencore-amr' 'openjpeg2' 'opus' 'schroedinger' 'sdl' 'speex'
'v4l-utils' 'xvidcore' 'zlib'
'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' 'libvpx.so'
- 'libx264.so' 'libx265.so'
+ 'libx264.so' 'libx265.so' 'libnetcdf.so'
'libfdk-aac')
makedepends=('hardening-wrapper' 'ladspa' 'libvdpau' 'yasm')
@@ -33,7 +33,7 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
conflicts=("$_name")
source=(https://ffmpeg.org/releases/$_name-$pkgver.tar.xz{,.asc})
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
-sha256sums=('49cc3105f7891c5637f8fabb1b75ebb19c9b5123b311a3ccc6182aa35d58b89a'
+sha256sums=('88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da'
'SKIP')
build() {