weston: update to 11.0.0, update dependencies

13 files changed, 46 insertions, 34 deletions

diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index 9daf8f7c6..f7e635f15 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -64,8 +64,8 @@ ifeq (${HOST_CONFIG_STYLE},meson)
 	cd ${WRKSRC}; PATH='${HOST_PATH}' \
 		meson --prefix $(STAGING_HOST_DIR)/usr \
 		 --pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \
-		 --buildtype release $(MESON_FLAGS) \
-		$(WRKSRC) $(WRKBUILD)
+		 --buildtype release $(HOST_MESON_FLAGS) \
+		$(WRKSRC) $(WRKBUILD) $(MAKE_TRACE)
 endif
 ifeq (${HOST_CONFIG_STYLE},perl)
 	@$(CMD_TRACE) "configuring perl module.. "
@@ -86,7 +86,7 @@ host-build:
 ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE}
 	@$(CMD_TRACE) "compiling.. "
 ifneq ($(filter meson,${HOST_STYLE}),)
-	PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD)
+	PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) $(MAKE_TRACE)
 else ifneq (${HOST_STYLE},manual)
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \
 	    ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE)
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 424a42ca9..7c333f339 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -57,7 +57,7 @@ else ifneq ($(filter meson,${CONFIG_STYLE}),)
 		 --cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf \
 		 --build.pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \
 		 --buildtype release $(MESON_FLAGS) \
-		$(WRKSRC) $(WRKBUILD))
+		$(WRKSRC) $(WRKBUILD)) $(MAKE_TRACE)
 else ifneq ($(filter cmake,${CONFIG_STYLE}),)
 	@$(CMD_TRACE) "configuring cmake.. "
 	sed -e "s#@@TARGET_CC@@#$(TARGET_CC_NO_CCACHE)#" \
@@ -139,7 +139,7 @@ ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE}
 	@env ${MAKE_ENV} ${MAKE} pre-build $(MAKE_TRACE)
 	@$(CMD_TRACE) "compiling.. "
 ifneq ($(filter meson,${BUILD_STYLE}),)
-	PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD)
+	PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) $(MAKE_TRACE)
 else ifneq ($(filter manual,${BUILD_STYLE}),)
 	env ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} do-build $(MAKE_TRACE)
 else ifeq ($(strip ${BUILD_STYLE}),)
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index ba47bc369..90ac2f089 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		dbus
 PKG_VERSION:=		1.10.20
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_HASH:=		e574b9780b5425fde4d973bb596e7ea0f09e00fe2edd662da9016e976c460b48
 PKG_DESCR:=		desktop bus daemon
 PKG_SECTION:=		sys/misc
@@ -40,6 +40,7 @@ CONFIGURE_ARGS+=	--disable-systemd \
 			--with-system-socket=/run/dbus/system_bus_socket \
 			--with-system-pid-file=/run/dbus/dbus.pid \
 			--disable-verbose-mode \
+			--disable-apparmor \
 			--disable-kqueue \
 			--disable-selinux \
 			--disable-libaudit \
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 940c5bca1..15e797efc 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -24,6 +24,7 @@ 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 \
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 4289bb955..5db6dea81 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		freetype
 PKG_VERSION:=		2.11.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b
 PKG_DESCR:=		free, high-quality and portable font engine
 PKG_SECTION:=		libs/fonts
@@ -26,12 +26,14 @@ $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE}
 
 HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS+=	--with-zlib \
+			--with-brotli=no \
 			--without-png \
 			--without-bzip2 \
 			--enable-freetype-config
 CONFIGURE_ARGS+=	--with-zlib \
 			--without-png \
 			--with-harfbuzz=no \
+			--with-brotli=no \
 			--without-bzip2 \
 			--enable-freetype-config
 
diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile
index 342f61c77..f5bf2d382 100644
--- a/package/libdrm/Makefile
+++ b/package/libdrm/Makefile
@@ -20,6 +20,8 @@ $(eval $(call PKG_template,LIBDRM,libdrm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 
 WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
 
+MESON_FLAGS+=		-Dvalgrind=disabled
+
 CONFIG_STYLE:=		meson
 BUILD_STYLE:=		meson
 INSTALL_STYLE:=		meson
diff --git a/package/libwebp/Makefile b/package/libwebp/Makefile
index 76b18bee4..d894f3831 100644
--- a/package/libwebp/Makefile
+++ b/package/libwebp/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_HASH:=		51e9297aadb7d9eb99129fe0050f53a11fcce38a0848fb2b0389e385ad93695e
 PKG_DESCR:=		new image format for the web
 PKG_SECTION:=		libs/image
-PKG_BUILDEP:=		cmake-host
+PKG_BUILDDEP:=		cmake-host
 PKG_URL:=		https://developers.google.com/speed/webp/
 PKG_SITES:=		https://github.com/webmproject/libwebp/archive/refs/tags/
 PKG_OPTS:=		dev
diff --git a/package/meson/Makefile b/package/meson/Makefile
index 94716a688..9456baa77 100644
--- a/package/meson/Makefile
+++ b/package/meson/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		meson
-PKG_VERSION:=		0.60.1
+PKG_VERSION:=		1.0.0
 PKG_RELEASE:=		1
-PKG_HASH:=		b06f7d621b90e094be0ea2157fa435648e069f19182d8d9402aa039727652b0c
+PKG_HASH:=		a2ada84d43c7e57400daee80a880a1f5003d062b2cb6c9be1747b0db38f2eb8d
 PKG_DESCR:=		build utility
 PKG_SECTION:=		dev/tools
 HOST_BUILDDEP:=		python3-host ninja-host
diff --git a/package/meson/src/cross-compilation.conf.in b/package/meson/src/cross-compilation.conf.in
index eb14312bc..6ee58950e 100644
--- a/package/meson/src/cross-compilation.conf.in
+++ b/package/meson/src/cross-compilation.conf.in
@@ -15,7 +15,7 @@ c_args = [@TARGET_CFLAGS@]
 c_link_args = [@TARGET_LDFLAGS@]                                             
 cpp_args = [@TARGET_CXXFLAGS@]                                               
 cpp_link_args = [@TARGET_LDFLAGS@]                                           
-needs_exe_wrapper = true
+needs_exe_wrapper = false
                                                                              
 [host_machine]                                                               
 system = 'linux'                                                             
diff --git a/package/wayland-protocols/Makefile b/package/wayland-protocols/Makefile
index 458ccc51b..9c1f8ad1d 100644
--- a/package/wayland-protocols/Makefile
+++ b/package/wayland-protocols/Makefile
@@ -4,13 +4,13 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		wayland-protocols
-PKG_VERSION:=		1.23
+PKG_VERSION:=		1.31
 PKG_RELEASE:=		1
-PKG_HASH:=		6c0af1915f96f615927a6270d025bd973ff1c58e521e4ca1fc9abfc914633f76
+PKG_HASH:=		a07fa722ed87676ec020d867714bc9a2f24c464da73912f39706eeef5219e238
 PKG_DESCR:=		wayland protocols
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		meson-host wayland-host
-PKG_SITES:=		https://wayland.freedesktop.org/releases/
+PKG_SITES:=		https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(PKG_VERSION)/downloads/
 PKG_OPTS:=		dev
 
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/wayland/Makefile b/package/wayland/Makefile
index c23942924..e46b96838 100644
--- a/package/wayland/Makefile
+++ b/package/wayland/Makefile
@@ -4,14 +4,14 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		wayland
-PKG_VERSION:=		1.19.0
+PKG_VERSION:=		1.21.0
 PKG_RELEASE:=		1
-PKG_HASH:=		baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15
+PKG_HASH:=		6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac
 PKG_DESCR:=		wayland
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		wayland-host meson-host
-HOST_BUILDDEP:=		expat-host libxml2-host
-PKG_SITES:=		https://wayland.freedesktop.org/releases/
+HOST_BUILDDEP:=		expat-host libxml2-host libffi-host
+PKG_SITES:=		https://gitlab.freedesktop.org/wayland/wayland/-/releases/$(PKG_VERSION)/downloads/
 PKG_OPTS:=		dev
 
 include $(ADK_TOPDIR)/mk/host.mk
@@ -20,16 +20,30 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,WAYLAND,wayland,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,WAYLAND,wayland,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
-HOST_CONFIGURE_ARGS+=	--disable-documentation
+HOST_MESON_FLAGS+=	-Ddocumentation=false \
+			-Dtests=false \
+			-Dscanner=true
 MESON_FLAGS+=		-Ddocumentation=false \
+			-Dtests=false \
+			-Dlibraries=true \
 			-Dscanner=false
 
 WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
 
+HOST_STYLE:=		meson
 CONFIG_STYLE:=		meson
 BUILD_STYLE:=		meson
 INSTALL_STYLE:=		meson
 
+hostpost-install:
+	$(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/bin
+	$(INSTALL_BIN) $(WRKBUILD)/src/wayland-scanner \
+		$(STAGING_HOST_DIR)/usr/bin
+	$(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/lib/pkgconfig
+	$(CP) $(WRKBUILD)/meson-private/wayland-scanner.pc \
+		$(STAGING_HOST_DIR)/usr/lib/pkgconfig
+
+
 wayland-install:
 	$(INSTALL_DIR) $(IDIR_WAYLAND)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libwayland*.so* \
diff --git a/package/wayland/patches/patch-src_wayland-client_pc_in b/package/wayland/patches/patch-src_wayland-client_pc_in
deleted file mode 100644
index 0b665638c..000000000
--- a/package/wayland/patches/patch-src_wayland-client_pc_in
+++ /dev/null
@@ -1,8 +0,0 @@
---- wayland-1.19.0.orig/src/wayland-client.pc.in	2021-01-27 17:49:04.000000000 +0100
-+++ wayland-1.19.0/src/wayland-client.pc.in	2021-11-14 05:40:27.300530861 +0100
-@@ -9,4 +9,4 @@ Name: Wayland Client
- Description: Wayland client side library
- Version: @WAYLAND_VERSION@
- Cflags: -I${includedir}
--Libs: -L${libdir} -lwayland-client
-+Libs: -L${libdir} -lwayland-client -lffi
diff --git a/package/weston/Makefile b/package/weston/Makefile
index 7233c8107..a3d374355 100644
--- a/package/weston/Makefile
+++ b/package/weston/Makefile
@@ -4,15 +4,15 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		weston
-PKG_VERSION:=		9.0.0
+PKG_VERSION:=		11.0.0
 PKG_RELEASE:=		1
-PKG_HASH:=		82b17ab1766f13557fc620c21e3c89165342d3a3ead79ba01181b4f7d2144487
+PKG_HASH:=		5816a9e7bd67d03f268553a7af2f0c3430b409f7606244dada65188478f90800
 PKG_DESCR:=		wayland compositor
 PKG_SECTION:=		x11/drivers
-PKG_DEPENDS:=		wayland libxkbcommon libinput libpng libjpeg-turbo
-PKG_DEPENDS+=		libwebp pam libxcursor libudev xkeyboard-config cairo
+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
+PKG_BUILDDEP+=		libwebp pam libXcursor eudev cairo libseat libffi
 PKG_SITES:=		https://github.com/wayland-project/weston/archive/refs/tags/
 
 PKG_CFLINE_WESTON:=	select ADK_PACKAGE_CAIRO_WITH_PNG@
@@ -24,11 +24,11 @@ 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 \
 			-Dbackend-drm-screencast-vaapi=false \
 			-Dbackend-rdp=false \
 			-Dcolor-management-lcms=false \
-			-Dcolor-management-colord=false \
 			-Dremoting=false \
 			-Dpipewire=false \
 			-Ddemo-clients=false 
@@ -49,7 +49,7 @@ weston-install:
 	$(INSTALL_DIR) $(IDIR_WESTON)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/weston \
 		$(IDIR_WESTON)/usr/lib/
-	$(CP) $(WRKINST)/usr/lib/libweston-9 \
+	$(CP) $(WRKINST)/usr/lib/libweston-11 \
 		$(IDIR_WESTON)/usr/lib/
 	$(CP) $(WRKINST)/usr/lib/libweston*so* \
 		$(IDIR_WESTON)/usr/lib/