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

Commit

Permalink
Update mesa, libelf.
Browse files Browse the repository at this point in the history
  • Loading branch information
jedavies-dev committed Mar 6, 2020
1 parent b9820a2 commit cc8f4c2
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 5 deletions.
2 changes: 1 addition & 1 deletion repo/libelf/checksums
2 changes: 1 addition & 1 deletion repo/libelf/sources
2 changes: 1 addition & 1 deletion repo/libelf/version
30 changes: 29 additions & 1 deletion repo/mesa/build
Original file line number Diff line number Diff line change
@@ -1,16 +1,44 @@
#!/bin/sh -e

# Install python-mako which is solely needed for mesa
# and thus contained in this build.
{
cd mako

python3 setup.py build
python3 setup.py install \
--prefix=/usr \
--root="$PWD/dist"

# Use a glob to avoid having to figure out the Python
# version for the path below.
cd dist/usr/lib/python*/site-packages

# Set the PYTHONPATH so python knows where to find mako.
# The one liner simply appends the existing path and
# handles the case where an unset PYTHONPATH breaks
# python as it will only contain our new addition.
PYTHONPATH=$PWD:$(python -c "import sys; print(':'.join(sys.path))")

cd -; cd ..
}

export PYTHONPATH
export DESTDIR="$1"
export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS"
export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS -fcommon"

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

# Apply panfrost patch
patch -p0 < panfrost.patch

meson \
--prefix=/usr \
--sysconfdir=/etc \
--includedir=/usr/include \
--mandir=/usr/share/man \
--localstatedir=/var \
--buildtype=release \
Expand Down
1 change: 0 additions & 1 deletion repo/mesa/checksums

This file was deleted.

3 changes: 3 additions & 0 deletions repo/mesa/checksums
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
6153ba3f8cb0524bbfc08e4db76b408126b2d1be8f789dffe28d1a0461eedde4 mesa-20.0.1.tar.xz
2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4 Mako-1.1.1.tar.gz
1ac4478371e7503abb52b0388d3f7bc93d9de0bcc1c044365728e5d9f6307a0b panfrost.patch
10 changes: 10 additions & 0 deletions repo/mesa/patches/panfrost.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- src/gallium/drivers/panfrost/pan_bo.h
+++ src/gallium/drivers/panfrost/pan_bo.h
@@ -29,6 +29,7 @@
#include <panfrost-misc.h>
#include "pipe/p_state.h"
#include "util/list.h"
+#include "time.h"

struct panfrost_screen;

0 comments on commit cc8f4c2

Please sign in to comment.