misc fixes for cog

package/bcm28xx-bootloader/Makefile

@@ -66,7 +66,6 @@ ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_CUTDOWN),y)
 endif
 	printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
-ifeq ($(ADK_PACKAGE_KODI),y)
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y)
 	printf "dtoverlay=vc4-kms-v3d-pi4\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
@@ -75,7 +74,6 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI5),y)
 	printf "dtoverlay=vc4-kms-v3d-pi5\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
 endif
-endif
 ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_AMP),)
 	printf "dtoverlay=hifiberry-amp\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt

package/cog/Makefile

@@ -31,6 +31,9 @@ BUILD_STYLE:=		meson
 INSTALL_STYLE:=		meson
 
 cog-install:
+	$(INSTALL_DIR) $(IDIR_COG)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libcogcore.so* \
+		$(IDIR_COG)/usr/lib
 	$(INSTALL_DIR) $(IDIR_COG)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/cog \
 		$(IDIR_COG)/usr/bin

package/font-util/Makefile

@@ -14,8 +14,10 @@ PKG_SITES:=		http://www.x.org/releases/individual/font/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
+include ${ADK_TOPDIR}/mk/host.mk
 include ${ADK_TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 # XXX: Push the mapping files to a place where we can find them
@@ -38,4 +40,5 @@ font-util-install:
 	${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
 		${IDIR_FONT_UTIL}/usr/share/fonts/X11/util
 
+include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/libdisplay-info/Makefile

@@ -6,13 +6,15 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		libdisplay-info
 PKG_VERSION:=		0.2.0
 PKG_RELEASE:=		1
-PKG_HASH:=		5a2f002a16f42dd3540c8846f80a90b8f4bdcd067a94b9d2087bc2feae974176
+PKG_HASH:=		f7331fcaf5527251b84c8fb84238d06cd2f458422ce950c80e86c72927aa8c2b
 PKG_DESCR:=		edid and displayid library
 PKG_SECTION:=		libs/misc
-PKG_BUILDDEP:=		hwdata
-PKG_SITES:=		https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/$(PKG_VERSION)/downloads/
+PKG_BUILDDEP:=		hwdata meson-host
+PKG_SITES:=		https://gitlab.freedesktop.org/emersion/libdisplay-info/-/archive/$(PKG_VERSION)/
 PKG_OPTS:=		dev
 
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
+
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBDISPLAY_INFO,libdisplay-info,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))

package/libdrm/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libdrm
-PKG_VERSION:=		2.4.120
+PKG_VERSION:=		2.4.124
 PKG_RELEASE:=		1
-PKG_HASH:=		3bf55363f76c7250946441ab51d3a6cc0ae518055c0ff017324ab76cdefb327a
+PKG_HASH:=		ac36293f61ca4aafaf4b16a2a7afff312aa4f5c37c9fbd797de9e3c0863ca379
 PKG_DESCR:=		direct rendering manager library
 PKG_SECTION:=		libs/video
 PKG_BUILDDEP:=		meson-host libpthread-stubs cairo libpciaccess

package/libinput/Makefile

@@ -4,16 +4,18 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libinput
-PKG_VERSION:=		1.19.2
+PKG_VERSION:=		1.28.1
 PKG_RELEASE:=		1
-PKG_HASH:=		0fc39f0af3ee1a77c60c34bc45391a4d0879169f7c0f7bbbeb5eef590b98b883
+PKG_HASH:=		a13f8c9a7d93df3c85c66afd135f0296701d8d32f911991b7aa4273fdd6a42a3
 PKG_DESCR:=		input library
 PKG_DEPENDS:=		mtdev libevdev libudev
 PKG_BUILDDEP:=		mtdev libevdev eudev
 PKG_SECTION:=		libs/misc
-PKG_SITES:=		https://www.freedesktop.org/software/libinput/
+PKG_SITES:=		https://gitlab.freedesktop.org/libinput/libinput/-/archive/$(PKG_VERSION)/
 PKG_OPTS:=		dev
 
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
+
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBINPUT,libinput,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))

package/libpsl/Makefile

@@ -24,9 +24,9 @@ CONFIG_STYLE:=		meson
 BUILD_STYLE:=		meson
 INSTALL_STYLE:=		meson
 
-libsoup-install:
-	$(INSTALL_DIR) $(IDIR_LIBSOUP)/usr/lib
+libpsl-install:
+	$(INSTALL_DIR) $(IDIR_LIBPSL)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libpsl*.so* \
-		$(IDIR_LIBSOUP)/usr/lib
+		$(IDIR_LIBPSL)/usr/lib
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/libsoup3/Makefile

@@ -31,8 +31,8 @@ BUILD_STYLE:=		meson
 INSTALL_STYLE:=		meson
 
 libsoup3-install:
-	$(INSTALL_DIR) $(IDIR_LIBSOUP)/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBSOUP3)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libsoup*.so* \
-		$(IDIR_LIBSOUP)/usr/lib
+		$(IDIR_LIBSOUP3)/usr/lib
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/libwpe/Makefile

