summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD9
2 files changed, 10 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2854b55ad69a..e9e135af1078 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Dec 17 00:15:57 UTC 2015
+# Thu Dec 17 12:20:18 UTC 2015
pkgbase = ffmpeg-full
pkgdesc = Complete solution to record, convert and stream audio and video (with all options)
pkgver = 2.8.3
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = http://ffmpeg.org/
arch = i686
@@ -66,13 +66,16 @@ pkgbase = ffmpeg-full
depends = mesa
depends = openal
depends = opencl-headers
+ depends = openh264
depends = rtmpdump
depends = shine
+ depends = snappy
depends = twolame
depends = vid.stab
depends = vo-aacenc
depends = vo-amrwbenc
depends = wavpack
+ depends = xavs
depends = zeromq
depends = zvbi
provides = libavcodec.so
@@ -84,9 +87,6 @@ pkgbase = ffmpeg-full
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so
- provides = openh264
- provides = snappy
- provides = xavs
provides = ffmpeg
conflicts = ffmpeg
conflicts = ffmpeg-git
diff --git a/PKGBUILD b/PKGBUILD
index fa02bf480c70..2720d68bc488 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
pkgname=ffmpeg-full
pkgver=2.8.3
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (with all options)'
arch=('i686' 'x86_64')
@@ -27,15 +27,16 @@ depends=(
'celt' 'faac' 'frei0r-plugins' 'jack' 'ladspa' 'libaacplus'
'libavc1394' 'libbs2b' 'libcaca' 'libcdio-paranoia' 'libcl' 'libdc1394'
'libfdk-aac' 'libgme' 'libiec61883' 'libutvideo-git'
- 'libxv' 'mesa' 'openal' 'opencl-headers' 'rtmpdump' 'shine' 'twolame'
- 'vid.stab' 'vo-aacenc' 'vo-amrwbenc' 'wavpack' 'zeromq' 'zvbi'
+ 'libxv' 'mesa' 'openal' 'opencl-headers' 'openh264'
+ 'rtmpdump' 'shine' 'snappy' 'twolame' 'vid.stab'
+ 'vo-aacenc' 'vo-amrwbenc' 'wavpack' 'xavs' 'zeromq' 'zvbi'
)
makedepends=('hardening-wrapper' 'libvdpau' 'yasm')
conflicts=('ffmpeg' 'ffmpeg-git' 'ffmpeg-full-git')
provides=(
'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
- 'libswscale.so' 'openh264' 'snappy' 'xavs'
+ 'libswscale.so'
'ffmpeg'
)
source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2{,.asc}