diff options
37 files changed, 112 insertions, 164 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 9b3191ae7..0c7ce0b24 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -127,9 +127,6 @@ ifeq ($(ADK_TARGET_WITH_ROOT_RW),y) else echo 'export IPKGTMPDIR=/tmp' >> $(IDIR_BASE_FILES)/etc/profile endif -ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) - echo 'export LD_LIBRARY_PATH=/opt/vc/lib' >> $(IDIR_BASE_FILES)/etc/profile -endif endif ifeq (${ADK_TARGET_PACKAGE_IPKG},y) $(CP) ./files/ipkg.conf $(IDIR_BASE_FILES)/etc/ diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index 83a594ad0..b297779a2 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/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 diff --git a/package/bcm28xx-utils/Makefile b/package/bcm28xx-utils/Makefile deleted file mode 100644 index e59dbde56..000000000 --- a/package/bcm28xx-utils/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= bcm28xx-utils -PKG_VERSION:= e65f5ec102e74218cda7da9fdc8b1caa0fd1127d -PKG_GIT:= hash -PKG_RELEASE:= 1 -PKG_DESCR:= videocore tools and utils -PKG_SECTION:= sys/hw -PKG_BUILDDEP:= cmake-host -PKG_NEEDS:= c++ threads -PKG_URL:= https://github.com/raspberrypi/utils -PKG_SITES:= https://github.com/raspberrypi/utils.git - -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi4 raspberry-pi4-64 raspberry-pi5 - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,BCM28XX_UTILS,bcm28xx-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -CONFIG_STYLE:= cmake - -bcm28xx-utils-install: - $(INSTALL_DIR) $(IDIR_BCM28XX_UTILS)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/vcgencmd \ - $(IDIR_BCM28XX_UTILS)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/vclog \ - $(IDIR_BCM28XX_UTILS)/usr/bin - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/bcm28xx-utils/patches/patch-CMakeLists_txt b/package/bcm28xx-utils/patches/patch-CMakeLists_txt deleted file mode 100644 index 956feac7e..000000000 --- a/package/bcm28xx-utils/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,16 +0,0 @@ ---- bcm28xx-utils-e65f5ec102e74218cda7da9fdc8b1caa0fd1127d.orig/CMakeLists.txt 2024-01-23 03:17:28.000000000 +0100 -+++ bcm28xx-utils-e65f5ec102e74218cda7da9fdc8b1caa0fd1127d/CMakeLists.txt 2024-01-23 03:21:39.257325745 +0100 -@@ -3,13 +3,10 @@ cmake_minimum_required(VERSION 3.1...3.2 - project(utils) - - # List of subsidiary CMakeLists --add_subdirectory(dtmerge) - add_subdirectory(eeptools) - add_subdirectory(otpset) - add_subdirectory(overlaycheck) - add_subdirectory(ovmerge) --add_subdirectory(pinctrl) - add_subdirectory(raspinfo) - add_subdirectory(vcgencmd) - add_subdirectory(vclog) --add_subdirectory(vcmailbox) diff --git a/package/cog/Makefile b/package/cog/Makefile index fead4df57..f2f757750 100644 --- a/package/cog/Makefile +++ b/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 diff --git a/package/curl/Makefile b/package/curl/Makefile index a7c53c947..4ee635110 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 8.12.1 +PKG_VERSION:= 8.13.0 PKG_RELEASE:= 1 -PKG_HASH:= 0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202 +PKG_HASH:= 4a093979a3c2d02de2fbc00549a32771007f2e78032c6faa5ecd2f7a9e152025 PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_BUILDDEP:= zlib diff --git a/package/expat/Makefile b/package/expat/Makefile index b178c115f..d8a723ac9 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -4,13 +4,12 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= expat -PKG_VERSION:= 2.7.0 +PKG_VERSION:= 2.7.1 PKG_RELEASE:= 1 -PKG_HASH:= 25df13dd2819e85fb27a1ce0431772b7047d72af81ae78dc26b4c6e0805f48d1 +PKG_HASH:= 354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30 PKG_DESCR:= xml parsing library PKG_SECTION:= libs/data -PKG_NEEDS:= c++ -PKG_SITES:= https://github.com/libexpat/libexpat/releases/download/R_2_7_0/ +PKG_SITES:= https://github.com/libexpat/libexpat/releases/download/R_2_7_1/ PKG_LIBNAME:= libexpat PKG_OPTS:= dev diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile index a9fcab4ff..cf4f25c08 100644 --- a/package/font-adobe-100dpi/Makefile +++ b/package/font-adobe-100dpi/Makefile @@ -20,11 +20,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,FONT_ADOBE_100DPI,font-adobe-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS+= DESTDIR='' - font-adobe-100dpi-install: $(INSTALL_DIR) $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi - $(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/100dpi/* \ + $(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \ $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile index 4f9d4dae9..61dc6568a 100644 --- a/package/font-adobe-75dpi/Makefile +++ b/package/font-adobe-75dpi/Makefile @@ -20,11 +20,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,FONT_ADOBE_75DPI,font-adobe-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS+= DESTDIR='' - font-adobe-75dpi-install: $(INSTALL_DIR) $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi - $(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/75dpi/* \ + $(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \ $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-util/Makefile b/package/font-util/Makefile index 5b9289f89..eeb265a28 100644 --- a/package/font-util/Makefile +++ b/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 diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 614a16381..aeb6fc8e9 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -4,20 +4,18 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= fontconfig -PKG_VERSION:= 2.15.0 +PKG_VERSION:= 2.16.0 PKG_RELEASE:= 1 -PKG_HASH:= f5f359d6332861bd497570848fcb42520964a9e83d5e3abe397b6b6db9bcaaf4 +PKG_HASH:= 6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220 PKG_DESCR:= library for configuring and customizing font access PKG_SECTION:= libs/fonts -PKG_DEPENDS:= libxml2 +PKG_DEPENDS:= libfreetype libxml2 PKG_BUILDDEP:= freetype libxml2 gperf-host util-linux HOST_BUILDDEP:= expat-host PKG_URL:= http://fontconfig.org/ PKG_SITES:= http://fontconfig.org/release/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -25,11 +23,13 @@ $(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})) HOST_STYLE:= auto -CONFIGURE_ARGS+= --with-arch=${ADK_TARGET_ARCH} \ - --enable-libxml2 \ +CONFIGURE_ARGS+= --enable-libxml2 \ --disable-docs fontconfig-install: + ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/fc-* \ + ${IDIR_FONTCONFIG}/usr/bin ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib ${IDIR_FONTCONFIG}/etc/fonts ${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib $(CP) ${WRKINST}/etc/fonts/* ${IDIR_FONTCONFIG}/etc/fonts diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 5db6dea81..1c6c264d7 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= freetype -PKG_VERSION:= 2.11.1 -PKG_RELEASE:= 2 -PKG_HASH:= f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b +PKG_VERSION:= 2.13.3 +PKG_RELEASE:= 1 +PKG_HASH:= 5c3a8e78f7b24c20b25b54ee575d6daa40007a5f4eea2845861c3409b3021747 PKG_DESCR:= free, high-quality and portable font engine PKG_SECTION:= libs/fonts PKG_DEPENDS:= zlib diff --git a/package/lftp/Makefile b/package/lftp/Makefile index 993df08b3..a3706227e 100644 --- a/package/lftp/Makefile +++ b/package/lftp/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= lftp -PKG_VERSION:= 4.9.2 +PKG_VERSION:= 4.9.3 PKG_RELEASE:= 1 -PKG_HASH:= c517c4f4f9c39bd415d7313088a2b1e313b2d386867fe40b7692b83a20f0670d +PKG_HASH:= 96e7199d7935be33cf6b1161e955b2aab40ab77ecdf2a19cea4fc1193f457edc PKG_DESCR:= ftp and http client PKG_SECTION:= net/http PKG_DEPENDS:= libncurses libexpat @@ -16,7 +16,10 @@ PKG_NEEDS:= c++ PKG_URL:= http://lftp.yar.ru/ PKG_SITES:= http://lftp.yar.ru/ftp/ -PKG_CHOICES_LFTP:= WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKG_CHOICES_LFTP:= WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl @@ -41,6 +44,10 @@ ifeq (${ADK_PACKAGE_LFTP_WITH_GNUTLS},y) CONFIGURE_ARGS+= --without-openssl \ --with-gnutls endif +ifeq (${ADK_PACKAGE_LFTP_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-openssl="$(STAGING_TARGET_DIR)/usr" \ + --without-gnutls +endif ifeq (${ADK_PACKAGE_LFTP_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-openssl="$(STAGING_TARGET_DIR)/usr" \ --without-gnutls diff --git a/package/lftp/patches/patch-src_lftp_ssl_cc b/package/lftp/patches/patch-src_lftp_ssl_cc deleted file mode 100644 index d8569322e..000000000 --- a/package/lftp/patches/patch-src_lftp_ssl_cc +++ /dev/null @@ -1,38 +0,0 @@ ---- lftp-4.9.2.orig/src/lftp_ssl.cc 2020-01-29 21:36:37.000000000 +0100 -+++ lftp-4.9.2/src/lftp_ssl.cc 2024-02-22 14:42:11.060809468 +0100 -@@ -34,7 +34,7 @@ - #include "misc.h" - #include "network.h" - #include "buffer.h" --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject - #endif - extern "C" { -@@ -775,7 +775,7 @@ error: - #elif USE_OPENSSL - //static int lftp_ssl_passwd_callback(char *buf,int size,int rwflag,void *userdata); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L) - // for compatibility with older versions - X509_OBJECT *X509_OBJECT_new() - { -@@ -840,7 +840,7 @@ lftp_ssl_openssl_instance::lftp_ssl_open - ssl_ctx=SSL_CTX_new(); - X509_set_default_verify_paths(ssl_ctx->cert); - #else --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - SSLeay_add_ssl_algorithms(); - #endif - ssl_ctx=SSL_CTX_new(SSLv23_client_method()); -@@ -1080,7 +1080,7 @@ void lftp_ssl_openssl::copy_sid(const lf - - const char *lftp_ssl_openssl::strerror() - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - SSL_load_error_strings(); - #endif - int error=ERR_get_error(); diff --git a/package/libdisplay-info/Makefile b/package/libdisplay-info/Makefile index 9edc11c4f..c90de5b58 100644 --- a/package/libdisplay-info/Makefile +++ b/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))) diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile index e5999416b..608ca2850 100644 --- a/package/libdrm/Makefile +++ b/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 diff --git a/package/libinput/Makefile b/package/libinput/Makefile index 8c0c6a759..dddc4831f 100644 --- a/package/libinput/Makefile +++ b/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))) diff --git a/package/libnettle/Makefile b/package/libnettle/Makefile index c5c10771e..75cd70ea1 100644 --- a/package/libnettle/Makefile +++ b/package/libnettle/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libnettle -PKG_VERSION:= 3.9.1 +PKG_VERSION:= 3.10.1 PKG_RELEASE:= 1 -PKG_HASH:= ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3 +PKG_HASH:= b0fcdd7fc0cdea6e80dcf1dd85ba794af0d5b4a57e26397eee3bc193272d9132 PKG_DESCR:= crypto library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgmp diff --git a/package/libpsl/Makefile b/package/libpsl/Makefile index b8df0cf24..b71f7cc29 100644 --- a/package/libpsl/Makefile +++ b/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 diff --git a/package/libsoup3/Makefile b/package/libsoup3/Makefile index caef6b013..f7aa3fb9b 100644 --- a/package/libsoup3/Makefile +++ b/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 diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile index 7cf62dc53..468ba9145 100644 --- a/package/libtasn1/Makefile +++ b/package/libtasn1/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libtasn1 -PKG_VERSION:= 4.19.0 +PKG_VERSION:= 4.20.0 PKG_RELEASE:= 1 -PKG_HASH:= 1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a +PKG_HASH:= 92e0e3bd4c02d4aeee76036b2ddd83f0c732ba4cda5cb71d583272b23587a76c PKG_DESCR:= asn.1 and der structures manipulation library PKG_SECTION:= libs/crypto PKG_URL:= http://www.gnupg.org/ diff --git a/package/libwpe/Makefile b/package/libwpe/Makefile index c8e744ddd..bf633fde4 100644 --- a/package/libwpe/Makefile +++ b/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 diff --git a/package/libxkbcommon/Makefile b/package/libxkbcommon/Makefile index 1650043a9..784fcd736 100644 --- a/package/libxkbcommon/Makefile +++ b/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 diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 078788d7e..a38d6898d 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libxml2 -PKG_VERSION:= 2.10.3 +PKG_VERSION:= 2.14.2 PKG_RELEASE:= 1 -PKG_HASH:= 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c +PKG_HASH:= 353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6 PKG_DESCR:= xml parser and toolkit PKG_SECTION:= libs/data PKG_DEPENDS:= zlib PKG_BUILDDEP:= libxml2-host python3 zlib HOST_BUILDDEP:= python3-host PKG_URL:= http://www.xmlsoft.org/ -PKG_SITES:= https://download.gnome.org/sources/libxml2/2.10/ +PKG_SITES:= https://download.gnome.org/sources/libxml2/2.14/ PKG_OPTS:= dev include $(ADK_TOPDIR)/mk/host.mk diff --git a/package/mesa/Makefile b/package/mesa/Makefile index 0f0955160..d29a0a2d9 100644 --- a/package/mesa/Makefile +++ b/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 diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 5e8f57851..8d8e113ef 100644 --- a/package/util-linux/Makefile +++ b/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 diff --git a/package/wayland-protocols/Makefile b/package/wayland-protocols/Makefile index 364703e12..260071ad7 100644 --- a/package/wayland-protocols/Makefile +++ b/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))) diff --git a/package/weston/Makefile b/package/weston/Makefile index 3355dd394..9165036cd 100644 --- a/package/weston/Makefile +++ b/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 diff --git a/package/wpebackend-fdo/Makefile b/package/wpebackend-fdo/Makefile index b981c0b08..e47faad6b 100644 --- a/package/wpebackend-fdo/Makefile +++ b/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 diff --git a/package/wpewebkit/Makefile b/package/wpewebkit/Makefile index 64282f161..08fbe767e 100644 --- a/package/wpewebkit/Makefile +++ b/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 diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile index 4df0982a5..90f850545 100644 --- a/package/xf86-video-fbdev/Makefile +++ b/package/xf86-video-fbdev/Mak |