[arch-commits] Commit in ffmpeg/trunk (PKGBUILD)

[Maxime Gauduin]

    Date: Friday, January 15, 2016 @ 20:36:31
  Author: alucryd
Revision: 258334

FS#47738: ffmpeg 1:2.8.4-4

Modified:
  ffmpeg/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-15 19:16:43 UTC (rev 258333)
+++ PKGBUILD	2016-01-15 19:36:31 UTC (rev 258334)
@@ -7,7 +7,7 @@
 
 pkgname=ffmpeg
 pkgver=2.8.4
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video'
 arch=('i686' 'x86_64')
@@ -24,13 +24,28 @@
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
           'libswscale.so')
-source=(http://ffmpeg.org/releases/${pkgname}-${pkgver}.tar.bz2{,.asc})
+source=(http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.bz2{,.asc}
+        https://github.com/FFmpeg/FFmpeg/commit/7145e80b4f78cff5ed5fee04d4c4d53daaa0e077.patch
+        https://github.com/FFmpeg/FFmpeg/commit/6ba42b6482c725a59eb468391544dc0c75b8c6f0.patch
+        https://github.com/FFmpeg/FFmpeg/commit/cfda1bea4c18ec1edbc11ecc465f788b02851488.patch)
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
 sha256sums=('83cc8136a7845546062a43cda9ae3cf0a02f43ef5e434d2f997f055231a75f8e'
-            'SKIP')
+            'SKIP'
+            '402477e1cdea436bc322016d97f0a48433c7063ab8cb1100490d059b1663e92e'
+            'c5e5d2cba239f663004e65f86f87ab608348b5eedb11c0ac6d3403a0b8b49f42'
+            'cd285af37d91e04c26a112d6bcbab994e9acf7f49e9f9db06d7c9e8540bb25bd')
 
+prepare() {
+  cd ffmpeg-${pkgver}
+
+  # FS#47738
+  patch -Np1 -i ../7145e80b4f78cff5ed5fee04d4c4d53daaa0e077.patch
+  patch -Np1 -i ../6ba42b6482c725a59eb468391544dc0c75b8c6f0.patch
+  patch -Np1 -i ../cfda1bea4c18ec1edbc11ecc465f788b02851488.patch
+}
+
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ffmpeg-${pkgver}
 
   ./configure \
     --prefix='/usr' \
@@ -71,8 +86,7 @@
     --enable-libxvid \
     --enable-shared \
     --enable-version3 \
-    --enable-x11grab \
-    --disable-demuxer='hls' --disable-protocol='concat,hls' # FS#47738
+    --enable-x11grab
 
   make
   make tools/qt-faststart
@@ -80,7 +94,7 @@
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ffmpeg-${pkgver}
 
   make DESTDIR="${pkgdir}" install install-man
   install -Dm 755 tools/qt-faststart "${pkgdir}"/usr/bin/