wip mesa

reapply xxx

wip mesa
reapply xxx
fb13961e · Jérome Perrin · 9b8e2786 · fb13961e · fb13961e · fb13961e
Commit fb13961e authored Nov 18, 2023 by Jérome Perrin
7 changed files
--- a/component/chromedriver/buildout.cfg
+++ b/component/chromedriver/buildout.cfg
@@ -5,7 +5,14 @@
 [buildout]
 extends =
  ../chromium/buildout.cfg
+<<<<<<< HEAD
  ../glib/buildout.cfg
+||||||| parent of 16a281a40 (wip mesa)
+  ../nss/buildout.cfg
+=======
+  ../glib/buildout.cfg
+  ../nss/buildout.cfg
+>>>>>>> 16a281a40 (wip mesa)
  ../nspr/buildout.cfg
  ../nss/buildout.cfg
  ../pcre2/buildout.cfg

--- a/component/chromium/buildout.cfg
+++ b/component/chromium/buildout.cfg
@@ -142,6 +142,7 @@ library =
  ${sqlite3:location}/lib
  ${xdamage:location}/lib
  ${xfixes:location}/lib
+  ${xxf86vm:location}/lib
  ${zlib:location}/lib
 path =
  ${fontconfig:location}/bin

--- a/component/firefox/buildout.cfg
+++ b/component/firefox/buildout.cfg
@@ -2,6 +2,7 @@
 extends =
  ../alsa/buildout.cfg
  ../dbus/buildout.cfg
+  ../coreutils/buildout.cfg
  ../fontconfig/buildout.cfg
  ../fonts/buildout.cfg
  ../gtk-2/buildout.cfg
@@ -11,6 +12,7 @@ extends =
  ../mesa/buildout.cfg
  ../p11-kit/buildout.cfg
  ../pcre/buildout.cfg
+  ../util-linux/buildout.cfg
  ../xorg/buildout.cfg
  ../xz-utils/buildout.cfg

@@ -143,6 +145,7 @@ library =
  ${libxml2:location}/lib
  ${libXrandr:location}/lib
  ${libXrender:location}/lib
+  ${libxshmfence:location}/lib
  ${libXt:location}/lib
  ${libXtst:location}/lib
  ${mesa:location}/lib
@@ -151,10 +154,13 @@ library =
  ${pixman:location}/lib
  ${xdamage:location}/lib
  ${xfixes:location}/lib
+  ${xxf86vm:location}/lib
  ${xz-utils:location}/lib
  ${zlib:location}/lib
 path =
+  ${coreutils:location}/bin
  ${fontconfig:location}/bin
+  ${util-linux:location}/bin

 install =
  self.copyTree(guessworkdir(self.extract(self.download())), location)

--- a/component/libepoxy/buildout.cfg
+++ b/component/libepoxy/buildout.cfg
@@ -12,4 +12,4 @@ url = https://github.com/anholt/libepoxy/releases/download/v1.4/libepoxy-1.4.0.t
 md5sum = d8d8cbf2beb64975d424fcc5167a2a38
 environment =
  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${mesa:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorgproto:location}/share/pkgconfig
+  PKG_CONFIG_PATH=${mesa:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorgproto:location}/share/pkgconfig:${xxf86vm:location}/lib/pkgconfig:${xxf86vm:pkg_config_depends}:${libdrm:location}/lib/pkgconfig
--- a/component/mesa/buildout.cfg
+++ b/component/mesa/buildout.cfg
 [buildout]
 extends =
-  ../autoconf/buildout.cfg
-  ../automake/buildout.cfg
  ../bison/buildout.cfg
+  ../cmake/buildout.cfg
  ../flex/buildout.cfg
  ../libexpat/buildout.cfg
  ../libtool/buildout.cfg
+  ../meson/buildout.cfg
+  ../ninja/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../xorg/buildout.cfg
  ../xz-utils/buildout.cfg
@@ -14,49 +15,102 @@ extends =
 parts =
  mesa

-[mesa]
+
+[glslang]
 recipe = slapos.recipe.cmmi
+url = https://github.com/KhronosGroup/glslang/archive/refs/tags/13.1.1.tar.gz
+md5sum = 65fc5f9ed3440ff7ccd9760327ba1083
 shared = true
-url = https://archive.mesa3d.org/mesa-18.0.0.tar.xz
-md5sum = c2a59fc5b56de3e197fa3a6023409e23
+configure-command = cmake
 configure-options =
+  -Bbuild
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DCMAKE_BUILD_TYPE=Release
+  -DENABLE_OPT=0
+make-options = -C build
+environment =
+  PATH=${cmake:location}/bin:%(PATH)s
+patches =
+  ${:_profile_base_location_}/glslang-explicitly-add-lstdc-fs-for-gcc-8.patch#f2653242e36444de52d65fee601d8670
+patch-options = -p1
+
+[mesa-markupsafe-download]
+recipe = slapos.recipe.build:download
+shared = true
+url = https://files.pythonhosted.org/packages/bf/10/ff66fea6d1788c458663a84d88787bae15d45daa16f6b3ef33322a51fc7e/${:filename}
+filename = MarkupSafe-2.0.1.tar.gz
+md5sum = 892e0fefa3c488387e5cc0cad2daa523
+
+[mesa-mako-download]
+recipe = slapos.recipe.build:download
+shared = true
+url = https://files.pythonhosted.org/packages/24/3b/11fe92d68c6a42468ddab0cf03f454419b0788fff4e91ba46b8bebafeffd/${:filename}
+filename = Mako-1.3.0-py3-none-any.whl
+md5sum = 3768c14b8a92597920b2ffd9c9195c82
+
+
+[mesa-python]
+recipe = slapos.recipe.build
+shared = true
+markupsafe = ${mesa-markupsafe-download:target}
+mako = ${mesa-mako-download:target}
+
+install =
+  import os, sys
+  call([sys.executable, '-m', 'venv', '--clear', location])
+  pip = os.path.join(location, 'bin', 'pip')
+  # call([pip, 'install', '--no-index', options['markupsafe']])
+  # call([pip, 'install', '--no-index', options['mako']])
+  call([pip, 'install', '--no-index', options['markupsafe'], options['mako']])
+  # selftest
+  python = os.path.join(location, 'bin', 'python')
+  call([python, '-c', 'from mako.template import Template'])
+
+[mesa]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://archive.mesa3d.org/mesa-23.2.1.tar.xz
+md5sum = 0d89ec154ac9f06a1e876214114ed9af
+configure-command = ${meson:location}/bin/meson builddir -Dprefix=@@LOCATION@@ --libdir=lib -Dgallium-drivers=virgl -Dvulkan-drivers=[] -Dplatforms=x11 -Dlibunwind=disabled -Dglx=dri -Dllvm=disabled -Degl=enabled
+make-binary = ninja -C builddir
+todo =
+  Run-time dependency libzstd found: NO (tried pkgconfig and cmake)
+  Run-time dependency libomxil-bellagio found: NO (tried pkgconfig and cmake)
+  Run-time dependency libtizonia found: NO (tried pkgconfig and cmake)
+  Run-time dependency libtizplatform found: NO (tried pkgconfig and cmake)
+  Run-time dependency tizilheaders found: NO (tried pkgconfig and cmake)
+  Run-time dependency libva found: NO (tried pkgconfig and cmake)
+
+todo =
  --disable-gles1
  --disable-gles2
  --enable-dri
  --disable-dri3
-  --enable-egl
  --enable-gbm
  --enable-sysfs
  --disable-xvmc
  --disable-vdpau
  --disable-va
  --disable-xlib-glx
-  --enable-shared-glapi
  --disable-driglx-direct
  --disable-gallium-llvm
  --with-gallium-drivers=
  --with-dri-drivers=
 environment =
