summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancoism902019-07-25 19:03:45 +0200
committerfrancoism902019-07-25 19:03:45 +0200
commit3e417ec420950cba7c8fcfbeeb44f8722ff7848f (patch)
tree91f7ccd3f3bf5fa7af7087d36807ea04e37e2dc7
parentfe57598d5e1ae44eb7293f48e1475240d50deebe (diff)
downloadaur-3e417ec420950cba7c8fcfbeeb44f8722ff7848f.tar.gz
updpkg: remove libmfx dep
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD21
2 files changed, 6 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f2a16ff6e71..79d9d65d146 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-qsv
pkgdesc = Complete solution to record, convert and stream audio and video (including qsv and libfdk-aac)
pkgver = 4.1.4
- pkgrel = 2
+ pkgrel = 3
url = https://www.ffmpeg.org/
arch = x86_64
license = GPL3
@@ -37,8 +37,8 @@ pkgbase = ffmpeg-qsv
depends = libva
depends = libvdpau
depends = libvidstab.so
- depends = libvorbisenc.so
depends = libvorbis.so
+ depends = libvorbisenc.so
depends = libvpx.so
depends = libwebp
depends = libx11
@@ -49,6 +49,7 @@ pkgbase = ffmpeg-qsv
depends = libxml2
depends = libxv
depends = libxvidcore.so
+ depends = ocl-icd
depends = opencore-amr
depends = openjpeg2
depends = opus
@@ -58,17 +59,8 @@ pkgbase = ffmpeg-qsv
depends = xz
depends = zlib
depends = libfdk-aac
- depends = libmfx
depends = intel-media-sdk
optdepends = ladspa: LADSPA filters
- optdepends = libva-utils: Intel VA-API Media Applications and Scripts for libva
- optdepends = libva-intel-driver: VA-API implementation for Intel G45 and HD Graphics family
- optdepends = libva-mesa-driver: VA-API implementation for gallium
- optdepends = intel-compute-runtime: Intel(R) Graphics Compute Runtime for OpenCL(TM). Replaces Beignet for Gen8 (Broadwell) and beyond
- optdepends = beignet: OpenCL implementation for Intel IvyBridge+ iGPUs
- optdepends = opencl-mesa: OpenCL support for AMD/ATI Radeon mesa drivers
- optdepends = opencl-amd: OpenCL userspace driver as provided in the amdgpu-pro driver stack
- optdepends = opencl-nvidia: OpenCL implemention for NVIDIA
provides = ffmpeg
provides = ffmpeg-libfdk_aac
provides = libavcodec.so
@@ -80,13 +72,6 @@ pkgbase = ffmpeg-qsv
provides = libswresample.so
provides = libswscale.so
conflicts = ffmpeg
- conflicts = ffmpeg-full-nvenc
- conflicts = ffmpeg-nvenc
- conflicts = ffmpeg-libfdk_aac
- conflicts = ffmpeg-decklink
- conflicts = ffmpeg-git
- conflicts = ffmpeg-full-git
- conflicts = ffmpeg-semifull-git
conflicts = ffmpeg-qsv-git
source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.1.4
source = LICENSE
diff --git a/PKGBUILD b/PKGBUILD
index 0d8921f4ed1..ad1b1ae2d63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
_srcname=ffmpeg
pkgname=ffmpeg-qsv
pkgver=4.1.4
-pkgrel=2
+pkgrel=3
pkgdesc='Complete solution to record, convert and stream audio and video (including qsv and libfdk-aac)'
arch=(x86_64)
url='https://www.ffmpeg.org/'
@@ -43,8 +43,8 @@ depends=(
libva
libvdpau
libvidstab.so
- libvorbisenc.so
libvorbis.so
+ libvorbisenc.so
libvpx.so
libwebp
libx11
@@ -55,6 +55,7 @@ depends=(
libxml2
libxv
libxvidcore.so
+ ocl-icd
opencore-amr
openjpeg2
opus
@@ -64,7 +65,6 @@ depends=(
xz
zlib
libfdk-aac
- libmfx
intel-media-sdk
)
makedepends=(
@@ -76,14 +76,6 @@ makedepends=(
)
optdepends=(
'ladspa: LADSPA filters'
- 'libva-utils: Intel VA-API Media Applications and Scripts for libva'
- 'libva-intel-driver: VA-API implementation for Intel G45 and HD Graphics family'
- 'libva-mesa-driver: VA-API implementation for gallium'
- 'intel-compute-runtime: Intel(R) Graphics Compute Runtime for OpenCL(TM). Replaces Beignet for Gen8 (Broadwell) and beyond'
- 'beignet: OpenCL implementation for Intel IvyBridge+ iGPUs'
- 'opencl-mesa: OpenCL support for AMD/ATI Radeon mesa drivers'
- 'opencl-amd: OpenCL userspace driver as provided in the amdgpu-pro driver stack'
- 'opencl-nvidia: OpenCL implemention for NVIDIA'
)
provides=(
ffmpeg
@@ -99,13 +91,6 @@ provides=(
)
conflicts=(
ffmpeg
- ffmpeg-full-nvenc
- ffmpeg-nvenc
- ffmpeg-libfdk_aac
- ffmpeg-decklink
- ffmpeg-git
- ffmpeg-full-git
- ffmpeg-semifull-git
ffmpeg-qsv-git
)
source=("git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}" 'LICENSE')