Updated package ffmpeg2.8 2.8.21-2

2 files changed, 14 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4a16b9e15ad..ea9af445e29c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ffmpeg2.8
 	pkgdesc = Complete solution to record, convert and stream audio and video
 	pkgver = 2.8.21
-	pkgrel = 1
+	pkgrel = 2
 	url = https://ffmpeg.org/
 	arch = x86_64
 	license = GPL3
@@ -62,10 +62,12 @@ pkgbase = ffmpeg2.8
 	options = !lto
 	source = https://ffmpeg.org/releases/ffmpeg-2.8.21.tar.xz
 	source = https://ffmpeg.org/releases/ffmpeg-2.8.21.tar.xz.asc
+	source = mathops_shift.patch::https://github.com/FFmpeg/FFmpeg/commit/effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch
 	source = ffmpeg2.8.conf
 	validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
 	sha256sums = e5d956c19bff2aa5bdd60744509c9d8eb01330713d52674a7f650d54b570c82d
 	sha256sums = SKIP
+	sha256sums = 8fad5f253bcda7a17523dbfcbfcfd60b3db23783dcdb65998005cddc7c7776c3
 	sha256sums = f0d34b08843e3cba6276e234f1fc4e520e3a7c45d2b4450393a1a5dd9da49247
 
 pkgname = ffmpeg2.8
diff --git a/PKGBUILD b/PKGBUILD
index dc1c063e4ad2..d0e66f14182b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=ffmpeg2.8
 pkgver=2.8.21
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete solution to record, convert and stream audio and video'
 arch=('x86_64')
 url='https://ffmpeg.org/'
@@ -27,12 +27,21 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
           'libswscale.so')
 source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
+        "mathops_shift.patch"::"https://github.com/FFmpeg/FFmpeg/commit/effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch"
         "${pkgname}.conf")
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
 sha256sums=('e5d956c19bff2aa5bdd60744509c9d8eb01330713d52674a7f650d54b570c82d'
             'SKIP'
+            '8fad5f253bcda7a17523dbfcbfcfd60b3db23783dcdb65998005cddc7c7776c3'
             'f0d34b08843e3cba6276e234f1fc4e520e3a7c45d2b4450393a1a5dd9da49247')
 
+prepare() {
+  cd "ffmpeg-${pkgver}"
+  # avcodec/x86/mathops
+  # clip constants used with shift instructions with in inline assembly
+  patch -Np1 -i "${srcdir}/mathops_shift.patch"
+}
+
 build() {
   cd "ffmpeg-${pkgver}"
 
@@ -44,6 +53,7 @@ build() {
     --disable-debug \
     --disable-static \
     --disable-stripping \
+    --disable-htmlpages \
     --enable-avisynth \
     --enable-avresample \
     --enable-fontconfig \