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

[Git][xorg-team/lib/mesa][debian-experimental] 4 commits: control, rules: Drop llvm support from kfreebsd, as llvm isn't built there.

Title: GitLab

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

Commits:

3 changed files:

Changes:

  • debian/changelog
    1 1 
     mesa (20.3.0-2) UNRELEASED; urgency=medium
    2 2
    3 3 
       * rules: Fix the name of the broadcom vulkan driver.
    4 
    +  * control, rules: Drop llvm support from kfreebsd, as llvm isn't built
    5 
    +    there.
    6 
    +  * rules: Enable gallium swrast (softpipe) and OSMesa everywhere, as
    7 
    +    they're not actually tied to llvm being available.
    8 
    +  * rules: Move common settings for !hurd to the top.
    9 
    +  * rules: Use a better method to build the arrays of drivers, thanks
    10 
    +    Witold Baryluk! (Closes: #972736)
    4 11
    5 12 
      -- Timo Aaltonen <tjaalton@debian.org>  Tue, 08 Dec 2020 09:03:41 +0200
    6 13

  • debian/control
    ... ... @@ -43,10 +43,10 @@ Build-Depends:
    43 43 
      libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    44 44 
      libwayland-dev (>= 1.15.0) [linux-any],
    45 45 
      libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
    46 
    - llvm-11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    47 
    - libclang-11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    48 
    - libclang-cpp11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    49 
    - libclc-dev (>= 0.2.0+git20190827-7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    46 
    + llvm-11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    47 
    + libclang-11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    48 
    + libclang-cpp11-dev (>= 1:11.0.0~) [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    49 
    + libclc-dev (>= 0.2.0+git20190827-7~) [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    50 50 
      wayland-protocols (>= 1.9),
    51 51 
      zlib1g-dev,
    52 52 
      libglvnd-dev (>= 1.3.2),
    ... ... @@ -87,7 +87,7 @@ Description: X acceleration library -- development files
    87 87
    88 88 
     Package: libd3dadapter9-mesa
    89 89 
     Section: libs
    90 
    -Architecture: amd64 arm64 armel armhf i386 kfreebsd-i386 powerpc
    90 
    +Architecture: amd64 arm64 armel armhf i386 powerpc
    91 91 
     Depends:
    92 92 
      ${shlibs:Depends},
    93 93 
      ${misc:Depends},
    ... ... @@ -101,7 +101,7 @@ Description: state-tracker for Direct3D9
    101 101
    102 102 
     Package: libd3dadapter9-mesa-dev
    103 103 
     Section: libdevel
    104 
    -Architecture: amd64 arm64 armel armhf i386 kfreebsd-i386 powerpc
    104 
    +Architecture: amd64 arm64 armel armhf i386 powerpc
    105 105 
     Depends:
    106 106 
      libd3dadapter9-mesa (= ${binary:Version}),
    107 107 
      libudev1 [linux-any],
    ... ... @@ -412,7 +412,7 @@ Description: Mesa Vulkan graphics drivers
    412 412
    413 413 
     Package: mesa-opencl-icd
    414 414 
     Section: libs
    415 
    -Architecture: amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
    415 
    +Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
    416 416 
     Pre-Depends: ${misc:Pre-Depends}
    417 417 
     Depends:
    418 418 
      libclc-r600 (>= 0.2.0+git20180312-1~),

  • debian/rules
    ... ... @@ -32,21 +32,25 @@ endif
    32 32
    33 33 
     DRI_DRIVERS =
    34 34 
     EGL_PLATFORMS = x11
    35 
    -GALLIUM_DRIVERS =
    35 
    +GALLIUM_DRIVERS = swrast
    36 36 
     VULKAN_DRIVERS =
    37 37
    38 38 
     confflags_DRI3 = -Ddri3=disabled
    39 
    +confflags_OSMESA =  -Dosmesa=gallium
    39 40
    40 41 
     # hurd doesn't do direct rendering
    41 42 
     ifeq ($(DEB_HOST_ARCH_OS), hurd)
    42 
    -	DRI_DRIVERS = swrast
    43 
    -
    44 43 
     	confflags_DIRECT_RENDERING = -Dglx-direct=false
    45 44 
     	confflags_GBM = -Dgbm=disabled
    46 
    -	confflags_OSMESA = -Dosmesa=classic
    47 45 
     else
    48 
    -	DRI_DRIVERS += r200,r100
    49 
    -	GALLIUM_DRIVERS += r600,r300
    46 
    +	DRI_DRIVERS += r100 r200
    47 
    +	GALLIUM_DRIVERS += r300 r600
    48 
    +
    49 
    +	confflags_DIRECT_RENDERING = -Dglx-direct=true
    50 
    +	confflags_GBM = -Dgbm=enabled
    51 
    +	confflags_GALLIUM += -Dgallium-extra-hud=true
    52 
    +	confflags_GALLIUM += -Dgallium-vdpau=enabled
    53 
    +	confflags_GALLIUM += -Dlmsensors=enabled
    50 54
    51 55 
       # radv needs LLVM and the Vulkan loader, so only build on the subset of
    52 56 
       # arches where we have LLVM enabled and where the Vulkan loader is built.
    ... ... @@ -56,26 +60,26 @@ else
    56 60
    57 61 
       ifeq ($(DEB_HOST_ARCH_OS), linux)
    58 62 
     	confflags_DRI3 = -Ddri3=true
    59 
    -	DRI_DRIVERS += ,nouveau
    63 
    +	DRI_DRIVERS += nouveau
    60 64 
     	# Gallium drivers which require kernel support, not yet ported to non-Linux
    61 
    -	GALLIUM_DRIVERS += ,nouveau,virgl
    65 
    +	GALLIUM_DRIVERS += nouveau virgl
    62 66
    63 67 
     	# Freedreno requires arm in addition
    64 68 
     	ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
    65 
    -		GALLIUM_DRIVERS += ,freedreno
    69 
    +		GALLIUM_DRIVERS += freedreno
    66 70 
     	endif
    67 71
    68 72 
     	# etnaviv, kmsro, tegra, vc4 and v3d kernel support are only available on armhf and arm64
    69 73 
     	ifneq (,$(filter $(DEB_HOST_ARCH), armhf arm64))
    70 
    -		GALLIUM_DRIVERS += ,etnaviv,kmsro,lima,panfrost,tegra,vc4,v3d
    71 
    -		VULKAN_DRIVERS += ,broadcom
    74 
    +		GALLIUM_DRIVERS += etnaviv kmsro lima panfrost tegra vc4 v3d
    75 
    +		VULKAN_DRIVERS += broadcom
    72 76 
     	endif
    73 77
    74 78 
     	ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
    75 
    -		GALLIUM_DRIVERS += ,svga
    79 
    +		GALLIUM_DRIVERS += svga
    76 80 
     		# svga needs xa state tracker
    77 81 
     		confflags_GALLIUM += -Dgallium-xa=enabled
    78 
    -		VULKAN_DRIVERS += ,intel
    82 
    +		VULKAN_DRIVERS += intel
    79 83 
     	endif
    80 84
    81 85 
     	# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
    ... ... @@ -88,55 +92,57 @@ else
    88 92
    89 93 
       # Build intel drivers on archs where libdrm-intel is installed
    90 94 
       ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32))
    91 
    -	DRI_DRIVERS += ,i915, i965
    92 
    -	GALLIUM_DRIVERS += ,iris
    95 
    +	DRI_DRIVERS += i915 i965
    96 
    +	GALLIUM_DRIVERS += iris
    93 97 
       endif
    94 98
    95 99 
       # LLVM is required for building r300g, radeonsi and llvmpipe drivers.
    96 100 
       # It's also required for building OpenCL support.
    97 
    -  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64))
    98 
    -	GALLIUM_DRIVERS += ,radeonsi,swrast
    101 
    +  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64))
    102 
    +	GALLIUM_DRIVERS += radeonsi
    99 103 
     	confflags_GALLIUM += -Dllvm=enabled
    100 104 
     	confflags_GALLIUM += -Dgallium-opencl=icd
    101 
    -	confflags_OSMESA = -Dosmesa=gallium
    102 105
    103 106 
     	# nine makes sense only on archs that build wine
    104 
    -	ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-i386 powerpc))
    107 
    +	ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 powerpc))
    105 108 
     		confflags_GALLIUM += -Dgallium-nine=true
    106 109 
     	endif
    107 110 
       else
    108 
    -	DRI_DRIVERS += ,swrast
    109 111 
     	confflags_GALLIUM += -Dllvm=disabled
    110 
    -	confflags_OSMESA = -Dosmesa=classic
    111 112 
       endif
    112 113
    113 114 
       # build vulkan layers where Vulkan loader is available
    114 115 
       ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64 x32))
    115 
    -	GALLIUM_DRIVERS += ,zink
    116 
    +	GALLIUM_DRIVERS += zink
    116 117 
     	confflags_VULKAN += -Dvulkan-device-select-layer=true
    117 118 
     	confflags_VULKAN += -Dvulkan-overlay-layer=true
    118 119 
       endif
    119 120
    120 
    -	confflags_DIRECT_RENDERING = -Dglx-direct=true
    121 
    -	confflags_GBM = -Dgbm=enabled
    122 
    -	confflags_GALLIUM += -Dgallium-extra-hud=true
    123 
    -	confflags_GALLIUM += -Dgallium-vdpau=enabled
    124 
    -	confflags_GALLIUM += -Dlmsensors=enabled
    125 
    -
    126 121 
       ifeq (,$(filter pkg.mesa.nolibva,$(DEB_BUILD_PROFILES)))
    127 
    -        confflags_GALLIUM += -Dgallium-va=enabled
    122 
    +	confflags_GALLIUM += -Dgallium-va=enabled
    128 123 
       endif
    129 124 
     endif
    130 125
    126 
    +
    127 
    +empty:=
    128 
    +space := $(empty) $(empty)
    129 
    +comma := ,
    130 
    +DRI_DRIVERS := $(patsubst %,'%',$(DRI_DRIVERS))
    131 
    +DRI_DRIVERS_LIST := $(subst $(space),$(comma),$(DRI_DRIVERS))
    132 
    +GALLIUM_DRIVERS := $(patsubst %,'%',$(GALLIUM_DRIVERS))
    133 
    +GALLIUM_DRIVERS_LIST := $(subst $(space),$(comma),$(GALLIUM_DRIVERS))
    134 
    +VULKAN_DRIVERS := $(patsubst %,'%',$(VULKAN_DRIVERS))
    135 
    +VULKAN_DRIVERS_LIST := $(subst $(space),$(comma),$(VULKAN_DRIVERS))
    136 
    +
    131 137 
     confflags_EGL = -Dplatforms="$(EGL_PLATFORMS)"
    132 138 
     confflags_GLES = -Dgles1=disabled -Dgles2=enabled
    133 
    -confflags_GALLIUM += -Dgallium-drivers="$(GALLIUM_DRIVERS)"
    139 
    +confflags_GALLIUM += -Dgallium-drivers="[$(GALLIUM_DRIVERS_LIST)]"
    134 140
    135 141 
     confflags += \
    136 
    -	-Ddri-drivers="$(DRI_DRIVERS)" \
    142 
    +	-Ddri-drivers="[$(DRI_DRIVERS_LIST)]" \
    137 143 
     	-Ddri-drivers-path=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
    138 144 
     	-Ddri-search-path='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
    139 
    -	-Dvulkan-drivers="$(VULKAN_DRIVERS)" \
    145 
    +	-Dvulkan-drivers="[$(VULKAN_DRIVERS_LIST)]" \
    140 146 
     	-Dglvnd=true \
    141 147 
     	-Dshared-glapi=enabled \
    142 148 
     	-Dgallium-xvmc=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: