package/fontconfig/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		fontconfig
-PKG_VERSION:=		2.13.1
+PKG_VERSION:=		2.15.0
 PKG_RELEASE:=		1
-PKG_HASH:=		9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f
+PKG_HASH:=		f5f359d6332861bd497570848fcb42520964a9e83d5e3abe397b6b6db9bcaaf4
 PKG_DESCR:=		library for configuring and customizing font access
 PKG_SECTION:=		libs/fonts
 PKG_DEPENDS:=		libxml2
@@ -24,7 +24,6 @@ include ${ADK_TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-AUTOTOOL_STYLE:=	autoreconf
 HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--with-arch=${ADK_TARGET_ARCH} \
 			--enable-libxml2 \

package/libdisplay-info/Makefile

@@ -4,13 +4,13 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libdisplay-info
-PKG_VERSION:=		0.1.1
+PKG_VERSION:=		0.2.0
 PKG_RELEASE:=		1
-PKG_HASH:=		0d8731588e9f82a9cac96324a3d7c82e2ba5b1b5e006143fefe692c74069fb60
+PKG_HASH:=		5a2f002a16f42dd3540c8846f80a90b8f4bdcd067a94b9d2087bc2feae974176
 PKG_DESCR:=		edid and displayid library
 PKG_SECTION:=		libs/misc
 PKG_BUILDDEP:=		hwdata
-PKG_SITES:=		https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/0.1.1/downloads/
+PKG_SITES:=		https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/$(PKG_VERSION)/downloads/
 PKG_OPTS:=		dev
 
 include $(ADK_TOPDIR)/mk/package.mk

package/libgpg-error/Makefile

@@ -10,7 +10,7 @@ PKG_HASH:=		9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb
 PKG_DESCR:=		helper library for common error codes and descriptions
 PKG_SECTION:=		libs/misc
 PKG_URL:=		http://www.gnupg.org/
-PKG_SITES:=		ftp://ftp.gnupg.org/gcrypt/libgpg-error/
+PKG_SITES:=		https://www.gnupg.org/ftp/gcrypt/libgpg-error/
 PKG_OPTS:=		dev
 PKG_NOPARALLEL:=	1
 

package/libjpeg-turbo/Makefile

@@ -4,19 +4,18 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libjpeg-turbo
-PKG_VERSION:=		1.5.2
+PKG_VERSION:=		3.0.3
 PKG_RELEASE:=		1
-PKG_HASH:=		9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528
+PKG_HASH:=		a649205a90e39a548863a3614a9576a3fb4465f8e8e66d54999f127957c25b21
 PKG_DESCR:=		jpeg image library
 PKG_SECTION:=		libs/image
 PKG_BUILDDEP:=		yasm-host
 HOST_BUILDDEP:=		yasm-host
-PKG_URL:=		http://libjpeg-turbo.virtualgl.org/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/}
+PKG_URL:=		http://libjpeg-turbo.org/
+PKG_SITES:=		https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/
 PKG_OPTS:=		dev
-PKG_NOPARALLEL:=	1
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		${PKG_VERSION}.tar.gz
 
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
@@ -24,15 +23,7 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBJPEG_TURBO,libjpeg-turbo,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBJPEG_TURBO,libjpeg-turbo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_CFLAGS+=		-fPIC
-
-ifeq ($(ADK_x32),y)
-CONFIGURE_ARGS+=	--without-simd
-endif
-
-CONFIGURE_ENV+=		ac_cv_prog_NASM=yasm
-CONFIGURE_ARGS+=	--with-pic
-HOST_CONFIGURE_ARGS+=	--without-simd
+CONFIG_STYLE:=		cmake
 
 libjpeg-turbo-install:
 	$(INSTALL_DIR) $(IDIR_LIBJPEG_TURBO)/usr/lib

package/libseat/Makefile

@@ -4,18 +4,30 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libseat
-PKG_VERSION:=		0.7.0
+PKG_VERSION:=		0.8.0
 PKG_RELEASE:=		1
-PKG_HASH:=		ea6ccbaf86949dba4eda64761b11aa8d05b61fc60f569b0fc05f2c4d06baeb87
+PKG_HASH:=		a562a44ee33ccb20954a1c1ec9a90ecb2db7a07ad6b18d0ac904328efbcf65a0
 PKG_DESCR:=		seat library
 PKG_SECTION:=		libs/misc
-PKG_URL:=		https://git.sr.ht/~kennylevinsen/seatd
-PKG_SITES:=		https://git.sr.ht/~kennylevinsen/seatd
+PKG_URL:=		https://git.sr.ht/~kennylevinsen/seatd/
+PKG_SITES:=		https://git.sr.ht/~kennylevinsen/seatd/archive/
+PKG_LIBNAME:=		libseat
 PKG_OPTS:=		dev
 
+PKG_SUBPKGS:=		LIBSEAT SEATD
+PKGSD_LIBSEAT:=		seat library
+PKGSC_LIBSEAT:=		libs/misc
+PKGSD_SEATD:=		seat daemon
+PKGSC_SEATD:=		sys/misc
+PKGSS_SEATD:=		libseat
+
+DISTFILES:=		$(PKG_VERSION).tar.gz
+WRKDIST=		${WRKDIR}/seatd-${PKG_VERSION}
+
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBSEAT,libseat,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+$(eval $(call PKG_template,SEATD,seatd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
 
@@ -28,4 +40,9 @@ libseat-install:
 	$(CP) $(WRKINST)/usr/lib/libseat*.so* \
 		$(IDIR_LIBSEAT)/usr/lib
 
+seatd-install:
+	$(INSTALL_DIR) $(IDIR_SEATD)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/seatd \
+		$(IDIR_SEATD)/usr/bin
+
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/u-boot/Makefile

@@ -143,6 +143,7 @@ ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y)
 endif
 ifeq ($(ADK_TARGET_SYSTEM_IMGTEC_CI20),y)
 	$(CP) $(WRKBUILD)/spl/u-boot-spl.bin $(FW_DIR)
+	cat ./files/uboot-env.txt.ci20 | PATH='$(HOST_PATH)' mkenvimage -s "32768" -o $(FW_DIR)/uboot-env.bin -
 endif
 ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
 	$(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR)

package/wayland/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		wayland
-PKG_VERSION:=		1.22.0
+PKG_VERSION:=		1.23.0
 PKG_RELEASE:=		1
-PKG_HASH:=		1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842
+PKG_HASH:=		05b3e1574d3e67626b5974f862f36b5b427c7ceeb965cb36a4e6c2d342e45ab2
 PKG_DESCR:=		wayland
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		wayland-host

package/weston/Makefile

@@ -4,33 +4,32 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		weston
-PKG_VERSION:=		11.0.0
+PKG_VERSION:=		13.0.3
 PKG_RELEASE:=		1
-PKG_HASH:=		5816a9e7bd67d03f268553a7af2f0c3430b409f7606244dada65188478f90800
+PKG_HASH:=		27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093
 PKG_DESCR:=		wayland compositor
 PKG_SECTION:=		x11/drivers
-PKG_DEPENDS:=		wayland libxkbcommon libinput libpng libjpeg-turbo libseat
-PKG_DEPENDS+=		libwebp pam libxcursor libudev xkeyboard-config cairo libffi
-PKG_BUILDDEP:=		wayland libxkbcommon libinput libpng libjpeg-turbo
-PKG_BUILDDEP+=		libwebp pam libXcursor eudev cairo libseat libffi
-PKG_SITES:=		https://github.com/wayland-project/weston/archive/refs/tags/
+PKG_DEPENDS:=		wayland libxkbcommon libinput libpng libjpeg-turbo libseat mesa libexpat
+PKG_DEPENDS+=		libwebp pam libxcursor libudev xkeyboard-config cairo libffi libdrm seatd
+PKG_BUILDDEP:=		wayland wayland-protocols libxkbcommon libinput libpng libjpeg-turbo expat
+PKG_BUILDDEP+=		libwebp pam libXcursor eudev cairo libseat libffi libdrm libdisplay-info mesa
+PKG_SITES:=		https://gitlab.freedesktop.org/wayland/weston/-/releases/$(PKG_VERSION)/downloads/
 
 PKG_CFLINE_WESTON:=	select ADK_PACKAGE_CAIRO_WITH_PNG@
 
-DISTFILES:=             $(PKG_VERSION).tar.gz
-
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,WESTON,weston,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
-MESON_FLAGS+=		-Dlauncher-logind=false \
-			-Dlauncher-libseat=true \
-			-Dsystemd=false \
+MESON_FLAGS+=		-Dsystemd=false \
 			-Dbackend-drm-screencast-vaapi=false \
 			-Dbackend-rdp=false \
 			-Dcolor-management-lcms=false \
 			-Dremoting=false \
 			-Dpipewire=false \
+			-Dbackend-pipewire=false \
+			-Dxwayland=false \
+			-Dtest-junit-xml=false \
 			-Ddemo-clients=false 
 
 WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
@@ -49,9 +48,9 @@ weston-install:
 	$(INSTALL_DIR) $(IDIR_WESTON)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/weston \
 		$(IDIR_WESTON)/usr/lib/
-	$(CP) $(WRKINST)/usr/lib/libweston-11 \
+	$(CP) $(WRKINST)/usr/lib/libweston-13 \
 		$(IDIR_WESTON)/usr/lib/
-	$(CP) $(WRKINST)/usr/lib/libweston*so* \
+	$(CP) $(WRKINST)/usr/lib/*so* \
 		$(IDIR_WESTON)/usr/lib/
 	$(INSTALL_DIR) $(IDIR_WESTON)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/weston \

target/config/Config.in.kernelfmt

@@ -19,6 +19,9 @@ config ADK_TARGET_KERNEL_UIMAGE
 config ADK_TARGET_KERNEL_UIMAGEBIN
 	bool
 
+config ADK_TARGET_KERNEL_UIMAGEGZ
+	bool
+
 config ADK_TARGET_KERNEL_BZIMAGE
 	bool
 
@@ -54,6 +57,7 @@ config ADK_TARGET_KERNEL
 	default "loader" if ADK_TARGET_KERNEL_LOADER
 	default "uImage" if ADK_TARGET_KERNEL_UIMAGE
 	default "uImage.bin" if ADK_TARGET_KERNEL_UIMAGEBIN
+	default "uImage.gz" if ADK_TARGET_KERNEL_UIMAGEGZ
 	default "zImage" if ADK_TARGET_KERNEL_ZIMAGE
 	default "Image" if ADK_TARGET_KERNEL_IMAGE
 	default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN

target/linux/Config.in.kernelcfg

@@ -67,6 +67,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG
 	default "haps_arc64_defconfig" if ADK_TARGET_CPU_ARC_ARC64
 	default "m5208evb_defconfig" if ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	default "default_defconfig" if ADK_TARGET_ARCH_KVX
+	default "ci20_defconfig" if ADK_TARGET_SYSTEM_IMGTEC_CI20
 	default ""
 
 config ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH

target/mips/Makefile

@@ -9,6 +9,9 @@ KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL)
 ifeq ($(ADK_TARGET_KERNEL_UIMAGE),y)
 KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage
 endif
+ifeq ($(ADK_TARGET_KERNEL_UIMAGEGZ),y)
+KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage.gz
+endif
 
 OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
 
@@ -76,12 +79,12 @@ targethelp:
 endif
 ifeq ($(ADK_TARGET_FS),genimage)
 targethelp:
-	@echo "The disk image is: $(FW_DIR)/disk.img"
+	@echo "The disk image is: $(FW_DIR)/sdcard.img"
 ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} $(FW_DIR)/disk.img'
 else
 	@echo "Use following command to install it on SD card:"
-	@echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k'
+	@echo 'sudo dd if=$(FW_DIR)/sdcard.img of=/dev/sdX bs=2048k'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),ubifs)
@@ -90,13 +93,9 @@ targethelp:
 	@echo 'The UBI image is: ${FW_DIR}/${ROOTFSUBIFS}'
 endif
 
-# image creation and kernel install
+# dummy
 kernel-strip:
-ifeq ($(ADK_TARGET_KERNEL_UIMAGE),)
-	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
-else
 	@cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
-endif
 
 kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}

target/mips/systems/imgtec-ci20

@@ -10,7 +10,7 @@ config ADK_TARGET_SYSTEM_IMGTEC_CI20
 	select ADK_TARGET_WITH_NETDEVICE
 	select ADK_TARGET_WITH_BLOCK
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
-	select ADK_TARGET_KERNEL_UIMAGE
+	select ADK_TARGET_KERNEL_UIMAGEGZ
 	select ADK_PACKAGE_U_BOOT
 	select ADK_HOST_BUILD_U_BOOT
 	help