mesalib: version bump 18.3.2 -> 19.0.0

- switch build system to Meson
- install gallium dri drivers as gallium_dri.so, symlink the others

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

1 files changed, 68 insertions, 75 deletions

diff --git a/rules/mesalib.make b/rules/mesalib.make
index cca349177..8d730cc90 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION	:= 18.3.2
-MESALIB_MD5	:= 4a82bf3ac2e81493a1a84dd7581ec786
+MESALIB_VERSION	:= 19.0.0
+MESALIB_MD5	:= d0d76cd8b00bc1308e37985d4a45d3c5
 MESALIB		:= mesa-$(MESALIB_VERSION)
 MESALIB_SUFFIX	:= tar.xz
 MESALIB_URL	:= \
@@ -36,10 +36,6 @@ MESALIB_LICENSE_FILES := \
 # Prepare
 # ----------------------------------------------------------------------------
 
-MESALIB_CONF_ENV := \
-	$(CROSS_ENV) \
-	ac_cv_prog_PYTHON2=$(PTXDIST_TOPDIR)/bin/python
-
 ifdef PTXCONF_ARCH_X86
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_I915)		+= i915
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_I965)		+= i965
@@ -47,6 +43,7 @@ endif
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU_VIEUX)+= nouveau
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R200)		+= r200
 
+MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_KMSRO)	+= kmsro
 ifndef PTXCONF_ARCH_ARM # broken: https://bugs.freedesktop.org/show_bug.cgi?id=72064
 ifndef PTXCONF_ARCH_X86 # needs llvm
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_R300)	+= r300
@@ -54,21 +51,20 @@ endif
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_R600)	+= r600
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_RADEONSI)	+= radeonsi
 endif
-
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU)	+= nouveau
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_FREEDRENO)+= freedreno
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_ETNAVIV)	+= etnaviv
-MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_IMX)	+= imx
 ifdef PTXCONF_ARCH_ARM
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_V3D)	+= v3d
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_VC4)	+= vc4
 endif
-
 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_SWRAST)	+= swrast
 
-MESALIB_DRI_LIBS-y += \
-	$(subst nouveau,nouveau_vieux,$(MESALIB_DRI_DRIVERS-y)) \
-	$(subst imx,imx-drm,$(subst freedreno,kgsl,$(MESALIB_GALLIUM_DRIVERS-y)))
+MESALIB_DRI_LIBS-y = \
+	$(subst nouveau,nouveau_vieux,$(MESALIB_DRI_DRIVERS-y))
+
+MESALIB_DRI_GALLIUM_LIBS-y = \
+	$(subst kmsro,imx-drm pl111 hx8357d,$(subst freedreno,kgsl,$(MESALIB_GALLIUM_DRIVERS-y)))
 
 MESALIB_LIBS-y				:= libglapi
 MESALIB_LIBS-$(PTXCONF_MESALIB_GLX)	+= libGL
@@ -82,68 +78,55 @@ MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_X11)	+= x11
 MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_DRM)	+= drm
 MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_WAYLAND)	+= wayland
 
-MESALIB_BUILD_OOT	:= YES
-MESALIB_CONF_TOOL	:= autoconf
+MESALIB_CONF_TOOL	:= meson
 MESALIB_CONF_OPT	:= \
-	$(CROSS_AUTOCONF_USR) \
-	--$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-largefile \
-	--disable-static \
-	--enable-shared \
-	--disable-pwr8 \
-	--disable-debug \
-	--disable-profile \
-	--disable-sanitize \
-	--disable-asm \
-	--disable-selinux \
-	--disable-llvm-shared-libs \
-	--disable-libunwind \
-	--$(call ptx/endis, PTXCONF_MESALIB_OPENGL)-opengl \
-	--$(call ptx/endis, PTXCONF_MESALIB_GLES1)-gles1 \
-	--$(call ptx/endis, PTXCONF_MESALIB_GLES2)-gles2 \
-	--enable-dri \
-	--$(call ptx/endis, PTXCONF_MESALIB_EXTENDED_HUD)-gallium-extra-hud \
-	--$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)-lmsensors \
-	--disable-dri3 \
-	--$(call ptx/endis, PTXCONF_MESALIB_GLX)-glx \
-	--disable-osmesa \
-	--disable-gallium-osmesa \
-	--$(call ptx/endis, PTXCONF_MESALIB_EGL)-egl \
-	--disable-xa \
-	--$(call ptx/endis, PTXCONF_MESALIB_GBM)-gbm \
-	--disable-nine \
-	--disable-xvmc \
-	--disable-vdpau \
-	--disable-omx-tizonia \
-	--disable-omx-bellagio \
-	--disable-va \
-	--disable-opencl \
-	--disable-opencl-icd \
-	--disable-gallium-tests \
-	--disable-libglvnd \
-	--disable-mangling \
-	--enable-shared-glapi \
-	--enable-driglx-direct \
-	--enable-glx-tls \
-	--disable-glx-read-only-text \
-	--disable-xlib-lease \
-	--disable-llvm \
-	--disable-valgrind \
-	--with-gallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
-	--with-platforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) \
-	--with-dri-driverdir=/usr/lib/dri \
-	--with-dri-searchpath=/usr/lib/dri \
-	--with-dri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
-	--without-vulkan-drivers \
-	--with-vulkan-icddir=/etc/vulkan/icd.d \
-	--with-osmesa-bits=8 \
-	--with-clang-libdir=/usr/lib \
-	--with-xvmc-libdir=/usr/lib \
-	--with-vdpau-libdir=/usr/lib/vdpau \
-	--with-omx-bellagio-libdir=/usr/lib/dri \
-	--with-omx-tizonia-libdir=/usr/lib/dri \
-	--with-va-libdir=/usr/lib/dri \
-	--with-d3d-libdir=/usr/lib/d3d \
-	--with-swr-archs=
+	$(CROSS_MESON_USR) \
+	-Dasm=false \
+	-Dbuild-tests=false \
+	-Dd3d-drivers-path=/usr/lib/d3d \
+	-Ddri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \
+	-Ddri-drivers-path=/usr/lib/dri \
+	-Ddri-search-path=/usr/lib/dri \
+	-Ddri3=false \
+	-Degl=$(call ptx/truefalse, PTXCONF_MESALIB_EGL) \
+	-Dgallium-drivers=$(subst $(space),$(comma),$(MESALIB_GALLIUM_DRIVERS-y)) \
+	-Dgallium-extra-hud=$(call ptx/truefalse, PTXCONF_MESALIB_EXTENDED_HUD) \
+	-Dgallium-nine=false \
+	-Dgallium-omx=disabled \
+	-Dgallium-opencl=disabled \
+	-Dgallium-va=false \
+	-Dgallium-vdpau=false \
+	-Dgallium-xa=false \
+	-Dgallium-xvmc=false \
+	-Dgbm=$(call ptx/truefalse, PTXCONF_MESALIB_GBM) \
+	-Dgles1=$(call ptx/truefalse, PTXCONF_MESALIB_GLES1) \
+	-Dgles2=$(call ptx/truefalse, PTXCONF_MESALIB_GLES2) \
+	-Dglvnd=false \
+	-Dglx=$(call ptx/ifdef, PTXCONF_MESALIB_GLX, dri, disabled) \
+	-Dglx-direct=false \
+	-Dglx-read-only-text=false \
+	-Dlibunwind=false \
+	-Dllvm=false \
+	-Dlmsensors=$(call ptx/truefalse, PTXCONF_MESALIB_LMSENSORS) \
+	-Domx-libs-path=/usr/lib/dri \
+	-Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \
+	-Dosmesa=none \
+	-Dosmesa-bits=8 \
+	-Dplatforms=$(subst $(space),$(comma),$(MESALIBS_EGL_PLATFORMS-y)) \
+	-Dpower8=false \
+	-Dselinux=false \
+	-Dshader-cache=false \
+	-Dshared-glapi=true \
+	-Dshared-llvm=false \
+	-Dswr-arches=[] \
+	-Dtools=[] \
+	-Dva-libs-path=/usr/lib/dri \
+	-Dvalgrind=false \
+	-Dvdpau-libs-path=/usr/lib/vdpau \
+	-Dvulkan-drivers=[] \
+	-Dvulkan-icd-dir=/etc/vulkan/icd.d \
+	-Dxlib-lease=false \
+	-Dxvmc-libs-path=/usr/lib
 
 # ----------------------------------------------------------------------------
 # Compile
@@ -170,10 +153,20 @@ $(STATEDIR)/mesalib.targetinstall:
 
 	@$(foreach lib, $(MESALIB_DRI_LIBS-y), \
 		$(call install_copy, mesalib, 0, 0, 0644, -, \
-		/usr/lib/dri/$(lib)_dri.so);)
+		/usr/lib/dri/$(lib)_dri.so)$(ptx/nl))
+
+ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),)
+	@$(call install_copy, mesalib, 0, 0, 0644, \
+		$(MESALIB_PKGDIR)/usr/lib/dri/$(firstword $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \
+		/usr/lib/dri/gallium_dri.so)
+
+	@$(foreach lib, $(MESALIB_DRI_GALLIUM_LIBS-y), \
+		$(call install_link, mesalib, gallium_dri.so, \
+		/usr/lib/dri/$(lib)_dri.so)$(ptx/nl))
+endif
 
 	@$(foreach lib, $(MESALIB_LIBS-y), \
-		$(call install_lib, mesalib, 0, 0, 0644, $(lib));)
+		$(call install_lib, mesalib, 0, 0, 0644, $(lib))$(ptx/nl))
 
 	@$(call install_finish, mesalib)