summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
2 files changed, 5 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bab6ac55e5d9..ce35df5d8600 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Oct 25 21:02:49 UTC 2016
+# Tue Oct 25 22:46:38 UTC 2016
pkgbase = ffmpeg-libfdk_aac
pkgdesc = Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)
pkgver = 3.1.5
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = http://ffmpeg.org/
arch = i686
@@ -65,10 +65,8 @@ pkgbase = ffmpeg-libfdk_aac
conflicts = ffmpeg
source = https://ffmpeg.org/releases/ffmpeg-3.1.5.tar.xz
source = https://ffmpeg.org/releases/ffmpeg-3.1.5.tar.xz.asc
- source = https://trac.ffmpeg.org/raw-attachment/ticket/5694/ffmpeg_opj2.patch
sha256sums = 49cc3105f7891c5637f8fabb1b75ebb19c9b5123b311a3ccc6182aa35d58b89a
sha256sums = SKIP
- sha256sums = 336f14fa497598fbd437fc780305fa7c576fd6cd44aaef77b0b4f61448f55fb8
pkgname = ffmpeg-libfdk_aac
diff --git a/PKGBUILD b/PKGBUILD
index 6e5ce211bacb..7486973343b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
_name=ffmpeg
pkgname=ffmpeg-libfdk_aac
pkgver=3.1.5
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)'
arch=('i686' 'x86_64')
@@ -31,17 +31,10 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libswscale.so'
"ffmpeg=$pkgver")
conflicts=("$_name")
-source=(https://ffmpeg.org/releases/$_name-$pkgver.tar.xz{,.asc}
- https://trac.ffmpeg.org/raw-attachment/ticket/5694/ffmpeg_opj2.patch)
+source=(https://ffmpeg.org/releases/$_name-$pkgver.tar.xz{,.asc})
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
sha256sums=('49cc3105f7891c5637f8fabb1b75ebb19c9b5123b311a3ccc6182aa35d58b89a'
- 'SKIP'
- '336f14fa497598fbd437fc780305fa7c576fd6cd44aaef77b0b4f61448f55fb8')
-
-prepare() {
- cd $_name-$pkgver
- patch -Np1 <../ffmpeg_opj2.patch
-}
+ 'SKIP')
build() {
cd $_name-$pkgver