Merge pull request #7179 from Rmys/master

x11 library*:rebuild verbump

x11/library/mesa/actions.py

@@ -18,46 +18,18 @@ def setup():
 # --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.system("sed -i 's|python2|python|g' \
-                       meson.build \
-                       src/meson.build")
-    shelltools.system("sed -i 's|prog_python2|prog_python|g' \
-                       src/util/xmlpool/meson.build \
-                       src/util/meson.build \
-                       src/mapi/glapi/gen/meson.build \
-                       src/mapi/shared-glapi/meson.build \
-                       src/mapi/es1api/meson.build \
-                       src/mapi/es2api/meson.build \
-                       src/compiler/meson.build \
-                       src/compiler/spirv/meson.build \
-                       src/compiler/nir/meson.build \
-                       src/compiler/glsl/meson.build \
-                       src/vulkan/util/meson.build \
-                       src/amd/common/meson.build \
-                       src/amd/vulkan/meson.build \
-                       src/intel/genxml/meson.build \
-                       src/intel/isl/meson.build \
-                       src/intel/compiler/meson.build \
-                       src/intel/vulkan/meson.build \
-                       src/mesa/main/meson.build \
-                       src/mesa/meson.build \
-                       src/mesa/drivers/dri/i965/meson.build \
-                       src/egl/meson.build \
-                       src/gallium/auxiliary/meson.build \
-                       src/gallium/drivers/r600/meson.build \
-                       src/gallium/drivers/radeonsi/meson.build") 
 
     shelltools.makedirs("build")
     shelltools.cd("build")
     options = "meson --prefix=/usr \
                      --sysconfdir=/etc \
                      --buildtype=release \
-                     -Ddri-drivers-path=lib/xorg/modules/dri \
+                     -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,swrast,virgl \
+                     -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,swr,iris,swrast,virgl \
                      -Dgallium-extra-hud=true \
                      -Dgallium-vdpau=true \
                      -Dgallium-xvmc=true \
@@ -78,7 +50,6 @@ def setup():
                      -Dvalgrind=false \
                      -Dlibunwind=true \
                      -Dbuild-tests=false \
-                     -Dtexture-float=true \
                      -Dosmesa=gallium \
                      -Dlmsensors=false \
                      -Dswr-arches=avx,avx2"
@@ -91,7 +62,7 @@ def setup():
         shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
         shelltools.export("LLVM_CONFIG","/usr/bin/llvm-config-32")        
         options += " --libdir=lib32 \
-                     -Ddri-drivers-path=lib32/xorg/modules/dri \
+                     -Ddri-drivers-path=/usr/lib32/xorg/modules/dri \
                      -Dclang-libdir-path=/usr/lib32 \
                      -Dgallium-opencl=disabled"
 

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="6a16cb828c9b4fc244f1af45960f01e90ab03553" type="tarxz">https://mesa.freedesktop.org/archive/mesa-18.2.8.tar.xz</Archive>
+        <Archive sha1sum="6ddc41e71d894dd406a3ca482f1cfda44566a5f8" type="tarxz">https://mesa.freedesktop.org/archive/mesa-19.2.2.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>meson</Dependency>
             <Dependency>zlib-devel</Dependency>
@@ -38,7 +38,7 @@
             <Dependency>libXv-devel</Dependency>
             <Dependency>eudev-devel</Dependency>
             <Dependency>nettle-devel</Dependency>
-            <Dependency>python-mako</Dependency>
+            <Dependency>python3-mako</Dependency>
             <Dependency versionFrom="7.1.0">llvm</Dependency>
             <Dependency versionFrom="7.1.0">llvm-clang-devel</Dependency>
             <Dependency versionFrom="1.2">libxshmfence-devel</Dependency>
@@ -53,7 +53,6 @@
             <Dependency>libXrandr-devel</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch level="1">n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch</Patch> -->
 <!--             <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> -->
@@ -100,6 +99,7 @@
             <Path fileType="library">/usr/lib</Path>
             <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="doc">/usr/share/doc</Path>
         </Files>
         <AdditionalFiles>
@@ -203,6 +203,13 @@
     </Package>
 
     <History>
+        <Update release="15">
+            <Date>2019-10-24</Date>
+            <Version>19.2.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="14">
             <Date>2019-05-29</Date>
             <Version>18.2.8</Version>