diff --git a/x11/library/mesa/actions.py b/x11/library/mesa/actions.py
old mode 100755
new mode 100644
index a450b88306..d566d17251
--- a/x11/library/mesa/actions.py
+++ b/x11/library/mesa/actions.py
@@ -4,97 +4,59 @@
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import get
-from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
+from pisi.actionsapi import mesontools
from pisi.actionsapi import shelltools
-
-Libdir = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib"
-
+libdir = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib"
def setup():
- #autotools.autoreconf("-vif")
-
-# --enable-sysfs option provides better hardware information support with "lspci"
-# --enable-32-bit option is not present anymore. Although build fails in emul32. With --disable-asm option, not fail. Needs to be tested.
-
-
- shelltools.makedirs("build")
- shelltools.cd("build")
- options = "meson --prefix=/usr \
- --sysconfdir=/etc \
- --buildtype=release \
- -Ddri-drivers-path=/usr/lib/xorg/modules/dri \
- -Db_ndebug=true \
- -Dplatforms=x11,wayland,drm,surfaceless \
- -Ddri3=true \
- -Ddri-drivers=i915,i965,r100,r200,nouveau \
- -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,swr,iris,swrast,virgl \
- -Dgallium-extra-hud=true \
- -Dgallium-vdpau=true \
- -Dgallium-xvmc=true \
- -Dgallium-va=false \
- -Dgallium-xa=true \
- -Dgallium-nine=true \
- -Dvulkan-drivers=amd,intel \
- -Dshared-glapi=true \
- -Dgles1=true \
- -Dgles2=true \
- -Dopengl=true \
- -Dgbm=true \
- -Dglx=dri \
- -Degl=true \
- -Dglvnd=false \
- -Dasm=true \
- -Dllvm=true \
- -Dvalgrind=false \
- -Dlibunwind=true \
- -Dbuild-tests=false \
- -Dosmesa=gallium \
- -Dlmsensors=false \
- -Dswr-arches=avx,avx2"
-
-
+ options = "--buildtype=release \
+ -Dclang-libdir-path=%s \
+ -Ddri-drivers-path=%s/xorg/modules/dri \
+ -Db_ndebug=true \
+ -Dplatforms=x11,wayland,drm,surfaceless \
+ -Ddri3=true \
+ -Ddri-drivers=i915,i965,r100,r200,nouveau \
+ -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,swr,iris,swrast,virgl \
+ -Dgallium-extra-hud=true \
+ -Dgallium-vdpau=true \
+ -Dgallium-xvmc=true \
+ -Dgallium-va=false \
+ -Dgallium-xa=true \
+ -Dgallium-nine=true \
+ -Dvulkan-drivers=amd,intel \
+ -Dshared-glapi=true \
+ -Dgles1=true \
+ -Dgles2=true \
+ -Dopengl=true \
+ -Dgbm=true \
+ -Dglx=dri \
+ -Degl=true \
+ -Dglvnd=true \
+ -Dasm=true \
+ -Dllvm=true \
+ -Dvalgrind=false \
+ -Dlibunwind=true \
+ -Dbuild-tests=false \
+ -Dosmesa=gallium \
+ -Dswr-arches=avx,avx2 \
+ " % ((libdir, ) * 2)
if get.buildTYPE() == "emul32":
+ options += " -Dlmsensors=false"
shelltools.export("CC", "gcc -m32")
shelltools.export("CXX", "g++ -m32")
shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
- shelltools.export("LLVM_CONFIG","/usr/bin/llvm-config-32")
- options += " --libdir=lib32 \
- -Ddri-drivers-path=/usr/lib32/xorg/modules/dri \
- -Dclang-libdir-path=/usr/lib32 \
- -Dgallium-opencl=disabled"
+ shelltools.export("LLVM_CONFIG","/usr/bin/llvm-config-32")
+ else: options += " -Dgallium-opencl=icd -Dgallium-omx=bellagio -Dlmsensors=true"
- elif get.ARCH() == "x86_64":
- options += " -Dclang-libdir-path=/usr/lib \
- -Dgallium-omx=bellagio \
- -Dgallium-opencl=disabled .."
-
- shelltools.system(options)
- #pisitools.dosed("libtool","( -shared )", " -Wl,--as-needed\\1")
+ mesontools.configure(options)
def build():
- shelltools.cd("build")
- shelltools.system("ninja")
+ mesontools.build()
def install():
- shelltools.cd("build")
- shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
+ mesontools.install()
- pisitools.domove("%s/libGL.so.1.2.0" % Libdir, "%s/mesa" % Libdir)
- pisitools.dosym("libGL.so.1.2.0", "%s/libGL.so.1.2" % Libdir)
-
- if get.buildTYPE() == "emul32":
- #pisitools.remove("/usr/lib32/pkgconfig/wayland-egl.pc")
- #pisitools.remove("/usr/lib32/libwayland-egl.so*")
- return
-
- shelltools.cd("..")
-
- #pisitools.dodoc("docs/COPYING")
pisitools.dohtml("docs/*")
-
- #pisitools.remove("/usr/lib/libwayland-egl.so*")
- #pisitools.remove("/usr/lib/pkgconfig/wayland-egl.pc")
-
diff --git a/x11/library/mesa/comar/package-emul32.py b/x11/library/mesa/comar/package-emul32.py
deleted file mode 100755
index d430c333c9..0000000000
--- a/x11/library/mesa/comar/package-emul32.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/python
-
-import os
-
-def postInstall(fromVersion, fromRelease, toVersion, toRelease):
- os.system("/usr/sbin/alternatives \
- --install /usr/lib32/libGL.so.1.2.0 libGL-32bit /usr/lib32/mesa/libGL.so.1.2.0 80 \
- --slave /usr/lib32/xorg/modules/volatile xorg-modules-volatile-32bit /var/empty")
-
- if not os.path.lexists("/usr/lib32/libGL.so.1"):
- os.symlink("libGL.so.1.2.0", "/usr/lib32/libGL.so.1")
-
- if not os.path.lexists("/usr/lib32/libGL.so.1.2"):
- os.symlink("libGL.so.1.2.0", "/usr/lib32/libGL.so.1.2")
-
-def preRemove():
- # FIXME This is not needed when upgrading package; but pisi does not
- # provide a way to learn operation type.
- #os.system("/usr/sbin/alternatives --remove libGL-32bit /usr/lib32/mesa/libGL.so.1.2")
- pass
diff --git a/x11/library/mesa/comar/package.py b/x11/library/mesa/comar/package.py
deleted file mode 100755
index 64b1c9cceb..0000000000
--- a/x11/library/mesa/comar/package.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/python
-
-import os
-
-def postInstall(fromVersion, fromRelease, toVersion, toRelease):
- os.system("/usr/sbin/alternatives \
- --install /usr/lib/libGL.so.1.2.0 libGL /usr/lib/mesa/libGL.so.1.2.0 80 \
- --slave /usr/lib/xorg/modules/volatile xorg-modules-volatile /var/empty")
-
- if not os.path.lexists("/usr/lib/libGL.so.1"):
- os.symlink("libGL.so.1.2.0", "/usr/lib/libGL.so.1")
-
- if not os.path.lexists("/usr/lib/libGL.so.1.2"):
- os.symlink("libGL.so.1.2.0", "/usr/lib/libGL.so.1.2")
-
-def preRemove():
- # FIXME This is not needed when upgrading package; but pisi does not
- # provide a way to learn operation type.
- #os.system("/usr/sbin/alternatives --remove libGL /usr/lib/mesa/libGL.so.1.2")
- pass
-
diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml
index 543bc24615..c0d5bd6edb 100644
--- a/x11/library/mesa/pspec.xml
+++ b/x11/library/mesa/pspec.xml
@@ -13,7 +13,7 @@
app:console
Mesa graphics libraries and utilities
Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.
- https://mesa.freedesktop.org/archive/mesa-19.2.4.tar.xz
+ https://mesa.freedesktop.org/archive/mesa-19.3.1.tar.xz
meson
zlib-devel
@@ -39,8 +39,8 @@
eudev-devel
nettle-devel
python3-mako
- llvm
- llvm-clang-devel
+ llvm
+ llvm-clang-devel
libxshmfence-devel
automake
libX11-devel
@@ -51,14 +51,9 @@
libunwind-devel
wayland-protocols-devel
libXrandr-devel
+ libglvnd-devel
-
-
-
-
-
-
@@ -66,32 +61,29 @@
mesa
zlib
- elfutils
- libdrm-amd
- alternatives
- libX11
+ expat
+ libXv
+ libX11libdrm
libgcc
libxcb
- expat
- libdrm
libXext
+ libXvMC
+ elfutils
libXfixes
libXdamage
libXxf86vm
- libXv
- libXvMC
+ libdrm-amd
+ lm_sensors
libdrm-intel
+ libxshmfence
libdrm-radeon
libdrm-nouveau
wayland-client
wayland-server
libomxil-bellagio
- nettle
- libunwind
- libxshmfence
-
-
- llvm-libs
+ llvm
+ llvm-clang
/etc
@@ -100,14 +92,12 @@
/usr/lib/libGL.so.1.2
/usr/share/vulkan/icd.d
/usr/share/drirc.d/00-mesa-defaults.conf
+ /usr/share/glvnd/egl_vendor.d/50_mesa.json
/usr/share/doc
drirc
-
- System.Package
-
@@ -163,14 +153,13 @@
libxshmfence-32bit
nettle-32bit
libunwind-32bit
- llvm-32bit
+ llvm-32bit
libXrandr-32bit
zlib-32bit
elfutils-32bit
openssl-32bit
- alternatives
libgcc
libxcb-32bit
expat-32bit
@@ -191,18 +180,22 @@
wayland-32bit
libunwind-32bit
mesa
- llvm-32bit
+ llvm-32bit
/usr/lib32
/usr/share/vulkan/icd.d/*.i686.json
-
- System.Package
-
+
+ 2020-01-03
+ 19.3.1
+ Version bump.
+ Marcin Bojara
+ marcin.bojara|@gmail.com
+
2019-11-15
19.2.4