Changeset c2453e6 for x


Ignore:
Timestamp:
10/20/2022 03:49:10 PM (20 months ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal
Children:
b50ec75c
Parents:
402910e (diff), e9aed80 (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 plabs/python-mods

Location:
x
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • x/installing/libva.xml

    r402910e rc2453e6  
    55  %general-entities;
    66
    7   <!ENTITY libva-version                "2.15.0">
     7  <!ENTITY libva-version                "2.16.0">
    88  <!ENTITY libva-intel-driver-version   "2.4.1">
    99
    1010  <!ENTITY libva-download-http "https://github.com/intel/libva/releases/download/&libva-version;/libva-&libva-version;.tar.bz2">
    1111  <!ENTITY libva-download-ftp  " ">
    12   <!ENTITY libva-md5sum        "9d13c18c4f84623be7cad1192de99ed8">
     12  <!ENTITY libva-md5sum        "79e44d9705f859e07a3b6a3c80fe772e">
    1313  <!ENTITY libva-size          "492 KB">
    14   <!ENTITY libva-buildsize     "7.8 MB">
     14  <!ENTITY libva-buildsize     "9.6 MB">
    1515  <!ENTITY libva-time          "less than 0.1 SBU">
    1616
    … …  
    186186<screen><userinput>tar -xvf ../intel-vaapi-driver-&libva-intel-driver-version;.tar.bz2 &amp;&amp;
    187187cd intel-vaapi-driver-&libva-intel-driver-version;</userinput></screen>
    188 
    189 <!-- Fixed in intel-vaapi-driver-2.4.1
    190       <para>
    191         Fix building with GCC-10 and above:
    192       </para>
    193 
    194 <screen><userinput>sed -e 's/const/extern &amp;/' \
    195     -i src/gen9_hevc_enc_kernels_binary.h</userinput></screen>
    196 -->
    197188
    198189      <para>

  • x/installing/mesa.xml

    r402910e rc2453e6  
    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        "731cdd53d5f9dd695aae1b3a37081d5f">
     9  <!ENTITY mesa-md5sum        "5ff97bb6bf82af6f81b41ff9dacbcc0a">
    1010  <!ENTITY mesa-size          "16 MB">
    11   <!ENTITY mesa-buildsize     "366 MB (with docs, add 325 MB for tests)">
    12   <!ENTITY mesa-time          "2.2 SBU (Using parallelism=4; with docs, add 0.5 SBU for tests)">
     11  <!ENTITY mesa-buildsize     "462 MB (with docs, add 230 MB for tests)">
     12  <!ENTITY mesa-time          "2.4 SBU (Using parallelism=4; with docs, add 0.5 SBU for tests)">
    1313]>
    1414
    … …  
    250250      -Dgallium-drivers=auto  \
    251251      -Dvulkan-drivers=""     \
    252       -Dglx=dri               \
    253252      -Dvalgrind=disabled     \
    254253      -Dlibunwind=disabled    \
    255254      ..                      &amp;&amp;
    256 
     255<!-- Removed for 22.2.1: seems to be the default  -Dglx=dri      \ -->
    257256ninja</userinput></screen>
    258257
    … …  
    301300      switch, build sizes can span into the 2GB range.
    302301    </para>
    303 <!--
    304     <para>
    305       <parameter>-Ddri-drivers="..."</parameter>: This parameter
    306       controls which (non-gallium) dri drivers should be built.
    307     </para>
    308 -->
     302
    309303    <para>
    310304      <parameter>-Dgallium-drivers="..."</parameter>: This parameter
    311305      controls which Gallium3D drivers should be built.
    312306    </para>
    313 
    314307<!--
    315308    <para>
    … …  
    327320
    328321    <para>
    329       <parameter>-Degl-native-platform="..."</parameter>: This parameter
    330       controls which Embedded Graphics Library support will be built. Available
    331       linux options are auto (default), x11, wayland, surfaceless, and drm.
     322      <parameter>-Dvulkan-drivers=""</parameter>: This switch allows choosing
     323      which Vulkan drivers are built. The default is auto, but this requires
     324      the optional dependency <filename>glslang</filename>. So it is better
     325      to pass an empty list, in order to remove the need for that
     326      dependency.  Nothing in BLFS uses Vulkan anyway.
    332327    </para>
    333328
    … …  
    349344
    350345    <para>
    351       <option>-Dvulkan-drivers=...</option>: This switch allows choosing which
    352       Vulkan drivers are built. Since BLFS does not use
    353       Vulkan, it is safe to leave the list of Vulkan drivers empty. The default
    354       is auto. Note that you must have the optional dependency
    355       <filename>glslang</filename> installed in order to enable Vulkan drivers.
     346      <option>-Degl-native-platform="..."</option>: This parameter
     347      controls which Embedded Graphics Library support will be built. Available
     348      linux options are auto (default), x11, wayland, surfaceless, and drm.
    356349    </para>
    357350
    … …  
    380373          libgbm.so,
    381374          libglapi.so,
    382           <!-- Begin Vulkan drivers -->
     375          <!-- No Vulkan driver anymore
    383376          libvulkan_intel.so,
    384377          libvulkan_lvp.so,
    385           libvulkan_radeon.so, and
    386           <!-- End Vulkan drivers -->
    387           libxatracker.so
     378          libvulkan_radeon.so,-->
     379          libxatracker.so,
     380          libXvMCnouveau.so, and
     381          libXvMCr600.so
    388382        </seg>
    389383        <seg>
    … …  
    417411        </seg>
    418412        <seg>
    419           $XORG_PREFIX/{include/{EGL,GL,GLES,GLES2,GLES3,KHR},
     413          <!-- $XORG_PREFIX/include/GL is installed by xorg-protos -->
     414          $XORG_PREFIX/{include/{EGL,GLES,GLES2,GLES3,KHR},
    420415          $XORG_PREFIX/lib/{dri,vdpau}},
    421416          $XORG_PREFIX/share/drirc.d (contains workarounds for various applications,
    422417          particularly browsers and games),
    423           $XORG_PREFIX/share/vulkan,
     418          <!--          $XORG_PREFIX/share/vulkan, -->
    424419          and
    425420          /usr/share/doc/mesa-&mesa-version;

  • x/installing/x7app.xml

    r402910e rc2453e6  
    3232  <!ENTITY setxkbmap-md5sum                "2f72c7170cdbadc8ef786b2f9cfd4a69">
    3333
    34   <!ENTITY smproxy-version                 "1.0.6">
    35   <!ENTITY smproxy-md5sum                  "3a93d9f0859de5d8b65a68a125d48f6a">
     34  <!ENTITY smproxy-version                 "1.0.7">
     35  <!ENTITY smproxy-md5sum                  "9f7a4305f0e79d5a46c3c7d02df9437d">
    3636
    3737  <!ENTITY x11perf-version                 "1.6.1">
    … …  
    216216&sessreg-md5sum;  sessreg-&sessreg-version;.tar.bz2
    217217&setxkbmap-md5sum;  setxkbmap-&setxkbmap-version;.tar.xz
    218 &smproxy-md5sum;  smproxy-&smproxy-version;.tar.bz2
     218&smproxy-md5sum;  smproxy-&smproxy-version;.tar.xz
    219219&x11perf-md5sum;  x11perf-&x11perf-version;.tar.bz2
    220220&xauth-md5sum;  xauth-&xauth-version;.tar.xz

  • x/installing/x7lib.xml

    r402910e rc2453e6  
    77  <!ENTITY x7libs-download-http "&xorg-download-http;/lib/">
    88  <!ENTITY x7libs-download-ftp  "&xorg-download-ftp;/lib/">
    9   <!ENTITY x7libs-size          "13 MB">
    10   <!ENTITY x7libs-buildsize     "224 MB (34 MB installed) - if source directories not deleted">
    11   <!ENTITY x7libs-time          "2.4 SBU">
     9  <!ENTITY x7libs-size          "12 MB">
     10  <!ENTITY x7libs-buildsize     "225 MB (34 MB installed) - if source directories not deleted">
     11  <!ENTITY x7libs-time          "2.1 SBU">
    1212
    1313  <!ENTITY xtrans-version                  "1.4.0">
    … …  
    3535  <!ENTITY libXt-md5sum                    "b122ff9a7ec70c94dbbfd814899fffa5">
    3636
    37   <!ENTITY libXmu-version                  "1.1.3">
    38   <!ENTITY libXmu-md5sum                   "ac774cff8b493f566088a255dbf91201">
     37  <!ENTITY libXmu-version                  "1.1.4">
     38  <!ENTITY libXmu-md5sum                   "ed52d396115fbc4d05300762aab79685">
    3939
    4040  <!ENTITY libXpm-version                  "3.5.13">
    … …  
    9898  <!ENTITY libdmx-md5sum                   "d2f1f0ec68ac3932dd7f1d9aa0a7a11c">
    9999
    100   <!ENTITY libpciaccess-version            "0.16">
    101   <!ENTITY libpciaccess-md5sum             "b34e2cbdd6aa8f9cc3fa613fd401a6d6">
    102 
    103   <!ENTITY libxkbfile-version              "1.1.0">
    104   <!ENTITY libxkbfile-md5sum               "dd7e1e946def674e78c0efbc5c7d5b3b">
     100  <!ENTITY libpciaccess-version            "0.17">
     101  <!ENTITY libpciaccess-md5sum             "1466cf950c914ad2db1dbb76c9a724db">
     102
     103  <!ENTITY libxkbfile-version              "1.1.1">
     104  <!ENTITY libxkbfile-md5sum               "93491cc26e6a47ef12061c9229bffc13">
    105105
    106106  <!ENTITY libxshmfence-version            "1.3">
    … …  
    211211&libXScrnSaver-md5sum;  libXScrnSaver-&libXScrnSaver-version;.tar.bz2
    212212&libXt-md5sum;  libXt-&libXt-version;.tar.bz2
    213 &libXmu-md5sum;  libXmu-&libXmu-version;.tar.bz2
     213&libXmu-md5sum;  libXmu-&libXmu-version;.tar.xz
    214214&libXpm-md5sum;  libXpm-&libXpm-version;.tar.bz2
    215215&libXaw-md5sum;  libXaw-&libXaw-version;.tar.bz2
    … …  
    232232&libXxf86vm-md5sum;  libXxf86vm-&libXxf86vm-version;.tar.xz
    233233&libdmx-md5sum;  libdmx-&libdmx-version;.tar.bz2
    234 &libpciaccess-md5sum;  libpciaccess-&libpciaccess-version;.tar.bz2
    235 &libxkbfile-md5sum;  libxkbfile-&libxkbfile-version;.tar.bz2
     234&libpciaccess-md5sum;  libpciaccess-&libpciaccess-version;.tar.xz
     235&libxkbfile-md5sum;  libxkbfile-&libxkbfile-version;.tar.xz
    236236&libxshmfence-md5sum;  libxshmfence-&libxshmfence-version;.tar.bz2</literal>
    237237EOF</userinput></screen>
    … …  
    268268
    269269    <para>
    270       BLFS developers have confirmed that
    271       <application>libX11</application>, <application>libXt</application> and
     270      BLFS developers have confirmed that <application>libX11</application>,
     271      <application>libXt</application>, <application>libXmu</application>, and
    272272      <application>libxshmfence</application> are distributed with working test
    273273      suites.
    … …  
    301301
    302302    libX11-* )
    303       ./configure $XORG_CONFIG --disable-thread-safety-constructor
     303      ./configure $XORG_CONFIG $docdir \
     304                  --disable-thread-safety-constructor
    304305    ;;
    305306
    … …  
    397398        <seg>
    398399          <envar>$XORG_PREFIX</envar>/include/X11/fonts,
     400          <envar>$XORG_PREFIX</envar>/include/X11/Xmu,
    399401          <envar>$XORG_PREFIX</envar>/include/X11/Xtrans,
    400402          <envar>$XORG_PREFIX</envar>/share/doc/libFS,
    … …  
    405407          <envar>$XORG_PREFIX</envar>/share/doc/libXext,
    406408          <envar>$XORG_PREFIX</envar>/share/doc/libXi,
    407           <envar>$XORG_PREFIX</envar>/share/doc/libXmu,
     409          <envar>$XORG_PREFIX</envar>/share/doc/libXmu-&libXmu-version;,
    408410          <envar>$XORG_PREFIX</envar>/share/doc/libXrender,
    409411          <envar>$XORG_PREFIX</envar>/share/doc/libXt,

  • x/installing/xwayland.xml

    r402910e rc2453e6  
    131131      for a stripped down build of <application>weston</application> is shown
    132132      in <ulink
    133       url="https://gitlab.freedesktop.org/xorg/xserver/-/blob/xwayland-21.1/.gitlab-ci/debian-install.sh">
     133      url="https://gitlab.freedesktop.org/xorg/xserver/-/blob/xwayland-22.1/.gitlab-ci/debian-install.sh">
    134134      Upstream continuous integration build</ulink>.
    135135    </para>

  • x/lib/freeglut.xml

    r402910e rc2453e6  
    88           "&sourceforge-dl;/freeglut/freeglut-&freeglut-version;.tar.gz">
    99  <!ENTITY freeglut-download-ftp " ">
    10   <!ENTITY freeglut-md5sum        "485c1976165315fc42c0b0a1802816d9">
    11   <!ENTITY freeglut-size          "388 KB">
    12   <!ENTITY freeglut-buildsize     "4.9 MB">
     10  <!ENTITY freeglut-md5sum        "f1621464e6525d0368976870cab8f418">
     11  <!ENTITY freeglut-size          "404 KB">
     12  <!ENTITY freeglut-buildsize     "5.7 MB">
    1313  <!ENTITY freeglut-time          "less than 0.1 SBU">
    1414]>
    … …  
    173173        </seg>
    174174        <seg>
    175           None
     175          /usr/lib/cmake/FreeGLUT
    176176        </seg>
    177177      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.