summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIacopo Isimbaldi2016-01-16 01:08:58 +0100
committerIacopo Isimbaldi2016-01-16 01:08:58 +0100
commit622da53ee60a6540d7b4381e902994db6548c705 (patch)
tree75277a50aa03dee1b6765e09b9d206d62fcea66f
parent19b02153a345d9bf579f519c965842c398a1558e (diff)
downloadaur-622da53ee60a6540d7b4381e902994db6548c705.tar.gz
Updated to version 2.8.5
-rw-r--r--.SRCINFO10
-rw-r--r--.gitignore3
-rw-r--r--PKGBUILD7
3 files changed, 11 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1f825af6c049..9cc23d6cf865 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Jan 13 20:40:41 UTC 2016
+# Sat Jan 16 00:08:12 UTC 2016
pkgbase = ffmpeg-full
pkgdesc = Complete solution to record, convert and stream audio and video (with all options)
- pkgver = 2.8.4
- pkgrel = 2
+ pkgver = 2.8.5
+ pkgrel = 1
epoch = 1
url = http://ffmpeg.org/
arch = i686
@@ -91,8 +91,8 @@ pkgbase = ffmpeg-full
conflicts = ffmpeg
conflicts = ffmpeg-git
conflicts = ffmpeg-full-git
- source = http://ffmpeg.org/releases/ffmpeg-2.8.4.tar.bz2
- source = http://ffmpeg.org/releases/ffmpeg-2.8.4.tar.bz2.asc
+ source = http://ffmpeg.org/releases/ffmpeg-2.8.5.tar.bz2
+ source = http://ffmpeg.org/releases/ffmpeg-2.8.5.tar.bz2.asc
source = UNREDISTRIBUTABLE.txt
sha256sums = 83cc8136a7845546062a43cda9ae3cf0a02f43ef5e434d2f997f055231a75f8e
sha256sums = SKIP
diff --git a/.gitignore b/.gitignore
index 37997c6ad2b8..68059ce20416 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+!.gitignore
+
pkg
src
*.pkg*
+*.orig
diff --git a/PKGBUILD b/PKGBUILD
index 57e7e2bf27f1..f42d03ca07f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
# needs too.
pkgname=ffmpeg-full
-pkgver=2.8.4
-pkgrel=2
+pkgver=2.8.5
+pkgrel=1
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (with all options)'
arch=('i686' 'x86_64')
@@ -127,8 +127,7 @@ build() {
--enable-runtime-cpudetect \
--enable-swresample \
--enable-vdpau \
- --enable-version3 \
- --disable-demuxer='hls' --disable-protocol='concat,hls' # FS#47738
+ --enable-version3
make
make tools/qt-faststart