mesa: Use own python-mako. python-mako: drop

extra/mesa/build

@@ -1,5 +1,29 @@
 #!/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 -fcommon"
 

extra/mesa/checksums

@@ -1 +1,2 @@
 1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4  mesa-19.3.4.tar.xz
+2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4  Mako-1.1.1.tar.gz

extra/mesa/depends

@@ -14,6 +14,5 @@ libxshmfence
 llvm
 meson        make
 python       make
-python-mako  make
 xorgproto
 zlib

extra/mesa/sources

@@ -1 +1,2 @@
 https://mesa.freedesktop.org/archive/mesa-19.3.4.tar.xz
+https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.1.tar.gz mako

extra/python-mako/build

@@ -1,6 +0,0 @@
-#!/bin/sh -e
-
-python3 setup.py build
-python3 setup.py install \
-    --prefix=/usr \
-    --root="$1"

extra/python-mako/checksums

@@ -1 +0,0 @@
-2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4  Mako-1.1.1.tar.gz

extra/python-mako/depends

@@ -1 +0,0 @@
-python

extra/python-mako/sources

@@ -1 +0,0 @@
-https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.1.tar.gz

extra/python-mako/version

@@ -1 +0,0 @@
-1.1.1 1