summaryrefslogtreecommitdiff
path: root/libre-multilib
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2017-03-30 09:44:59 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2017-03-30 09:45:43 -0300
commit6539961a0765383d626df9214faacbdfad0857c0 (patch)
treea7e780869970bb2afb7108cd5c729574ee394214 /libre-multilib
parent72106a0bf1dfdda3ce20721311ad05a88693fb87 (diff)
downloadabslibre-6539961a0765383d626df9214faacbdfad0857c0.tar.gz
abslibre-6539961a0765383d626df9214faacbdfad0857c0.tar.bz2
abslibre-6539961a0765383d626df9214faacbdfad0857c0.zip
*mesa: remove *mesa-libcl-icd packages
Diffstat (limited to 'libre-multilib')
-rw-r--r--libre-multilib/lib32-mesa/PKGBUILD66
1 files changed, 3 insertions, 63 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/"
-}