Index: cairo/1.17.8/Makefile
===================================================================
--- cairo/1.17.8/Makefile (revision 384)
+++ cairo/1.17.8/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)
@@ -110,7 +116,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
Index: cairo/1.17.8
===================================================================
--- cairo/1.17.8 (revision 384)
+++ cairo/1.17.8 (revision 385)
Property changes on: cairo/1.17.8
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: cairo/1.17.8-ppc32
===================================================================
--- cairo/1.17.8-ppc32 (revision 384)
+++ cairo/1.17.8-ppc32 (revision 385)
Property changes on: cairo/1.17.8-ppc32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: cairo/1.17.8-x86_32
===================================================================
--- cairo/1.17.8-x86_32 (revision 384)
+++ cairo/1.17.8-x86_32 (revision 385)
Property changes on: cairo/1.17.8-x86_32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: pango/1.50.12/Makefile
===================================================================
--- pango/1.50.12/Makefile (revision 384)
+++ pango/1.50.12/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)
@@ -106,7 +112,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
@@ -144,7 +151,7 @@
endif
-extra_configure_switches += -Dintrospection=disabled
+extra_configure_switches += -Dintrospection=enabled
extra_configure_switches += -Dfontconfig=enabled
extra_configure_switches += -Dlibthai=enabled
extra_configure_switches += -Dcairo=enabled
@@ -153,6 +160,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 += -I$(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/glib-2.0/include
TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
@@ -196,7 +209,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 \
@@ -215,7 +229,10 @@
-Dinstall-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)
Index: pango/1.50.12
===================================================================
--- pango/1.50.12 (revision 384)
+++ pango/1.50.12 (revision 385)
Property changes on: pango/1.50.12
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: pango/1.50.12-ppc32
===================================================================
--- pango/1.50.12-ppc32 (revision 384)
+++ pango/1.50.12-ppc32 (revision 385)
Property changes on: pango/1.50.12-ppc32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: pango/1.50.12-x86_32
===================================================================
--- pango/1.50.12-x86_32 (revision 384)
+++ pango/1.50.12-x86_32 (revision 385)
Property changes on: pango/1.50.12-x86_32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: poppler/23.02.0/Makefile
===================================================================
--- poppler/23.02.0/Makefile (revision 384)
+++ poppler/23.02.0/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)
@@ -62,7 +68,7 @@
REQUIRES += libs/boost/1.77.0
REQUIRES += libs/glib2/2.76.0
REQUIRES += media/openjpeg2/2.5.0
-REQUIRES += net/nss/3.89
+REQUIRES += net/nss/3.97
REQUIRES += net/curl/7.75.0
REQUIRES += X11/libs/poppler-data/0.4.12
REQUIRES += env/X11/cairo/1.17.8
Index: poppler/23.02.0
===================================================================
--- poppler/23.02.0 (revision 384)
+++ poppler/23.02.0 (revision 385)
Property changes on: poppler/23.02.0
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: poppler/23.02.0-ppc32/Makefile
===================================================================
--- poppler/23.02.0-ppc32/Makefile (revision 384)
+++ poppler/23.02.0-ppc32/Makefile (revision 385)
@@ -23,7 +23,7 @@
REQUIRES += libs/boost/1.77.0-ppc32
REQUIRES += libs/glib2/2.76.0-ppc32
REQUIRES += media/openjpeg2/2.5.0-ppc32
-REQUIRES += net/nss/3.89-ppc32
+REQUIRES += net/nss/3.97-ppc32
REQUIRES += net/curl/7.75.0-ppc32
REQUIRES += env/X11/cairo/1.17.8-ppc32
Index: poppler/23.02.0-ppc32
===================================================================
--- poppler/23.02.0-ppc32 (revision 384)
+++ poppler/23.02.0-ppc32 (revision 385)
Property changes on: poppler/23.02.0-ppc32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: poppler/23.02.0-x86_32/Makefile
===================================================================
--- poppler/23.02.0-x86_32/Makefile (revision 384)
+++ poppler/23.02.0-x86_32/Makefile (revision 385)
@@ -20,7 +20,7 @@
REQUIRES += libs/boost/1.77.0-x86_32
REQUIRES += libs/glib2/2.76.0-x86_32
REQUIRES += media/openjpeg2/2.5.0-x86_32
-REQUIRES += net/nss/3.89-x86_32
+REQUIRES += net/nss/3.97-x86_32
REQUIRES += net/curl/7.75.0-x86_32
REQUIRES += env/X11/cairo/1.17.8-x86_32
Index: poppler/23.02.0-x86_32
===================================================================
--- poppler/23.02.0-x86_32 (revision 384)
+++ poppler/23.02.0-x86_32 (revision 385)
Property changes on: poppler/23.02.0-x86_32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc