Timo Aaltonen · Timo Aaltonen · f21ebecf · f21ebecf · f21ebecf
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mesa (18.3.0~rc4-1) UNRELEASED; urgency=medium
  * libgl1-mesa-dri.install: Updated, etc/drirc is now
    usr/share/drirc.d/00-mesa-defaults.conf.
  * libegl-mesa0.symbols: Updated.
+  * Build with gcc8 again.
+  * control, rules: Build with meson.

 -- Timo Aaltonen <tjaalton@debian.org>  Tue, 27 Nov 2018 15:46:54 +0200


--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,7 @@ Uploaders: Andreas Boll <aboll@debian.org>
 Standards-Version: 4.1.4
 Build-Depends:
 debhelper (>= 11),
- gcc-7,
- g++-7,
- cpp-7,
+ meson,
 quilt (>= 0.63-8.2~),
 pkg-config,
 libdrm-dev (>= 2.4.95) [!hurd-any],
@@ -22,8 +20,6 @@ Build-Depends:
 libva-dev (>= 1.6.0) [linux-any kfreebsd-any],
 libvdpau-dev (>= 1.1.1) [linux-any kfreebsd-any],
 libvulkan-dev [amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el sparc64 x32],
- autoconf,
- automake,
 libtool,
 x11proto-dev,
 linux-libc-dev (>= 2.6.31) [linux-any],
@@ -39,6 +35,7 @@ Build-Depends:
 libxshmfence-dev (>= 1.1),
 python,
 python-mako,
+ python3-mako,
 flex,
 bison,
 llvm-7-dev (>= 1:7~) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el],

--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,6 @@ DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)

-export CC = gcc-7
-export CXX = g++-7
-
 ifeq (,$(filter $(DEB_HOST_ARCH), armhf sh3 sh4))
 buildflags = \
 	$(shell DEB_CFLAGS_MAINT_APPEND=-Wall DEB_CXXFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
@@ -36,123 +33,122 @@ DRI_DRIVERS =
 GALLIUM_DRIVERS =
 VULKAN_DRIVERS =

-confflags_DRI3 = --disable-dri3
+confflags_DRI3 = -Ddri3=false

 # hurd doesn't do direct rendering
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
-	EGL_PLATFORMS = x11
+	EGL_PLATFORMS = x11,

-	confflags_DIRECT_RENDERING = --disable-driglx-direct
-	confflags_GBM = --disable-gbm
-	DRI_DRIVERS = swrast
+	confflags_DIRECT_RENDERING = -Dglx=xlib
+	confflags_GBM = -Dgbm=false
+	confflags_OSMESA = -Dosmesa=classic
+	DRI_DRIVERS = swrast,
 	with_libva = 
 else
-	EGL_PLATFORMS = x11,surfaceless
+	EGL_PLATFORMS = x11,surfaceless,

  ifeq ($(DEB_HOST_ARCH_OS), linux)
-	confflags_DRI3 = --enable-dri3
+	confflags_DRI3 = -Ddri3=true
 	# Gallium drivers which require kernel support, not yet ported to non-Linux
-	GALLIUM_DRIVERS += nouveau virgl
+	GALLIUM_DRIVERS += nouveau, virgl,

 	# Freedreno requires arm in addition
 	ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
-		GALLIUM_DRIVERS += freedreno
+		GALLIUM_DRIVERS += freedreno,
 	endif

 	# etnaviv, imx, tegra, vc4 and v3d kernel support are only available on armhf and arm64
 	ifneq (,$(filter $(DEB_HOST_ARCH), armhf arm64))
-		GALLIUM_DRIVERS += etnaviv imx tegra vc4 v3d
+		GALLIUM_DRIVERS += etnaviv, imx, tegra, vc4, v3d,
 	endif

 	ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
-		GALLIUM_DRIVERS += svga
+		GALLIUM_DRIVERS += svga,
 		# svga needs xa state tracker
-		confflags_GALLIUM += --enable-xa
-		VULKAN_DRIVERS += intel
+		confflags_GALLIUM += -Dgallium-xa=true
+		VULKAN_DRIVERS += intel,
 	endif

 	# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
-	EGL_PLATFORMS += wayland
+	EGL_PLATFORMS += wayland,

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

-	EGL_PLATFORMS += drm
+	EGL_PLATFORMS += drm,

  # Build intel drivers on archs where libdrm-intel is installed
  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32))
-	DRI_DRIVERS += i915 i965
+	DRI_DRIVERS += i915, i965,
  endif

  ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
-	DRI_DRIVERS += r200 radeon
-	GALLIUM_DRIVERS += r600 r300
+	DRI_DRIVERS += r200, r100
+	GALLIUM_DRIVERS += r600, r300,
  endif

  # 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
