[arch-commits] Commit in intel-media-sdk/trunk (5 files)

[Daniel Bermond]

    Date: Thursday, January 23, 2020 @ 00:57:09
  Author: dbermond
Revision: 554659

upgpkg: intel-media-sdk 19.4.0-3

FS#65238

Modified:
  intel-media-sdk/trunk/PKGBUILD
Deleted:
  intel-media-sdk/trunk/intel-media-sdk.conf
  intel-media-sdk/trunk/intel-media-sdk.install
  intel-media-sdk/trunk/intel-media-sdk.sh
  intel-media-sdk/trunk/libmfx.conf

-------------------------+
 PKGBUILD                |   38 +++++++++++---------------------------
 intel-media-sdk.conf    |    2 --
 intel-media-sdk.install |    4 ----
 intel-media-sdk.sh      |    2 --
 libmfx.conf             |    1 -
 5 files changed, 11 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-23 00:11:40 UTC (rev 554658)
+++ PKGBUILD	2020-01-23 00:57:09 UTC (rev 554659)
@@ -3,7 +3,7 @@
 pkgbase=intel-media-sdk
 pkgname=('intel-media-sdk' 'libmfx')
 pkgver=19.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc='API to access hardware-accelerated video on Intel Gen graphics hardware platforms'
 arch=('x86_64')
 url='https://software.intel.com/en-us/media-sdk/'
@@ -11,14 +11,8 @@
 makedepends=('libdrm' 'libva' 'wayland'
              'cmake' 'libpciaccess' 'libx11' 'libxcb' 'python'
              'opencl-headers' 'ocl-icd' 'intel-compute-runtime')
-source=("https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${pkgver}.tar.gz"
-        'libmfx.conf'
-        'intel-media-sdk.conf'
-        'intel-media-sdk.sh')
-sha256sums=('289a40ffe73dc291461d97edf452bdc622f76e52666483fd1eb4f131d2921cd1'
-            '82b64d0c5adde9ab73b8d2ac6cfb80e5ceacefef9ef6215fa550f4cd957f9fec'
-            '12a37e6e12d93fac5829082773b9f010a3c6c763ddeee177618b8e1a0547fbbc'
-            '315ea6f304cf2b7b6a8aaabb0b8f71fcd480677c7fb9c8cbfa51c7830bb159bc')
+source=("https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${pkgver}.tar.gz")
+sha256sums=('289a40ffe73dc291461d97edf452bdc622f76e52666483fd1eb4f131d2921cd1')
 
 build() {
     cmake -B build -S "MediaSDK-intel-mediasdk-${pkgver}" \
@@ -25,6 +19,7 @@
         -DCMAKE_BUILD_TYPE:STRING='None' \
         -DBUILD_ALL:BOOL='ON' \
         -DBUILD_TOOLS:BOOL='ON' \
+        -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         -DENABLE_ITT:BOOL='OFF' \
         -DENABLE_OPENCL:BOOL='ON' \
         -DENABLE_WAYLAND:BOOL='ON' \
@@ -41,25 +36,17 @@
     depends=('gcc-libs' 'libdrm' 'libva' 'wayland' "libmfx=${pkgver}" 'intel-media-driver')
     optdepends=('ocl-icd: for rotate_opencl plugin'
                 'intel-compute-runtime: for rotate_opencl plugin')
-    install="${pkgname}.install"
     
     make -C build DESTDIR="$pkgdir" install
     
-    # metrics_monitor
-    install -D -m755 build/__bin/None/libcttmetrics.so -t "${pkgdir}/opt/intel/mediasdk/share/mfx/samples"
-    install -D -m755 build/__bin/None/metrics_monitor  -t "${pkgdir}/opt/intel/mediasdk/share/mfx/samples"
-    ln -s ../share/mfx/samples/libcttmetrics.so "${pkgdir}/opt/intel/mediasdk/lib/libcttmetrics.so"
+    ln -s ../share/mfx/samples/libcttmetrics.so "${pkgdir}/usr/lib/libcttmetrics.so"
     
-    # ld.so and profile configuration files
-    install -D -m644 intel-media-sdk.conf -t "${pkgdir}/etc/ld.so.conf.d"
-    install -D -m755 intel-media-sdk.sh   -t "${pkgdir}/etc/profile.d"
-    
-    # remove core component libmfx :/
+    # remove core component libmfx
     [ -d 'libmfx' ] && rm -rf libmfx
     mkdir -p libmfx/lib/pkgconfig
-    mv "${pkgdir}/opt/intel/mediasdk/include" libmfx
-    mv "${pkgdir}/opt/intel/mediasdk/lib/libmfx.so"* libmfx/lib
-    mv "${pkgdir}/opt/intel/mediasdk/lib/pkgconfig/"{,lib}mfx.pc libmfx/lib/pkgconfig
+    mv "${pkgdir}/usr/include" libmfx
+    mv "${pkgdir}/usr/lib/libmfx.so"* libmfx/lib
+    mv "${pkgdir}/usr/lib/pkgconfig/"{,lib}mfx.pc libmfx/lib/pkgconfig
     
     # license
     install -D -m644 "MediaSDK-intel-mediasdk-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
@@ -70,12 +57,9 @@
     depends=('gcc-libs')
     
     # install core component libmfx into a separated package
-    mkdir -p "${pkgdir}/opt/intel/mediasdk"
-    mv libmfx/{include,lib} "${pkgdir}/opt/intel/mediasdk"
+    mkdir -p "${pkgdir}/usr"
+    mv libmfx/{include,lib} "${pkgdir}/usr"
     
-    # ld.so configuration file
-    install -D -m644 libmfx.conf -t "${pkgdir}/etc/ld.so.conf.d"
-    
     # license
     install -D -m644 "MediaSDK-intel-mediasdk-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }

Deleted: intel-media-sdk.conf
===================================================================
--- intel-media-sdk.conf	2020-01-23 00:11:40 UTC (rev 554658)
+++ intel-media-sdk.conf	2020-01-23 00:57:09 UTC (rev 554659)
@@ -1,2 +0,0 @@
-/opt/intel/mediasdk/lib
-/opt/intel/mediasdk/lib/mfx

Deleted: intel-media-sdk.install
===================================================================
--- intel-media-sdk.install	2020-01-23 00:11:40 UTC (rev 554658)
+++ intel-media-sdk.install	2020-01-23 00:57:09 UTC (rev 554659)
@@ -1,4 +0,0 @@
-post_install() {
-    printf '%s\n' 'The Intel Media SDK executable tools are in /opt/intel/mediasdk/bin'
-    printf '%s\n' 'You need to relogin in order for these files to appear in your PATH'
-}

Deleted: intel-media-sdk.sh
===================================================================
--- intel-media-sdk.sh	2020-01-23 00:11:40 UTC (rev 554658)
+++ intel-media-sdk.sh	2020-01-23 00:57:09 UTC (rev 554659)
@@ -1,2 +0,0 @@
-export MFX_HOME='/opt/intel/mediasdk'
-export PATH="${PATH:+${PATH}:}/opt/intel/mediasdk/bin"

Deleted: libmfx.conf
===================================================================
--- libmfx.conf	2020-01-23 00:11:40 UTC (rev 554658)
+++ libmfx.conf	2020-01-23 00:57:09 UTC (rev 554659)
@@ -1 +0,0 @@
-/opt/intel/mediasdk/lib