Skip to content
This repository was archived by the owner on Oct 11, 2021. It is now read-only.

Commit cc8f4c2

Browse files
committed
Update mesa, libelf.
1 parent b9820a2 commit cc8f4c2

File tree

6 files changed

+45
-5
lines changed

6 files changed

+45
-5
lines changed

repo/libelf/checksums

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/var/db/kiss/repo/core/libelf/checksums
1+
/var/db/kiss/repo/extra/libelf/checksums

repo/libelf/sources

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/var/db/kiss/repo/core/libelf/sources
1+
/var/db/kiss/repo/extra/libelf/sources

repo/libelf/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/var/db/kiss/repo/core/libelf/version
1+
/var/db/kiss/repo/extra/libelf/version

repo/mesa/build

+29-1
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,44 @@
11
#!/bin/sh -e
22

3+
# Install python-mako which is solely needed for mesa
4+
# and thus contained in this build.
5+
{
6+
cd mako
7+
8+
python3 setup.py build
9+
python3 setup.py install \
10+
--prefix=/usr \
11+
--root="$PWD/dist"
12+
13+
# Use a glob to avoid having to figure out the Python
14+
# version for the path below.
15+
cd dist/usr/lib/python*/site-packages
16+
17+
# Set the PYTHONPATH so python knows where to find mako.
18+
# The one liner simply appends the existing path and
19+
# handles the case where an unset PYTHONPATH breaks
20+
# python as it will only contain our new addition.
21+
PYTHONPATH=$PWD:$(python -c "import sys; print(':'.join(sys.path))")
22+
23+
cd -; cd ..
24+
}
25+
26+
export PYTHONPATH
327
export DESTDIR="$1"
4-
export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS"
28+
export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS -fcommon"
529

630
# Fix issues with musl and firefox.
731
# https://bugs.freedesktop.org/show_bug.cgi?id=35268
832
# https://github.com/mesa3d/mesa/commit/9f37c9903b87f86a533bfaffa72f0ecb285b02b2
933
sed -i "/pre_args += '-DUSE_ELF_TLS'/d" meson.build
1034

35+
# Apply panfrost patch
36+
patch -p0 < panfrost.patch
37+
1138
meson \
1239
--prefix=/usr \
1340
--sysconfdir=/etc \
41+
--includedir=/usr/include \
1442
--mandir=/usr/share/man \
1543
--localstatedir=/var \
1644
--buildtype=release \

repo/mesa/checksums

-1
This file was deleted.

repo/mesa/checksums

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
6153ba3f8cb0524bbfc08e4db76b408126b2d1be8f789dffe28d1a0461eedde4 mesa-20.0.1.tar.xz
2+
2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4 Mako-1.1.1.tar.gz
3+
1ac4478371e7503abb52b0388d3f7bc93d9de0bcc1c044365728e5d9f6307a0b panfrost.patch

repo/mesa/patches/panfrost.patch

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- src/gallium/drivers/panfrost/pan_bo.h
2+
+++ src/gallium/drivers/panfrost/pan_bo.h
3+
@@ -29,6 +29,7 @@
4+
#include <panfrost-misc.h>
5+
#include "pipe/p_state.h"
6+
#include "util/list.h"
7+
+#include "time.h"
8+
9+
struct panfrost_screen;
10+

0 commit comments

Comments
 (0)