mesa: reeeeeeeeeeeeeeeeeee

kisslinux · Jun 27, 2019 · f276368 · f276368
1 parent a220f17
commit f276368
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 94 deletions.
diff --git a/extra/meson/build b/extra/meson/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+python setup.py build
+python setup.py install \
+    --root="$1" \
+    --optimize=1 \
+    --skip-build
diff --git a/extra/meson/checksums b/extra/meson/checksums
@@ -0,0 +1 @@
+e9f52047f26636ee512439c01755064656db5faecdd68e9af09dc772d829198c  0.50.1.tar.gz
diff --git a/extra/meson/depends b/extra/meson/depends
@@ -0,0 +1,3 @@
+ninja
+python
+python-setuptools
diff --git a/extra/meson/licenses b/extra/meson/licenses
@@ -0,0 +1,2 @@
+Apache-2.0
+
diff --git a/extra/meson/sources b/extra/meson/sources
@@ -0,0 +1 @@
+https://github.com/mesonbuild/meson/archive/0.50.1.tar.gz
diff --git a/extra/meson/version b/extra/meson/version
@@ -0,0 +1 @@
+0.50.1 1
diff --git a/extra/ninja/build b/extra/ninja/build
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+patch -p1 < fix-musl.patch
+python configure.py --bootstrap
+install -m755 -D ninja "$1/usr/bin/ninja"
diff --git a/extra/ninja/checksums b/extra/ninja/checksums
@@ -0,0 +1,2 @@
+5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9  v1.9.0.tar.gz
+322b1bed1fba2e7a26f030f01d0c2ef570bf01424296b0116cc45d59ea40ea50  fix-musl.patch
diff --git a/extra/ninja/depends b/extra/ninja/depends
@@ -0,0 +1 @@
+python make
diff --git a/extra/ninja/licenses b/extra/ninja/licenses
diff --git a/extra/ninja/manifest b/extra/ninja/manifest
@@ -0,0 +1,14 @@
+/var/db/kiss/ninja/version
+/var/db/kiss/ninja/sources
+/var/db/kiss/ninja/manifest
+/var/db/kiss/ninja/licenses
+/var/db/kiss/ninja/depends
+/var/db/kiss/ninja/checksums
+/var/db/kiss/ninja/build
+/var/db/kiss/ninja/
+/var/db/kiss/
+/var/db/
+/var/
+/usr/bin/ninja
+/usr/bin/
+/usr/
diff --git a/extra/ninja/patches/fix-musl.patch b/extra/ninja/patches/fix-musl.patch
@@ -0,0 +1,39 @@
+2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001
+From: makepost <makepost@firemail.cc>
+Date: Mon, 24 Dec 2018 03:13:16 +0200
+Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510
+
+In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward
+compatibility macro. Should help avoid hardcoding platform detection.
+---
+ src/disk_interface.cc | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/src/disk_interface.cc b/src/disk_interface.cc
+index d4c2fb087..dc297c449 100644
+--- src/disk_interface.cc
++++ /src/disk_interface.cc
+@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const {
+   // that it doesn't exist.
+   if (st.st_mtime == 0)
+     return 1;
+-#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE)
++#if defined(_AIX)
++  return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
++#elif defined(__APPLE__)
+   return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL +
+           st.st_mtimespec.tv_nsec);
+-#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \
+-       defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__))
+-  // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html
+-  // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above.
+-  // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar
+-  // For bionic, C and POSIX API is always enabled.
+-  // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html.
++#elif defined(st_mtime) // A macro, so we're likely on modern POSIX.
+   return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec;
+-#elif defined(_AIX)
+-  return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
+ #else
+   return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec;
+ #endif
diff --git a/extra/ninja/sources b/extra/ninja/sources
@@ -0,0 +1,2 @@
+https://github.com/martine/ninja/archive/v1.9.0.tar.gz
+patches/fix-musl.patch
diff --git a/extra/ninja/version b/extra/ninja/version
@@ -0,0 +1 @@
+1.9.0 1
diff --git a/xorg/mesa/build b/xorg/mesa/build
@@ -1,16 +1,16 @@
 #!/bin/sh -e
 
-patch -p1 < musl.patch
-
-# Use autotools to build mesa.
-# Meson has no ability to disable 'gettext'.
-./configure \
+meson \
     --prefix=/usr \
     --sysconfdir=/etc \
     --mandir=/usr/share/man \
     --localstatedir=/var \
-    --with-platforms=x11,drm \
-    --enable-autotools
+    --buildtype=release \
+    --platforms=x11,drm \
+    --valgrind=false \
+    . output
+
+ninja -C output
+
+DESTDIR="$1" ninja -C output install
 
-make
-make DESTDIR="$1" install
diff --git a/xorg/mesa/checksums b/xorg/mesa/checksums
@@ -1 +1 @@
-1a2edc3ce56906a676c91e6851298db45903df1f5cb9827395a922c1452db802  mesa-19.0.2.tar.xz
+72114b16b4a84373b2acda060fe2bb1d45ea2598efab3ef2d44bdeda74f15581  mesa-19.1.1.tar.xz
diff --git a/xorg/mesa/depends b/xorg/mesa/depends
@@ -9,6 +9,8 @@ libXxf86vm   make
 libdrm       make
 libxcb       make
 libxshmfence make
+meson        make
+ninja        make
 python       make
 python-mako  make
 xorgproto    make

diff --git a/xorg/mesa/patches/musl.patch b/xorg/mesa/patches/musl.patch
diff --git a/xorg/mesa/sources b/xorg/mesa/sources
@@ -1,2 +1 @@
 https://mesa.freedesktop.org/archive/mesa-19.1.1.tar.xz
-patches/musl.patch