From 211b848af331aa8b799ef06e379788988ded7e40 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 24 Nov 2021 01:47:35 +0000 Subject: [PATCH] mesa: update to version 21.3.0 * build vulkan drivers only if selected * disable broadcom vulkan driver as it causes meson-related build troubles (unrelated to the version bump) Signed-off-by: Daniel Golle --- libs/mesa/Makefile | 48 +++++++++++-------- .../001-fix-wayland-scanner-detect.patch | 4 +- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/libs/mesa/Makefile b/libs/mesa/Makefile index c61f558..66220d3 100644 --- a/libs/mesa/Makefile +++ b/libs/mesa/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mesa -PKG_VERSION:=21.1.7 +PKG_VERSION:=21.3.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://archive.mesa3d.org/ -PKG_HASH:=e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb +PKG_HASH:=a2753c09deef0ba14d35ae8a2ceff3fe5cd13698928c7bb62c2ec8736eb09ce1 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=BSD-3-Clause @@ -70,7 +70,7 @@ define Package/libxatracker SUBMENU:=Video TITLE:=Mesa3D libxatracker URL:=https://www.mesa3d.org - DEPENDS:=+libstdcpp +zlib +libdrm +libexpat + DEPENDS:=+libstdcpp +zlib +libdrm +libexpat @(aarch64||arm||i386||i686||x86_64) endef define Package/libxatracker/description @@ -116,7 +116,7 @@ define Package/libvulkan-broadcom SECTION:=libs CATEGORY:=Libraries SUBMENU:=Video - DEPENDS:=libmesa @(arm||aarch64) + DEPENDS:=libmesa @(arm||aarch64) @BROKEN TITLE:=Broadcom Vulkan driver URL:=https://www.mesa3d.org endef @@ -169,7 +169,6 @@ GALLIUM_DRIVERS:=kmsro swrast vc4 virgl ifneq ($(CONFIG_LIBDRM_INTEL),) DRI_DRIVERS+=i965 - VULKAN_DRIVERS+=intel GALLIUM_DRIVERS+=i915 endif @@ -184,21 +183,8 @@ ifneq ($(CONFIG_LIBDRM_RADEON),) # r600 and radeonsi require LLVM endif -ifeq ($(ARCH),x86_64) - GALLIUM_DRIVERS+=svga -endif - -ifeq ($(ARCH),i386) - GALLIUM_DRIVERS+=svga -endif - -ifeq ($(ARCH),i686) - GALLIUM_DRIVERS+=svga -endif - ifeq ($(ARCH),aarch64) GALLIUM_DRIVERS+=freedreno etnaviv panfrost lima - VULKAN_DRIVERS+=broadcom freedreno ifneq ($(CONFIG_LIBDRM_NOUVEAU),) GALLIUM_DRIVERS+=tegra endif @@ -206,7 +192,6 @@ endif ifeq ($(ARCH),arm) GALLIUM_DRIVERS+=freedreno etnaviv panfrost lima - VULKAN_DRIVERS+=broadcom freedreno ifneq ($(CONFIG_LIBDRM_NOUVEAU),) GALLIUM_DRIVERS+=tegra endif @@ -220,6 +205,29 @@ ifeq ($(ARCH),mipsel) GALLIUM_DRIVERS+=etnaviv endif +ifeq ($(ARCH),x86_64) + GALLIUM_DRIVERS+=svga +endif + +ifeq ($(ARCH),i386) + GALLIUM_DRIVERS+=svga +endif + +ifeq ($(ARCH),i686) + GALLIUM_DRIVERS+=svga +endif + +ifneq ($(CONFIG_PACKAGE_libvulkan-broadcom),) + VULKAN_DRIVERS+=broadcom +endif + +ifneq ($(CONFIG_PACKAGE_libvulkan-freedreno),) + VULKAN_DRIVERS+=freedreno +endif + +ifneq ($(CONFIG_PACKAGE_libvulkan-intel),) + VULKAN_DRIVERS+=intel +endif MESON_ARGS += \ -Dplatforms=wayland \ @@ -242,6 +250,8 @@ MESON_ARGS += \ -Ddraw-use-llvm=false \ -Dscanner_bin="$(STAGING_DIR_HOSTPKG)/bin/wayland-scanner" +TARGET_CFLAGS += -I$(MESON_BUILD_DIR)/src/broadcom/ + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ diff --git a/libs/mesa/patches/001-fix-wayland-scanner-detect.patch b/libs/mesa/patches/001-fix-wayland-scanner-detect.patch index 482c6bc..278a479 100644 --- a/libs/mesa/patches/001-fix-wayland-scanner-detect.patch +++ b/libs/mesa/patches/001-fix-wayland-scanner-detect.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -1830,12 +1830,17 @@ endif +@@ -1973,12 +1973,17 @@ endif # TODO: symbol mangling if with_platform_wayland @@ -25,7 +25,7 @@ dep_wayland_client = dependency('wayland-client', version : '>=1.18') --- a/meson_options.txt +++ b/meson_options.txt -@@ -456,6 +456,11 @@ option( +@@ -486,6 +486,11 @@ option( value : 25, description : 'Android Platform SDK version. Default: Nougat version.' ) -- 2.30.2