From: Jeffery To <jeffery.to@gmail.com>
Date: Fri, 18 Mar 2022 08:27:28 +0000 (+0800)
Subject: mesa: Use Mako installed by host pip instead of Mako/host
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=375b9ad7e19a6b4cd40e813cc23fd30785ef49b9;p=feed%2Fvideo.git

mesa: Use Mako installed by host pip instead of Mako/host

Packages normally use host pip to install libraries for host Python.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
---

diff --git a/libs/mesa/Makefile b/libs/mesa/Makefile
index 66220d3..3b767f8 100644
--- a/libs/mesa/Makefile
+++ b/libs/mesa/Makefile
@@ -12,7 +12,7 @@ PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=BSD-3-Clause
 
 PKG_INSTALL:=1
-PKG_BUILD_DEPENDS:=Mako/host
+PKG_BUILD_DEPENDS:=python3/host
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_LIBDRM_INTEL \
@@ -21,8 +21,12 @@ PKG_CONFIG_DEPENDS:= \
 
 TARGET_CPPFLAGS+=-Wno-format -Wno-format-security
 
+PYTHON3_PKG_BUILD:=0
+HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=./host-pip-requirements.txt
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/meson.mk
+include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
 
 DRI_PLUGINS := \
 	armada-drm:@(aarch64||arm) \
@@ -252,6 +256,11 @@ MESON_ARGS += \
 
 TARGET_CFLAGS += -I$(MESON_BUILD_DIR)/src/broadcom/
 
+define Build/Configure
+	$(call Py3Build/InstallBuildDepends)
+	$(call Build/Configure/Meson)
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
diff --git a/libs/mesa/host-pip-requirements.txt b/libs/mesa/host-pip-requirements.txt
new file mode 100644
index 0000000..4dab062
--- /dev/null
+++ b/libs/mesa/host-pip-requirements.txt
@@ -0,0 +1,2 @@
+Mako==1.2.0 --hash=sha256:9a7c7e922b87db3686210cf49d5d767033a41d4010b284e747682c92bddd8b39
+MarkupSafe==2.1.1 --hash=sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b