Index: 2.42.9/Makefile
===================================================================
--- 2.42.9/Makefile (revision 384)
+++ 2.42.9/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)
@@ -55,6 +61,7 @@
SOURCE_REQUIRES = sources/GNOME/core/gdk-pixbuf
REQUIRES = libs/glib2/2.76.0
+REQUIRES += libs/gobject-introspection/1.76.1
REQUIRES += libs/shared-mime-info/2.2
REQUIRES += libs/libpng/libpng16/1.6.37
REQUIRES += libs/libtiff/4.3.0
@@ -139,7 +146,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
@@ -180,9 +188,15 @@
extra_configure_switches += -Dpng=enabled
extra_configure_switches += -Dtiff=enabled
extra_configure_switches += -Djpeg=enabled
-extra_configure_switches += -Dintrospection=disabled
+extra_configure_switches += -Dintrospection=enabled
+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
TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
@@ -230,6 +244,7 @@
@echo "pkgconfig = 'pkg-config'" >> $(cross_file)
@echo "" >> $(cross_file)
@PKG_CONFIG_PATH= \
+ $(python_environment) \
meson setup \
--prefix=/usr \
--libdir=lib$(LIBSUFFIX) \
@@ -255,7 +270,10 @@
@( cd $(build_dir) ; \
sed -i 's,-Wcast-align ,,g' build.ninja ; \
)
- @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)
@@ -262,7 +280,8 @@
@mkdir -p $(PIXBUF2_PKG)
@cd $(build_dir) && $(env_sysroot) ninja install
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) \
$(TOOLCHAIN_POWER8_GLIBC) $(TOOLCHAIN_POWER9_GLIBC) \
$(TOOLCHAIN_POWER8LE_GLIBC) $(TOOLCHAIN_POWER9LE_GLIBC) \
Index: 2.42.9
===================================================================
--- 2.42.9 (revision 384)
+++ 2.42.9 (revision 385)
Property changes on: 2.42.9
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: 2.42.9-ppc32
===================================================================
--- 2.42.9-ppc32 (revision 384)
+++ 2.42.9-ppc32 (revision 385)
Property changes on: 2.42.9-ppc32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: 2.42.9-x86_32
===================================================================
--- 2.42.9-x86_32 (revision 384)
+++ 2.42.9-x86_32 (revision 385)
Property changes on: 2.42.9-x86_32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc