summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rwxr-xr-xPKGBUILD6
2 files changed, 5 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 120617f8b583..f9b46c48139c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Jun 23 20:51:13 UTC 2016
+# Fri Jul 8 15:15:31 UTC 2016
pkgbase = ffmpeg-full-git
pkgdesc = Record, convert and stream audio and video (Git version with all possible libs)
- pkgver = N.80614.g7e4e8fd
+ pkgver = N.80926.g83a940e
pkgrel = 1
url = http://www.ffmpeg.org/
arch = i686
@@ -53,7 +53,6 @@ pkgbase = ffmpeg-full-git
depends = opencore-amr
depends = opencv
depends = openh264
- depends = openjpeg
depends = opus
depends = pulseaudio
depends = rubberband
diff --git a/PKGBUILD b/PKGBUILD
index 7f2644871d23..30cb36485aed 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
# intel-media-sdk (experimental Intel QSV support only for x86_64)
pkgname=ffmpeg-full-git
-pkgver=N.80614.g7e4e8fd
+pkgver=N.80926.g83a940e
pkgrel=1
pkgdesc="Record, convert and stream audio and video (Git version with all possible libs)"
arch=('i686' 'x86_64')
@@ -27,7 +27,7 @@ depends=(
'libgcrypt' 'gmp' 'gnutls' 'glibc' 'ladspa' 'libass' 'libbluray' 'libbs2b' 'libcaca' 'celt'
'libcdio-paranoia' 'libdc1394' 'libebur128' 'faac' 'libfdk-aac' 'flite-fpic' 'freetype2'
'fribidi' 'libgme' 'gsm' 'libiec61883' 'libilbc' 'kvazaar' 'libmodplug' 'lame' 'netcdf'
- 'nut-multimedia-git' 'opencore-amr' 'opencv' 'openh264' 'openjpeg' 'opus' 'pulseaudio'
+ 'nut-multimedia-git' 'opencore-amr' 'opencv' 'openh264' 'opus' 'pulseaudio'
'rubberband' 'rtmpdump' 'schroedinger' 'shine' 'smbclient' 'libavc1394' 'snappy' 'libsoxr'
'speex' 'libssh' 'tesseract' 'libtheora' 'twolame' 'v4l-utils' 'vid.stab' 'vo-amrwbenc'
'libvorbis' 'libvpx' 'wavpack' 'libwebp' 'libx264.so' 'x265' 'libxcb' 'xvidcore' 'zimg'
@@ -150,7 +150,7 @@ build() {
--enable-libopencore-amrwb \
--enable-libopencv \
--enable-libopenh264 \
- --enable-libopenjpeg \
+ --disable-libopenjpeg \
--enable-libopus \
--enable-libpulse \
--enable-librubberband \