[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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

Title: GitLab

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

Commits:

4 changed files:

Changes:

  • debian/changelog
    1 
    -mesa (18.3.0~rc5-1) UNRELEASED; urgency=medium
    1 
    +mesa (18.3.0~rc5-1) experimental; urgency=medium
    2 2
    3 3 
       * New upstream release candidate.
    4 4 
       * rules: Fix a typo in list of dri drivers.
    5 
    +  * rules, meson-add-glx-direct-toggle.diff: Fix build on hurd.
    6 
    +  * rules: Drop extra -Dosmesa from confflags.
    7 
    +  * rules: Don't build gallium nouveau on s390x.
    8 
    +  * rules: Classic osmesa needs classic swrast, and since it's not enabled
    9 
    +    where llvmpipe is enabled, enable gallium osmesa there.
    5 10
    6 
    - -- Timo Aaltonen <tjaalton@debian.org>  Thu, 29 Nov 2018 17:04:13 +0200
    11 
    + -- Timo Aaltonen <tjaalton@debian.org>  Fri, 30 Nov 2018 11:45:45 +0200
    7 12
    8 13 
     mesa (18.3.0~rc4-1) experimental; urgency=medium
    9 14

  • debian/patches/meson-add-glx-direct-toggle.diff
    1 
    +diff --git a/meson.build b/meson.build
    2 
    +index 33f4e5ad3cf..90cc0bb3af2 100644
    3 
    +--- a/meson.build
    4 
    ++++ b/meson.build
    5 
    +@@ -53,6 +53,7 @@ with_tests = get_option('build-tests')
    6 
    + with_valgrind = get_option('valgrind')
    7 
    + with_libunwind = get_option('libunwind')
    8 
    + with_asm = get_option('asm')
    9 
    ++with_glx_direct= get_option('glx-direct')
    10 
    + with_glx_read_only_text = get_option('glx-read-only-text')
    11 
    + with_osmesa = get_option('osmesa')
    12 
    + with_swr_arches = get_option('swr-arches')
    13 
    +@@ -370,9 +371,6 @@ if with_glvnd
    14 
    +   endif
    15 
    + endif
    16 
    +
    17 
    +-# TODO: toggle for this
    18 
    +-with_glx_direct = true
    19 
    +-
    20 
    + if with_vulkan_icd_dir == ''
    21 
    +   with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
    22 
    + endif
    23 
    +diff --git a/meson_options.txt b/meson_options.txt
    24 
    +index a1d5ab0e185..4d5f36bf33d 100644
    25 
    +--- a/meson_options.txt
    26 
    ++++ b/meson_options.txt
    27 
    +@@ -205,6 +205,12 @@ option(
    28 
    +   choices : ['auto', 'disabled', 'dri', 'xlib', 'gallium-xlib'],
    29 
    +   description : 'Build support for GLX platform'
    30 
    + )
    31 
    ++option(
    32 
    ++  'glx-direct',
    33 
    ++  type : 'boolean',
    34 
    ++  value : 'true',
    35 
    ++  description : 'Enable direct rendering in GLX and EGL for DRI'
    36 
    ++)
    37 
    + option(
    38 
    +   'egl',
    39 
    +   type : 'combo',

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

  • debian/rules
    ... ... @@ -39,7 +39,7 @@ confflags_DRI3 = -Ddri3=false
    39 39 
     ifeq ($(DEB_HOST_ARCH_OS), hurd)
    40 40 
     	EGL_PLATFORMS = x11,
    41 41
    42 
    -	confflags_DIRECT_RENDERING = -Dglx=xlib
    42 
    +	confflags_DIRECT_RENDERING = -Dglx-direct=false
    43 43 
     	confflags_GBM = -Dgbm=false
    44 44 
     	confflags_OSMESA = -Dosmesa=classic
    45 45 
     	DRI_DRIVERS = swrast,
    ... ... @@ -50,7 +50,7 @@ else
    50 50 
       ifeq ($(DEB_HOST_ARCH_OS), linux)
    51 51 
     	confflags_DRI3 = -Ddri3=true
    52 52 
     	# Gallium drivers which require kernel support, not yet ported to non-Linux
    53 
    -	GALLIUM_DRIVERS += nouveau, virgl,
    53 
    +	GALLIUM_DRIVERS += virgl,
    54 54
    55 55 
     	# Freedreno requires arm in addition
    56 56 
     	ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
    ... ... @@ -74,6 +74,7 @@ else
    74 74
    75 75 
     	ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
    76 76 
     		DRI_DRIVERS += nouveau,
    77 
    +		GALLIUM_DRIVERS += nouveau,
    77 78 
     	endif
    78 79 
       endif
    79 80
    ... ... @@ -92,10 +93,10 @@ else
    92 93 
       # LLVM is required for building r300g, radeonsi and llvmpipe drivers.
    93 94 
       # It's also required for building OpenCL support.
    94 95 
       ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el))
    95 
    -	GALLIUM_DRIVERS += radeonsi,
    96 
    +	GALLIUM_DRIVERS += radeonsi, swrast
    96 97 
     	confflags_GALLIUM += -Dllvm=true
    97 98 
     	confflags_GALLIUM += -Dgallium-opencl=icd
    98 
    -	GALLIUM_DRIVERS += swrast,
    99 
    +	confflags_OSMESA = -Dosmesa=gallium
    99 100
    100 101 
     	# nine makes sense only on archs that build wine
    101 102 
     	ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-i386 powerpc))
    ... ... @@ -104,6 +105,7 @@ else
    104 105 
       else
    105 106 
     	DRI_DRIVERS += swrast,
    106 107 
     	confflags_GALLIUM += -Dllvm=false
    108 
    +	confflags_OSMESA = -Dosmesa=classic
    107 109 
       endif
    108 110
    109 111 
       # radv needs LLVM and the Vulkan loader, so only build on the subset of
    ... ... @@ -112,13 +114,12 @@ else
    112 114 
     	VULKAN_DRIVERS += amd,
    113 115 
       endif
    114 116
    115 
    -	confflags_DIRECT_RENDERING = -Dglx=dri
    117 
    +	confflags_DIRECT_RENDERING = -Dglx-direct=true
    116 118 
     	confflags_GBM = -Dgbm=true
    117 119 
     	confflags_GALLIUM += -Dgallium-vdpau=true
    118 120 
     	confflags_GALLIUM += -Dgallium-va=true
    119 121 
     	confflags_GALLIUM += -Dgallium-extra-hud=true
    120 122 
     	confflags_GALLIUM += -Dlmsensors=true
    121 
    -	confflags_OSMESA = -Dosmesa=gallium
    122 123 
     	with_libva = ,libva
    123 124 
     endif
    124 125
    ... ... @@ -138,7 +139,6 @@ confflags += \
    138 139 
     	-Ddri-search-path='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
    139 140 
     	-Dvulkan-drivers="$(VULKAN_DRIVERS)" \
    140 141 
     	-Dglvnd=true \
    141 
    -	-Dosmesa=classic \
    142 142 
     	-Dshared-glapi=true \
    143 143 
     	-Dgallium-xvmc=false \
    144 144 
     	-Dgallium-omx=disabled \

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: