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

[Git][xorg-team/lib/mesa][debian-experimental] 2 commits: Build with gcc8 again.

Title: GitLab

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

Commits:

3 changed files:

Changes:

  • debian/changelog
    ... ... @@ -5,6 +5,8 @@ mesa (18.3.0~rc4-1) UNRELEASED; urgency=medium
    5 5 
       * libgl1-mesa-dri.install: Updated, etc/drirc is now
    6 6 
         usr/share/drirc.d/00-mesa-defaults.conf.
    7 7 
       * libegl-mesa0.symbols: Updated.
    8 
    +  * Build with gcc8 again.
    9 
    +  * control, rules: Build with meson.
    8 10
    9 11 
      -- Timo Aaltonen <tjaalton@debian.org>  Tue, 27 Nov 2018 15:46:54 +0200
    10 12

  • debian/control
    ... ... @@ -6,9 +6,7 @@ Uploaders: Andreas Boll <aboll@debian.org>
    6 6 
     Standards-Version: 4.1.4
    7 7 
     Build-Depends:
    8 8 
      debhelper (>= 11),
    9 
    - gcc-7,
    10 
    - g++-7,
    11 
    - cpp-7,
    9 
    + meson,
    12 10 
      quilt (>= 0.63-8.2~),
    13 11 
      pkg-config,
    14 12 
      libdrm-dev (>= 2.4.95) [!hurd-any],
    ... ... @@ -22,8 +20,6 @@ Build-Depends:
    22 20 
      libva-dev (>= 1.6.0) [linux-any kfreebsd-any],
    23 21 
      libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
    24 22 
      libvulkan-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el sparc64 x32],
    25 
    - autoconf,
    26 
    - automake,
    27 23 
      libtool,
    28 24 
      x11proto-dev,
    29 25 
      linux-libc-dev (>= 2.6.31) [linux-any],
    ... ... @@ -39,6 +35,7 @@ Build-Depends:
    39 35 
      libxshmfence-dev (>= 1.1),
    40 36 
      python,
    41 37 
      python-mako,
    38 
    + python3-mako,
    42 39 
      flex,
    43 40 
      bison,
    44 41 
      llvm-7-dev (>= 1:7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],

  • debian/rules
    ... ... @@ -10,9 +10,6 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
    10 10 
     DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
    11 11 
     DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
    12 12
    13 
    -export CC = gcc-7
    14 
    -export CXX = g++-7
    15 
    -
    16 13 
     ifeq (,$(filter $(DEB_HOST_ARCH), armhf sh3 sh4))
    17 14 
     buildflags = \
    18 15 
     	$(shell DEB_CFLAGS_MAINT_APPEND=-Wall DEB_CXXFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
    ... ... @@ -36,123 +33,122 @@ DRI_DRIVERS =
    36 33 
     GALLIUM_DRIVERS =
    37 34 
     VULKAN_DRIVERS =
    38 35
    39 
    -confflags_DRI3 = --disable-dri3
    36 
    +confflags_DRI3 = -Ddri3=false
    40 37
    41 38 
     # hurd doesn't do direct rendering
    42 39 
     ifeq ($(DEB_HOST_ARCH_OS), hurd)
    43 
    -	EGL_PLATFORMS = x11
    40 
    +	EGL_PLATFORMS = x11,
    44 41
    45 
    -	confflags_DIRECT_RENDERING = --disable-driglx-direct
    46 
    -	confflags_GBM = --disable-gbm
    47 
    -	DRI_DRIVERS = swrast
    42 
    +	confflags_DIRECT_RENDERING = -Dglx=xlib
    43 
    +	confflags_GBM = -Dgbm=false
    44 
    +	confflags_OSMESA = -Dosmesa=classic
    45 
    +	DRI_DRIVERS = swrast,
    48 46 
     	with_libva =
    49 47 
     else
    50 
    -	EGL_PLATFORMS = x11,surfaceless
    48 
    +	EGL_PLATFORMS = x11,surfaceless,
    51 49
    52 50 
       ifeq ($(DEB_HOST_ARCH_OS), linux)
    53 
    -	confflags_DRI3 = --enable-dri3
    51 
    +	confflags_DRI3 = -Ddri3=true
    54 52 
     	# Gallium drivers which require kernel support, not yet ported to non-Linux
    55 
    -	GALLIUM_DRIVERS += nouveau virgl
    53 
    +	GALLIUM_DRIVERS += nouveau, virgl,
    56 54
    57 55 
     	# Freedreno requires arm in addition
    58 56 
     	ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
    59 
    -		GALLIUM_DRIVERS += freedreno
    57 
    +		GALLIUM_DRIVERS += freedreno,
    60 58 
     	endif
    61 59
    62 60 
     	# etnaviv, imx, tegra, vc4 and v3d kernel support are only available on armhf and arm64
    63 61 
     	ifneq (,$(filter $(DEB_HOST_ARCH), armhf arm64))
    64 
    -		GALLIUM_DRIVERS += etnaviv imx tegra vc4 v3d
    62 
    +		GALLIUM_DRIVERS += etnaviv, imx, tegra, vc4, v3d,
    65 63 
     	endif
    66 64
    67 65 
     	ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
    68 
    -		GALLIUM_DRIVERS += svga
    66 
    +		GALLIUM_DRIVERS += svga,
    69 67 
     		# svga needs xa state tracker
    70 
    -		confflags_GALLIUM += --enable-xa
    71 
    -		VULKAN_DRIVERS += intel
    68 
    +		confflags_GALLIUM += -Dgallium-xa=true
    69 
    +		VULKAN_DRIVERS += intel,
    72 70 
     	endif
    73 71
    74 72 
     	# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
    75 
    -	EGL_PLATFORMS += wayland
    73 
    +	EGL_PLATFORMS += wayland,
    76 74
    77 75 
     	ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
    78 
    -		DRI_DRIVERS += nouveau
    76 
    +		DRI_DRIVERS += nouveau,
    79 77 
     	endif
    80 78 
       endif
    81 79
    82 
    -	EGL_PLATFORMS += drm
    80 
    +	EGL_PLATFORMS += drm,
    83 81
    84 82 
       # Build intel drivers on archs where libdrm-intel is installed
    85 83 
       ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32))
    86 
    -	DRI_DRIVERS += i915 i965
    84 
    +	DRI_DRIVERS += i915, i965,
    87 85 
       endif
    88 86
    89 87 
       ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
    90 
    -	DRI_DRIVERS += r200 radeon
    91 
    -	GALLIUM_DRIVERS += r600 r300
    88 
    +	DRI_DRIVERS += r200, r100
    89 
    +	GALLIUM_DRIVERS += r600, r300,
    92 90 
       endif
    93 91
    94 92 
       # LLVM is required for building r300g, radeonsi and llvmpipe drivers.
    95 93 
       # It's also required for building OpenCL support.
    96 94 
       ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el))
    97 
    -	GALLIUM_DRIVERS += radeonsi
    98 
    -	confflags_GALLIUM += --enable-llvm
    99 
    -	confflags_GALLIUM += --enable-opencl --enable-opencl-icd
    100 
    -	confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-7
    101 
    -	GALLIUM_DRIVERS += swrast
    95 
    +	GALLIUM_DRIVERS += radeonsi,
    96 
    +	confflags_GALLIUM += -Dllvm=true
    97 
    +	confflags_GALLIUM += -Dgallium-opencl=icd
    98 
    +	GALLIUM_DRIVERS += swrast,
    102 99
    103 100 
     	# nine makes sense only on archs that build wine
    104 101 
     	ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-i386 powerpc))
    105 
    -		confflags_GALLIUM += --enable-nine
    102 
    +		confflags_GALLIUM += -Dgallium-nine=true
    106 103 
     	endif
    107 104 
       else
    108 
    -	DRI_DRIVERS += swrast
    109 
    -	confflags_GALLIUM += --disable-llvm
    105 
    +	DRI_DRIVERS += swrast,
    106 
    +	confflags_GALLIUM += -Dllvm=false
    110 107 
       endif
    111 108
    112 109 
       # radv needs LLVM and the Vulkan loader, so only build on the subset of
    113 110 
       # arches where we have LLVM enabled and where the Vulkan loader is built.
    114 111 
       ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el))
    115 
    -	VULKAN_DRIVERS += radeon
    112 
    +	VULKAN_DRIVERS += amd,
    116 113 
       endif
    117 114
    118 
    -	confflags_DIRECT_RENDERING = --enable-driglx-direct
    119 
    -	confflags_GBM = --enable-gbm
    120 
    -	confflags_GALLIUM += --enable-vdpau
    121 
    -	confflags_GALLIUM += --enable-va
    122 
    -	confflags_GALLIUM += --enable-gallium-extra-hud
    123 
    -	confflags_GALLIUM += --enable-lmsensors
    115 
    +	confflags_DIRECT_RENDERING = -Dglx=dri
    116 
    +	confflags_GBM = -Dgbm=true
    117 
    +	confflags_GALLIUM += -Dgallium-vdpau=true
    118 
    +	confflags_GALLIUM += -Dgallium-va=true
    119 
    +	confflags_GALLIUM += -Dgallium-extra-hud=true
    120 
    +	confflags_GALLIUM += -Dlmsensors=true
    121 
    +	confflags_OSMESA = -Dosmesa=gallium
    124 122 
     	with_libva = ,libva
    125 123 
     endif
    126 124
    127 125 
     # Disable assembly usage on x32 otherwise Mesa defaults to x86_64 assembly
    128 126 
     # which doesn't work on x32 (see #758094)
    129 127 
     ifneq (,$(filter $(DEB_HOST_ARCH), x32))
    130 
    -	confflags += --disable-asm
    128 
    +	confflags += -Dasm=false
    131 129 
     endif
    132 130
    133 
    -confflags_EGL = --with-platforms="$(EGL_PLATFORMS)"
    134 
    -confflags_GLES = --disable-gles1 --enable-gles2
    135 
    -confflags_GALLIUM += --with-gallium-drivers="$(GALLIUM_DRIVERS)"
    131 
    +confflags_EGL = -Dplatforms="$(EGL_PLATFORMS)"
    132 
    +confflags_GLES = -Dgles1=false -Dgles2=true
    133 
    +confflags_GALLIUM += -Dgallium-drivers="$(GALLIUM_DRIVERS)"
    136 134
    137 135 
     confflags += \
    138 
    -	--enable-dri \
    139 
    -	--with-dri-drivers="$(DRI_DRIVERS)" \
    140 
    -	--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
    141 
    -	--with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
    142 
    -	--with-vulkan-drivers="$(VULKAN_DRIVERS)" \
    143 
    -	--enable-libglvnd \
    144 
    -	--enable-osmesa \
    145 
    -	--enable-glx-tls \
    146 
    -	--enable-shared-glapi \
    147 
    -	--disable-xvmc \
    148 
    -	--disable-omx-bellagio \
    136 
    +	-Ddri-drivers="$(DRI_DRIVERS)" \
    137 
    +	-Ddri-drivers-path=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
    138 
    +	-Ddri-search-path='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
    139 
    +	-Dvulkan-drivers="$(VULKAN_DRIVERS)" \
    140 
    +	-Dglvnd=true \
    141 
    +	-Dosmesa=classic \
    142 
    +	-Dshared-glapi=true \
    143 
    +	-Dgallium-xvmc=false \
    144 
    +	-Dgallium-omx=disabled \
    149 145 
     	$(confflags_DIRECT_RENDERING) \
    150 146 
     	$(confflags_GBM) \
    151 147 
     	$(confflags_DRI3) \
    152 148 
     	$(confflags_EGL) \
    153 149 
     	$(confflags_GALLIUM) \
    154 150 
     	$(confflags_GLES) \
    155 
    -	$(buildflags)
    151 
    +	$(confflags_OSMESA)
    156 152
    157 153 
     override_dh_clean:
    158 154 
     	rm -rf .pc
    ... ... @@ -161,18 +157,18 @@ override_dh_clean:
    161 157 
     	rm -rf $$(find -name Makefile.in)
    162 158 
     	rm -rf bin/install-sh bin/ltmain.sh
    163 159 
     	for file in debian/*.in; do rm -f $${file%%.in}; done
    164 
    -	rm -f src/amd/vulkan/*.pyc
    165 
    -	rm -f src/compiler/nir/*.pyc
    166 
    -	rm -f src/egl/generate/*.pyc
    167 
    -	rm -f src/intel/vulkan/*.pyc
    168 
    -	rm -f src/mapi/glapi/gen/*.pyc
    169 
    -	rm -f src/mesa/main/*.pyc
    170 
    -	rm -f src/gallium/auxiliary/util/*.pyc
    160 
    +	rm -rf src/amd/vulkan/*.pyc src/amd/vulkan/__pycache__/
    161 
    +	rm -rf src/compiler/nir/*.pyc src/compiler/nir/__pycache__/
    162 
    +	rm -rf src/egl/generate/*.pyc src/egl/generate/__pycache__/
    163 
    +	rm -rf src/gallium/auxiliary/util/*.pyc src/gallium/auxiliary/util/__pycache__/
    164 
    +	rm -rf src/intel/vulkan/*.pyc src/intel/vulkan/__pycache__/
    165 
    +	rm -rf src/mapi/glapi/gen/*.pyc src/mapi/glapi/gen/__pycache__/
    166 
    +	rm -rf src/mesa/main/*.pyc src/mesa/main/__pycache__/
    171 167
    172 168 
     	dh_clean
    173 169
    174 170 
     override_dh_auto_configure:
    175 
    -	dh_auto_configure -- \
    171 
    +	$(buildflags) dh_auto_configure -- \
    176 172 
     		$(confflags)
    177 173
    178 174 
     override_dh_auto_install:
    ... ... @@ -248,7 +244,8 @@ override_dh_makeshlibs:
    248 244
    249 245 
     %:
    250 246 
     	dh $@ --with quilt$(with_libva) \
    251 
    -		--builddirectory=build/
    247 
    +		--builddirectory=build/ \
    248 
    +		--buildsystem=meson
    252 249
    253 250 
     # For maintainer use only, generate a tarball:
    254 251 
     gentarball: SOURCE=mesa

    • —
    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: