summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorBermond2016-10-15 21:53:10 -0300
committerBermond2016-10-15 21:53:10 -0300
commitff4c4d3ed34ea9e11880ea8960cf87fc6102f644 (patch)
tree1b5ee73ea087e94389c61b9b244bbb6f8e85b47b /PKGBUILD
parent200b7745d85269a3a810c82d01740a503a84066c (diff)
downloadaur-ff4c4d3ed34ea9e11880ea8960cf87fc6102f644.tar.gz
Removed libopenjpeg patch (compilation fixed by upstream)
FFmpeg was having a compilation error when both openjpeg and openjpeg2 2.1.x were installed. Have previously handled this by an own patch and now the issue is fixed by upstream. Fixed by upstream git commit: http://git.videolan.org/?p=ffmpeg.git;a=commit;h=7a65aef00d113a38e0d1a54df49eead9df6aa15c Upstream bug report fixed: https://trac.ffmpeg.org/ticket/5694
Diffstat (limited to 'PKGBUILD')
-rwxr-xr-xPKGBUILD12
1 files changed, 3 insertions, 9 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 148023083bb6..2b679c669b24 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@
# intel-media-sdk (experimental Intel QSV support only for x86_64)
pkgname=ffmpeg-full-git
-pkgver=N.81857.g635a89b
+pkgver=N.82003.g9082603
pkgrel=1
pkgdesc="Record, convert and stream audio and video (Git version with all possible libs)"
arch=('i686' 'x86_64')
@@ -49,11 +49,9 @@ conflicts=(
'ffmpeg' 'ffmpeg-git' 'ffmpeg-full' 'ffmpeg-full-extra' 'ffmpeg-full-nvenc'
'ffmpeg-libfdk_aac')
source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git'
- 'UNREDISTRIBUTABLE.txt'
- 'libopenjpeg-use-only-1.5.patch')
+ 'UNREDISTRIBUTABLE.txt')
sha256sums=('SKIP'
- 'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4'
- '97d1a4a168ebbb2ae39e52bd1e14d94333c51666f039965d32b7e5d160507ed4')
+ 'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4')
pkgver() {
cd "${srcdir}/${pkgname}"
@@ -91,10 +89,6 @@ build() {
_intelsdklib=""
fi
- # Apply patch for using only openjpeg 1.5
- # (openjpeg 2.1.1 is currently not supported)
- patch -Np1 -i ../libopenjpeg-use-only-1.5.patch
-
msg2 "Running ffmpeg configure script. Please wait..."
./configure \