Merge pull request #7354 from marcin-/master

mesa: version bump

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")
+    options = "--buildtype=release \
-
+               -Dclang-libdir-path=%s \
-# --enable-sysfs option provides better hardware information support with "lspci"
+               -Ddri-drivers-path=%s/xorg/modules/dri \
-# --enable-32-bit option is not present anymore. Although build fails in emul32. With --disable-asm option, not fail. Needs to be tested.
+               -Db_ndebug=true \
-
+               -Dplatforms=x11,wayland,drm,surfaceless \
-
+               -Ddri3=true \
-    shelltools.makedirs("build")
+               -Ddri-drivers=i915,i965,r100,r200,nouveau \
-    shelltools.cd("build")
+               -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,swr,iris,swrast,virgl \
-    options = "meson --prefix=/usr \
+               -Dgallium-extra-hud=true \
-                     --sysconfdir=/etc \
+               -Dgallium-vdpau=true \
-                     --buildtype=release \
+               -Dgallium-xvmc=true \
-                     -Ddri-drivers-path=/usr/lib/xorg/modules/dri \
+               -Dgallium-va=false \
-                     -Db_ndebug=true \
+               -Dgallium-xa=true \
-                     -Dplatforms=x11,wayland,drm,surfaceless \
+               -Dgallium-nine=true \
-                     -Ddri3=true \
+               -Dvulkan-drivers=amd,intel \
-                     -Ddri-drivers=i915,i965,r100,r200,nouveau \
+               -Dshared-glapi=true \
-                     -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,swr,iris,swrast,virgl \
+               -Dgles1=true \
-                     -Dgallium-extra-hud=true \
+               -Dgles2=true \
-                     -Dgallium-vdpau=true \
+               -Dopengl=true \
-                     -Dgallium-xvmc=true \
+               -Dgbm=true \
-                     -Dgallium-va=false \
+               -Dglx=dri \
-                     -Dgallium-xa=true \
+               -Degl=true \
-                     -Dgallium-nine=true \
+               -Dglvnd=true \
-                     -Dvulkan-drivers=amd,intel \
+               -Dasm=true \
-                     -Dshared-glapi=true \
+               -Dllvm=true \
-                     -Dgles1=true \
+               -Dvalgrind=false \
-                     -Dgles2=true \
+               -Dlibunwind=true \
-                     -Dopengl=true \
+               -Dbuild-tests=false \
-                     -Dgbm=true \
+               -Dosmesa=gallium \
-                     -Dglx=dri \
+               -Dswr-arches=avx,avx2 \
-                     -Degl=true \
+              " % ((libdir, ) * 2)
-                     -Dglvnd=false \
-                     -Dasm=true \
-                     -Dllvm=true \
-                     -Dvalgrind=false \
-                     -Dlibunwind=true \
-                     -Dbuild-tests=false \
-                     -Dosmesa=gallium \
-                     -Dlmsensors=false \
-                     -Dswr-arches=avx,avx2"
-                     
-
 
     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")        
+        shelltools.export("LLVM_CONFIG","/usr/bin/llvm-config-32") 
-        options += " --libdir=lib32 \
+    else: options += " -Dgallium-opencl=icd -Dgallium-omx=bellagio -Dlmsensors=true"
-                     -Ddri-drivers-path=/usr/lib32/xorg/modules/dri \
-                     -Dclang-libdir-path=/usr/lib32 \
-                     -Dgallium-opencl=disabled"
 
-    elif get.ARCH() == "x86_64":
+    mesontools.configure(options)
-        options += " -Dclang-libdir-path=/usr/lib \
-                     -Dgallium-omx=bellagio \
-                     -Dgallium-opencl=disabled .."
-
-    shelltools.system(options)
-    #pisitools.dosed("libtool","( -shared )", " -Wl,--as-needed\\1")
 
 def build():
-    shelltools.cd("build")
+    mesontools.build()
-    shelltools.system("ninja")
 
 def install():
-    shelltools.cd("build")
+    mesontools.install()
-    shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
 
-    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")
-    

x11/library/mesa/comar/package-emul32.py

@@ -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

x11/library/mesa/comar/package.py

@@ -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
-

x11/library/mesa/pspec.xml

@@ -13,7 +13,7 @@
         <IsA>app:console</IsA>
         <Summary>Mesa graphics libraries and utilities</Summary>
         <Description>Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.</Description>
-        <Archive sha1sum="85cc1b57840f14d720f806f8160356b8c9b13a7f" type="tarxz">https://mesa.freedesktop.org/archive/mesa-19.2.4.tar.xz</Archive>
+        <Archive sha1sum="2307babbae8cba0d8849ffb412cb91ee36f5d052" type="tarxz">https://mesa.freedesktop.org/archive/mesa-19.3.1.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>meson</Dependency>
             <Dependency>zlib-devel</Dependency>
@@ -39,8 +39,8 @@
             <Dependency>eudev-devel</Dependency>
             <Dependency>nettle-devel</Dependency>
             <Dependency>python3-mako</Dependency>
-            <Dependency versionFrom="7.1.0">llvm</Dependency>
+            <Dependency versionFrom="8.0.0">llvm</Dependency>
-            <Dependency versionFrom="7.1.0">llvm-clang-devel</Dependency>
+            <Dependency versionFrom="8.0.0">llvm-clang-devel</Dependency>
             <Dependency versionFrom="1.2">libxshmfence-devel</Dependency>
             <Dependency>automake</Dependency>
             <Dependency>libX11-devel</Dependency>
