Index: Makefile
===================================================================
--- Makefile (revision 384)
+++ 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)
@@ -56,6 +62,7 @@
REQUIRES = app/fontconfig/2.13.95
REQUIRES += libs/glib2/2.76.0
+REQUIRES += libs/gobject-introspection/1.76.1
REQUIRES += X11/libs/gdk-pixbuf2-xlib/2.40.2
REQUIRES += X11/libs/at-spi2-core/2.47.1
REQUIRES += X11/libs/pango/1.50.12
@@ -146,7 +153,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
@@ -184,7 +192,7 @@
endif
-extra_configure_switches += -Dintrospection=false
+extra_configure_switches += -Dintrospection=true
extra_configure_switches += -Dx11_backend=true
extra_configure_switches += -Dwayland_backend=true
extra_configure_switches += -Dbroadway_backend=true
@@ -205,6 +213,12 @@
extra_configure_switches += -Dgtk_doc=false
+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 += -Wno-deprecated-declarations -Wno-format-nonliteral -Wno-switch
CFLAGS += -Wno-ignored-qualifiers -Wno-undef -Wno-array-bounds -Wno-maybe-uninitialized
@@ -254,7 +268,8 @@
@echo "strip = '$(STRIP)'" >> $(cross_file)
@echo "pkgconfig = 'pkg-config'" >> $(cross_file)
@echo "" >> $(cross_file)
- @meson setup \
+ @$(python_environment) \
+ meson setup \
--prefix=/usr \
--libdir=lib$(LIBSUFFIX) \
--libexecdir=/usr/libexec \
@@ -274,7 +289,10 @@
-Dinstalled_tests=false \
$(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)
@@ -285,7 +303,8 @@
# ======= Install a "starter" gtkrc =======
@echo 'gtk-theme-name="Adwaita"' > $(GTK3_PKG)/etc/gtk-3.0/gtkrc.new
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) \