-  PATH=${autoconf:location}/bin:${bison:location}/bin:${flex:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${xorgproto:location}/share/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libexpat:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libdrm:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
+  PATH=${mesa-python:location}/bin:${bison:location}/bin:${cmake:location}/bin:${flex:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${xorgproto:location}/share/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libexpat:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libdrm:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libxshmfence:location}/lib/pkgconfig:${xxf86vm:location}/lib/pkgconfig:${libXrandr:location}/lib/pkgconfig:${libXrandr:pkg_config_depends}
  PYTHON2=${buildout:executable}
-  ACLOCAL=${automake:location}/bin/aclocal -I${libtool:location}/share/aclocal -I${pkgconfig:location}/share/aclocal
-  AUTOCONF=${autoconf:location}/bin/autoconf
-  AUTOMAKE=${automake:location}/bin/automake
  LDFLAGS=-Wl,-rpath=${libdrm:location}/lib -Wl,-rpath=${zlib:location}/lib
-make-options =
-  -j1
-  LIBTOOL=${libtool:location}/bin/libtool
+  CFLAGS=-I${libxcb:location}/include -I${libX11:location}/include -I${xfixes:location}/include

 [glu]
 recipe = slapos.recipe.cmmi
 shared = true
-# tar.bz2 cannot be well extracted why ?
-url = ftp://ftp.freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz
-md5sum = bbc57d4fe3bd3fb095bdbef6fcb977c4
+url = https://archive.mesa3d.org/glu/glu-9.0.3.tar.xz
+md5sum = 06a4fff9179a98ea32ef41b6d83f6b19
 configure-options =
  --disable-static
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${xorgproto:location}/share/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libexpat:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${mesa:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
  LDFLAGS=-Wl,-rpath=${libdrm:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/mesa/glslang-explicitly-add-lstdc-fs-for-gcc-8.patch
+++ b/component/mesa/glslang-explicitly-add-lstdc-fs-for-gcc-8.patch
+From a5d9cd935ddc49c0ac4cefe8e9dec8b137684c29 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
+Date: Fri, 17 Nov 2023 18:29:59 +0900
+Subject: [PATCH] explicitly add -lstdc++fs for gcc 8
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a734ad1f..e1ce3149 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -181,6 +181,7 @@ endif()
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+link_libraries(stdc++fs)
+ 
+ function(glslang_set_link_args TARGET)
+     # For MinGW compiles, statically link against the GCC and C++ runtimes.
+-- 
+2.40.1
+
--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
@@ -676,8 +676,8 @@ recipe = slapos.recipe.cmmi
 shared = true
 configure-command = ${meson:location}/bin/meson builddir --libdir=lib -Dprefix=@@LOCATION@@
 make-binary = ninja -C builddir
-url = https://dri.freedesktop.org/libdrm/libdrm-2.4.106.tar.xz
-md5sum = 4e316ae1966a1a63c31a3885313a8fb8
+url = https://dri.freedesktop.org/libdrm/libdrm-2.4.117.tar.xz
+md5sum = 69b17be6250b2c863411e0c5f6aefd6a
 pkg_config_depends = ${pciaccess:location}/lib/pkgconfig
 environment =
  PKG_CONFIG_PATH=${:pkg_config_depends}
@@ -721,3 +721,21 @@ md5sum = b553fdb6024c5a137ff925bf4c337724
 environment =
  PATH=${xz-utils:location}/bin:${pkgconfig:location}/bin:${ninja:location}/bin:%(PATH)s
  LDFLAGS=-Wl,-rpath=@@LOCATION@@/lib
+
+[xxf86vm]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://www.x.org/archive/individual/lib/libXxf86vm-1.1.5.tar.xz
+md5sum = 5b913dac587f2de17a02e17f9a44a75f
+environment =
+  PATH=${xz-utils:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+pkg_config_depends = ${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${xextproto:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${xf86vidmodeproto:location}/lib/pkgconfig
+
+[xf86vidmodeproto]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://www.x.org/archive/individual/proto/xf86vidmodeproto-2.3.1.tar.gz
+md5sum = 99016d0fe355bae0bb23ce00fb4d4a2c
+environment =
+  PATH=${xz-utils:location}/bin:${pkgconfig:location}/bin:%(PATH)s