From c8287d35245d7c19e51b19f6b4c82eb9efc706d6 Mon Sep 17 00:00:00 2001
From: Taner Tas <taner76@gmail.com>
Date: Tue, 12 Jun 2018 17:50:46 +0300
Subject: [PATCH] main/mesa: Upgrade to 18.1.1
---
main/mesa/APKBUILD | 8 ++++----
main/mesa/glx_ro_text_segm.patch | 12 ++++++------
main/mesa/musl-fix-includes.patch | 20 ++++++++++++++++++++
3 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 0838c610a6f2..e6de92f35929 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mesa
-pkgver=18.0.5
+pkgver=18.1.1
pkgrel=0
pkgdesc="Mesa DRI OpenGL library"
url="http://www.mesa3d.org"
@@ -265,7 +265,7 @@ _vulkan() {
_mv_vulkan intel ;;
esac
}
-sha512sums="63b47cdca7f8282aab7aaa66233411f02918e5c4804b7a0010de2b1867fe90171e492ff031dfc4aa20968dfc99bd7dceb5d35fd44c709e54a2ece61175a60f3d mesa-18.0.5.tar.xz
-c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch
-910dd69c29b9b51b3b66e975baefbd8a6458500ef3164837036a4ac923c33254d558d678a100025ba2a69fd1111aa6b3ec83f332a66cae4207431e5e1c8ec567 musl-fix-includes.patch
+sha512sums="7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90 mesa-18.1.1.tar.xz
+8a434ffefdc6ce924d613727a8649b9a77ad9f0ed0674c9cfb8f6ff0fec483f9318e681254535b62c957db1d0432f96427f917e2f139f4c65ef761bffb528255 glx_ro_text_segm.patch
+2c9cb0fa890d29e4140d956ee52a74b4522e29e44fadfc2dd144e581c2701a1d8842ab5c8ff0b68e14b2242e2812a9d4ac0aed1c3314a2143333bc37f2323b58 musl-fix-includes.patch
3409483217dbec732286e628e268e1e8cd392b7e8efb13c7651b38e6563aa5a4988279efb029096dcd092ebe7a92eece103014ed420d2b242eab8d0237f056fd drmdeps.patch"
diff --git a/main/mesa/glx_ro_text_segm.patch b/main/mesa/glx_ro_text_segm.patch
index 8cad4876b02b..621361ee5d31 100644
--- a/main/mesa/glx_ro_text_segm.patch
+++ b/main/mesa/glx_ro_text_segm.patch
@@ -3,11 +3,11 @@
#240956
* configure.ac add support to enable readonly test segment on x86
---- ./configure.ac.orig 2008-11-17 23:19:38.000000000 +0100
-+++ ./configure.ac 2008-11-17 23:20:17.000000000 +0100
-@@ -499,6 +499,20 @@
- enable_xcb=no
- fi
+--- a/configure.ac
++++ b/configure.ac
+@@ -539,6 +539,20 @@
+
+ AM_CONDITIONAL(BUILD_SHARED, test "x$enable_shared" = xyes)
+
+dnl readonly text segment on x86 hardened platforms
@@ -24,5 +24,5 @@
+
+
dnl
- dnl libGL configuration per driver
+ dnl other compiler options
dnl
diff --git a/main/mesa/musl-fix-includes.patch b/main/mesa/musl-fix-includes.patch
index 556aa9cd9a6a..6f7a0a5a1270 100644
--- a/main/mesa/musl-fix-includes.patch
+++ b/main/mesa/musl-fix-includes.patch
@@ -20,3 +20,23 @@
#include "pipe/p_compiler.h"
#include "pipe/p_state.h"
+--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
++++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
+@@ -37,6 +37,7 @@
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>
++#include <time.h>
+ #include "util/u_atomic.h"
+ #include "util/list.h"
+
+--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
++++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+@@ -32,6 +32,7 @@
+ #include "ac_gpu_info.h"
+ #include "addrlib/addrinterface.h"
+ #include <amdgpu.h>
++#include <pthread.h>
+ #include "util/list.h"
+
+ struct radv_amdgpu_winsys {
--
GitLab