From: marmeladema <marmeladema@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mesa: update to 21.0.0
Date: Wed, 17 Mar 2021 00:53:27 +0100 [thread overview]
Message-ID: <20210316235327.EuamDyAC3vlPTsxpuF006kSOI_9yHYMVrhcqnYccOFQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29520@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
There is an updated pull request by marmeladema against master on the void-packages repository
https://github.com/marmeladema/void-packages mesa-21.0
https://github.com/void-linux/void-packages/pull/29520
mesa: update to 21.0.0
Friendly take over / continuation of https://github.com/void-linux/void-packages/pull/27956
A patch file from https://github.com/void-linux/void-packages/pull/29520.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-21.0-29520.patch --]
[-- Type: text/x-diff, Size: 6184 bytes --]
From 604aad531ad42064dc08e4c5d76cd9b3b8658929 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 15 Jan 2021 16:25:56 -0600
Subject: [PATCH] mesa: update to 21.0.0
---
srcpkgs/mesa/patches/add-use-elf-tls.patch | 16 +++++-----
srcpkgs/mesa/patches/gen-git_sha1_h.patch | 34 ----------------------
srcpkgs/mesa/template | 20 ++++++-------
3 files changed, 19 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/mesa/patches/gen-git_sha1_h.patch
diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-use-elf-tls.patch
index 617d8c0e9464..e10fdfa225bc 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-use-elf-tls.patch
@@ -2,26 +2,24 @@ Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
Status: Not fixed upstream
diff --git meson.build meson.build
-index d228de0..972cd79 100644
+index 932eb13..1d1a4be 100644
--- meson.build
+++ meson.build
-@@ -392,7 +392,8 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
- endif
+@@ -448,7 +448,8 @@ endif
# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
use_elf_tls = false
--if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+-if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+with_use_elf_tls = get_option('use-elf-tls')
+if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and with_use_elf_tls and (not with_platform_android or get_option('platform-sdk-version') >= 29)
pre_args += '-DUSE_ELF_TLS'
use_elf_tls = true
endif
-
diff --git meson_options.txt meson_options.txt
-index b768c15..2533220 100644
+index fc73f6e..2d9e4a2 100644
--- meson_options.txt
+++ meson_options.txt
-@@ -366,3 +366,9 @@ option(
+@@ -445,6 +445,12 @@ option(
value : 25,
description : 'Android Platform SDK version. Default: Nougat version.'
)
@@ -31,3 +29,7 @@ index b768c15..2533220 100644
+ value : true,
+ description : 'Build support for initial-exec TLS model'
+)
+ option(
+ 'zstd',
+ type : 'combo',
+
diff --git a/srcpkgs/mesa/patches/gen-git_sha1_h.patch b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
deleted file mode 100644
index 20b4bc23e940..000000000000
--- a/srcpkgs/mesa/patches/gen-git_sha1_h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/intel/common/meson.build 2021-01-29 19:33:19.836871900 +0100
-+++ - 2021-02-14 14:36:02.838935228 +0100
-@@ -42,8 +42,8 @@
- )
-
- libintel_common = static_library(
-- ['intel_common', genX_xml_h],
-- files_libintel_common,
-+ 'intel_common',
-+ [files_libintel_common, genX_xml_h, sha1_h],
- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
- c_args : [no_override_init_args],
- gnu_symbol_visibility : 'hidden',
---- src/gallium/frontends/lavapipe/meson.build 2021-01-29 19:33:19.784871800 +0100
-+++ - 2021-02-14 14:36:36.898986675 +0100
-@@ -57,7 +57,7 @@
-
- liblavapipe_st = static_library(
- 'lavapipe_st',
-- [liblvp_files, lvp_entrypoints, lvp_extensions_c ],
-+ [liblvp_files, lvp_entrypoints, lvp_extensions_c , sha1_h],
- link_with : [ libvulkan_wsi ],
- c_args : [ lvp_flags ],
- gnu_symbol_visibility : 'hidden',
---- src/freedreno/common/meson.build 2021-01-29 19:33:19.570870900 +0100
-+++ - 2021-02-14 14:37:08.623233120 +0100
-@@ -27,6 +27,7 @@
- 'freedreno_uuid.c',
- 'freedreno_uuid.h',
- 'freedreno_guardband.h',
-+ sha1_h
- ],
- include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
- c_args : [no_override_init_args],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 1e622adebf95..4b0549ec6ae1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,15 +1,15 @@
# Template file for 'mesa'
pkgname=mesa
-version=20.3.4
+version=21.0.0
revision=1
wrksrc="mesa-${version}"
build_style=meson
-configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
- -Dosmesa=gallium -Dgles1=true -Dgles2=true -Dglx=dri -Ddri3=true
- -Dlmsensors=true -Dplatforms=x11,wayland
- -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14"
+configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
+ -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
+ -Dlmsensors=enabled -Dplatforms=x11,wayland
+ -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
- wayland-protocols wayland-devel"
+ wayland-protocols wayland-devel glibc-devel"
makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084
+checksum=e6204e98e6a8d77cf9dc5d34f99dd8e3ef7144f3601c808ca0dd26ba522e0d84
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -Duse-elf-tls=false"
@@ -124,12 +124,12 @@ fi
if [ "$_have_vmware" ]; then
_gallium_drivers+=",svga"
- configure_args+=" -Dgallium-xa=true"
+ configure_args+=" -Dgallium-xa=enabled"
subpackages+=" libxatracker"
# transitional dummy packages
subpackages+=" mesa-vmwgfx-dri"
else
- configure_args+=" -Dgallium-xa=false"
+ configure_args+=" -Dgallium-xa=disabled"
fi
# enabled currently by amd drivers
@@ -141,7 +141,7 @@ if [ "$_have_opencl" ]; then
fi
if [ "$_have_hwdec" ]; then
- configure_args+=" -Dgallium-vdpau=true -Dgallium-va=true -Dgallium-xvmc=true"
+ configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
else
configure_args+=" -Dgallium-vdpau=false -Dgallium-va=false -Dgallium-xvmc=false"
next prev parent reply other threads:[~2021-03-16 23:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 23:36 [PR PATCH] " marmeladema
2021-03-16 23:53 ` marmeladema [this message]
2021-03-17 0:12 ` [PR PATCH] [Updated] " marmeladema
2021-03-17 0:32 ` marmeladema
2021-03-17 1:35 ` abenson
2021-03-17 8:49 ` marmeladema
2021-03-17 23:44 ` [PR PATCH] [Updated] " marmeladema
2021-03-24 23:57 ` marmeladema
2021-03-29 12:58 ` mesa: update to 21.0.1 ardadem
2021-03-29 15:44 ` marmeladema
2021-04-06 9:51 ` codingHahn
2021-04-06 13:02 ` marmeladema
2021-04-06 21:51 ` [PR PATCH] [Closed]: " abenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210316235327.EuamDyAC3vlPTsxpuF006kSOI_9yHYMVrhcqnYccOFQ@z \
--to=marmeladema@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).