summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2017-04-01 02:06:57 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2017-04-01 02:06:57 -0300
commitdeea7f703858bb3b8427dab5a40dad237b2ae700 (patch)
tree78f7c26af76014e73b49b9631ef37fd1d480aaca
parent3fde56ed08b45a8f68202e18cc6ed0853365b23f (diff)
downloadabslibre-deea7f703858bb3b8427dab5a40dad237b2ae700.tar.gz
abslibre-deea7f703858bb3b8427dab5a40dad237b2ae700.tar.bz2
abslibre-deea7f703858bb3b8427dab5a40dad237b2ae700.zip
add lib32-mesa-vanilla to [pcr-multilib]
-rw-r--r--pcr-multilib/lib32-mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch26
-rw-r--r--pcr-multilib/lib32-mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch82
-rw-r--r--pcr-multilib/lib32-mesa-vanilla/LICENSE82
-rw-r--r--pcr-multilib/lib32-mesa-vanilla/PKGBUILD218
-rw-r--r--pcr-multilib/lib32-mesa-vanilla/remove-libpthread-stubs.patch13
5 files changed, 421 insertions, 0 deletions
diff --git a/pcr-multilib/lib32-mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch b/pcr-multilib/lib32-mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch
new file mode 100644
index 000000000..7f8f7164c
--- /dev/null
+++ b/pcr-multilib/lib32-mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch
@@ -0,0 +1,26 @@
+From 1b5a187c3c31513ae39cd2a917a3234c2c5f87fc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 12 Oct 2016 13:41:33 -0400
+Subject: [PATCH] Fix linkage against shared glapi
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/gallium/targets/osmesa/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
+index 5d39486..04add87 100644
+--- a/src/gallium/targets/osmesa/Makefile.am
++++ b/src/gallium/targets/osmesa/Makefile.am
+@@ -63,7 +63,7 @@ lib@OSMESA_LIB@_la_LIBADD = \
+ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+ $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
+ $(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \
+- $(top_builddir)/src/mapi/glapi/libglapi.la \
++ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
+ $(SHARED_GLAPI_LIB) \
+ $(OSMESA_LIB_DEPS) \
+ $(CLOCK_LIB)
+--
+2.9.3
+
diff --git a/pcr-multilib/lib32-mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch b/pcr-multilib/lib32-mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch
new file mode 100644
index 000000000..376828e67
--- /dev/null
+++ b/pcr-multilib/lib32-mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch
@@ -0,0 +1,82 @@
+From 16875ea5b9170f2213fd486d763f27a9d6dfc1b5 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart@gmail.com>
+Date: Tue, 25 Oct 2016 09:35:13 +0200
+Subject: [PATCH 1/3] glapi: Link with glapi when built shared
+
+This patch explicitly links to libglapi when built shared.
+This was specially needed to avoid undefined non-weak-symbol as shown
+with:
+
+ldd -r /usr/lib64/dri/i915_dri.so
+ linux-vdso.so.1 (0x00007fff821f4000)
+ libdrm_intel.so.1 => /lib64/libdrm_intel.so.1 (0x00007f6adf2c7000)
+ libdrm_nouveau.so.2 => /lib64/libdrm_nouveau.so.2 (0x00007f6adf0be000)
+ libdrm_radeon.so.1 => /lib64/libdrm_radeon.so.1 (0x00007f6adeeb2000)
+ libselinux.so.1 => /lib64/libselinux.so.1 (0x00007f6adec8b000)
+ libdrm.so.2 => /lib64/libdrm.so.2 (0x00007f6adea7c000)
+ libexpat.so.1 => /lib64/libexpat.so.1 (0x00007f6ade84f000)
+ libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f6ade633000)
+ libdl.so.2 => /lib64/libdl.so.2 (0x00007f6ade42f000)
+ libm.so.6 => /lib64/libm.so.6 (0x00007f6ade125000)
+ libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x00007f6addf0e000)
+ libc.so.6 => /lib64/libc.so.6 (0x00007f6addb4c000)
+ /lib64/ld-linux-x86-64.so.2 (0x000056274e913000)
+ libpciaccess.so.0 => /lib64/libpciaccess.so.0 (0x00007f6add941000)
+ libpcre.so.1 => /lib64/libpcre.so.1 (0x00007f6add6ce000)
+undefined symbol: _glapi_get_dispatch_table_size (/usr/lib64/dri/i915_dri.so)
+undefined symbol: _glapi_get_context (/usr/lib64/dri/i915_dri.so)
+undefined symbol: _glapi_add_dispatch (/usr/lib64/dri/i915_dri.so)
+undefined symbol: _glapi_check_multithread (/usr/lib64/dri/i915_dri.so)
+undefined symbol: _glapi_tls_Context (/usr/lib64/dri/i915_dri.so)
+undefined symbol: _glapi_set_context (/usr/lib64/dri/i915_dri.so)
+undefined symbol: _glapi_set_dispatch (/usr/lib64/dri/i915_dri.so)
+undefined symbol: _glapi_tls_Dispatch (/usr/lib64/dri/i915_dri.so)
+
+v3: Add gallium counterpart for radeon cases
+Reported-by: Jonathan Dieter <jdieter@lesbg.com>
+
+v2: Add Bugzilla and Signed-off
+
+Fixes: 0cbc90c57c ("mesa: dri: Add shared glapi to LIBADD on Android")
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98428
+Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
+---
+ src/gallium/targets/dri/Makefile.am | 2 --
+ src/mesa/drivers/dri/Makefile.am | 3 ---
+ 2 files changed, 5 deletions(-)
+
+diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
+index bca747f..05f6c8c 100644
+--- a/src/gallium/targets/dri/Makefile.am
++++ b/src/gallium/targets/dri/Makefile.am
+@@ -1,10 +1,8 @@
+ include $(top_srcdir)/src/gallium/Automake.inc
+
+-if HAVE_ANDROID
+ if HAVE_SHARED_GLAPI
+ SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+ endif
+-endif
+
+ AM_CFLAGS = \
+ -I$(top_srcdir)/src/mapi \
+diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
+index 1c6dd08..8e68fc0 100644
+--- a/src/mesa/drivers/dri/Makefile.am
++++ b/src/mesa/drivers/dri/Makefile.am
+@@ -6,12 +6,9 @@ MEGADRIVERS_DEPS =
+
+ SUBDIRS+=common
+
+-# On Android, we need to explicitly link to libglapi.so.
+-if HAVE_ANDROID
+ if HAVE_SHARED_GLAPI
+ SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+ endif
+-endif
+
+ if HAVE_I915_DRI
+ SUBDIRS += i915
+--
+2.7.4
+
diff --git a/pcr-multilib/lib32-mesa-vanilla/LICENSE b/pcr-multilib/lib32-mesa-vanilla/LICENSE
new file mode 100644
index 000000000..ae33d2709
--- /dev/null
+++ b/pcr-multilib/lib32-mesa-vanilla/LICENSE
@@ -0,0 +1,82 @@
+Disclaimer
+
+Mesa is a 3-D graphics library with an API which is very similar to
+that of OpenGL*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from Silicon Graphics,
+Inc.(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
+
+Please do not refer to the library as MesaGL (for legal
+reasons). It's just Mesa or The Mesa 3-D graphics
+library
+
+* OpenGL is a trademark of Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+The Mesa distribution consists of several components. Different copyrights
+and licenses apply to different components. For example, GLUT is copyrighted
+by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
+device drivers are copyrighted by their authors. See below for a list of
+Mesa's main components and the license for each.
+
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+
+The default Mesa license is as follows:
+
+Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+
+
+Mesa Component Licenses
+
+Component Location Primary Author License
+----------------------------------------------------------------------------
+Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
+
+Device drivers src/mesa/drivers/* See drivers See drivers
+
+Ext headers include/GL/glext.h SGI SGI Free B
+ include/GL/glxext.h
+
+GLUT src/glut/ Mark Kilgard Mark's copyright
+
+Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
+
+SGI GLU library src/glu/sgi/ SGI SGI Free B
+
+demo programs progs/demos/ various see source files
+
+X demos progs/xdemos/ Brian Paul see source files
+
+SGI demos progs/samples/ SGI SGI copyright
+
+RedBook demos progs/redbook/ SGI SGI copyright
diff --git a/pcr-multilib/lib32-mesa-vanilla/PKGBUILD b/pcr-multilib/lib32-mesa-vanilla/PKGBUILD
new file mode 100644
index 000000000..eac65217e
--- /dev/null
+++ b/pcr-multilib/lib32-mesa-vanilla/PKGBUILD
@@ -0,0 +1,218 @@
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+
+pkgbase=lib32-mesa-vanilla
+pkgname=('lib32-opencl-mesa-vanilla' 'lib32-libva-mesa-driver-vanilla' 'lib32-mesa-vdpau-vanilla' 'lib32-mesa-vanilla'
+ 'lib32-mesa-libgl-vanilla' 'lib32-vulkan-radeon-vanilla' 'lib32-vulkan-intel-vanilla')
+pkgver=17.0.2
+pkgrel=2
+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'
+ 'lib32-libomxil-bellagio' 'lib32-libclc' 'lib32-clang' 'lib32-lm_sensors' 'gcc-multilib') # Implement 'lm_sensors' extra functionality, for i2c on video drivers
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
+ LICENSE
+ remove-libpthread-stubs.patch
+ 0001-Fix-linkage-against-shared-glapi.patch
+ 0001-glapi-Link-with-glapi-when-built-shared.patch)
+sha256sums=('f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4'
+ 'SKIP'
+ '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+ '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f'
+ 'c68d1522f9bce4ce31c92aa7a688da49f13043f5bb2254795b76dea8f47130b7'
+ '064dcd5a3ab1b7c23383e2cafbd37859e4c353f8839671d9695c6f7c2ef3260b')
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
+
+prepare() {
+ cd ${srcdir}/mesa-${pkgver}
+
+ # Now mesa checks for libpthread-stubs - so remove the check
+ patch -Np1 -i ../remove-libpthread-stubs.patch
+
+ # non-upstreamed ones
+ patch -Np1 -i ../0001-Fix-linkage-against-shared-glapi.patch
+ patch -Np1 -i ../0001-glapi-Link-with-glapi-when-built-shared.patch
+
+ autoreconf -fiv
+}
+
+build() {
+ # copy source to build mesa-libcl-icd package
+ cp -a ${srcdir}/{mesa,opencl}-${pkgver}
+
+ cd ${srcdir}/mesa-${pkgver}
+
+ # softpipe,llvmpipe
+ DRI=i915,i965,r200,radeon,nouveau,swrast
+ # Implement 'swr' (OpenSWR) software driver (only support x86 hardware with AVX extension, see: http://openswr.org/)
+ GALLIUM=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr
+ VULKAN=intel,radeon
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ export LLVM_CONFIG='/usr/bin/llvm-config32'
+ if [[ $(uname -o) == GNU/Hurd ]]; then
+ export _HOST=i686-unknown-gnu
+ elif [[ $(uname -o) == GNU/Linux ]]; then
+ export _HOST=i686-unknown-linux-gnu
+ elif [[ $(uname -o) == GNU/kFreeBSD ]]; then
+ export _HOST=i686-unknown-kfreebsd-gnu
+ fi
+
+ # Implement 'gallium-extra-hud' extra functionality
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
+ --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-opencl-icd \
+ --enable-gallium-extra-hud \
+ --enable-lmsensors \
+ --with-clang-libdir=/usr/lib32 \
+ --libdir=/usr/lib32 \
+ --libexecdir=/usr/lib32 \
+ --host=$_HOST
+
+ make
+
+ # fake installation
+ mkdir $srcdir/fakeinstall
+ make DESTDIR=${srcdir}/fakeinstall install
+}
+
+package_lib32-opencl-mesa-vanilla() {
+ pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers (32-bit)"
+ depends=('lib32-mesa-vanilla' 'opencl-mesa-vanilla' 'lib32-opencl-icd-loader' '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-mesa' 'lib32-opencl-nvidia' 'lib32-opencl-nvidia-340xx' 'lib32-opencl-nvidia-304xx' 'lib32-opencl-catalyst')
+ replaces=('lib32-opencl-nvidia' 'lib32-opencl-nvidia-340xx' 'lib32-opencl-nvidia-304xx' 'lib32-opencl-catalyst')
+
+ install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libMesaOpenCL* ${pkgdir}/usr/lib32/
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_{r600,radeonsi}.so ${pkgdir}/usr/lib32/gallium-pipe/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-opencl-mesa"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-opencl-mesa/"
+}
+
+package_lib32-vulkan-intel-vanilla() {
+ pkgdesc="Intel's Vulkan mesa driver (32-bit)"
+ depends=('lib32-mesa-vanilla' 'vulkan-intel-vanilla' 'lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence')
+ provides=('lib32-vulkan-driver')
+ conflicts=('lib32-vulkan-intel')
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libvulkan_intel.so ${pkgdir}/usr/lib32/
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-vulkan-intel"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-vulkan-intel/"
+}
+
+package_lib32-vulkan-radeon-vanilla() {
+ pkgdesc="Radeon's Vulkan mesa driver (32-bit)"
+ depends=('lib32-mesa-vanilla' 'vulkan-radeon-vanilla' 'lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence' 'lib32-libelf' 'lib32-libdrm' 'lib32-llvm-libs')
+ provides=('lib32-vulkan-driver')
+ conflicts=('lib32-vulkan-radeon')
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libvulkan_radeon.so ${pkgdir}/usr/lib32/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-vulkan-radeon"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-vulkan-radeon/"
+}
+
+package_lib32-libva-mesa-driver-vanilla() {
+ pkgdesc="VA-API implementation for gallium (32-bit)"
+ depends=('lib32-mesa-vanilla' 'libva-mesa-driver-vanilla' 'lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat' 'lib32-libelf' 'lib32-libxshmfence' 'lib32-lm_sensors')
+ conflicts=('lib32-libva-mesa-driver')
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/dri ${pkgdir}/usr/lib32
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver/"
+}
+
+package_lib32-mesa-vdpau-vanilla() {
+ pkgdesc="Mesa VDPAU drivers (32-bit)"
+ depends=('lib32-mesa-vanilla' 'mesa-vdpau-vanilla' 'lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat' 'lib32-libelf' 'lib32-libxshmfence' 'lib32-lm_sensors')
+ conflicts=('lib32-mesa-vdpau')
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau/"
+}
+
+package_lib32-mesa-vanilla() {
+ pkgdesc="A free implementation of the OpenGL specification (32-bit)"
+ depends=('mesa-vanilla' 'lib32-libdrm' 'lib32-wayland' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-libelf'
+ 'lib32-libomxil-bellagio' 'lib32-libtxc_dxtn' 'lib32-llvm-libs' 'lib32-mesa-libgl-vanilla' 'lib32-lm_sensors')
+ optdepends=('opengl-man-pages: for the OpenGL API man pages'
+ 'lib32-mesa-vdpau: for accelerated video playback'
+ 'lib32-libva-mesa-driver: for accelerated video playback')
+ provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri'
+ 'lib32-swrast-dri' 'lib32-virgl-dri' 'lib32-swr-dri' 'lib32-mesa-dri' 'lib32-opengl-driver')
+ conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri'
+ 'lib32-swrast-dri' 'lib32-virgl-dri' 'lib32-swr-dri' 'lib32-mesa-dri' 'lib32-mesa'
+ 'lib32-nvidia-utils' 'lib32-nvidia-340xx-utils' 'lib32-nvidia-304xx-utils' 'lib32-catalyst-utils')
+ replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri'
+ 'lib32-swrast-dri' 'lib32-virgl-dri' 'lib32-swr-dri' 'lib32-mesa-dri'
+ 'lib32-nvidia-utils' 'lib32-nvidia-340xx-utils' 'lib32-nvidia-304xx-utils' 'lib32-catalyst-utils')
+
+ install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
+ # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
+ cp -av ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri
+
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/bellagio ${pkgdir}/usr/lib32
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/d3d ${pkgdir}/usr/lib32
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/lib{gbm,glapi}.so* ${pkgdir}/usr/lib32/
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libOSMesa.so* ${pkgdir}/usr/lib32/
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libwayland*.so* ${pkgdir}/usr/lib32/
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libxatracker.so* ${pkgdir}/usr/lib32/
+
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa/"
+}
+
+package_lib32-mesa-libgl-vanilla() {
+ pkgdesc="Mesa 3-D graphics library (32-bit)"
+ depends=('mesa-libgl-vanilla' 'lib32-libdrm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-wayland')
+ provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles' 'lib32-mesa-libgl' 'lib32-libglvnd')
+ conflicts=('lib32-mesa-libgl' 'lib32-libglvnd' 'lib32-nvidia-libgl' 'lib32-nvidia-340xx-libgl' 'lib32-nvidia-304xx-libgl' 'lib32-nvidia-cg-toolkit' 'lib32-catalyst-libgl')
+ replaces=('lib32-nvidia-libgl' 'lib32-nvidia-340xx-libgl' 'lib32-nvidia-304xx-libgl' 'lib32-nvidia-cg-toolkit' 'lib32-catalyst-libgl')
+
+ install -m755 -d "${pkgdir}/usr/lib32/"
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libGL.so* ${pkgdir}/usr/lib32/
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libEGL.so* ${pkgdir}/usr/lib32/
+ cp -rv ${srcdir}/fakeinstall/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-libgl"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-libgl/"
+}
diff --git a/pcr-multilib/lib32-mesa-vanilla/remove-libpthread-stubs.patch b/pcr-multilib/lib32-mesa-vanilla/remove-libpthread-stubs.patch
new file mode 100644
index 000000000..efe8aaddd
--- /dev/null
+++ b/pcr-multilib/lib32-mesa-vanilla/remove-libpthread-stubs.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 54416b4..8a708d3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -824,7 +824,7 @@ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
+
+ dnl pthread-stubs is mandatory on targets where it exists
+ case "$host_os" in
+-cygwin* )
++cygwin* | linux* )
+ pthread_stubs_possible="no"
+ ;;
+ * )