Bug#973675: mesa: Fix warnings for deprecated options
Package: mesa
Version: 20.2.1-1
Attached is a patch that fixes a bunch of warnings about deprecated commands along the lines of:
option "true" deprecated, please use "enabled" instead.
option "false" deprecated, please use "disabled" instead.
Suspect that these changes will become mandatory in the future, so best to get the warnings sorted now.
Tested build on amd64.
Note: Doesn't seem to affect all options that take true/false, or at least the ones that affect amd64.
--
Stuart Young (aka Cefiar)
--- a/debian/rules 2020-11-03 06:03:30.000000000 +0000
+++ b/debian/rules 2020-11-03 06:01:29.350023534 +0000
@@ -34,7 +34,7 @@
GALLIUM_DRIVERS =
VULKAN_DRIVERS =
-confflags_DRI3 = -Ddri3=false
+confflags_DRI3 = -Ddri3=disabled
# hurd doesn't do direct rendering
ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -42,7 +42,7 @@
EGL_PLATFORMS = x11
confflags_DIRECT_RENDERING = -Dglx-direct=false
- confflags_GBM = -Dgbm=false
+ confflags_GBM = -Dgbm=disabled
confflags_OSMESA = -Dosmesa=classic
else
DRI_DRIVERS += r200,r100
@@ -56,7 +56,7 @@
endif
ifeq ($(DEB_HOST_ARCH_OS), linux)
- confflags_DRI3 = -Ddri3=true
+ confflags_DRI3 = -Ddri3=enabled
DRI_DRIVERS += ,nouveau
# Gallium drivers which require kernel support, not yet ported to non-Linux
GALLIUM_DRIVERS += ,nouveau,virgl
@@ -74,7 +74,7 @@
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
GALLIUM_DRIVERS += ,svga,zink
# svga needs xa state tracker
- confflags_GALLIUM += -Dgallium-xa=true
+ confflags_GALLIUM += -Dgallium-xa=enabled
VULKAN_DRIVERS += ,intel
endif
@@ -82,7 +82,7 @@
EGL_PLATFORMS += ,wayland
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x))
- confflags_VALGRIND += -Dvalgrind=true
+ confflags_VALGRIND += -Dvalgrind=enabled
endif
endif
@@ -96,7 +96,7 @@
# It's also required for building OpenCL support.
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64))
GALLIUM_DRIVERS += ,radeonsi,swrast
- confflags_GALLIUM += -Dllvm=true
+ confflags_GALLIUM += -Dllvm=enabled
confflags_GALLIUM += -Dgallium-opencl=icd
confflags_OSMESA = -Dosmesa=gallium
@@ -106,7 +106,7 @@
endif
else
DRI_DRIVERS += ,swrast
- confflags_GALLIUM += -Dllvm=false
+ confflags_GALLIUM += -Dllvm=disabled
confflags_OSMESA = -Dosmesa=classic
endif
@@ -117,18 +117,18 @@
endif
confflags_DIRECT_RENDERING = -Dglx-direct=true
- confflags_GBM = -Dgbm=true
+ confflags_GBM = -Dgbm=enabled
confflags_GALLIUM += -Dgallium-extra-hud=true
- confflags_GALLIUM += -Dgallium-vdpau=true
- confflags_GALLIUM += -Dlmsensors=true
+ confflags_GALLIUM += -Dgallium-vdpau=enabled
+ confflags_GALLIUM += -Dlmsensors=enabled
ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES)))
- confflags_GALLIUM += -Dgallium-va=true
+ confflags_GALLIUM += -Dgallium-va=enabled
endif
endif
confflags_EGL = -Dplatforms="$(EGL_PLATFORMS)"
-confflags_GLES = -Dgles1=false -Dgles2=true
+confflags_GLES = -Dgles1=disabled -Dgles2=enabled
confflags_GALLIUM += -Dgallium-drivers="$(GALLIUM_DRIVERS)"
confflags += \
@@ -137,8 +137,8 @@
-Ddri-search-path='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
-Dvulkan-drivers="$(VULKAN_DRIVERS)" \
-Dglvnd=true \
- -Dshared-glapi=true \
- -Dgallium-xvmc=false \
+ -Dshared-glapi=enabled \
+ -Dgallium-xvmc=disabled \
-Dgallium-omx=disabled \
-Db_ndebug=true \
-Dbuild-tests=true \
Reply to: