Ignore:
Timestamp:
12/04/2021 03:28:15 PM (5 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • x/installing/mesa.xml

    rb22e4ceb r8307474  
    77  <!ENTITY mesa-download-http "https://mesa.freedesktop.org/archive/mesa-&mesa-version;.tar.xz">
    88  <!ENTITY mesa-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/mesa-&mesa-version;.tar.xz">
    9   <!ENTITY mesa-md5sum        "25f4b3a8e92d20e2fc6231e253fce1ee">
    10   <!ENTITY mesa-size          "15 MB">
    11   <!ENTITY mesa-buildsize     "562 MB (with docs, add 376 MB if running the tests)">
    12   <!ENTITY mesa-time          "3.5 SBU (Using parallelism=4; with docs)">
     9  <!ENTITY mesa-md5sum        "d6efe1ecc0680cd1adb942f05600d884">
     10  <!ENTITY mesa-size          "16 MB">
     11  <!ENTITY mesa-buildsize     "588 MB (with docs, add 389 MB for tests)">
     12  <!ENTITY mesa-time          "3.4 SBU (Using parallelism=4; with docs, add 0.6 SBU for tests)">
    1313]>
    1414
     
    168168        systems. VC4 is for the Broadcom VC4 used in the raspberry pi - ken -->
    169169
    170     <para>
    171       Adjust a script file in test suite to use Python 3, instead of the
    172       obsolete Python 2:
    173     </para>
    174 
    175 <screen><userinput>sed '1s/python/&amp;3/' -i bin/symbols-check.py</userinput></screen>
    176 
    177170    <note>
    178171      <para>
     
    260253      If you built the tests (see 'Command Explanations'), to run them issue:
    261254      <command>ninja test</command>.
     255<!-- All tests passed for me for 21.2.4 [pierre]
    262256      All 33 subtests tests in the mesa:compiler+glsl / glsl compiler warnings
    263       suite are known to fail.
     257      suite are known to fail.-->
    264258    </para>
    265259
     
    276270    </para>
    277271
    278 <screen role="root"><userinput>install -v -dm755 /usr/share/doc/mesa-&mesa-version; &amp;&amp;
     272<screen role="root"
     273        remap="doc"><userinput>install -v -dm755 /usr/share/doc/mesa-&mesa-version; &amp;&amp;
    279274cp -rfv ../docs/* /usr/share/doc/mesa-&mesa-version;</userinput></screen>
    280275
     
    351346      <option>-Dbuild-tests=true</option>: This option will cause the test code
    352347      to be enabled. To run the tests, issue: <command>ninja test</command>.
     348    </para>
     349
     350    <para>
     351      <option>-Dvulkan-drivers=...</option>: This option allows choosing which
     352      Vulkan drivers are built. Since those drivers depend on the
     353      corresponding Gallium3D drivers, do not enable drivers that are not
     354      enabled in Gallium3D drivers. Furthermore, since BLFS does not use
     355      Vulkan, it is safe to leave the list of Vulkan drivers empty.
    353356    </para>
    354357
     
    373376          libGLESv1_CM.so,
    374377          libGLESv2.so,
    375           libOSMesa.so,
     378<!--          libOSMesa.so,-->
    376379          libXvMCnouveau.so,
    377380          libXvMCr600.so,
     
    386389        </seg>
    387390        <seg>
    388           <!-- Begini gallium DRI drivers : this is the full set -->
     391          <!-- Begin gallium DRI drivers : this is the full set -->
    389392          d3dadapter9.so (optional), <!-- For Windows games. This is DirectX's
    390393                                          Direct3D -->
    391394          crocus_dri.so,
    392           i830_dri.so,
     395<!--          i830_dri.so,-->
    393396          i915_dri.so,
    394397          i965_dri.so,
     
    418421        </seg>
    419422        <seg>
    420           $XORG_PREFIX/{include/{EGL,GL,GLES,GLES2,GLES3,KHR,vulkan},lib/{dri,vdpau}},
     423          $XORG_PREFIX/{include/{EGL,GL,GLES,GLES2,GLES3,KHR},lib/{dri,vdpau}},
    421424          $XORG_PREFIX/include/d3adapter (optional),
    422425          $XORG_PREFIX/lib/d3d (optional),
    423426          $XORG_PREFIX/share/drirc.d (contains workarounds for various applications,
    424           particularly browsers and games)
     427          particularly browsers and games),
    425428          $XORG_PREFIX/share/vulkan/icd.d,
    426429          and
     
    522525        </listitem>
    523526      </varlistentry>
    524 
     527<!--
    525528      <varlistentry id="libOSMesa">
    526529        <term><filename class="libraryfile">libOSMesa.so</filename></term>
     
    534537        </listitem>
    535538      </varlistentry>
    536 
     539-->
    537540    </variablelist>
    538541
Note: See TracChangeset for help on using the changeset viewer.