New commits:
commit 3eb6bbcc0620e97191494e0046f6792987769662
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>
graphics-libs/mesa: adapted to no DRI drivers build, split the patch for
scm branch to work, some cleanups
-
config_query_multi MESA_DRM "which libdrm hardware" AMD INTEL NOUVEAU RADEON
&&
# only suggest drivers for specified hardware
-local AVAILABLE_DRI=""
local AVAILABLE_GALLIUM="svga swrast virgl zink"
local AVAILABLE_VULKAN="swrast"
if list_find "$MESA_DRM" AMD;then
AVAILABLE_VULKAN+=" amd"
fi &&
if list_find "$MESA_DRM" RADEON;then
- AVAILABLE_DRI+=" r100 r200"
AVAILABLE_GALLIUM+=" r300 r600 radeonsi"
fi &&
if list_find "$MESA_DRM" INTEL;then
- AVAILABLE_DRI+=" i915 i965"
AVAILABLE_GALLIUM+=" i915 iris"
AVAILABLE_VULKAN+=" intel"
fi &&
if list_find "$MESA_DRM" NOUVEAU;then
- AVAILABLE_DRI+=" nouveau"
AVAILABLE_GALLIUM+=" nouveau"
fi &&
+# Mesa has dropped DRI drivers. The code below (except in the else clause)
+# should be deleted when stable release with no DRI drivers will be out.
+if [[ "${MESA_BRANCH}" == "stable" ]]; then
+ local AVAILABLE_DRI="" &&
+
+ config_query_multi MESA_GLX "glx build types, recommend dri" dri xlib
gallium-xlib &&
+
+ if list_find "$MESA_DRM" RADEON;then
+ AVAILABLE_DRI+=" r100 r200"
+ fi &&
+ if list_find "$MESA_DRM" INTEL;then
+ AVAILABLE_DRI+=" i915 i965"
+ fi &&
+ if list_find "$MESA_DRM" NOUVEAU;then
+ AVAILABLE_DRI+=" nouveau"
+ fi &&
-if list_find "$MESA_GLX" dri;then
- config_query_multi MESA_DRI \
- "which DRI drivers to build?" \
- all $AVAILABLE_DRI &&
+ if list_find "$MESA_GLX" dri;then
+ config_query_multi MESA_DRI \
+ "which DRI drivers to build?" \
+ all $AVAILABLE_DRI &&
- if list_find "$MESA_DRI" all; then
- MESA_DRI="$AVAILABLE_DRI"
- fi
+ if list_find "$MESA_DRI" all; then
+ MESA_DRI="$AVAILABLE_DRI"
+ fi
+ fi &&
+ MESA_DRI="${MESA_DRI# }"
+else
+ list_remove MESA_GLX "gallium-xlib" &&
+ config_query_multi MESA_GLX "glx build types, recommend dri" dri xlib &&
+
+ persistent_remove MESA_DRI
fi &&
+
# Gallium support
message "${MESSAGE_COLOR}If you want to enable VDPAU you have to select at
least one of the r300, r600,$DEFAULT_COLOR" &&
@@ -85,6 +103,5 @@ config_query_multi MESA_ARCH "which arch" avx avx2 knl
skx &&
config_query_multi MESA_OMX "OMax support" auto disabled tizonia bellagio
# strip any leading spaces from the driver lists
-MESA_DRI="${MESA_DRI# }"
MESA_GALLIUM="${MESA_GALLIUM# }"
MESA_VULKAN="${MESA_VULKAN# }"
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index e163cf7..9b605c5 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,9 @@
+2021-12-05 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFIGURE, BUILD: adapted to no DRI drivers build (scm branch),
+ some cleanups
+ * PRE_BUILD, patches{,-{scm,stable}}/add-use-elf-tls.patch: split the
patch
+ for corresponding branches
+
2021-12-04 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 21.3.1
diff --git a/graphics-libs/mesa/PRE_BUILD b/graphics-libs/mesa/PRE_BUILD
index 387dbfb..c8a9fd7 100755
--- a/graphics-libs/mesa/PRE_BUILD
+++ b/graphics-libs/mesa/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&