summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-08-07 17:36:52 +0000
committerDaniel Bermond2018-08-07 17:36:52 +0000
commit5a17eec5f42280ecd7d38eceae625bfe8f4a4301 (patch)
tree5f2b077f99c96c794a9b6bdcf3eb940de8d64106
parent8e404176d9395f82969d30bfdfd3cd77e02cedc1 (diff)
downloadaur-5a17eec5f42280ecd7d38eceae625bfe8f4a4301.tar.gz
conflicts: add intel-media-stack-bin
-rw-r--r--.SRCINFO3
-rwxr-xr-xPKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f179c9f1fe5e..5339225de18c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = intel-media-sdk-git
pkgdesc = API to access hardware-accelerated video decode, encode and filtering on Intel platforms with integrated graphics (git version)
pkgver = 2018.Q2.1.r215.g7885aa1
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/Intel-Media-SDK/MediaSDK/
arch = x86_64
license = MIT
@@ -19,6 +19,7 @@ pkgbase = intel-media-sdk-git
provides = intel-media-sdk
provides = libmfx
conflicts = intel-media-sdk
+ conflicts = intel-media-stack-bin
conflicts = intel-media-server-studio
options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index ddb251bf9462..12e2d91bd57d 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
pkgname=intel-media-sdk-git
pkgver=2018.Q2.1.r215.g7885aa1
-pkgrel=3
+pkgrel=4
pkgdesc='API to access hardware-accelerated video decode, encode and filtering on Intel platforms with integrated graphics (git version)'
arch=('x86_64')
url='https://github.com/Intel-Media-SDK/MediaSDK/'
@@ -22,7 +22,7 @@ depends=(
)
makedepends=('git' 'git-lfs' 'cmake' 'libpciaccess' 'libx11' 'libxcb')
provides=('intel-media-sdk' 'libmfx')
-conflicts=('intel-media-sdk' 'intel-media-server-studio')
+conflicts=('intel-media-sdk' 'intel-media-stack-bin' 'intel-media-server-studio')
options=('!emptydirs')
prepare() {