summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Tobias2016-01-14 21:04:18 +1100
committerDaniel Tobias2016-01-14 21:04:18 +1100
commit8455f0223749465faa55a72cdef170a26084d7c9 (patch)
tree49a72f7f7edd91ba2038213fe159e42ee54cc50b
parentaf430627ea7cb910f47597e66860e0b47902a7f6 (diff)
downloadaur-8455f0223749465faa55a72cdef170a26084d7c9.tar.gz
accidentally had 2 provides=(), the first was ignored breaking packages that depend on 'ffmpeg'
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD9
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0675ac7bc5b6..8271325276b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Thu Jan 14 08:41:26 UTC 2016
+# Thu Jan 14 10:02:49 UTC 2016
pkgbase = ffmpeg-headless
pkgdesc = The FFmpeg media toolkit optimised for server (headless) systems
pkgver = 2.8.4
@@ -45,6 +45,7 @@ pkgbase = ffmpeg-headless
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so
+ provides = ffmpeg=${pkgver}-${pkgrel}
conflicts = ffmpeg
replaces = ffmpeg
source = http://ffmpeg.org/releases/ffmpeg-2.8.4.tar.bz2
diff --git a/PKGBUILD b/PKGBUILD
index 4d25fccd12bd..a047a2ca9af3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,15 +8,12 @@
_pkgname=ffmpeg
pkgname=ffmpeg-headless
pkgver=2.8.4
-pkgrel=1
+pkgrel=1.1
epoch=1
pkgdesc='The FFmpeg media toolkit optimised for server (headless) systems'
arch=('i686' 'x86_64')
url='http://ffmpeg.org/'
license=('GPL3')
-provides=("ffmpeg=${pkgver}-${pkgrel}")
-conflicts=("ffmpeg")
-replaces=("ffmpeg")
depends=('bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' 'libass'
'libbluray' 'libmodplug' 'libtheora' 'libwebp' 'opencore-amr'
'openjpeg' 'opus' 'schroedinger' 'speex' 'v4l-utils' 'xvidcore' 'zlib'
@@ -25,7 +22,9 @@ depends=('bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' 'libass'
makedepends=('hardening-wrapper' 'yasm')
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
- 'libswscale.so')
+ 'libswscale.so' 'ffmpeg=${pkgver}-${pkgrel}')
+conflicts=('ffmpeg')
+replaces=('ffmpeg')
source=(http://ffmpeg.org/releases/${_pkgname}-${pkgver}.tar.bz2)
sha256sums=('83cc8136a7845546062a43cda9ae3cf0a02f43ef5e434d2f997f055231a75f8e')