summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Kharitonov2016-07-09 00:53:12 +0500
committerDmitry Kharitonov2016-07-09 00:53:12 +0500
commit145d670c3239f1906046390ece9ee89e67dc7fc1 (patch)
tree2a4054755855fda7ec9c45e3c5c60410d6dce362
parent85d6c167e27473047cb6ffef2de27990b6ebdcc6 (diff)
downloadaur-145d670c3239f1906046390ece9ee89e67dc7fc1.tar.gz
Really disable openjpeg support
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD5
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c3bad4346c0d..5df2c5a570d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Jul 8 19:50:05 UTC 2016
+# Fri Jul 8 19:53:03 UTC 2016
pkgbase = ffmpeg-full-nvenc
pkgdesc = Record, convert, and stream audio and video (all codecs including Nvidia NVENC)
pkgver = 3.1.1
- pkgrel = 2
+ pkgrel = 3
epoch = 1
url = http://ffmpeg.org/
arch = i686
@@ -60,7 +60,6 @@ pkgbase = ffmpeg-full-nvenc
depends = openal
depends = opencore-amr
depends = opencl-headers
- depends = openjpeg
depends = opus
depends = rubberband
depends = rtmpdump
diff --git a/PKGBUILD b/PKGBUILD
index 7453f3f7347f..e891134ffbe4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@
pkgname=ffmpeg-full-nvenc
_pkgbasename=ffmpeg
pkgver=3.1.1
-pkgrel=2
+pkgrel=3
epoch=1
pkgdesc="Record, convert, and stream audio and video (all codecs including Nvidia NVENC)"
arch=('i686' 'x86_64')
@@ -29,7 +29,7 @@ depends=('alsa-lib' 'bzip2' 'celt' 'chromaprint' 'faac' 'flite' 'fontconfig' 'fr
'libebur128' 'libfdk-aac' 'libgme' 'libiec61883' 'libilbc' 'libmfx-git' 'libmodplug'
'libomxil-bellagio' 'libpulse' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' 'libwebp'
'libxv' 'mesa' 'netcdf' 'nut-multimedia-git' 'openal' 'opencore-amr' 'opencl-headers'
- 'openjpeg' 'opus' 'rubberband' 'rtmpdump' 'schroedinger' 'sdl' 'smbclient' 'speex' 'shine'
+ 'opus' 'rubberband' 'rtmpdump' 'schroedinger' 'sdl' 'smbclient' 'speex' 'shine'
'tesseract' 'twolame' 'v4l-utils' 'vid.stab' 'vo-amrwbenc' 'libxcb' 'xvidcore'
'wavpack' 'zeromq' 'zimg' 'zlib' 'zvbi'
'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so' 'x265'
@@ -140,6 +140,7 @@ build() {
--enable-libopencore-amrwb \
--enable-libopencv \
--enable-libopenh264 \
+ --disable-openjpeg \
--enable-libopus \
--enable-libpulse \
--enable-librubberband \