*mesa: remove *mesa-libcl-icd packages

1 files changed, 3 insertions, 56 deletions

diff --git a/libre/mesa/PKGBUILD b/libre/mesa/PKGBUILD
index 7b3c5d0fb..ca678522c 100644
--- a/libre/mesa/PKGBUILD
+++ b/libre/mesa/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgbase=mesa
 pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa'
-         'mesa-libgl' 'mesa-libcl-icd' 'vulkan-radeon')
+         'mesa-libgl' 'vulkan-radeon')
 [[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]] && pkgname+=('vulkan-intel')
 pkgver=17.0.2
-pkgrel=2.parabola3
+pkgrel=2.parabola4
 arch=('i686' 'x86_64' 'armv7h')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
@@ -95,49 +95,11 @@ build() {
   # fake installation
   mkdir $srcdir/fakeinstall
   make DESTDIR=${srcdir}/fakeinstall install
-
-  # build mesa-libcl-icd
-  cd ${srcdir}/opencl-${pkgver}
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-gallium-drivers=${GALLIUM} \
-    --with-dri-drivers=${DRI} \
-    --with-egl-platforms=x11,drm,wayland \
-    --with-vulkan-drivers=${VULKAN} \
-    --disable-xvmc \
-    --enable-gallium-llvm \
-    --enable-llvm-shared-libs \
-    --enable-shared-glapi \
-    --disable-libglvnd \
-    --enable-egl \
-    --enable-glx \
-    --enable-glx-tls \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-gbm \
-    --enable-dri \
-    --enable-gallium-osmesa \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-vdpau \
-    --enable-omx \
-    --enable-nine \
-    --enable-opencl \
-    --enable-gallium-extra-hud \
-    --enable-lmsensors \
-    --with-clang-libdir=/usr/lib
-
-  make
-
-  # fake mesa-libcl-icd installation
-  mkdir $srcdir/openclinstall
-  make DESTDIR=${srcdir}/openclinstall install
 }
 
 package_opencl-mesa() {
   pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
-  depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang' 'lm_sensors')
+  depends=('ocl-icd' 'expat' 'libdrm' 'libelf' 'libclc' 'clang' 'lm_sensors')
   optdepends=('opencl-headers: headers necessary for OpenCL development')
   provides=('opencl-driver')
   conflicts=('opencl-nvidia' 'opencl-nvidia-340xx' 'opencl-nvidia-304xx' 'opencl-catalyst')
@@ -273,18 +235,3 @@ package_mesa-libgl() {
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
 }
-
-package_mesa-libcl-icd() {
-  pkgdesc="Mesa OpenCL ICD Bindings"
-  depends=('expat' 'gcc-libs' 'libdrm' 'libedit' 'libelf' 'libffi' 'llvm-libs' 'ncurses' 'zlib')
-  optdepends=('opencl-driver: packaged opencl driver')
-  provides=('opencl-icd-loader' 'ocl-icd' 'libcl')
-  conflicts=('ocl-icd' 'libcl')
-  replaces=('ocl-icd' 'libcl')
-
-  install -m755 -d ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/openclinstall/usr/lib/libOpenCL* ${pkgdir}/usr/lib/
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libcl-icd"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libcl-icd/"
-}