Changeset 8307474 for x/installing/mesa.xml

Timestamp:

12/04/2021 03:28:15 PM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

lazarus

Children:

e6974d1

Parents:

b22e4ceb (diff), edd2feb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into lazarus

File:

• x/installing/mesa.xml (modified) (10 diffs)

x/installing/mesa.xml

@@ -7 +7 @@
   <!ENTITY mesa-download-http "https://mesa.freedesktop.org/archive/mesa-&mesa-version;.tar.xz">
   <!ENTITY mesa-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/mesa-&mesa-version;.tar.xz">
-  <!ENTITY mesa-md5sum        "25f4b3a8e92d20e2fc6231e253fce1ee">
-  <!ENTITY mesa-size          "15 MB">
-  <!ENTITY mesa-buildsize     "562 MB (with docs, add 376 MB if running the tests)">
-  <!ENTITY mesa-time          "3.5 SBU (Using parallelism=4; with docs)">
+  <!ENTITY mesa-md5sum        "d6efe1ecc0680cd1adb942f05600d884">
+  <!ENTITY mesa-size          "16 MB">
+  <!ENTITY mesa-buildsize     "588 MB (with docs, add 389 MB for tests)">
+  <!ENTITY mesa-time          "3.4 SBU (Using parallelism=4; with docs, add 0.6 SBU for tests)">
 ]>
 
@@ -168 +168 @@
         systems. VC4 is for the Broadcom VC4 used in the raspberry pi - ken -->
 
-    <para>
-      Adjust a script file in test suite to use Python 3, instead of the
-      obsolete Python 2:
-    </para>
-
-<screen><userinput>sed '1s/python/&amp;3/' -i bin/symbols-check.py</userinput></screen>
-
     <note>
       <para>
@@ -260 +253 @@
       If you built the tests (see 'Command Explanations'), to run them issue:
       <command>ninja test</command>.
+<!-- All tests passed for me for 21.2.4 [pierre]
       All 33 subtests tests in the mesa:compiler+glsl / glsl compiler warnings
-      suite are known to fail.
+      suite are known to fail.-->
     </para>
 
@@ -276 +270 @@
     </para>
 
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/mesa-&mesa-version; &amp;&amp;
+<screen role="root"
+        remap="doc"><userinput>install -v -dm755 /usr/share/doc/mesa-&mesa-version; &amp;&amp;
 cp -rfv ../docs/* /usr/share/doc/mesa-&mesa-version;</userinput></screen>
 
@@ -351 +346 @@
       <option>-Dbuild-tests=true</option>: This option will cause the test code
       to be enabled. To run the tests, issue: <command>ninja test</command>.
+    </para>
+
+    <para>
+      <option>-Dvulkan-drivers=...</option>: This option allows choosing which
+      Vulkan drivers are built. Since those drivers depend on the
+      corresponding Gallium3D drivers, do not enable drivers that are not
+      enabled in Gallium3D drivers. Furthermore, since BLFS does not use
+      Vulkan, it is safe to leave the list of Vulkan drivers empty.
     </para>
 
@@ -373 +376 @@
           libGLESv1_CM.so,
           libGLESv2.so,
-          libOSMesa.so,
+<!--          libOSMesa.so,-->
           libXvMCnouveau.so,
           libXvMCr600.so,
@@ -386 +389 @@
         </seg>
         <seg>
-          <!-- Begini gallium DRI drivers : this is the full set -->
+          <!-- Begin gallium DRI drivers : this is the full set -->
           d3dadapter9.so (optional), <!-- For Windows games. This is DirectX's
                                           Direct3D -->
           crocus_dri.so,
-          i830_dri.so,
+<!--          i830_dri.so,-->
           i915_dri.so,
           i965_dri.so,
@@ -418 +421 @@
         </seg>
         <seg>
-          $XORG_PREFIX/{include/{EGL,GL,GLES,GLES2,GLES3,KHR,vulkan},lib/{dri,vdpau}},
+          $XORG_PREFIX/{include/{EGL,GL,GLES,GLES2,GLES3,KHR},lib/{dri,vdpau}},
           $XORG_PREFIX/include/d3adapter (optional),
           $XORG_PREFIX/lib/d3d (optional),
           $XORG_PREFIX/share/drirc.d (contains workarounds for various applications,
-          particularly browsers and games)
+          particularly browsers and games),
           $XORG_PREFIX/share/vulkan/icd.d,
           and
@@ -522 +525 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="libOSMesa">
         <term><filename class="libraryfile">libOSMesa.so</filename></term>
@@ -534 +537 @@
         </listitem>
       </varlistentry>
-
+-->
     </variablelist>