Remove the now unneeded patch. Update cmake options. Cosmetics.

3 files changed, 22 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8b69054495d..d5319ec01e2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = intel-compute-runtime-git
 	pkgdesc = Intel(R) Graphics Compute Runtime for OpenCL(TM). Replaces Beignet for Gen8 (Broadwell) and beyond. (git version)
-	pkgver = 19.12.12612.r98.gcefa3e31
+	pkgver = 19.21.13045.r47.gc0383491
 	pkgrel = 1
-	url = https://01.org/compute-runtime
+	url = https://01.org/compute-runtime/
 	arch = x86_64
 	license = MIT
 	makedepends = git
@@ -17,9 +17,7 @@ pkgbase = intel-compute-runtime-git
 	provides = intel-compute-runtime
 	conflicts = intel-compute-runtime
 	source = git+https://github.com/intel/compute-runtime.git
-	source = intel-compute-runtime-git-fix-ld.so-config.patch
 	sha256sums = SKIP
-	sha256sums = 08cedef03d3c3fe07360d3d5056f8054a13ecc0b92d3748ea61641f859f8bb44
 
 pkgname = intel-compute-runtime-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6f8189ec05e0..7778c6b9b193 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,27 @@
 # Maintainer: Daniel Bermond < gmail-com: danielbermond >
 
-_srcname=compute-runtime
-pkgname=intel-${_srcname}-git
-pkgver=19.12.12612.r98.gcefa3e31
+pkgname=intel-compute-runtime-git
+pkgver=19.21.13045.r47.gc0383491
 pkgrel=1
-pkgdesc="Intel(R) Graphics Compute Runtime for OpenCL(TM). Replaces Beignet for Gen8 (Broadwell) and beyond. (git version)"
-arch=(x86_64)
-url="https://01.org/compute-runtime"
-license=(MIT)
-depends=(gcc-libs intel-gmmlib intel-graphics-compiler)
-makedepends=(git cmake libva)
+pkgdesc='Intel(R) Graphics Compute Runtime for OpenCL(TM). Replaces Beignet for Gen8 (Broadwell) and beyond. (git version)'
+arch=('x86_64')
+url='https://01.org/compute-runtime/'
+license=('MIT')
+depends=('gcc-libs' 'intel-gmmlib' 'intel-graphics-compiler')
+makedepends=('git' 'cmake' 'libva')
 optdepends=('libva: for cl_intel_va_api_media_sharing'
             'libdrm: for cl_intel_va_api_media_sharing')
-provides=(opencl-driver intel-compute-runtime)
-conflicts=(intel-compute-runtime)
-source=('git+https://github.com/intel/compute-runtime.git'
-        'intel-compute-runtime-git-fix-ld.so-config.patch')
-sha256sums=('SKIP'
-            '08cedef03d3c3fe07360d3d5056f8054a13ecc0b92d3748ea61641f859f8bb44')
+provides=('opencl-driver' 'intel-compute-runtime')
+conflicts=('intel-compute-runtime')
+source=('git+https://github.com/intel/compute-runtime.git')
+sha256sums=('SKIP')
 
 prepare() {
     mkdir -p build
-    
-    # fix path in ld.so config file
-    cd "$_srcname"
-    patch -Np1 -i "${srcdir}/intel-compute-runtime-git-fix-ld.so-config.patch"
 }
 
 pkgver() {
-    cd "$_srcname"
+    cd compute-runtime
     
     # git, tags available
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
@@ -36,16 +29,16 @@ pkgver() {
 
 build() {
     cd build
-    cmake ../${_srcname} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        -DNEO_DRIVER_VERSION=${pkgver}
+    cmake ../compute-runtime \
+        -DCMAKE_BUILD_TYPE='Release' \
+        -DCMAKE_INSTALL_PREFIX='/usr' \
+        -DCMAKE_INSTALL_LIBDIR='lib' \
+        -DNEO_DRIVER_VERSION="$pkgver"
     make
 }
 
 package() {
     cd build
-    make DESTDIR="${pkgdir}" install
-    install -Dm644 ../${_srcname}/LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}
+    make DESTDIR="$pkgdir" install
+    install -D -m644 "${srcdir}/compute-runtime/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
diff --git a/intel-compute-runtime-git-fix-ld.so-config.patch b/intel-compute-runtime-git-fix-ld.so-config.patch
deleted file mode 100644
index e7f097833f4e..000000000000
--- a/intel-compute-runtime-git-fix-ld.so-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp a/package.cmake b/package.cmake
---- a/package.cmake	2019-04-03 02:06:41.000000000 +0000
-+++ b/package.cmake	2019-04-03 02:35:40.789495405 +0000
-@@ -39,7 +39,7 @@ if(UNIX)
- 
-   set(OCL_ICD_RUNTIME_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${NEO_DLL_NAME_BASE}${CMAKE_SHARED_LIBRARY_SUFFIX})
-   install(
--    CODE "file( WRITE ${IGDRCL_BINARY_DIR}/libintelopencl.conf \"${CMAKE_INSTALL_FULL_LIBDIR}\n\" )"
-+    CODE "file( WRITE ${IGDRCL_BINARY_DIR}/libintelopencl.conf \"${CMAKE_INSTALL_FULL_LIBDIR}/intel-opencl\n\" )"
-     CODE "file( WRITE ${IGDRCL_BINARY_DIR}/intel.icd \"${CMAKE_INSTALL_FULL_LIBDIR}/intel-opencl/${OCL_ICD_RUNTIME_NAME}\n\" )"
-     CODE "file( WRITE ${IGDRCL_BINARY_DIR}/tmp/postinst \"/sbin/ldconfig\n\" )"
-     CODE "file( WRITE ${IGDRCL_BINARY_DIR}/tmp/postrm \"/sbin/ldconfig\n\" )"