[Git][xorg-team/lib/mesa][debian-experimental] 5 commits: rules, meson-add-glx-direct-toggle.diff: Fix build on hurd.

[Timo Aaltonen]

Timo Aaltonen pushed to branch debian-experimental at X Strike Force / lib / mesa


Commits:
8c5f9835 by Timo Aaltonen at 2018-11-30T09:09:56Z
rules, meson-add-glx-direct-toggle.diff: Fix build on hurd.

- - - - -
4cdf5bba by Timo Aaltonen at 2018-11-30T09:31:03Z
rules: Drop extra -Dosmesa from confflags.

- - - - -
57279553 by Timo Aaltonen at 2018-11-30T09:35:38Z
rules: Don't build gallium nouveau on s390x.

- - - - -
284b3af8 by Timo Aaltonen at 2018-11-30T09:45:10Z
rules: Classic osmesa needs classic swrast.

and since it's not enabled where llvmpipe is enabled,
enable gallium osmesa there.

- - - - -
cf7962bb by Timo Aaltonen at 2018-11-30T10:00:38Z
release to experimental

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/meson-add-glx-direct-toggle.diff
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,14 @@
-mesa (18.3.0~rc5-1) UNRELEASED; urgency=medium
+mesa (18.3.0~rc5-1) experimental; urgency=medium

* New upstream release candidate.
* rules: Fix a typo in list of dri drivers.
+ * rules, meson-add-glx-direct-toggle.diff: Fix build on hurd.
+ * rules: Drop extra -Dosmesa from confflags.
+ * rules: Don't build gallium nouveau on s390x.
+ * rules: Classic osmesa needs classic swrast, and since it's not enabled
+ where llvmpipe is enabled, enable gallium osmesa there.

- -- Timo Aaltonen <***@debian.org> Thu, 29 Nov 2018 17:04:13 +0200
+ -- Timo Aaltonen <***@debian.org> Fri, 30 Nov 2018 11:45:45 +0200

mesa (18.3.0~rc4-1) experimental; urgency=medium



=====================================
debian/patches/meson-add-glx-direct-toggle.diff
=====================================
@@ -0,0 +1,39 @@
+diff --git a/meson.build b/meson.build
+index 33f4e5ad3cf..90cc0bb3af2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -53,6 +53,7 @@ with_tests = get_option('build-tests')
+ with_valgrind = get_option('valgrind')
+ with_libunwind = get_option('libunwind')
+ with_asm = get_option('asm')
++with_glx_direct= get_option('glx-direct')
+ with_glx_read_only_text = get_option('glx-read-only-text')
+ with_osmesa = get_option('osmesa')
+ with_swr_arches = get_option('swr-arches')
+@@ -370,9 +371,6 @@ if with_glvnd
+ endif
+ endif
+
+-# TODO: toggle for this
+-with_glx_direct = true
+-
+ if with_vulkan_icd_dir == ''
+ with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index a1d5ab0e185..4d5f36bf33d 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -205,6 +205,12 @@ option(
+ choices : ['auto', 'disabled', 'dri', 'xlib', 'gallium-xlib'],
+ description : 'Build support for GLX platform'
+ )
++option(
++ 'glx-direct',
++ type : 'boolean',
++ value : 'true',
++ description : 'Enable direct rendering in GLX and EGL for DRI'
++)
+ option(
+ 'egl',
+ type : 'combo',


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
07_gallium-fix-build-failure-on-powerpcspe.diff
+meson-add-glx-direct-toggle.diff


=====================================
debian/rules
=====================================
@@ -39,7 +39,7 @@ confflags_DRI3 = -Ddri3=false
ifeq ($(DEB_HOST_ARCH_OS), hurd)
EGL_PLATFORMS = x11,

- confflags_DIRECT_RENDERING = -Dglx=xlib
+ confflags_DIRECT_RENDERING = -Dglx-direct=false
confflags_GBM = -Dgbm=false
confflags_OSMESA = -Dosmesa=classic
DRI_DRIVERS = swrast,
@@ -50,7 +50,7 @@ else
ifeq ($(DEB_HOST_ARCH_OS), linux)
confflags_DRI3 = -Ddri3=true
# Gallium drivers which require kernel support, not yet ported to non-Linux
- GALLIUM_DRIVERS += nouveau, virgl,
+ GALLIUM_DRIVERS += virgl,

# Freedreno requires arm in addition
ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
@@ -74,6 +74,7 @@ else

ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += nouveau,
+ GALLIUM_DRIVERS += nouveau,
endif
endif

@@ -92,10 +93,10 @@ else
# LLVM is required for building r300g, radeonsi and llvmpipe drivers.
# It's also required for building OpenCL support.
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el))
- GALLIUM_DRIVERS += radeonsi,
+ GALLIUM_DRIVERS += radeonsi, swrast
confflags_GALLIUM += -Dllvm=true
confflags_GALLIUM += -Dgallium-opencl=icd
- GALLIUM_DRIVERS += swrast,
+ confflags_OSMESA = -Dosmesa=gallium

# nine makes sense only on archs that build wine
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-i386 powerpc))
@@ -104,6 +105,7 @@ else
else
DRI_DRIVERS += swrast,
confflags_GALLIUM += -Dllvm=false
+ confflags_OSMESA = -Dosmesa=classic
endif

# radv needs LLVM and the Vulkan loader, so only build on the subset of
@@ -112,13 +114,12 @@ else
VULKAN_DRIVERS += amd,
endif

- confflags_DIRECT_RENDERING = -Dglx=dri
+ confflags_DIRECT_RENDERING = -Dglx-direct=true
confflags_GBM = -Dgbm=true
confflags_GALLIUM += -Dgallium-vdpau=true
confflags_GALLIUM += -Dgallium-va=true
confflags_GALLIUM += -Dgallium-extra-hud=true
confflags_GALLIUM += -Dlmsensors=true
- confflags_OSMESA = -Dosmesa=gallium
with_libva = ,libva
endif

@@ -138,7 +139,6 @@ confflags += \
-Ddri-search-path='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
-Dvulkan-drivers="$(VULKAN_DRIVERS)" \
-Dglvnd=true \
- -Dosmesa=classic \
-Dshared-glapi=true \
-Dgallium-xvmc=false \
-Dgallium-omx=disabled \



View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/compare/9d4115421c2ce7b0e94104789e2a8765d520eb6f...cf7962bba22e00e00293743296874c518955153d