@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		960bdd11c3f2cf5bd91569603ed6d2aa42fd4000ed7cac930a804eac367888d7
 PKG_DESCR:=		general purpose library for wpe
 PKG_SECTION:=		libs/misc
+PKG_DEPENDS:=		libxkbcommon
+PKG_BUILDDEP:=		libxkbcommon
 PKG_URL:=		https://wpewebkit.org
 PKG_SITES:=		https://wpewebkit.org/releases/
 PKG_OPTS:=		dev

package/libxkbcommon/Makefile

@@ -4,12 +4,13 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libxkbcommon
-PKG_VERSION:=		1.5.0
+PKG_VERSION:=		1.7.0
 PKG_RELEASE:=		1
-PKG_HASH:=		560f11c4bbbca10f495f3ef7d3a6aa4ca62b4f8fb0b52e7d459d18a26e46e017
+PKG_HASH:=		65782f0a10a4b455af9c6baab7040e2f537520caa2ec2092805cdfd36863b247
 PKG_DESCR:=		library for handling of keyboard descriptions
 PKG_SECTION:=		libs/misc
-PKG_BUILDDEP:=		meson-host
+PKG_DEPENDS:=		wayland
+PKG_BUILDDEP:=		meson-host wayland wayland-protocols
 PKG_SITES:=		https://xkbcommon.org/download/
 PKG_OPTS:=		dev
 
@@ -18,7 +19,7 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBXKBCOMMON,libxkbcommon,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 MESON_FLAGS+=		-Denable-docs=false \
-			-Denable-wayland=false \
+			-Denable-wayland=true \
 			-Dxkb-config-root=/usr/share/X11/xkb
 
 WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj

package/mesa/Makefile

@@ -40,6 +40,7 @@ MESON_FLAGS+=		-Dllvm=disabled \
 
 mesa-install:
 	$(INSTALL_DIR) $(IDIR_MESA)/usr/lib/dri
+	$(INSTALL_DIR) $(IDIR_MESA)/usr/lib/gbm
 	$(CP) $(WRKINST)/usr/lib/libEGL*.so* \
 		$(IDIR_MESA)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libGL*.so* \
@@ -50,5 +51,7 @@ mesa-install:
 		$(IDIR_MESA)/usr/lib
 	${CP} $(WRKINST)/usr/lib/dri/*.so \
 		${IDIR_MESA}/usr/lib/dri/
+	${CP} $(WRKINST)/usr/lib/gbm/*.so \
+		${IDIR_MESA}/usr/lib/gbm/
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/util-linux/Makefile

@@ -53,6 +53,7 @@ PKGSS_MOUNT:=		libblkid libmount libuuid libncurses
 PKGSC_MOUNT:=		sys/fs
 PKGSD_MCOOKIE:=		generate magic cookies for xauth
 PKGSC_MCOOKIE:=		x11/utils
+PKGSS_MCOOKIE:=		libncurses
 
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk

package/wayland-protocols/Makefile

@@ -6,13 +6,15 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		wayland-protocols
 PKG_VERSION:=		1.43
 PKG_RELEASE:=		1
-PKG_HASH:=		ba3c3425dd27c57b5291e93dba97be12479601e00bcab24d26471948cb643653
+PKG_HASH:=		05fc0ff0c6b3081549d8f81c6b584076a20be18e8c2b9be65ae09ce05e5aea9e
 PKG_DESCR:=		wayland protocols
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		meson-host wayland-host
-PKG_SITES:=		https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(PKG_VERSION)/downloads/
+PKG_SITES:=		https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/$(PKG_VERSION)/
 PKG_OPTS:=		dev
 
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
+
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,WAYLAND_PROTOCOLS,wayland-protocols,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))

package/weston/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		weston
-PKG_VERSION:=		14.0.1
+PKG_VERSION:=		14.0.2
 PKG_RELEASE:=		1
-PKG_HASH:=		a8150505b126a59df781fe8c30c8e6f87da7013e179039eb844a5bbbcc7c79b3
+PKG_HASH:=		633f4e0f232ad150300c95ffcbc646fedf1349487bf389dbd2045fa69013d6e2
 PKG_DESCR:=		wayland compositor
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		wayland libxkbcommon libinput libpng libjpeg-turbo libseat mesa libexpat
@@ -14,7 +14,9 @@ PKG_DEPENDS+=		libwebp pam libxcursor libudev xkeyboard-config cairo libffi libd
 PKG_DEPENDS+=		libdisplay-info
 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_SITES:=		https://gitlab.freedesktop.org/wayland/weston/-/archive/$(PKG_VERSION)/
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
 
@@ -29,7 +31,9 @@ MESON_FLAGS+=		-Dsystemd=false \
 			-Dbackend-pipewire=false \
 			-Dxwayland=false \
 			-Dtest-junit-xml=false \
-			-Ddemo-clients=false 
+			-Ddemo-clients=false \
+			-Dshell-fullscreen=true \
+			-Drenderer-gl=true
 
 WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
 

package/wpebackend-fdo/Makefile

@@ -9,7 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		beddf321232d5bd08106c179dbc600f8ce88eb3620b4a59a6329063b78f64635
 PKG_DESCR:=		freedesktop.org wpe backend
 PKG_SECTION:=		libs/misc
-PKG_BUILDDEP:=		wayland
+PKG_DEPENDS:=		libwpe
+PKG_BUILDDEP:=		wayland libwpe
 PKG_URL:=		https://wpewebkit.org
 PKG_SITES:=		https://wpewebkit.org/releases/
 PKG_OPTS:=		dev
@@ -26,7 +27,7 @@ INSTALL_STYLE:=		meson
 
 wpebackend-fdo-install:
 	$(INSTALL_DIR) $(IDIR_WPEBACKEND_FDO)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libwpebackend-fdo*.so* \
+	$(CP) $(WRKINST)/usr/lib/libWPEBackend-fdo*.so* \
 		$(IDIR_WPEBACKEND_FDO)/usr/lib
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/wpewebkit/Makefile

@@ -9,8 +9,12 @@ PKG_RELEASE:=		1
 PKG_HASH:=		25bc557fd62f06ac8393a6f638ffceff3d9f367d6d35195315fa459c82f80850
 PKG_DESCR:=		web platform for embedded
 PKG_SECTION:=		libs/misc
-PKG_DEPENDS:=		libwpe libsoup3
-PKG_BUILDDEP:=		cmake-host libwpe libsoup3
+PKG_DEPENDS:=		libwpe libsoup3 harfbuzz libjpeg-turbo libgcrypt
+PKG_DEPENDS+=		libtasn1 libwebp gstreamer gst-plugins-base libxslt
+PKG_DEPENDS+=		libpsl libmount
+PKG_BUILDDEP:=		cmake-host libwpe libsoup3 harfbuzz libjpeg-turbo
+PKG_BUILDDEP+=		libgcrypt libtasn1 libwebp gstreamer gst-plugins-base
+PKG_BUILDDEP+=		libxslt libpsl
 PKG_URL:=		https://wpewebkit.org
 PKG_SITES:=		https://wpewebkit.org/releases/
 PKG_OPTS:=		dev

package/xf86-video-fbdev/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-video-fbdev
-PKG_VERSION:=		0.4.4
+PKG_VERSION:=		0.5.1
 PKG_RELEASE:=		1
-PKG_HASH:=		49e545951ea5fddc0d9b3ed3bf60e9a588a9c09401cc93ac082e064530bc0f81
+PKG_HASH:=		5e73c01f6ede09ddbc1f553fecdf35dd8efe76b44c7ed263de786a5968c5116f
 PKG_DESCR:=		x11 driver for framebuffer devices
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server

package/xorg-server/Makefile

@@ -20,7 +20,7 @@ PKG_BUILDDEP+=		scrnsaverproto resourceproto fontsproto videoproto
 PKG_BUILDDEP+=		compositeproto evieext libxkbfile libXfont2 pixman
 PKG_BUILDDEP+=		libpciaccess xf86dgaproto recordproto dri3proto
 PKG_BUILDDEP+=		xineramaproto presentproto xf86driproto glproto mesa
-PKG_BUILDDEP+=		xorgproto libxcvt libdrm libepoxy
+PKG_BUILDDEP+=		xorgproto libxcvt libdrm libepoxy font-util-host
 PKG_NEEDS:=		threads c++
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		http://www.x.org/releases/individual/xserver/
@@ -48,6 +48,8 @@ $(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE}
 
 TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t
 
+AUTOTOOL_STYLE:=	autoreconf
+
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_OPENSSL},y)
 CONFIGURE_ARGS+=	 --with-sha1=libcrypto
 endif

package/xorg-server/patches/patch-configure

@@ -1,6 +1,6 @@
---- xorg-server-21.1.5.orig/configure	2022-12-14 03:25:26.000000000 +0100
-+++ xorg-server-21.1.5/configure	2022-12-31 10:38:30.017910171 +0100
-@@ -29281,7 +29281,7 @@ printf "%s\n" "#define BASE_FONT_PATH \"
+--- xorg-server-21.1.16.orig/configure	2025-02-25 18:56:12.000000000 +0000
++++ xorg-server-21.1.16/configure	2025-04-19 02:08:40.369203750 +0000
+@@ -30272,7 +30272,7 @@ printf "%s\n" "#define BASE_FONT_PATH \"
    test "$prefix_NONE" && prefix=NONE
    test "$exec_prefix_NONE" && exec_prefix=NONE
  

package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am

@@ -0,0 +1,11 @@
+--- xorg-server-21.1.16.orig/hw/xfree86/drivers/modesetting/Makefile.am	2025-02-25 18:56:05.000000000 +0000
++++ xorg-server-21.1.16/hw/xfree86/drivers/modesetting/Makefile.am	2025-04-24 17:19:31.290883875 +0000
+@@ -41,7 +41,7 @@ AM_CPPFLAGS = \
+ 
+ modesetting_drv_la_LTLIBRARIES = modesetting_drv.la
+ modesetting_drv_la_LDFLAGS = -module -avoid-version
+-modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS)
++modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS) $(GBM_LIBS)
+ modesetting_drv_ladir = @moduledir@/drivers
+ 
+ modesetting_drv_la_SOURCES = \