conflicts: add intel-media-sdk{-git}

2 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 945fc6fe9b1b..7e79a6b51b41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = intel-media-server-studio
 	pkgdesc = Intel Media Server Studio (only SDK files, no kernel patches, no system modifications)
 	pkgver = 2018.R1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://software.intel.com/en-us/intel-media-server-studio/
 	arch = x86_64
 	license = custom
@@ -10,6 +10,8 @@ pkgbase = intel-media-server-studio
 	provides = intel-opencl-runtime
 	conflicts = intel-opencl
 	conflicts = intel-opencl-runtime
+	conflicts = intel-media-sdk
+	conflicts = intel-media-sdk-git
 	options = !strip
 	options = staticlibs
 	source = http://registrationcenter-download.intel.com/akdlm/irc_nas/vcp/12841/MediaServerStudioEssentials2018R1.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 75b7b025827f..2b33a3c046e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,14 +12,14 @@ _release=R1
 _sdkver=16.8
 pkgname=intel-media-server-studio
 pkgver="${_year}.${_release}"
-pkgrel=1
+pkgrel=2
 pkgdesc='Intel Media Server Studio (only SDK files, no kernel patches, no system modifications)'
 arch=('x86_64')
 url='https://software.intel.com/en-us/intel-media-server-studio/'
 license=('custom')
 makedepends=('poppler')
-conflicts=('intel-opencl' 'intel-opencl-runtime')
 provides=('intel-opencl' 'intel-opencl-runtime')
+conflicts=('intel-opencl' 'intel-opencl-runtime' 'intel-media-sdk' 'intel-media-sdk-git')
 options=('!strip' 'staticlibs')
 source=("http://registrationcenter-download.intel.com/akdlm/irc_nas/vcp/12841/MediaServerStudioEssentials${_year}${_release}.tar.gz")
 sha256sums=('2bb4a8d2235203f4943a19398feb51c4a07b9f60f1e11da8d4aff2b8c7eb2187')