summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Kharitonov2015-08-20 18:43:18 +0500
committerDmitry Kharitonov2015-08-20 18:43:18 +0500
commitfef4d518db92ae70e9b7cb5287c7a370309d85fe (patch)
treeafcef83bb2e44a53ea52e350b26456d7043c660d
parenta666369f20a30f7b2f5f8fd70d3f7f2d10459426 (diff)
downloadaur-fef4d518db92ae70e9b7cb5287c7a370309d85fe.tar.gz
OpenCL still breaks compiling of other programs (freshplayerplugin, telegram-desktop etc.) -- disabling it
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
2 files changed, 4 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d3398df65ad1..2fa2547f5ae3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-full-nvenc
pkgdesc = Record, convert, and stream audio and video (all codecs including Nvidia NVENC and opencl)
pkgver = 2.7.2
- pkgrel = 3
+ pkgrel = 4
epoch = 1
url = http://ffmpeg.org/
arch = i686
@@ -48,7 +48,6 @@ pkgbase = ffmpeg-full-nvenc
depends = libxv
depends = mesa
depends = openal
- depends = opencl-headers12-svn
depends = opencore-amr
depends = openjpeg
depends = opus
@@ -74,7 +73,6 @@ pkgbase = ffmpeg-full-nvenc
depends = libx265.so
optdepends = avxsynth-git: for Avisynth support
optdepends = cuda: for CUDA support
- optdepends = opencl-nvidia: for OpenCL support
provides = libavcodec.so
provides = libavdevice.so
provides = libavfilter.so
diff --git a/PKGBUILD b/PKGBUILD
index d97a3736be76..c8dd0cb7cc5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
pkgname=ffmpeg-full-nvenc
_pkgbasename=ffmpeg
pkgver=2.7.2
-pkgrel=3
+pkgrel=4
epoch=1
pkgdesc="Record, convert, and stream audio and video (all codecs including Nvidia NVENC and opencl)"
arch=('i686' 'x86_64')
@@ -20,15 +20,14 @@ depends=('alsa-lib' 'bzip2' 'celt' 'faac' 'fontconfig' 'frei0r-plugins' 'fribidi
'libbluray' 'libbs2b' 'libcaca' 'libcdio-paranoia' 'libcl' 'libdc1394'
'libfdk-aac' 'libgme' 'libiec61883' 'libmodplug' 'libpulse' 'libsoxr'
'libutvideo-git' 'libssh' 'libtheora' 'libva' 'libvdpau' 'libwebp'
- 'libxv' 'mesa' 'openal' 'opencl-headers12-svn' 'opencore-amr'
+ 'libxv' 'mesa' 'openal' 'opencore-amr'
'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex' 'rtmpdump' 'shine'
'twolame' 'v4l-utils' 'vid.stab' 'vo-aacenc' 'vo-amrwbenc' 'xvidcore'
'wavpack' 'zeromq' 'zlib' 'zvbi'
'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so' 'libx265.so')
makedepends=('hardening-wrapper' 'libvdpau' 'nvenc-api' 'yasm')
optdepends=('avxsynth-git: for Avisynth support'
- 'cuda: for CUDA support'
- 'opencl-nvidia: for OpenCL support')
+ 'cuda: for CUDA support')
conflicts=('ffmpeg' 'ffmpeg-full' 'ffmpeg-git' 'ffmpeg-full-git' 'ffmpeg-full-extra')
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
@@ -109,7 +108,6 @@ build() {
--enable-nonfree \
--enable-nvenc \
--enable-openal \
- --enable-opencl \
--enable-opengl \
--enable-openssl \
--enable-postproc\