From fc3065922116d882c4d6a00a8d3c1bc6cad8f6cc Mon Sep 17 00:00:00 2001
From: Danct12 <danct12@disroot.org>
Date: Mon, 28 Oct 2019 07:15:12 +0700
Subject: [PATCH] temp/mesa-git: upgrade to 0_git20191101 (!705)

Signed-off-by: Danct12 <danct12@disroot.org>

[ci:skip-build]: already built successfully in CI
---
 temp/mesa-git/APKBUILD              | 16 +++++++++-------
 temp/mesa-git/add-use-elf-tls.patch |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/temp/mesa-git/APKBUILD b/temp/mesa-git/APKBUILD
index 82be0cb1a..ef78803dc 100644
--- a/temp/mesa-git/APKBUILD
+++ b/temp/mesa-git/APKBUILD
@@ -8,9 +8,9 @@
 # of this aport, so mesa-git including _all_ of the subpackages, to not cause
 # conflicts
 pkgname=mesa-git
-pkgver=0_git20191002
-pkgrel=1
-_commit="2236cf24a74a40fd0a423c08ad778ea853bb1c1c"
+pkgver=0_git20191101
+pkgrel=0
+_commit="c236e6c1e3224dd324b9ee3d3b501bd02ba2f177"
 pkgdesc="(Git) Mesa DRI OpenGL library"
 url="https://www.mesa3d.org"
 arch="armhf armv7 aarch64"
@@ -24,7 +24,6 @@ subpackages="
 	$pkgname-dri-virtio:_dri
 	$pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles
 	$pkgname-xatracker $pkgname-osmesa $pkgname-gbm
-	$pkgname-vulkan-ati:_vulkan
 	"
 _llvmver=8
 depends_dev="
@@ -71,6 +70,7 @@ source="
 	"
 provides="mesa"
 replaces="mesa-dricore mesa"
+options="!check" # to follow alpine's standards
 builddir="$srcdir/mesa-$_commit"
 
 _dri_driverdir=/usr/lib/xorg/modules/dri
@@ -87,7 +87,8 @@ x86*)
 	subpackages="$subpackages \
 			$pkgname-dri-intel:_dri \
 			$pkgname-dri-vmwgfx:_dri \
-			$pkgname-vulkan-intel:_vulkan"
+			$pkgname-vulkan-intel:_vulkan
+			$pkgname-vulkan-ati:_vulkan"
 	_arch_opts="-Ddri3=true"
 	case "$CARCH" in
 	x86)
@@ -96,6 +97,7 @@ x86*)
 	;;
 armhf|armv7|aarch64)
 	_gallium_drivers="${_gallium_drivers},vc4,kmsro,lima,panfrost,etnaviv,tegra"
+	_vulkan_drivers="" # latest patches uses a syscall that is no longer available for EABI.
 	subpackages="$subpackages
 		$pkgname-dri-vc4:_dri
 		$pkgname-dri-kmsro:_dri
@@ -345,7 +347,7 @@ _vulkan() {
 		_mv_vulkan intel ;;
 	esac
 }
-sha512sums="f867c6a7a29f41131d61ac055371fcb82dcf685efa7682b0ed26bb7518d8016193f62964cb994dbc6fc7130c38711e3295325c9d365c98d7ee9596d120971224  mesa-git-2236cf24a74a40fd0a423c08ad778ea853bb1c1c.tar.gz
+sha512sums="28a20ddb2007753565b6c11031b6b0c90115812bf39d7753d1115a70ea3618e68ca30b3d43b08256b9dd43ec8e08fe28813b96df76e20d6e9191ee39580ccfa0  mesa-git-c236e6c1e3224dd324b9ee3d3b501bd02ba2f177.tar.gz
 cdf22d2da3328e116c379264886bd01fd3ad5cc45fe03dc6fd97bdc4794502598ee195c0b9d975fa264d6ac31c6fa108c0535c91800ecf4fcabfd308e53074cc  adjust-cache-deflate-buffer.patch
 cf849044d6cc7d2af4ff015208fb09d70bf9660538699797da21bda2ecb7c1892d312af83d05116afd826708d9caafb1d05a13f09139c558aea6fee931e3eee7  musl-fix-includes.patch
-6974e344b9a613077cb322b734ff4e2780e78f1a2af60657686b3b3341ad526273f58b22624ba6c575988474dbc0978e7ebe4a9d1547483305f8fc251d24d86e  add-use-elf-tls.patch"
+bd9539abe5ac6d3ff1f4f8a2155b85dce5f61fc4b10b718b51e7d5ec5674ebfef569cdfdffe981abe5eb0a49989e50a6ddf881486b03649a95b52620a944c9c0  add-use-elf-tls.patch"
diff --git a/temp/mesa-git/add-use-elf-tls.patch b/temp/mesa-git/add-use-elf-tls.patch
index 53668da5a..b1c944dcb 100644
--- a/temp/mesa-git/add-use-elf-tls.patch
+++ b/temp/mesa-git/add-use-elf-tls.patch
@@ -6,9 +6,9 @@ index 501957e35e1..8ee027f1a1e 100644
  endif
  
  # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
--if not with_platform_android or get_option('platform-sdk-version') >= 29
+-if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
 -  pre_args += '-DUSE_ELF_TLS'
-+if not with_platform_android or get_option('platform-sdk-version') >= 29 
++if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29) 
 +  if get_option('use-elf-tls')
 +    pre_args += '-DUSE_ELF_TLS'
 +  endif