@@ -51,14 +51,9 @@
             <Dependency>libunwind-devel</Dependency>
             <Dependency>wayland-protocols-devel</Dependency>
             <Dependency>libXrandr-devel</Dependency>
+            <Dependency>libglvnd-devel</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch level="1">n_Define-GLAPIVAR-separate-from-GLAPI.patch</Patch> -->
-<!--             <Patch level="1">N_01-WIP-nouveau-add-locking.patch</Patch> -->
-<!--             <Patch level="1">N_02-nouveau-more-locking-make-sure-that-fence-work-is-always-done-with-the-push-mutex-acquired.patch</Patch> -->
-<!--             <Patch level="1">N_03-nv30-locking-fixes.patch</Patch> -->
-<!--             <Patch level="1">N_04-nv50-Fix-double-lock-in-nv50_hw_sm_get_query_result.patch</Patch> -->
-<!--             <Patch level="1">N_05-Use-nv50_render_condition-in-nv50_blitctx_post_blit.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -66,32 +61,29 @@
         <Name>mesa</Name>
         <RuntimeDependencies>
             <Dependency>zlib</Dependency>
-            <Dependency>elfutils</Dependency>
+            <Dependency>expat</Dependency>
-            <Dependency>libdrm-amd</Dependency>
+            <Dependency>libXv</Dependency>
-            <Dependency>alternatives</Dependency>
+            <Dependency>libX11</Dependency
-            <Dependency>libX11</Dependency>
+            <Dependency>libdrm</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>libxcb</Dependency>
-            <Dependency>expat</Dependency>
-            <Dependency>libdrm</Dependency>
             <Dependency>libXext</Dependency>
+            <Dependency>libXvMC</Dependency>
+            <Dependency>elfutils</Dependency>
             <Dependency>libXfixes</Dependency>
             <Dependency>libXdamage</Dependency>
             <Dependency>libXxf86vm</Dependency>
-            <Dependency>libXv</Dependency>
+            <Dependency>libdrm-amd</Dependency>
-            <Dependency>libXvMC</Dependency>
+            <Dependency>lm_sensors</Dependency>
             <Dependency>libdrm-intel</Dependency>
+            <Dependency>libxshmfence</Dependency>
             <Dependency>libdrm-radeon</Dependency>
             <Dependency>libdrm-nouveau</Dependency>
             <Dependency>wayland-client</Dependency>
             <Dependency>wayland-server</Dependency>
             <Dependency>libomxil-bellagio</Dependency>
-            <Dependency>nettle</Dependency>
+            <Dependency versionFrom="8.0.0">llvm</Dependency>
-            <Dependency>libunwind</Dependency>
+            <Dependency versionFrom="8.0.0">llvm-clang</Dependency>
-            <Dependency versionFrom="1.2">libxshmfence</Dependency>
-<!--             <Dependency versionFrom="7.1.0">llvm</Dependency> -->
-<!--             <Dependency versionFrom="7.1.0">llvm-clang</Dependency> -->
-            <Dependency versionFrom="7.1.0">llvm-libs</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -100,14 +92,12 @@
             <Path fileType="library">/usr/lib/libGL.so.1.2</Path>
             <Path fileType="data">/usr/share/vulkan/icd.d</Path>
             <Path fileType="data">/usr/share/drirc.d/00-mesa-defaults.conf</Path>
+            <Path fileType="data">/usr/share/glvnd/egl_vendor.d/50_mesa.json</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
         <AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="/etc/drirc">drirc</AdditionalFile>
         </AdditionalFiles>
-        <Provides>
-            <COMAR script="package.py">System.Package</COMAR>
-        </Provides>
     </Package>
 
     <Package>
@@ -163,14 +153,13 @@
             <Dependency>libxshmfence-32bit</Dependency>
             <Dependency>nettle-32bit</Dependency>
             <Dependency>libunwind-32bit</Dependency>
-            <Dependency versionFrom="7.1.0">llvm-32bit</Dependency>
+            <Dependency versionFrom="8.0.0">llvm-32bit</Dependency>
             <Dependency>libXrandr-32bit</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency>zlib-32bit</Dependency>
             <Dependency>elfutils-32bit</Dependency>
             <Dependency>openssl-32bit</Dependency>
-            <Dependency>alternatives</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>libxcb-32bit</Dependency>
             <Dependency>expat-32bit</Dependency>
@@ -191,18 +180,22 @@
             <Dependency>wayland-32bit</Dependency>
             <Dependency>libunwind-32bit</Dependency>
             <Dependency release="current">mesa</Dependency>
-            <Dependency versionFrom="7.1.0">llvm-32bit</Dependency>
+            <Dependency versionFrom="8.0.0">llvm-32bit</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32</Path>
             <Path fileType="data">/usr/share/vulkan/icd.d/*.i686.json</Path>
         </Files>
-        <Provides>
-            <COMAR script="package-emul32.py">System.Package</COMAR>
-        </Provides>
     </Package>
 
     <History>
+        <Update release="18">
+            <Date>2020-01-03</Date>
+            <Version>19.3.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin.bojara|@gmail.com</Email>
+        </Update>
         <Update release="17">
             <Date>2019-11-15</Date>
             <Version>19.2.4</Version>