Index: 3.3.1/Makefile
===================================================================
--- 3.3.1/Makefile (revision 384)
+++ 3.3.1/Makefile (revision 385)
@@ -9,7 +9,12 @@
COMPONENT_TARGETS += $(HARDWARE_NANOPI_NEO)
COMPONENT_TARGETS += $(HARDWARE_ORANGE_PP)
COMPONENT_TARGETS += $(HARDWARE_ORANGE_PL2)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PI5)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PI5B)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PI5P)
+COMPONENT_TARGETS += $(HARDWARE_ROCK_5B)
COMPONENT_TARGETS += $(HARDWARE_WECHIP_TX6)
+COMPONENT_TARGETS += $(HARDWARE_REPKA_PI3)
COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
COMPONENT_TARGETS += $(HARDWARE_POIN2)
COMPONENT_TARGETS += $(HARDWARE_RK3328_CC)
@@ -42,6 +47,7 @@
COMPONENT_TARGETS += $(HARDWARE_TL2SV2)
COMPONENT_TARGETS += $(HARDWARE_TL2WK2_LSB)
COMPONENT_TARGETS += $(HARDWARE_TL2SV2_LSB)
+COMPONENT_TARGETS += $(HARDWARE_VISIONFIVE2)
COMPONENT_TARGETS += $(HARDWARE_SIFIVE_U740)
@@ -57,6 +63,7 @@
REQUIRES = env/freetype/2.11.1
REQUIRES += libs/graphite2/1.3.14
REQUIRES += libs/glib2/2.76.0
+REQUIRES += libs/gobject-introspection/1.76.1
REQUIRES += libs/icu4c/73.1
# ======= __END_OF_REQUIRES__ =======
@@ -135,7 +142,8 @@
endian = little
endif
ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_H5_GLIBC) $(TOOLCHAIN_RK33XX_GLIBC) \
- $(TOOLCHAIN_RK339X_GLIBC) $(TOOLCHAIN_S9XX_GLIBC) \
+ $(TOOLCHAIN_RK339X_GLIBC) $(TOOLCHAIN_RK358X_GLIBC) \
+ $(TOOLCHAIN_S9XX_GLIBC) \
$(TOOLCHAIN_A311X_GLIBC) $(TOOLCHAIN_M1000_GLIBC)),)
cpu_name = aarch64
endian = little
@@ -172,6 +180,13 @@
extra_configure_switches += --default-library=shared
endif
+
+PYTHON3_VERSION = 3.10
+
+python_environment = PYTHON=$(PYTHON3)
+python_environment += PYTHONPATH='$(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/gobject-introspection:$(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/python$(PYTHON3_VERSION)/lib-dynload'
+
+
CFLAGS += -I$(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/glib-2.0/include
LDFLAGS += -Wl,-rpath,/lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
@@ -215,6 +230,7 @@
@echo "pkgconfig = 'pkg-config'" >> $(cross_file)
@echo "" >> $(cross_file)
@PKG_CONFIG_PATH= \
+ $(python_environment) \
meson setup \
--prefix=/usr \
--libdir=lib$(LIBSUFFIX) \
@@ -236,7 +252,7 @@
-Dicu=enabled \
-Dgraphite2=enabled \
-Dfreetype=enabled \
- -Dintrospection=disabled \
+ -Dintrospection=enabled \
-Dcairo=disabled \
-Dchafa=disabled \
-Ddocs=enabled \
@@ -243,7 +259,10 @@
-Dtests=disabled \
$(extra_configure_switches) \
--cross-file=$(cross_file) $(SRC_DIR) $(build_dir)
- @cd $(build_dir) && ninja -v
+ @( cd $(build_dir) ; \
+ sed -i '/COMMAND = /s, /usr/bin/g-ir-scanner , $(python_environment) $(TARGET_DEST_DIR)/usr/bin/g-ir-scanner-wrapper ,g' build.ninja ; \
+ )
+ @( cd $(build_dir) ; env -i ninja -v )
@touch $@
$(install_target): $(build_target)
Index: 3.3.1
===================================================================
--- 3.3.1 (revision 384)
+++ 3.3.1 (revision 385)
Property changes on: 3.3.1
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: 3.3.1-ppc32
===================================================================
--- 3.3.1-ppc32 (revision 384)
+++ 3.3.1-ppc32 (revision 385)
Property changes on: 3.3.1-ppc32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: 3.3.1-x86_32
===================================================================
--- 3.3.1-x86_32 (revision 384)
+++ 3.3.1-x86_32 (revision 385)
Property changes on: 3.3.1-x86_32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc