2
0
mirror of https://codeberg.org/kiss-community/repo synced 2024-07-02 14:02:27 +00:00

mesa: bump version and fix mesa build.

This commit is contained in:
Dylan Araps 2019-08-04 00:12:24 +03:00
parent 411dd08730
commit a333ac410a
5 changed files with 53 additions and 3 deletions

View File

@ -1,6 +1,7 @@
#!/bin/sh -e
patch -p1 < mesa-no-gettext.patch
patch -p1 < add-glx-use-tls.patch
export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS"

View File

@ -1,2 +1,3 @@
72114b16b4a84373b2acda060fe2bb1d45ea2598efab3ef2d44bdeda74f15581 mesa-19.1.1.tar.xz
845460b2225d15c15d4a9743dec798ff0b7396b533011d43e774e67f7825b7e0 mesa-19.1.3.tar.xz
9f434a4788f5303724ae38786b7ddd7493fdf666283997a977e4a66a25034ee0 mesa-no-gettext.patch
e5498c65655d3e334618cfc325ce8fdfef84de4b55334b2ac87e8b34bd2fee3a add-glx-use-tls.patch

View File

@ -0,0 +1,47 @@
From f895a39b7437381a86383dd97250aa2cc7393bff Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Thu, 9 Aug 2018 18:37:30 -0300
Subject: [PATCH] meson: add glx-use-tls option.
---
meson.build | 6 +++++-
meson_options.txt | 6 ++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 5dbb786..1ab3092 100644
--- meson.build
+++ meson.build
@@ -340,7 +340,11 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless)
endif
endif
-pre_args += '-DGLX_USE_TLS'
+with_glx_use_tls = get_option('glx-use-tls')
+if with_glx_use_tls
+ pre_args += '-DGLX_USE_TLS'
+endif
+
if with_glx != 'disabled'
if not (with_platform_x11 and with_any_opengl)
if with_glx == 'auto'
diff --git a/meson_options.txt b/meson_options.txt
index 496fe38..12981dd 100644
--- meson_options.txt
+++ meson_options.txt
@@ -195,6 +195,12 @@ option(
choices : ['auto', 'disabled', 'dri', 'xlib', 'gallium-xlib'],
description : 'Build support for GLX platform'
)
+option(
+ 'glx-use-tls',
+ type : 'boolean',
+ value : true,
+ description : 'Build support for initial-exec TLS model on GLX platform'
+)
option(
'egl',
type : 'combo',
--
2.18.0

View File

@ -1,2 +1,3 @@
https://mesa.freedesktop.org/archive/mesa-19.1.1.tar.xz
https://mesa.freedesktop.org/archive/mesa-19.1.3.tar.xz
patches/mesa-no-gettext.patch
patches/add-glx-use-tls.patch

View File

@ -1 +1 @@
19.1.1 2
19.1.3 1