lib32-mesa-17.3.1

lib32-mesa/0001-Fix-linkage-against-shared-glapi.patch

@@ -1,26 +0,0 @@
-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
-

lib32-mesa/PKGBUILD

@@ -1,6 +1,6 @@
 pkgbase=lib32-mesa
 pkgname=('lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa')
-pkgver=17.1.5
+pkgver=17.3.1
 pkgrel=1
 arch=('x86_64')
 makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm'
@@ -11,15 +11,11 @@ url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
         LICENSE
-        0001-Fix-linkage-against-shared-glapi.patch
+        glvnd-fix-gl-dot-pc.patch)
-        glvnd-fix-gl-dot-pc.patch
+sha256sums=('9ae607e0998a586fb2c866cfc8e45e6f52d1c56cb1b41288253ea83eada824c1'
-        remove-gbm_bo_create_with_modifiers.patch)
-sha256sums=('378516b171712687aace4c7ea8b37c85895231d7a6d61e1e27362cf6034fded9'
             'SKIP'
             '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
-            'c68d1522f9bce4ce31c92aa7a688da49f13043f5bb2254795b76dea8f47130b7'
+            '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966')
-            '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966'
-            '0ee964bfd975b6b19e74be5f9a9fe6215ea171d0f895ffc7e9f73ee728d576ae')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
 validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # "Andres Gomez <tanty@igalia.com>"
 validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>"
@@ -30,8 +26,6 @@ prepare() {
   # glvnd support patches - from Fedora
   # non-upstreamed ones
   patch -Np1 -i ../glvnd-fix-gl-dot-pc.patch
-  patch -Np1 -i ../0001-Fix-linkage-against-shared-glapi.patch
-  patch -Np1 -i ../remove-gbm_bo_create_with_modifiers.patch
 
   autoreconf -fiv
 }
@@ -49,7 +43,6 @@ build() {
     --libdir=/usr/lib32 \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
     --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr \
     --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
     --with-platforms=x11,drm,wayland \
@@ -115,8 +108,8 @@ package_lib32-libva-mesa-driver() {
   depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-libelf' 'lib32-lm_sensors'
            'lib32-libxshmfence')
 
-  install -m755 -d ${pkgdir}/usr/lib32
+  install -m755 -d ${pkgdir}/usr/lib32/dri
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/dri ${pkgdir}/usr/lib32
+  cp -av ${srcdir}/fakeinstall/usr/lib32/dri/*_drv_video.so ${pkgdir}/usr/lib32/dri
    
   install -m755 -d "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver/"
@@ -127,8 +120,8 @@ package_lib32-mesa-vdpau() {
   depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-elfutils' 'lib32-libxshmfence'
            'lib32-lm_sensors')
 
-  install -m755 -d ${pkgdir}/usr/lib32
+  install -m755 -d ${pkgdir}/usr/lib32/vdpau
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32
+  cp -av ${srcdir}/fakeinstall/usr/lib32/vdpau/* ${pkgdir}/usr/lib32/vdpau
    
   install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau/"
@@ -137,16 +130,16 @@ package_lib32-mesa-vdpau() {
 package_lib32-mesa() {
   pkgdesc="an open-source implementation of the OpenGL specification (32-bit)"
   depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-lm_sensors'
-           'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libtxc_dxtn' 'lib32-libglvnd' 'mesa')
+           'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libglvnd' 'mesa')
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
               'lib32-mesa-vdpau: for accelerated video playback')
   provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri' 'lib32-mesa-libgl' 'lib32-opengl-driver')
   conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri' 'lib32-mesa-libgl')
   replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri' 'lib32-mesa-libgl')
 
-  install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
+  install -m755 -d ${pkgdir}/usr/lib32/dri
   # ati-dri, nouveay-dri, intel-dri, swrast
-  cp -av ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri
+  cp -av ${srcdir}/fakeinstall/usr/lib32/dri/*_dri.so ${pkgdir}/usr/lib32/dri
 
   install -m755 -d ${pkgdir}/usr/lib32
   cp -rv ${srcdir}/fakeinstall/usr/lib32/d3d  ${pkgdir}/usr/lib32

lib32-mesa/remove-gbm_bo_create_with_modifiers.patch

@@ -1,28 +0,0 @@
---- a/src/egl/drivers/dri2/platform_drm.c	2017-05-10 16:13:57.000000000 +0200
-+++ b/src/egl/drivers/dri2/platform_drm.c	2017-05-28 20:52:57.507271447 +0200
-@@ -230,21 +230,10 @@
- 
-    if (dri2_surf->back == NULL)
-       return -1;
--   if (dri2_surf->back->bo == NULL) {
--      if (surf->base.modifiers)
--         dri2_surf->back->bo = gbm_bo_create_with_modifiers(&dri2_dpy->gbm_dri->base.base,
--                                                            surf->base.width, surf->base.height,
--                                                            surf->base.format,
--                                                            surf->base.modifiers,
--                                                            surf->base.count);
--      else
--         dri2_surf->back->bo = gbm_bo_create(&dri2_dpy->gbm_dri->base.base,
--                                             surf->base.width,
--                                             surf->base.height,
--                                             surf->base.format,
--                                             surf->base.flags);
--
--   }
-+   if (dri2_surf->back->bo == NULL)
-+      dri2_surf->back->bo = gbm_bo_create(&dri2_dpy->gbm_dri->base.base,
-+					  surf->base.width, surf->base.height,
-+					  surf->base.format, surf->base.flags);
-    if (dri2_surf->back->bo == NULL)
-       return -1;
-