-	confflags_GALLIUM += --enable-llvm
-	confflags_GALLIUM += --enable-opencl --enable-opencl-icd
-	confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-7
-	GALLIUM_DRIVERS += swrast
+	GALLIUM_DRIVERS += radeonsi,
+	confflags_GALLIUM += -Dllvm=true
+	confflags_GALLIUM += -Dgallium-opencl=icd
+	GALLIUM_DRIVERS += swrast,

 	# nine makes sense only on archs that build wine
 	ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 kfreebsd-i386 powerpc))
-		confflags_GALLIUM += --enable-nine
+		confflags_GALLIUM += -Dgallium-nine=true
 	endif
  else
-	DRI_DRIVERS += swrast
-	confflags_GALLIUM += --disable-llvm
+	DRI_DRIVERS += swrast,
+	confflags_GALLIUM += -Dllvm=false
  endif

  # radv needs LLVM and the Vulkan loader, so only build on the subset of
  # arches where we have LLVM enabled and where the Vulkan loader is built.
  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 sparc64 ppc64el))
-	VULKAN_DRIVERS += radeon
+	VULKAN_DRIVERS += amd,
  endif

-	confflags_DIRECT_RENDERING = --enable-driglx-direct
-	confflags_GBM = --enable-gbm
-	confflags_GALLIUM += --enable-vdpau
-	confflags_GALLIUM += --enable-va
-	confflags_GALLIUM += --enable-gallium-extra-hud
-	confflags_GALLIUM += --enable-lmsensors
+	confflags_DIRECT_RENDERING = -Dglx=dri
+	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

 # Disable assembly usage on x32 otherwise Mesa defaults to x86_64 assembly
 # which doesn't work on x32 (see #758094)
 ifneq (,$(filter $(DEB_HOST_ARCH), x32))
-	confflags += --disable-asm
+	confflags += -Dasm=false
 endif

-confflags_EGL = --with-platforms="$(EGL_PLATFORMS)"
-confflags_GLES = --disable-gles1 --enable-gles2
-confflags_GALLIUM += --with-gallium-drivers="$(GALLIUM_DRIVERS)"
+confflags_EGL = -Dplatforms="$(EGL_PLATFORMS)"
+confflags_GLES = -Dgles1=false -Dgles2=true
+confflags_GALLIUM += -Dgallium-drivers="$(GALLIUM_DRIVERS)"

 confflags += \
-	--enable-dri \
-	--with-dri-drivers="$(DRI_DRIVERS)" \
-	--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
-	--with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
-	--with-vulkan-drivers="$(VULKAN_DRIVERS)" \
-	--enable-libglvnd \
-	--enable-osmesa \
-	--enable-glx-tls \
-	--enable-shared-glapi \
-	--disable-xvmc \
-	--disable-omx-bellagio \
+	-Ddri-drivers="$(DRI_DRIVERS)" \
+	-Ddri-drivers-path=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
+	-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 \
 	$(confflags_DIRECT_RENDERING) \
 	$(confflags_GBM) \
 	$(confflags_DRI3) \
 	$(confflags_EGL) \
 	$(confflags_GALLIUM) \
 	$(confflags_GLES) \
-	$(buildflags)
+	$(confflags_OSMESA)

 override_dh_clean:
 	rm -rf .pc
@@ -161,18 +157,18 @@ override_dh_clean:
 	rm -rf $$(find -name Makefile.in)
 	rm -rf bin/install-sh bin/ltmain.sh
 	for file in debian/*.in; do rm -f $${file%%.in}; done
-	rm -f src/amd/vulkan/*.pyc
-	rm -f src/compiler/nir/*.pyc
-	rm -f src/egl/generate/*.pyc
-	rm -f src/intel/vulkan/*.pyc
-	rm -f src/mapi/glapi/gen/*.pyc
-	rm -f src/mesa/main/*.pyc
-	rm -f src/gallium/auxiliary/util/*.pyc
+	rm -rf src/amd/vulkan/*.pyc src/amd/vulkan/__pycache__/
+	rm -rf src/compiler/nir/*.pyc src/compiler/nir/__pycache__/
+	rm -rf src/egl/generate/*.pyc src/egl/generate/__pycache__/
+	rm -rf src/gallium/auxiliary/util/*.pyc src/gallium/auxiliary/util/__pycache__/
+	rm -rf src/intel/vulkan/*.pyc src/intel/vulkan/__pycache__/
+	rm -rf src/mapi/glapi/gen/*.pyc src/mapi/glapi/gen/__pycache__/
+	rm -rf src/mesa/main/*.pyc src/mesa/main/__pycache__/

 	dh_clean

 override_dh_auto_configure:
-	dh_auto_configure -- \
+	$(buildflags) dh_auto_configure -- \
 		$(confflags)

 override_dh_auto_install:
@@ -248,7 +244,8 @@ override_dh_makeshlibs:

 %:
 	dh $@ --with quilt$(with_libva) \
-		--builddirectory=build/
+		--builddirectory=build/ \
+		--buildsystem=meson

 # For maintainer use only, generate a tarball:
 gentarball: SOURCE=mesa