*mesa: remove *mesa-libcl-icd packages

2 files changed, 6 insertions, 119 deletions

diff --git a/libre-multilib/lib32-mesa/PKGBUILD b/libre-multilib/lib32-mesa/PKGBUILD
index 9cc37c821..5f8ff8507 100644
--- a/libre-multilib/lib32-mesa/PKGBUILD
+++ b/libre-multilib/lib32-mesa/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgbase=mesa
 pkgname=('lib32-opencl-mesa' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa'
-         'lib32-mesa-libgl' 'lib32-mesa-libcl-icd' 'lib32-vulkan-radeon' 'lib32-vulkan-intel')
+         'lib32-mesa-libgl' 'lib32-vulkan-radeon' 'lib32-vulkan-intel')
 pkgver=17.0.2
-pkgrel=2.parabola3
+pkgrel=2.parabola4
 arch=('x86_64')
 makedepends=('python2-mako' 'lib32-libxml2' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libvdpau' 'lib32-libva' 'lib32-wayland' 'elfutils' 'lib32-libelf' 'lib32-llvm'
@@ -101,56 +101,11 @@ build() {
   # fake installation
   mkdir $srcdir/fakeinstall
   make DESTDIR=${srcdir}/fakeinstall install
-
-  # build mesa-libcl-icd
-  cd ${srcdir}/opencl-${pkgver}
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./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/lib32 \
-    --libdir=/usr/lib32 \
-    --libexecdir=/usr/lib32 \
-    --host=$_HOST
-
-  make
-
-  # fake mesa-libcl-icd installation
-  mkdir $srcdir/openclinstall
-  make DESTDIR=${srcdir}/openclinstall install
 }
 
 package_lib32-opencl-mesa() {
   pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers (32-bit)"
-  depends=('opencl-mesa' 'lib32-expat' 'lib32-libdrm' 'lib32-libelf' 'lib32-libclc' 'lib32-clang' 'lib32-lm_sensors')
+  depends=('opencl-mesa' 'lib32-ocl-icd' 'lib32-expat' 'lib32-libdrm' 'lib32-libelf' 'lib32-libclc' 'lib32-clang' 'lib32-lm_sensors')
   optdepends=('opencl-headers: headers necessary for OpenCL development')
   provides=('lib32-opencl-driver')
   conflicts=('lib32-opencl-nvidia' 'lib32-opencl-nvidia-340xx' 'lib32-opencl-nvidia-304xx' 'lib32-opencl-catalyst')
@@ -257,18 +212,3 @@ package_lib32-mesa-libgl() {
   install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-libgl"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-libgl/"
 }
-
-package_lib32-mesa-libcl-icd() {
-  pkgdesc="Mesa OpenCL ICD Bindings (32-bit)"
-  depends=('mesa-libcl-icd' 'lib32-expat' 'lib32-gcc-libs' 'lib32-libdrm' 'lib32-libedit' 'lib32-libelf' 'lib32-libffi' 'lib32-llvm-libs' 'lib32-ncurses' 'lib32-zlib')
-  optdepends=('lib32-opencl-driver: packaged opencl driver')
-  provides=('lib32-opencl-icd-loader' 'lib32-ocl-icd' 'lib32-libcl')
-  conflicts=('lib32-ocl-icd' 'lib32-libcl')
-  replaces=('lib32-ocl-icd' 'lib32-libcl')
-
-  install -m755 -d ${pkgdir}/usr/lib32
-  cp -rv ${srcdir}/openclinstall/usr/lib32/libOpenCL* ${pkgdir}/usr/lib32/
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-libcl-icd"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-libcl-icd/"
-}
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/"
-}