diff options
Diffstat (limited to 'package')
56 files changed, 463 insertions, 185 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/bash/Makefile b/package/bash/Makefile index bfed5373c..3d8acfc22 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bash -PKG_VERSION:= 5.2.21 +PKG_VERSION:= 5.2.37 PKG_RELEASE:= 1 -PKG_HASH:= c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8 +PKG_HASH:= 9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff PKG_DESCR:= bourne-again shell PKG_SECTION:= base/shells PKG_URL:= http://www.gnu.org/software/bash/ 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 new file mode 100644 index 000000000..9a22fac0b --- /dev/null +++ b/package/cog/Makefile @@ -0,0 +1,44 @@ +# 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:= cog +PKG_VERSION:= 0.18.4 +PKG_RELEASE:= 1 +PKG_HASH:= 31d7079db2eeed790899d2f1f824dd6a54bf30d072d196d737be572f105d99b1 +PKG_DESCR:= minimalistic browser +PKG_SECTION:= app/browser +PKG_DEPENDS:= wpewebkit wpebackend-fdo libinput +PKG_BUILDDEP:= wpewebkit wpebackend-fdo libinput +PKG_URL:= https://wpewebkit.org +PKG_SITES:= https://wpewebkit.org/releases/ + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,COG,cog,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS+= -Ddocumentation=false \ + -Dmanpages=false \ + -Dprograms=true \ + -Dwpe_api=2.0 \ + -Dplatforms="wayland" + +CONFIG_STYLE:= meson +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/lib/cog/modules + $(CP) $(WRKINST)/usr/lib/cog/modules/* \ + $(IDIR_COG)/usr/lib/cog/modules + $(INSTALL_DIR) $(IDIR_COG)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/cog \ + $(IDIR_COG)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk 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/dnsmasq/Makefile b/package/dnsmasq/Makefile index d204305b0..d036235a1 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= dnsmasq -PKG_VERSION:= 2.90 +PKG_VERSION:= 2.91 PKG_RELEASE:= 1 -PKG_HASH:= 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 +PKG_HASH:= f622682848b33677adb2b6ad08264618a2ae0a01da486a93fd8cd91186b3d153 PKG_DESCR:= lightweight dns, dhcp and tftp server PKG_SECTION:= net/dns PKG_KDEPENDS:= inotify-user diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index cfadb30af..b47fe75ed 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= e2fsprogs -PKG_VERSION:= 1.47.1 +PKG_VERSION:= 1.47.2 PKG_RELEASE:= 1 -PKG_HASH:= 5a33dc047fd47284bca4bb10c13cfe7896377ae3d01cb81a05d406025d99e0d1 +PKG_HASH:= 08242e64ca0e8194d9c1caad49762b19209a06318199b63ce74ae4ef2d74e63c PKG_DESCR:= ext2/3/4 filesystem utilities PKG_SECTION:= sys/fs PKG_BUILDDEP:= util-linux diff --git a/package/expat/Makefile b/package/expat/Makefile index 6b58ee822..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 @@ -25,7 +24,8 @@ TARGET_CFLAGS:= $(filter-out -static,$(TARGET_CFLAGS)) TARGET_LDFLAGS:=$(filter-out -static,$(TARGET_LDFLAGS)) endif -CONFIGURE_ARGS+= --without-docbook +CONFIGURE_ARGS+= --without-docbook \ + --without-tests libexpat-install: ${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib 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/freetype/patches/patch-include_freetype_config_ftoption_h b/package/freetype/patches/patch-include_freetype_config_ftoption_h new file mode 100644 index 000000000..2ef6bb7f2 --- /dev/null +++ b/package/freetype/patches/patch-include_freetype_config_ftoption_h @@ -0,0 +1,11 @@ +--- freetype-2.13.3.orig/include/freetype/config/ftoption.h 2024-07-18 07:14:58.000000000 +0000 ++++ freetype-2.13.3/include/freetype/config/ftoption.h 2025-04-29 09:05:47.004181201 +0000 +@@ -255,7 +255,7 @@ FT_BEGIN_HEADER + * stream support, in the cases where file stream support is not necessary + * such as memory loading of font files. + */ +-/* #define FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT */ ++#define FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT + + + /************************************************************************** diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 3e7d88f80..1d3e818d9 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kexec-tools -PKG_VERSION:= 2.0.23 -PKG_RELEASE:= 2 -PKG_HASH:= aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b +PKG_VERSION:= 2.0.31 +PKG_RELEASE:= 1 +PKG_HASH:= 8a8f350ddc66e1c905a3ab525a7e9ba96c81e04e70ef69397b0155b67b922c31 PKG_DESCR:= kernel exec tools PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib diff --git a/package/kmod/Makefile b/package/kmod/Makefile index c46410927..36f4ea57f 100644 --- a/package/kmod/Makefile +++ b/package/kmod/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kmod -PKG_VERSION:= 31 +PKG_VERSION:= 34.2 PKG_RELEASE:= 1 -PKG_HASH:= f5a6949043cc72c001b728d8c218609c5a15f3c33d75614b78c79418fcf00d80 +PKG_HASH:= 5a5d5073070cc7e0c7a7a3c6ec2a0e1780850c8b47b3e3892226b93ffcb9cb54 PKG_DESCR:= kernel module utils PKG_SECTION:= sys/utils PKG_DEPENDS:= libkmod 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:= |