Install to the default path

Package now installs to '/opt/intel/mediasdk', which is the
default upstream install path.

This is made for historical and compatibility reasons. Software
that uses libmfx should use the 'PKG_CONFIG_PATH' environment
variable if needed.

2 files changed, 7 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ff75ad758b6..b2fd8fb0388d 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 = 1.2a.r55.g22dae39
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/Intel-Media-SDK/MediaSDK/
 	arch = x86_64
 	license = MIT
@@ -18,7 +18,7 @@ pkgbase = intel-media-sdk-git
 	provides = intel-media-sdk
 	provides = libmfx
 	conflicts = intel-media-sdk
-	conflicts = libmfx
+	conflicts = intel-media-server-studio
 	options = !emptydirs
 
 pkgname = intel-media-sdk-git
diff --git a/PKGBUILD b/PKGBUILD
index 60a7e68a35fa..abc564d98da7 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=intel-media-sdk-git
 pkgver=1.2a.r55.g22dae39
-pkgrel=2
+pkgrel=3
 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/'
@@ -20,9 +20,9 @@ depends=(
         'intel-media-driver-git'
 )
 makedepends=('git' 'git-lfs' 'cmake' 'libx11' 'libxcb')
-options=('!emptydirs')
 provides=('intel-media-sdk' 'libmfx')
-conflicts=('intel-media-sdk' 'libmfx')
+conflicts=('intel-media-sdk' 'intel-media-server-studio')
+options=('!emptydirs')
 
 prepare() {
     # makepkg does not support cloning git-lfs repositories
@@ -68,14 +68,11 @@ build() {
         -DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS} ${CPPFLAGS}" \
         -DCMAKE_C_FLAGS_RELEASE:STRING="${CFLAGS} ${CPPFLAGS}" \
         -DCMAKE_COLOR_MAKEFILE:BOOL='ON' \
-        -DCMAKE_INSTALL_LIBDIR:PATH='lib' \
-        -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         -DENABLE_DRM:BOOL='ON' \
         -DENABLE_OPENCL:BOOL='ON' \
         -DENABLE_WAYLAND:BOOL='ON' \
         -DENABLE_X11:BOOL='ON' \
         -DENABLE_X11_DRI3:BOOL='ON' \
-        -DMFX_PLUGINS_DIR='/usr/lib' \
         --no-warn-unused-cli \
         -Wno-dev \
         ..
@@ -88,10 +85,9 @@ package() {
     
     make DESTDIR="$pkgdir" install
     
-    mkdir -p "${pkgdir}/usr/"{bin,include/mfx}
-    
     # includes (add 'mfx' folder for ffmpeg compatibility)
-    cd "${pkgdir}/usr/include"
+    mkdir -p "${pkgdir}/opt/intel/mediasdk/include/mfx"
+    cd "${pkgdir}/opt/intel/mediasdk/include"
     for _header in *.h
     do
         cd mfx
@@ -99,10 +95,6 @@ package() {
         cd ..
     done
     
-    # move samples to better places
-    mv -f "$pkgdir"/usr/samples/lib* "${pkgdir}/usr/lib"
-    mv -f "$pkgdir"/usr/samples/*    "${pkgdir}/usr/bin"
-    
     # license
     cd "${srcdir}/${pkgname}"
     install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"