aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-10-21 05:50:53 -0300
committerKevin Daudt <kdaudt@alpinelinux.org>2019-10-21 11:05:45 +0000
commit70045f6d0c20829068a7a84a712832d73e0d4fd9 (patch)
treec3291348ae1f7f9d2feb399907dbb734c183629a /main
parent815c55e7ac738379dfa5644840cabe3eecd573ee (diff)
downloadaports-70045f6d0c20829068a7a84a712832d73e0d4fd9.tar.bz2
aports-70045f6d0c20829068a7a84a712832d73e0d4fd9.tar.xz
main/mesa: disable use-elf-tls
Closes !570
Diffstat (limited to 'main')
-rw-r--r--main/mesa/APKBUILD9
-rw-r--r--main/mesa/add-use-elf-tls.patch2
2 files changed, 8 insertions, 3 deletions
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 2f396fe9fc..0aaababb69 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mesa
pkgver=19.2.1
-pkgrel=0
+pkgrel=1
pkgdesc="Mesa DRI OpenGL library"
url="https://www.mesa3d.org"
arch="all"
@@ -62,6 +62,11 @@ source="
"
replaces="mesa-dricore"
+if [ "$CARCH" = x86 ]; then
+ # Bug upstream that needs to be fixed
+ options="$options textrels"
+fi
+
_dri_driverdir=/usr/lib/xorg/modules/dri
_dri_drivers="r100,r200,nouveau"
_gallium_drivers="r300,r600,radeonsi,nouveau,freedreno,swrast,virgl"
@@ -315,4 +320,4 @@ _vulkan() {
sha512sums="decd74976fe866bf67fac4ae55a62d8e33ad24278dd58effe533e7d258b249f0ead848360e7e71444265184c6d9d9b04361caf0c6df99504e33599e7a0cd6c5d mesa-19.2.1.tar.xz
cdf22d2da3328e116c379264886bd01fd3ad5cc45fe03dc6fd97bdc4794502598ee195c0b9d975fa264d6ac31c6fa108c0535c91800ecf4fcabfd308e53074cc adjust-cache-deflate-buffer.patch
cf849044d6cc7d2af4ff015208fb09d70bf9660538699797da21bda2ecb7c1892d312af83d05116afd826708d9caafb1d05a13f09139c558aea6fee931e3eee7 musl-fix-includes.patch
-74f7e71e61f28c26cb897ee2eba73cb9b8f3fa0bba0bb2458d7dd1d4f1dce84db3ef2384f0aaf3520e0669bc93922dcfb68e885227fa3b87c9e02b02c5247385 add-use-elf-tls.patch"
+6793388662ed98ae2a6bd964573d9ae380195f078386f0402957a1c9ac61b691b48a82ed41045c7172533f25b44f249af10f17f7ac68c8e03847594962cd4b04 add-use-elf-tls.patch"
diff --git a/main/mesa/add-use-elf-tls.patch b/main/mesa/add-use-elf-tls.patch
index 7af222cfaf..61575ab4cd 100644
--- a/main/mesa/add-use-elf-tls.patch
+++ b/main/mesa/add-use-elf-tls.patch
@@ -23,6 +23,6 @@ index b768c15..2533220 100644
+option(
+ 'use-elf-tls',
+ type : 'boolean',
-+ value : true,
++ value : false,
+ description : 'Build support for initial-exec TLS model'
+)