aboutsummaryrefslogtreecommitdiff
path: root/extra/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'extra/mesa')
-rwxr-xr-xextra/mesa/build45
-rw-r--r--extra/mesa/checksums6
-rw-r--r--extra/mesa/depends11
-rwxr-xr-xextra/mesa/files/pythonpath6
-rw-r--r--extra/mesa/meta3
-rw-r--r--extra/mesa/sources5
-rw-r--r--extra/mesa/version2
7 files changed, 45 insertions, 33 deletions
diff --git a/extra/mesa/build b/extra/mesa/build
index e640260e..64bc5128 100755
--- a/extra/mesa/build
+++ b/extra/mesa/build
@@ -1,5 +1,9 @@
#!/bin/sh -e
+# Support for vulkan drivers of intel, amd, and broadcom. Change if you just
+# want to specify your own graphics card.
+vulkan_drivers=amd,intel,broadcom
+
# Temporarily install python-mako to build mesa
(
cd mako
@@ -11,40 +15,33 @@
)
-pyver=$(python3 --version) pyver=${pyver##* }
-PYTHONPATH="$PWD/mako/dist/usr/lib/python${pyver%.*}/site-packages:$(python -c "import sys; print(':'.join(sys.path))")"
+PYTHONPATH=$(./pythonpath)
export PYTHONPATH
export DESTDIR="$1"
-export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS"
# Fix issues with musl and firefox.
# https://bugs.freedesktop.org/show_bug.cgi?id=35268
# https://github.com/mesa3d/mesa/commit/9f37c9903b87f86a533bfaffa72f0ecb285b02b2
-sed "/pre_args += '-DUSE_ELF_TLS'/d" meson.build >_
-cat _ > meson.build; rm -f _
+clsed "/pre_args += '-DUSE_ELF_TLS'/d" meson.build
python3 bin/git_sha1_gen.py --output include/git_sha1.h
-platforms=x11
-cpt l wayland-protocols >/dev/null 2>&1 && platforms=$platforms,wayland
-
-# Fix broken radeon object links
-(
- cd src/mesa/drivers/dri/r200
- find . -type l | while read -r link; do
- ln -sf "$PWD/../radeon/$link" "$link"
- done
-)
-
-meson \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --buildtype=release \
- -Dplatforms="$platforms" \
- -Dzstd=false \
+cl-meson \
+ -Dplatforms=x11,wayland \
+ -Dexpat=enabled \
+ -Ddri3=enabled \
+ -Degl=enabled \
+ -Dgbm=enabled \
+ -Dgles1=enabled \
+ -Dgles2=enabled \
+ -Dglx-read-only-text=true \
+ -Dglx=dri \
+ -Dllvm=enabled \
+ -Dshared-glapi=enabled \
+ -Dvulkan-drivers="$vulkan_drivers" \
+ -Dxmlconfig=enabled \
+ -Dzstd=disabled \
. output
ninja -C output
diff --git a/extra/mesa/checksums b/extra/mesa/checksums
index 5e97f063..bd081f31 100644
--- a/extra/mesa/checksums
+++ b/extra/mesa/checksums
@@ -1,2 +1,4 @@
-334ce86dde64712d44a1a39441d4fb64e448ed7da3f3cb337cae1efdd57f05e1 mesa-21.1.3.tar.gz
-2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4 Mako-1.1.1.tar.gz
+%BLAKE3
+43007133a84620374a16903511d303bb82d3ce4936ba1e8df907bab104ac8767 mesa-23.1.7.tar.xz
+d9023ad9f38b0f0d95e0d8dba698b35bbcf70194910e3f1f86c89ca81bededee Mako-1.2.4.tar.gz
+f8dd3db221098d462b08038180a5a9341f9df9e0bda97bdb072402ff865978af pythonpath
diff --git a/extra/mesa/depends b/extra/mesa/depends
index 07eef570..18063ed0 100644
--- a/extra/mesa/depends
+++ b/extra/mesa/depends
@@ -1,6 +1,7 @@
-bison make
+eudev
expat
-flex make
+flex make
+glslang make
libX11
libXdamage
libXext
@@ -12,7 +13,9 @@ libelf
libxcb
libxshmfence
llvm
-meson make
-python make
+meson make
+python make
+wayland
+wayland-protocols make
xorgproto
zlib
diff --git a/extra/mesa/files/pythonpath b/extra/mesa/files/pythonpath
new file mode 100755
index 00000000..563786ed
--- /dev/null
+++ b/extra/mesa/files/pythonpath
@@ -0,0 +1,6 @@
+#!/usr/bin/python3
+import os
+import sys
+
+print("%s/mako/dist/usr/lib/python%d.%d/site-packages:%s"
+ % (os.getcwd(), sys.version_info.major, sys.version_info.minor, ':'.join(sys.path)))
diff --git a/extra/mesa/meta b/extra/mesa/meta
new file mode 100644
index 00000000..33de416c
--- /dev/null
+++ b/extra/mesa/meta
@@ -0,0 +1,3 @@
+description: OpenGL implementation library and drivers
+license: MIT, LGPL-2.1-or-later
+maintainer: Cem Keylan <cem@carbslinux.org>
diff --git a/extra/mesa/sources b/extra/mesa/sources
index 62ef9d04..e273a4f5 100644
--- a/extra/mesa/sources
+++ b/extra/mesa/sources
@@ -1,2 +1,3 @@
-https://github.com/mesa3d/mesa/archive/mesa-21.1.3.tar.gz
-https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.1.tar.gz mako
+https://mesa.freedesktop.org/archive/mesa-23.1.7.tar.xz
+https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.2.4.tar.gz mako
+files/pythonpath
diff --git a/extra/mesa/version b/extra/mesa/version
index a4696c05..fea2fdba 100644
--- a/extra/mesa/version
+++ b/extra/mesa/version
@@ -1 +1 @@
-21.1.3 1
+23.1.7 1