diff options
Diffstat (limited to 'package')
165 files changed, 1265 insertions, 713 deletions
diff --git a/package/apcupsd/Makefile b/package/apcupsd/Makefile index 52b6def9a..382f33e2d 100644 --- a/package/apcupsd/Makefile +++ b/package/apcupsd/Makefile @@ -11,12 +11,12 @@ PKG_DESCR:= APC UPS daemon with integrated tcp/ip remote shutdown PKG_SECTION:= sys/misc PKG_DEPENDS:= libusb PKG_BUILDDEP:= libusb +PKG_KDEPENDS:= usb-hid usb-hiddev PKG_URL:= http://www.apcupsd.org PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=apcupsd/) DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CFLINE_APCUPSD:= select BUSYBOX_WALL@ -PKG_CFLINE_APCUPSD+= select ADK_LINUX_KERNEL_USB_HID@ include $(ADK_TOPDIR)/mk/package.mk 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/base-files/files/inittab.sysv b/package/base-files/files/inittab.sysv index f1fd8b126..a6684a4ea 100644 --- a/package/base-files/files/inittab.sysv +++ b/package/base-files/files/inittab.sysv @@ -1,5 +1,6 @@ null::sysinit:/bin/mount -t proc proc /proc null::sysinit:/bin/mount -t sysfs sys /sys +null::sysinit:/bin/mount -t devtmpfs devtmpfs /dev null::sysinit:/bin/mkdir -p /dev/pts null::sysinit:/bin/mkdir -p /dev/shm null::sysinit:/bin/mount -a -t devpts 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..58ae843dc 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 @@ -121,7 +119,7 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4),y) $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y) - printf "arm_control=0x200\n" >> \ + printf "arm_64bit=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt diff --git a/package/bcm28xx-bootloader/src/boot/bootcode.bin b/package/bcm28xx-bootloader/src/boot/bootcode.bin Binary files differindex 9e831a273..636933850 100644 --- a/package/bcm28xx-bootloader/src/boot/bootcode.bin +++ b/package/bcm28xx-bootloader/src/boot/bootcode.bin diff --git a/package/bcm28xx-bootloader/src/boot/fixup.dat b/package/bcm28xx-bootloader/src/boot/fixup.dat Binary files differindex 2ff966820..667cafba8 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4.dat b/package/bcm28xx-bootloader/src/boot/fixup4.dat Binary files differindex 4380d320e..9bf503434 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup4.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup4.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4cd.dat b/package/bcm28xx-bootloader/src/boot/fixup4cd.dat Binary files differindex 79a0b55e7..c0614cd5d 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup4cd.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup4cd.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4db.dat b/package/bcm28xx-bootloader/src/boot/fixup4db.dat Binary files differindex 4d13d6581..9ef1b932b 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup4db.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup4db.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup4x.dat b/package/bcm28xx-bootloader/src/boot/fixup4x.dat Binary files differindex 4d8ff5a96..9c10b2d5e 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup4x.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup4x.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat Binary files differindex 79a0b55e7..c0614cd5d 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_cd.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_cd.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_db.dat b/package/bcm28xx-bootloader/src/boot/fixup_db.dat Binary files differindex 3927ea52e..e695c9f9d 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_db.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_db.dat diff --git a/package/bcm28xx-bootloader/src/boot/fixup_x.dat b/package/bcm28xx-bootloader/src/boot/fixup_x.dat Binary files differindex b93bc0620..ea04cdbdb 100644 --- a/package/bcm28xx-bootloader/src/boot/fixup_x.dat +++ b/package/bcm28xx-bootloader/src/boot/fixup_x.dat diff --git a/package/bcm28xx-bootloader/src/boot/start.elf b/package/bcm28xx-bootloader/src/boot/start.elf Binary files differindex f5d78d670..0af80e5cf 100644 --- a/package/bcm28xx-bootloader/src/boot/start.elf +++ b/package/bcm28xx-bootloader/src/boot/start.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4.elf b/package/bcm28xx-bootloader/src/boot/start4.elf Binary files differindex 300e7a8a4..a5b6bf0ef 100644 --- a/package/bcm28xx-bootloader/src/boot/start4.elf +++ b/package/bcm28xx-bootloader/src/boot/start4.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4cd.elf b/package/bcm28xx-bootloader/src/boot/start4cd.elf Binary files differindex b7fe9328d..eee7efc46 100644 --- a/package/bcm28xx-bootloader/src/boot/start4cd.elf +++ b/package/bcm28xx-bootloader/src/boot/start4cd.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4db.elf b/package/bcm28xx-bootloader/src/boot/start4db.elf Binary files differindex acd07e82c..f3e979f10 100644 --- a/package/bcm28xx-bootloader/src/boot/start4db.elf +++ b/package/bcm28xx-bootloader/src/boot/start4db.elf diff --git a/package/bcm28xx-bootloader/src/boot/start4x.elf b/package/bcm28xx-bootloader/src/boot/start4x.elf Binary files differindex 274a62944..f9901aa7a 100644 --- a/package/bcm28xx-bootloader/src/boot/start4x.elf +++ b/package/bcm28xx-bootloader/src/boot/start4x.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_cd.elf b/package/bcm28xx-bootloader/src/boot/start_cd.elf Binary files differindex 5e616d0c6..46517c526 100644 --- a/package/bcm28xx-bootloader/src/boot/start_cd.elf +++ b/package/bcm28xx-bootloader/src/boot/start_cd.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_db.elf b/package/bcm28xx-bootloader/src/boot/start_db.elf Binary files differindex f10f87fa3..80a04b2ba 100644 --- a/package/bcm28xx-bootloader/src/boot/start_db.elf +++ b/package/bcm28xx-bootloader/src/boot/start_db.elf diff --git a/package/bcm28xx-bootloader/src/boot/start_x.elf b/package/bcm28xx-bootloader/src/boot/start_x.elf Binary files differindex 26c1de866..b21614bc2 100644 --- a/package/bcm28xx-bootloader/src/boot/start_x.elf +++ b/package/bcm28xx-bootloader/src/boot/start_x.elf 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/ccache/Makefile b/package/ccache/Makefile index 613cfe8aa..10dc9b945 100644 --- a/package/ccache/Makefile +++ b/package/ccache/Makefile @@ -4,12 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ccache -PKG_VERSION:= 3.3.4 +PKG_VERSION:= 4.11.3 PKG_RELEASE:= 1 -PKG_HASH:= 24f15bf389e38c41548c9c259532187774ec0cb9686c3497bbb75504c8dc404f +PKG_HASH:= d5a340e199977b7b1e89c0add794132c977fdc2ecc7ca5451e03d43627a1b1be PKG_DESCR:= compiler cache utility PKG_SECTION:= dev/tools -PKG_SITES:= http://samba.org/ftp/ccache/ +HOST_BUILDDEP:= cmake-host +PKG_SITES:= https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION)/ PKG_CFLINE_CCACHE:= depends on ADK_HOST_ONLY @@ -18,5 +19,15 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,CCACHE,ccache,$(PKG_VERSION)-${PKG_RELEASE})) +HOST_STYLE:= cmake + +host-build: + (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET}) + +hostpost-install: + (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET}) + include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cmake/Makefile b/package/cmake/Makefile index 5b80b32e6..b27983bb6 100644 --- a/package/cmake/Makefile +++ b/package/cmake/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= cmake -PKG_VERSION:= 4.0.0 +PKG_VERSION:= 4.1.2 PKG_RELEASE:= 1 -PKG_HASH:= ddc54ad63b87e153cf50be450a6580f1b17b4881de8941da963ff56991a4083b +PKG_HASH:= 643f04182b7ba323ab31f526f785134fb79cba3188a852206ef0473fee282a15 PKG_DESCR:= build utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= curl-host diff --git a/package/cog/Makefile b/package/cog/Makefile index fead4df57..7302f570f 100644 --- a/package/cog/Makefile +++ b/package/cog/Makefile @@ -4,16 +4,20 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= cog -PKG_VERSION:= 0.18.4 +PKG_VERSION:= 0.18.5 PKG_RELEASE:= 1 -PKG_HASH:= 31d7079db2eeed790899d2f1f824dd6a54bf30d072d196d737be572f105d99b1 +PKG_HASH:= 0ede9d09ab635ac519beec0543378e3fc51b56561a5fb7aa9c0cbca54c31b97c PKG_DESCR:= minimalistic browser PKG_SECTION:= app/browser -PKG_DEPENDS:= wpewebkit wpebackend-fdo libinput +PKG_DEPENDS:= wpewebkit wpebackend-fdo libinput glib-networking ca-certificates PKG_BUILDDEP:= wpewebkit wpebackend-fdo libinput PKG_URL:= https://wpewebkit.org PKG_SITES:= https://wpewebkit.org/releases/ +PKG_CHOICES_COG:= WITH_X11 WITH_WAYLAND +PKGCD_WITH_WAYLAND:= with wayland support +PKGCD_WITH_X11:= with X11 support + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,COG,cog,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) @@ -23,14 +27,27 @@ WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj MESON_FLAGS+= -Ddocumentation=false \ -Dmanpages=false \ -Dprograms=true \ - -Dwpe_api=2.0 \ - -Dplatforms=drm + -Dwpe_api=2.0 + +ifeq ($(ADK_PACKAGE_COG_WITH_WAYLAND),y) +MESON_FLAGS+= -Dplatforms="wayland" +endif + +ifeq ($(ADK_PACKAGE_COG_WITH_X11),y) +MESON_FLAGS+= -Dplatforms="x11" +endif 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 diff --git a/package/curl/Makefile b/package/curl/Makefile index a7c53c947..c4711a7d2 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,12 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 8.12.1 +PKG_VERSION:= 8.16.0 PKG_RELEASE:= 1 -PKG_HASH:= 0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202 +PKG_HASH:= 40c8cddbcb6cc6251c03dea423a472a6cea4037be654ba5cf5dec6eb2d22ff1d PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_BUILDDEP:= zlib +HOST_BUILDDEP:= openssl-host PKG_NEEDS:= threads PKG_URL:= https://curl.se/ PKG_SITES:= https://curl.se/download/ @@ -20,7 +21,7 @@ PKG_SUBPKGS:= LIBCURL CURL PKGSD_LIBCURL:= client-side url transfer library PKGSC_LIBCURL:= libs/net PKGSS_LIBCURL:= zlib -PKGSD_CURL:= client-side url transfer utiity +PKGSD_CURL:= client-side url transfer utility PKGSC_CURL:= net/http PKGSS_CURL:= zlib libcurl @@ -49,7 +50,7 @@ $(eval $(call HOST_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL},${PKG_OPTS})) $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -HOST_CONFIGURE_ARGS+= --without-ssl \ +HOST_CONFIGURE_ARGS+= --with-openssl="$(STAGING_HOST_DIR)/usr" \ --without-libpsl ifeq (${ADK_PACKAGE_LIBCURL_WITH_LIBRESSL},y) diff --git a/package/dejavu-ttf-fonts/Makefile b/package/dejavu-ttf-fonts/Makefile new file mode 100644 index 000000000..c1bc7d6f5 --- /dev/null +++ b/package/dejavu-ttf-fonts/Makefile @@ -0,0 +1,30 @@ +# 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:= dejavu-fonts-ttf +PKG_VERSION:= 2.37 +PKG_RELEASE:= 1 +PKG_HASH:= fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7 +PKG_DESCR:= free fonts +PKG_SECTION:= x11/fonts +PKG_URL:= https://dejavu-fonts.github.io/ +PKG_SITES:= http://sourceforge.net/projects/dejavu/files/dejavu/$(PKG_VERSION)/ + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,DEJAVU_FONTS_TTF,dejavu-fonts-ttf,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +dejavu-fonts-ttf-install: + $(INSTALL_DIR) $(IDIR_DEJAVU_FONTS_TTF)/usr/share/fonts/dejavu + $(INSTALL_BIN) $(WRKBUILD)/ttf/*.ttf \ + $(IDIR_DEJAVU_FONTS_TTF)/usr/share/fonts/dejavu + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/dillo/Makefile b/package/dillo/Makefile index bb72f80cf..8718e78e2 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -4,18 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= dillo -PKG_VERSION:= 3.0.5 +PKG_VERSION:= 3.2.0 PKG_RELEASE:= 1 -PKG_HASH:= db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b +PKG_HASH:= 1066ed42ea7fe0ce19e79becd029c651c15689922de8408e13e70bb5701931bf PKG_DESCR:= small graphical web browser PKG_SECTION:= x11/apps -PKG_DEPENDS:= libfltk libxi libpng zlib libjpeg-turbo libressl -PKG_BUILDDEP:= fltk libXi libjpeg-turbo libpng zlib libressl +PKG_DEPENDS:= libfltk libxi libpng zlib libjpeg-turbo libopenssl +PKG_DEPENDS+= libXrender libXfixes libXext fontconfig libxml2 +PKG_BUILDDEP:= fltk libXi libjpeg-turbo libpng zlib openssl PKG_NEEDS:= threads cxx -PKG_URL:= http://www.dillo.org/ -PKG_SITES:= http://www.dillo.org/download/ +PKG_URL:= https://dillo-browser.github.io/ +PKG_SITES:= https://github.com/dillo-browser/dillo/releases/download/v$(PKG_VERSION)/ -PKG_ARCH_DEPENDS:= arm mips mips64 x86 x86_64 +PKG_ARCH_DEPENDS:= aarch64 arm mips mips64 sh x86 x86_64 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -23,11 +24,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS+= -fcommon -TARGET_CXXFLAGS+= -fcommon -TARGET_LDFLAGS+= -liconv +TARGET_LDFLAGS+= -latomic CONFIGURE_ENV+= PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config -CONFIGURE_ARGS+= --enable-ssl +CONFIGURE_ARGS+= --enable-tls dillo-install: $(INSTALL_DIR) $(IDIR_DILLO)/etc/dillo diff --git a/package/dillo/patches/patch-src_decode_c b/package/dillo/patches/patch-src_decode_c new file mode 100644 index 000000000..012903a25 --- /dev/null +++ b/package/dillo/patches/patch-src_decode_c @@ -0,0 +1,11 @@ +--- dillo-3.2.0.orig/src/decode.c 2024-10-23 22:26:03.000000000 +0200 ++++ dillo-3.2.0/src/decode.c 2025-08-17 08:44:05.687194623 +0200 +@@ -373,7 +373,7 @@ Decode *a_Decode_charset_init(const char + iconv_t ic = iconv_open("UTF-8", format); + if (ic != (iconv_t) -1) { + dc = dNew(Decode, 1); +- dc->state = ic; ++ dc->state = (void *)ic; + dc->buffer = dNew(char, bufsize); + dc->leftover = dStr_new(""); + 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/elfutils/Makefile b/package/elfutils/Makefile index 231559424..e4f1d49a9 100644 --- a/package/elfutils/Makefile +++ b/package/elfutils/Makefile @@ -9,6 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= 39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8 PKG_DESCR:= libraries/utilities to handle elf objects (drop in replacement for libelf) PKG_SECTION:= base/libs +PKG_DEPENDS:= zlib +PKG_BUILDDEP:= zlib PKG_NEEDS:= intl PKG_SITES:= https://sourceware.org/elfutils/ftp/$(PKG_VERSION)/ diff --git a/package/eudev/Makefile b/package/eudev/Makefile index 8ed7c39d7..a14ee569c 100644 --- a/package/eudev/Makefile +++ b/package/eudev/Makefile @@ -4,15 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= eudev -PKG_VERSION:= 3.2.8 +PKG_VERSION:= 3.2.14 PKG_RELEASE:= 1 -PKG_HASH:= 61e4948e9e51271c3cce2bb5311a30b206dd03ef011062e6c627fb007e43f6b8 +PKG_HASH:= 8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc1927f006f PKG_DESCR:= device manager PKG_SECTION:= sys/utils -PKG_BUILDDEP:= gperf-host glib -PKG_DEPENDS:= glib libkmod +PKG_BUILDDEP:= gperf-host +PKG_DEPENDS:= libkmod +PKG_KDEPENDS:= inotify-user PKG_URL:= http://wiki.gentoo.org/wiki/Project:Eudev -PKG_SITES:= http://dev.gentoo.org/~blueness/eudev/ +PKG_SITES:= https://github.com/eudev-project/eudev/releases/download/v$(PKG_VERSION)/ PKG_LIBNAME:= libudev PKG_OPTS:= dev diff --git a/package/eudev/files/udev.postinst b/package/eudev/files/udev.postinst index 67c5d00df..ac8535079 100644 --- a/package/eudev/files/udev.postinst +++ b/package/eudev/files/udev.postinst @@ -5,8 +5,10 @@ add_group dialout $(get_next_gid) add_group disk $(get_next_gid) add_group input $(get_next_gid) add_group kmem $(get_next_gid) +add_group kvm $(get_next_gid) add_group lp $(get_next_gid) add_group tape $(get_next_gid) +add_group sgx $(get_next_gid) echo Generating hwdb udevadm hwdb --update --root="$IPKG_INSTROOT" rm -rf "$IPKG_INSTROOT/etc/udev/hwdb.d" diff --git a/package/exiv2/Makefile b/package/exiv2/Makefile new file mode 100644 index 000000000..4768487c1 --- /dev/null +++ b/package/exiv2/Makefile @@ -0,0 +1,33 @@ +# 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:= exiv2 +PKG_VERSION:= 0.28.7 +PKG_RELEASE:= 1 +PKG_HASH:= 5e292b02614dbc0cee40fe1116db2f42f63ef6b2ba430c77b614e17b8d61a638 +PKG_DESCR:= fast read and write access to the Exif, IPTC and XMP metadata of an image +PKG_SECTION:= libs/misc +PKG_DEPENDS:= libinih +PKG_BUILDDEP:= libinih +PKG_URL:= https://www.exiv2.org +PKG_SITES:= https://github.com/Exiv2/exiv2/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,EXIV2,exiv2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DEXIV2_ENABLE_BROTLI=OFF \ + -DBUILD_WITH_STACK_PROTECTOR=OFF + +exiv2-install: + $(INSTALL_DIR) $(IDIR_EXIV2)/usr/lib + $(CP) $(WRKINST)/usr/lib/libexiv2*.so* \ + $(IDIR_EXIV2)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/expat/Makefile b/package/expat/Makefile index b178c115f..d4f529697 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.3 PKG_RELEASE:= 1 -PKG_HASH:= 25df13dd2819e85fb27a1ce0431772b7047d72af81ae78dc26b4c6e0805f48d1 +PKG_HASH:= 71df8f40706a7bb0a80a5367079ea75d91da4f8c65c58ec59bcdfbf7decdab9f 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_3/ PKG_LIBNAME:= libexpat PKG_OPTS:= dev diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 2920791d7..ce7180293 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 6.1.1 -PKG_RELEASE:= 2 -PKG_HASH:= 5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20 +PKG_VERSION:= 7.1.2 +PKG_RELEASE:= 1 +PKG_HASH:= 5eb62f529114778333b7eb0381cb16e2b8725ce2ae081d07b1082effe22b12e9 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs/video PKG_NEEDS:= threads @@ -17,7 +17,7 @@ PKG_SITES:= http://www.ffmpeg.org/releases/ PKG_LIBNAME:= libffmpeg PKG_OPTS:= dev -PKG_CHOICES_LIBFFMPEG:= WITH_LIBRESSL WITH_OPENSSL +PKG_CHOICES_LIBFFMPEG:= WITH_OPENSSL WITH_LIBRESSL PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl @@ -196,7 +196,6 @@ CONFIGURE_ARGS:= --prefix=/usr \ --disable-doc \ --disable-debug \ --disable-iconv \ - --disable-yasm \ --disable-optimizations \ --disable-stripping \ --enable-shared \ @@ -206,6 +205,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --enable-swscale \ --enable-postproc \ --enable-openssl \ + --disable-x86asm \ $(CONFIGURE_CPU_OPTS) ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_BZIP2),y) diff --git a/package/ffmpeg/patches/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch b/package/ffmpeg/patches/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch deleted file mode 100644 index a23de2e78..000000000 --- a/package/ffmpeg/patches/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Fri, 9 Aug 2024 11:32:00 +0100 -Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with - binutils 2.43 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -binutils 2.43 has stricter validation for labels[1] and results in errors -when building ffmpeg for armv5: - -src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0' - -Remove the leading zero in the "01" label to resolve this error. - -[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b - -Signed-off-by: Ross Burton <ross.burton@arm.com> -Signed-off-by: Martin Storsjö <martin@martin.st> -Signed-off-by: Phil Sutter <phil@nwl.cc> ---- - libavcodec/arm/mlpdsp_armv5te.S | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S -index 4f9aa485fd21a..d31568611c30f 100644 ---- a/libavcodec/arm/mlpdsp_armv5te.S -+++ b/libavcodec/arm/mlpdsp_armv5te.S -@@ -229,7 +229,7 @@ A .endif - .endif - - // Begin loop --01: -+1: - .if TOTAL_TAPS == 0 - // Things simplify a lot in this case - // In fact this could be pipelined further if it's worth it... -@@ -241,7 +241,7 @@ A .endif - str ST0, [PST, #-4]! - str ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)] - str ST0, [PSAMP], #4 * MAX_CHANNELS -- bne 01b -+ bne 1b - .else - .if \fir_taps & 1 - .set LOAD_REG, 1 -@@ -333,7 +333,7 @@ T orr AC0, AC0, AC1 - str ST3, [PST, #-4]! - str ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)] - str ST3, [PSAMP], #4 * MAX_CHANNELS -- bne 01b -+ bne 1b - .endif - b 99f - --- -2.43.0 - diff --git a/package/flac/Makefile b/package/flac/Makefile index d6a89159d..ceeb695cd 100644 --- a/package/flac/Makefile +++ b/package/flac/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= flac -PKG_VERSION:= 1.3.4 +PKG_VERSION:= 1.5.0 PKG_RELEASE:= 1 -PKG_HASH:= 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 +PKG_HASH:= f2c1c76592a82ffff8413ba3c4a1299b6c7ab06c734dee03fd88630485c2b920 PKG_DESCR:= free lossless audio codec utility PKG_SECTION:= mm/audio PKG_DEPENDS:= libflac diff --git a/package/flatbuffers/Makefile b/package/flatbuffers/Makefile index f4811d7a8..719b5359e 100644 --- a/package/flatbuffers/Makefile +++ b/package/flatbuffers/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= flatbuffers -PKG_VERSION:= 2.0.6 +PKG_VERSION:= 25.9.23 PKG_RELEASE:= 1 -PKG_HASH:= e2dc24985a85b278dd06313481a9ca051d048f9474e0f199e372fea3ea4248c9 +PKG_HASH:= 9102253214dea6ae10c2ac966ea1ed2155d22202390b532d1dea64935c518ada PKG_DESCR:= cross platform serialization library PKG_SECTION:= libs/misc PKG_BUILDDEP:= flatbuffers-host diff --git a/package/fltk/Makefile b/package/fltk/Makefile index ce17671e8..77d299cf9 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -4,19 +4,20 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fltk -PKG_VERSION:= 1.3.8 +PKG_VERSION:= 1.3.11 PKG_RELEASE:= 1 -PKG_HASH:= f3c1102b07eb0e7a50538f9fc9037c18387165bc70d4b626e94ab725b9d4d1bf +PKG_HASH:= 92805abc84505e3e7e27aec775ab0754ecb4182fe2d8ff2a9d568ccdcb2811ac PKG_DESCR:= fast light toolkit PKG_SECTION:= libs/misc PKG_DEPENDS:= mesa libx11 libxi freeglut libfreetype PKG_BUILDDEP:= libX11 libXi mesa freeglut freetype +PKG_NEEDS:= locale PKG_URL:= http://www.fltk.org/ -PKG_SITES:= http://fltk.org/pub/fltk/$(PKG_VERSION)/ +PKG_SITES:= https://github.com/fltk/fltk/releases/download/release-$(PKG_VERSION)/ PKG_LIBNAME:= libfltk PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= x86 x86_64 mips arm +PKG_ARCH_DEPENDS:= aarch64 x86 x86_64 mips sh arm DISTFILES:= ${PKG_NAME}-$(PKG_VERSION)-source.tar.gz @@ -24,7 +25,10 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ARGS+= --disable-xinerama +CONFIGURE_ARGS+= --disable-xinerama \ + --disable-print \ + --disable-fluid \ + --disable-test libfltk-install: $(INSTALL_DIR) $(IDIR_LIBFLTK)/usr/lib diff --git a/package/fltk/patches/patch-Makefile b/package/fltk/patches/patch-Makefile index d6755ba24..1d7f0ea9b 100644 --- a/package/fltk/patches/patch-Makefile +++ b/package/fltk/patches/patch-Makefile @@ -1,11 +1,11 @@ ---- fltk-1.3.2.orig/Makefile 2011-07-19 06:49:30.000000000 +0200 -+++ fltk-1.3.2/Makefile 2014-05-28 13:50:10.000000000 +0200 -@@ -18,7 +18,7 @@ +--- fltk-1.3.11.orig/Makefile 2025-02-05 15:03:09.000000000 +0100 ++++ fltk-1.3.11/Makefile 2025-08-03 08:48:11.761069409 +0200 +@@ -16,7 +16,7 @@ include makeinclude -DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation -+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation ++DIRS = $(IMAGEDIRS) src $(CAIRODIR) all: makeinclude fltk-config for dir in $(DIRS); do\ diff --git a/package/fltk/patches/patch-makeinclude_in b/package/fltk/patches/patch-makeinclude_in deleted file mode 100644 index 8581117de..000000000 --- a/package/fltk/patches/patch-makeinclude_in +++ /dev/null @@ -1,12 +0,0 @@ ---- fltk-1.3.2.orig/makeinclude.in 2012-12-05 15:53:03.000000000 +0100 -+++ fltk-1.3.2/makeinclude.in 2014-05-28 16:08:25.000000000 +0200 -@@ -130,9 +130,6 @@ INSTALL_SCRIPT = $(INSTALL) -m 755 - INSTALL_DESKTOP = @INSTALL_DESKTOP@ - UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ - --# Be quiet when building... --.SILENT: -- - # Build commands and filename extensions... - .SUFFIXES: .0 .1 .3 .6 .c .cxx .mm .h .fl .man .o .z $(EXEEXT) - diff --git a/package/fmt/Makefile b/package/fmt/Makefile index 82d25c0cf..81d9d08aa 100644 --- a/package/fmt/Makefile +++ b/package/fmt/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fmt -PKG_VERSION:= 8.1.1 +PKG_VERSION:= 11.2.0 PKG_RELEASE:= 1 -PKG_HASH:= 3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346 +PKG_HASH:= bc23066d87ab3168f27cef3e97d545fa63314f5c79df5ea444d41d56f962c6af PKG_DESCR:= modern formatting library PKG_SECTION:= libs/misc PKG_BUILDDEP:= cmake-host 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-alias/Makefile b/package/font-alias/Makefile new file mode 100644 index 000000000..a65622140 --- /dev/null +++ b/package/font-alias/Makefile @@ -0,0 +1,35 @@ +# 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:= font-alias +PKG_VERSION:= 1.0.5 +PKG_RELEASE:= 1 +PKG_HASH:= f8e0ca6537003f11fcaf36c598f7de9c0428f8ed587388a8a37ff18ccc597730 +PKG_DESCR:= font alias utility +PKG_SECTION:= x11/fonts +PKG_URL:= http://www.x.org/ +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_ALIAS,font-alias,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FONT_ALIAS,font-alias,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +font-alias-install: + ${INSTALL_DIR} ${IDIR_FONT_ALIAS}/usr/share/fonts/X11/misc + ${CP} ${WRKINST}/usr/share/fonts/X11/misc/fonts.alias \ + ${IDIR_FONT_ALIAS}/usr/share/fonts/X11/misc + ${INSTALL_DIR} ${IDIR_FONT_ALIAS}/usr/share/fonts/X11/100dpi + ${CP} ${WRKINST}/usr/share/fonts/X11/100dpi/fonts.alias \ + ${IDIR_FONT_ALIAS}/usr/share/fonts/X11/100dpi + ${INSTALL_DIR} ${IDIR_FONT_ALIAS}/usr/share/fonts/X11/75dpi + ${CP} ${WRKINST}/usr/share/fonts/X11/75dpi/fonts.alias \ + ${IDIR_FONT_ALIAS}/usr/share/fonts/X11/75dpi + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-cursor-misc/Makefile b/package/font-cursor-misc/Makefile new file mode 100644 index 000000000..bcc7c9687 --- /dev/null +++ b/package/font-cursor-misc/Makefile @@ -0,0 +1,29 @@ +# 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:= font-cursor-misc +PKG_VERSION:= 1.0.4 +PKG_RELEASE:= 1 +PKG_HASH:= 37ef2363b3cfa6f5e20b65feab736db77fad484127c267b78de95d55fa39f61d +PKG_DESCR:= font cursor-misc +PKG_SECTION:= x11/fonts +PKG_URL:= http://www.x.org/ +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_CURSOR_MISC,font-cursor-misc,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FONT_CURSOR_MISC,font-cursor-misc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +font-cursor-misc-install: + ${INSTALL_DIR} ${IDIR_FONT_CURSOR_MISC}/usr/share/fonts/X11/misc + ${CP} ${WRKINST}/usr/share/fonts/X11/misc/cursor.pcf.gz \ + ${IDIR_FONT_CURSOR_MISC}/usr/share/fonts/X11/misc + +include ${ADK_TOPDIR}/mk/host-bottom.mk +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/freeglut/Makefile b/package/freeglut/Makefile index 1ed30db0d..84f8246c5 100644 --- a/package/freeglut/Makefile +++ b/package/freeglut/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= freeglut -PKG_VERSION:= 3.2.1 +PKG_VERSION:= 3.6.0 PKG_RELEASE:= 1 -PKG_HASH:= d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 +PKG_HASH:= 9c3d4d6516fbfa0280edc93c77698fb7303e443c1aaaf37d269e3288a6c3ea52 PKG_DESCR:= opengl utility toolkit libraries PKG_SECTION:= libs/video PKG_DEPENDS:= libglu @@ -18,13 +18,14 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_ARCH_DEPENDS:= arm mips mipsel mips64 mips64el x86 x86_64 +PKG_ARCH_DEPENDS:= arm mips mipsel mips64 mips64el sh x86 x86_64 include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,FREEGLUT,freeglut,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DFREEGLUT_BUILD_DEMOS=OFF freeglut-install: $(INSTALL_DIR) $(IDIR_FREEGLUT)/usr/lib diff --git a/package/freeglut/patches/patch-Makefile_in b/package/freeglut/patches/patch-Makefile_in deleted file mode 100644 index 143efe98a..000000000 --- a/package/freeglut/patches/patch-Makefile_in +++ /dev/null @@ -1,31 +0,0 @@ ---- freeglut-2.6.0.orig/Makefile.in 2009-11-25 20:14:30.000000000 +0100 -+++ freeglut-2.6.0/Makefile.in 2012-03-12 15:05:53.767407283 +0100 -@@ -220,28 +220,6 @@ EXTRA_DIST = \ - freeglut_static_vs2008.vcproj \ - freeglut_vs2008.sln \ - freeglut_vs2008.vcproj \ -- progs/demos/CallbackMaker/CallbackMakerStatic.dsp \ -- progs/demos/CallbackMaker/CallbackMakerStatic_vs2008.vcproj \ -- progs/demos/CallbackMaker/CallbackMaker_vs2008.vcproj \ -- progs/demos/Fractals/FractalsStatic.dsp \ -- progs/demos/Fractals/FractalsStatic_vs2008.vcproj \ -- progs/demos/Fractals/Fractals_vs2008.vcproj \ -- progs/demos/Fractals_random/Fractals_randomStatic.dsp \ -- progs/demos/Fractals_random/Fractals_randomStatic_vs2008.vcproj \ -- progs/demos/Fractals_random/Fractals_random_vs2008.vcproj \ -- progs/demos/Lorenz/lorenzStatic.dsp \ -- progs/demos/Lorenz/lorenzStatic_vs2008.vcproj \ -- progs/demos/Lorenz/lorenz_vs2008.vcproj \ -- progs/demos/One/oneStatic.dsp \ -- progs/demos/One/oneStatic_vs2008.vcproj \ -- progs/demos/One/one_vs2008.vcproj \ -- progs/demos/demos_vs2008.sln \ -- progs/demos/shapes/shapesStatic.dsp \ -- progs/demos/shapes/shapesStatic_vs2008.vcproj \ -- progs/demos/shapes/shapes_vs2008.vcproj \ -- progs/demos/smooth_opengl3/smooth_opengl3Static.dsp \ -- progs/demos/smooth_opengl3/smooth_opengl3Static_vs2008.vcproj \ -- progs/demos/smooth_opengl3/smooth_opengl3_vs2008.vcproj - - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/package/freeglut/patches/patch-progs_Makefile_in b/package/freeglut/patches/patch-progs_Makefile_in deleted file mode 100644 index e5d2993d1..000000000 --- a/package/freeglut/patches/patch-progs_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- freeglut-2.6.0.orig/progs/Makefile.in 2009-11-25 20:14:29.000000000 +0100 -+++ freeglut-2.6.0/progs/Makefile.in 2012-03-12 15:06:38.667411355 +0100 -@@ -177,7 +177,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = demos -+SUBDIRS = - all: all-recursive - - .SUFFIXES: diff --git a/package/freeglut/patches/patch-src_fg_gl2_c b/package/freeglut/patches/patch-src_fg_gl2_c deleted file mode 100644 index dbd947a91..000000000 --- a/package/freeglut/patches/patch-src_fg_gl2_c +++ /dev/null @@ -1,23 +0,0 @@ ---- freeglut-3.2.1.orig/src/fg_gl2.c 2014-06-01 11:24:47.000000000 +0200 -+++ freeglut-3.2.1/src/fg_gl2.c 2021-11-02 10:29:44.673793670 +0100 -@@ -27,6 +27,20 @@ - #include "fg_internal.h" - #include "fg_gl2.h" - -+#ifndef GL_ES_VERSION_2_0 -+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed -+ * names are defined in fg_gl2.h header to reference them, for any other case, -+ * define them as function pointers here. -+ */ -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#endif -+ - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { - if (fgStructure.CurrentWindow != NULL) - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; diff --git a/package/freeglut/patches/patch-src_fg_gl2_h b/package/freeglut/patches/patch-src_fg_gl2_h deleted file mode 100644 index a552d4fa9..000000000 --- a/package/freeglut/patches/patch-src_fg_gl2_h +++ /dev/null @@ -1,23 +0,0 @@ ---- freeglut-3.2.1.orig/src/fg_gl2.h 2012-04-21 20:22:24.000000000 +0200 -+++ freeglut-3.2.1/src/fg_gl2.h 2021-11-02 10:29:44.673793670 +0100 -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEV - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; - - # endif - diff --git a/package/freeglut/patches/patch-src_fg_version_h b/package/freeglut/patches/patch-src_fg_version_h deleted file mode 100644 index 6bb5f6d69..000000000 --- a/package/freeglut/patches/patch-src_fg_version_h +++ /dev/null @@ -1,16 +0,0 @@ ---- freeglut-3.2.1.orig/src/fg_version.h 2014-08-18 04:00:40.000000000 +0200 -+++ freeglut-3.2.1/src/fg_version.h 2021-11-02 09:37:27.466889937 +0100 -@@ -37,11 +37,11 @@ - #endif - - #ifndef VERSION_MINOR --#define VERSION_MINOR 0 -+#define VERSION_MINOR 2 - #endif - - #ifndef VERSION_PATCH --#define VERSION_PATCH 0 -+#define VERSION_PATCH 1 - #endif - - #endif diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 5db6dea81..1e427ecee 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.14.1 +PKG_RELEASE:= 1 +PKG_HASH:= 174d9e53402e1bf9ec7277e22ec199ba3e55a6be2c0740cb18c0ee9850fc8c34 PKG_DESCR:= free, high-quality and portable font engine PKG_SECTION:= libs/fonts PKG_DEPENDS:= zlib diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index e10050cfe..c47c5c131 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -10,6 +10,7 @@ PKG_RELEASE:= 1 PKG_HASH:= b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7 PKG_DESCR:= image loading and pixel buffer manipulation library PKG_SECTION:= libs/image +PKG_DEPENDS:= libjpeg-turbo libtiff glib libpng PKG_BUILDDEP:= libjpeg-turbo libtiff glib libpng gdk-pixbuf-host HOST_BUILDDEP:= glib-host libffi-host libpng-host libjpeg-turbo-host PKG_NEEDS:= c++ diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 6594eb995..fb38bea8e 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gettext -PKG_VERSION:= 0.19.8 +PKG_VERSION:= 0.26 PKG_RELEASE:= 1 -PKG_HASH:= 9c1781328238caa1685d7bc7a2e1dcf1c6c134e86b42ed554066734b621bd12f +PKG_HASH:= d1fb86e260cfe7da6031f94d2e44c0da55903dbae0a2fa0fae78c91ae1b56f00 PKG_DESCR:= i18n tools and libs PKG_SECTION:= libs/misc HOST_BUILDDEP:= automake-host PKG_URL:= https://www.gnu.org/software/gettext/ -PKG_SITES:= http://ftp.gnu.org/pub/gnu/gettext/ +PKG_SITES:= ${MASTER_SITE_GNU:=gettext/} PKG_OPTS:= dev PKG_CFLINE_GETTEXT:= depends on !ADK_TARGET_LIBC_WITHOUT_LIBICONV diff --git a/package/git/Makefile b/package/git/Makefile index 9710bfc36..e128c3783 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 2.49.0 +PKG_VERSION:= 2.51.0 PKG_RELEASE:= 1 -PKG_HASH:= 618190cf590b7e9f6c11f91f23b1d267cd98c3ab33b850416d8758f8b5a85628 +PKG_HASH:= 60a7c2251cc2e588d5cd87bae567260617c6de0c22dca9cdbfc4c7d2b8990b62 PKG_DESCR:= fast version control system PKG_SECTION:= dev/scm PKG_BUILDDEP:= zlib curl expat diff --git a/package/glib-networking/Makefile b/package/glib-networking/Makefile new file mode 100644 index 000000000..29108145e --- /dev/null +++ b/package/glib-networking/Makefile @@ -0,0 +1,38 @@ +# 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:= glib-networking +PKG_VERSION:= 2.80.1 +PKG_RELEASE:= 1 +PKG_HASH:= 35ca3d6ca638493765a7dc11c5f46b816dbc407ec939c1f69682960b6cfb76c9 +PKG_DESCR:= low-level core library for networking +PKG_SECTION:= libs/misc +PKG_DEPENDS:= glib +PKG_BUILDDEP:= glib +PKG_SITES:= https://gitlab.gnome.org/GNOME/glib-networking/-/archive/2.80.1/ + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,GLIB_NETWORKING,glib-networking,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dlibproxy=disabled \ + -Dgnome_proxy=disabled \ + -Dgnutls=disabled \ + -Dopenssl=enabled + +glib-networking-install: + $(INSTALL_DIR) $(IDIR_GLIB_NETWORKING)/usr/lib/gio/modules + $(CP) $(WRKINST)/usr/lib/gio/modules/*.so \ + $(IDIR_GLIB_NETWORKING)/usr/lib/gio/modules + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/glib/Makefile b/package/glib/Makefile index 6de8399e1..51276ee1a 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.84.0 +PKG_VERSION:= 2.84.3 PKG_RELEASE:= 1 PKG_EXTRAVER:= 2.84 -PKG_HASH:= f8823600cb85425e2815cfad82ea20fdaa538482ab74e7293d58b3f64a5aff6a +PKG_HASH:= aa4f87c3225bf57ca85f320888f7484901a17934ca37023c3bd8435a72db863e PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc PKG_DEPENDS:= pcre2 zlib libffi @@ -35,11 +35,20 @@ CONFIG_STYLE:= meson BUILD_STYLE:= meson INSTALL_STYLE:= meson -HOST_MESON_FLAGS:= -Dintrospection=disabled -Dnls=disabled -Dtests=false -Dxattr=false \ +HOST_MESON_FLAGS:= -Dintrospection=disabled \ + -Dnls=disabled \ + -Dtests=false \ + -Dxattr=false \ -Doss_fuzz=disabled \ -Dsysprof=disabled \ --default-library=static -MESON_FLAGS:= -Dintrospection=disabled -Dtests=false -Dxattr=false -Doss_fuzz=disabled -Dsysprof=disabled +MESON_FLAGS:= -Dintrospection=disabled \ + -Dnls=disabled \ + -Dtests=false \ + -Dxattr=false \ + -Doss_fuzz=disabled \ + -Dglib_debug=disabled \ + -Dsysprof=disabled hostpost-install: $(CP) $(HOSTWRKBUILD)/../glib-obj/meson-private/*.pc \ @@ -56,6 +65,7 @@ glib-install: $(CP) $(WRKINST)/usr/lib/libgobject*.so* $(IDIR_GLIB)/usr/lib $(CP) $(WRKINST)/usr/lib/libgmodule*.so* $(IDIR_GLIB)/usr/lib $(CP) $(WRKINST)/usr/lib/libgthread*.so* $(IDIR_GLIB)/usr/lib + -$(CP) $(WRKINST)/usr/lib/libintl*.so* $(IDIR_GLIB)/usr/lib # workaround for dev subpackage $(INSTALL_DIR) $(IDIR_GLIB_DEV)/usr/include $(INSTALL_DIR) $(IDIR_GLIB_DEV)/usr/lib/glib-2.0/include diff --git a/package/glibc/Makefile b/package/glibc/Makefile index a36c30903..73a65372b 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -50,7 +50,7 @@ do-install: ifneq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH) - for file in libc libpthread librt libdl libm libanl libnsl libresolv libutil libnss_dns libnss_files; do \ + for file in libc libpthread librt libdl libm libanl libnsl libresolv libutil libnss_dns libnss_files libmvec; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done else diff --git a/package/gnupg2/Makefile b/package/gnupg2/Makefile index a9e5a44c0..64e94c4da 100644 --- a/package/gnupg2/Makefile +++ b/package/gnupg2/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnupg2 -PKG_VERSION:= 2.4.4 +PKG_VERSION:= 2.4.8 PKG_RELEASE:= 1 -PKG_HASH:= 67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6 +PKG_HASH:= b58c80d79b04d3243ff49c1c3fc6b5f83138eb3784689563bcdd060595318616 PKG_DESCR:= gnu privacy guard (modern) PKG_SECTION:= app/crypto PKG_DEPENDS:= libreadline libncurses libgcrypt libgpg-error libassuan @@ -15,7 +15,7 @@ PKG_BUILDDEP:= readline ncurses libgcrypt libgpg-error libassuan PKG_BUILDDEP+= libksba npth PKG_NEEDS:= iconv PKG_URL:= http://www.gnupg.org/ -PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/gnupg/ +PKG_SITES:= https://www.gnupg.org/ftp/gcrypt/gnupg/ DISTFILES:= gnupg-$(PKG_VERSION).tar.bz2 WRKDIST= ${WRKDIR}/gnupg-${PKG_VERSION} @@ -28,6 +28,7 @@ $(eval $(call PKG_template,GNUPG2,gnupg2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP $(eval $(call PKG_template,GPGV2,gpgv2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) CONFIGURE_ARGS+= --disable-dirmngr \ + --disable-keyboxd \ --disable-gpgsm \ --disable-scdaemon \ --disable-card-support \ diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 1c32b7979..188d5b3d5 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 3.8.9 +PKG_VERSION:= 3.8.10 PKG_RELEASE:= 1 -PKG_HASH:= 69e113d802d1670c4d5ac1b99040b1f2d5c7c05daec5003813c049b5184820ed +PKG_HASH:= db7fab7cce791e7727ebbef2334301c821d79a550ec55c9ef096b610b03eb6b7 PKG_DESCR:= transport layer security library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp libunistring diff --git a/package/irssi/Makefile b/package/irssi/Makefile index 3e656877e..9c8f42418 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -17,10 +17,10 @@ PKG_SITES:= https://github.com/irssi/irssi/releases/download/$(PKG_VERSION)/ PKG_CHOICES_IRSSI:= WITH_OPENSSL WITH_LIBRESSL WITHOUT_SSL PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCB_WITH_OPENSSL:= openssl -PKGCS_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCB_WITH_LIBRESSL:= libressl -PKGCS_WITH_LIBRESSL:= libressl +PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCD_WITHOUT_SSL:= use no ssl PKG_FLAVOURS_IRSSI:= WITH_IPV6 @@ -30,7 +30,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,IRSSI,irssi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_LDFLAGS+= -ltinfo +TARGET_LDFLAGS+= -ltinfo -latomic CONFIGURE_ARGS+= --with-perl=no \ --with-textui \ --with-terminfo \ diff --git a/package/json/Makefile b/package/json/Makefile new file mode 100644 index 000000000..5d63e90ef --- /dev/null +++ b/package/json/Makefile @@ -0,0 +1,30 @@ +# 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:= json +PKG_VERSION:= 3.12.0 +PKG_RELEASE:= 1 +PKG_HASH:= 4b92eb0c06d10683f7447ce9406cb97cd4b453be18d7279320f7b2f025c10187 +PKG_DESCR:= C++ json library +PKG_SECTION:= libs/misc +PKG_URL:= https://github.com/nlohmann/json/ +PKG_SITES:= https://github.com/nlohmann/json/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,JSON,json,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +json-install: + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/kbd/Makefile b/package/kbd/Makefile index 7c0b62efa..97b2b691f 100644 --- a/package/kbd/Makefile +++ b/package/kbd/Makefile @@ -43,6 +43,10 @@ kbd-install: $(IDIR_KBD)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/loadkeys \ $(IDIR_KBD)/usr/bin +ifeq ($(ADK_TARGET_SYSTEM_HP_JORNADA),y) + $(INSTALL_DIR) $(IDIR_KBD)/etc + $(CP) ./files/hpjornada.map $(IDIR_KBD)/etc +endif ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) $(INSTALL_DIR) $(IDIR_KBD)/etc $(CP) ./files/zaurus.map $(IDIR_KBD)/etc diff --git a/package/kbd/files/hpjornada.map b/package/kbd/files/hpjornada.map new file mode 100644 index 000000000..c7fc2a670 --- /dev/null +++ b/package/kbd/files/hpjornada.map @@ -0,0 +1,279 @@ +# English keymap for Jornada 6xx devices. +# +# Created by Tibor Zenis ( zenis <at> fmph.uniba.sk ) +# (Lightly) Modified by Alex Palestras ( B_Linuz <at> yahoo.com ) +# plain, shift, altgr, ctrl, shift + ctrl, alt, ctrl + alt + +keymaps 0-2,4-5,8,12 +keycode 1 = Escape Escape + alt keycode 1 = Meta_Escape +keycode 2 = one exclam asciitilde + alt keycode 2 = Meta_one +keycode 3 = two at grave + alt keycode 3 = Meta_two +keycode 4 = three numbersign + alt keycode 4 = Meta_three + altgr keycode 4 = pound +keycode 5 = four dollar + control keycode 5 = Control_backslash + alt keycode 5 = Meta_four + altgr keycode 5 = currency +keycode 6 = five percent + control keycode 6 = Control_bracketright + alt keycode 6 = Meta_five +keycode 7 = six asciicircum + control keycode 7 = Control_asciicircum + alt keycode 7 = Meta_six +keycode 8 = seven ampersand braceleft + control keycode 8 = Control_underscore + altgr keycode 8 = KP_7 +keycode 9 = eight asterisk bracketleft + control keycode 9 = Delete + altgr keycode 9 = KP_8 +keycode 10 = nine parenleft bracketright + altgr keycode 10 = KP_9 +keycode 11 = zero parenright braceright + altgr keycode 11 = KP_Divide +keycode 12 = minus underscore backslash + control keycode 11 = Control_underscore + shift control keycode 11 = Control_underscore + alt keycode 11 = Meta_minus +keycode 13 = equal plus + alt keycode 13 = Meta_equal +keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete +keycode 15 = Tab Tab + alt keycode 15 = Meta_Tab +keycode 16 = q +keycode 17 = w +keycode 18 = e + Shift keycode 18 = E +keycode 19 = r +keycode 20 = t +keycode 21 = y + altgr keycode 21 = KP_4 +keycode 22 = u + altgr keycode 22 = KP_5 +keycode 23 = i + altgr keycode 23 = KP_6 +keycode 24 = o + altgr keycode 24 = KP_Multiply +keycode 25 = p + AltGr keycode 25 = braceleft +keycode 26 = backslash bar + AltGr keycode 26 = braceright +keycode 28 = Return + alt keycode 28 = Meta_Control_m +keycode 29 = Control + altgr keycode 29 = Num_Lock +keycode 30 = a +keycode 31 = s +keycode 32 = d +keycode 33 = f +keycode 34 = g +keycode 35 = h + altgr keycode 35 = KP_1 +keycode 36 = j + altgr keycode 36 = KP_2 +keycode 37 = k + altgr keycode 37 = KP_3 +keycode 38 = l + altgr keycode 38 = KP_Subtract +keycode 39 = semicolon colon bracketleft + alt keycode 39 = Meta_semicolon +keycode 40 = apostrophe quotedbl bracketright + control keycode 40 = Control_g + alt keycode 40 = Meta_apostrophe +keycode 41 = F11 + shift keycode 41 = F21 + altgr keycode 41 = Console_23 + alt keycode 41 = Console_11 + control alt keycode 41 = Console_11 +keycode 42 = Shift + altgr keycode 42 = Caps_Lock +keycode 44 = z +keycode 45 = x +keycode 46 = c +keycode 47 = v +keycode 48 = b +keycode 49 = n + altgr keycode 49 = KP_0 +keycode 50 = m + altgr keycode 50 = KP_Comma +keycode 51 = comma less + altgr keycode 51 = KP_Period +keycode 52 = period greater + control keycode 52 = Compose + altgr keycode 52 = KP_Add +keycode 54 = Shift +keycode 56 = Alt +keycode 57 = space space + alt keycode 57 = Meta_space +keycode 58 = F9 + shift keycode 58 = F19 + altgr keycode 58 = Console_21 + alt keycode 58 = Console_9 + control alt keycode 58 = Console_9 +keycode 59 = F1 + altgr keycode 59 = Console_13 + alt keycode 59 = Console_1 + control alt keycode 59 = Console_1 +keycode 60 = F2 + shift keycode 60 = F12 + altgr keycode 60 = Console_14 + alt keycode 60 = Console_2 + control alt keycode 60 = Console_2 +keycode 61 = F3 + shift keycode 61 = F13 + altgr keycode 61 = Console_15 + alt keycode 61 = Console_3 + control alt keycode 61 = Console_3 +keycode 62 = F4 + shift keycode 62 = F14 + altgr keycode 62 = Console_16 + alt keycode 62 = Console_4 + control alt keycode 62 = Console_4 +keycode 63 = F5 + shift keycode 63 = F15 + altgr keycode 63 = Console_17 + alt keycode 63 = Console_5 + control alt keycode 63 = Console_5 +keycode 64 = F6 + shift keycode 64 = F16 + altgr keycode 64 = Console_18 + alt keycode 64 = Console_6 + control alt keycode 64 = Console_6 +keycode 65 = F7 + shift keycode 65 = F17 + altgr keycode 65 = Console_19 + alt keycode 65 = Console_7 + control alt keycode 65 = Console_7 +keycode 66 = F8 + shift keycode 66 = F18 + altgr keycode 66 = Console_20 + alt keycode 66 = Console_8 + control alt keycode 66 = Console_8 +keycode 72 = Up + shift keycode 72 = Scroll_Backward + altgr keycode 72 = Scroll_Backward + alt keycode 72 = Prior +keycode 74 = Control +keycode 75 = Left + altgr keycode 75 = Decr_Console + alt keycode 75 = Find +keycode 77 = Right + altgr keycode 77 = Incr_Console + alt keycode 77 = Select +keycode 80 = Down + shift keycode 80 = Scroll_Forward + altgr keycode 80 = Scroll_Forward + alt keycode 80 = Next +keycode 83 = Remove Remove Meta_Delete + alt keycode 83 = Meta_Delete +keycode 112 = F10 + shift keycode 112 = F20 + altgr keycode 112 = Console_22 + alt keycode 112 = Console_10 + control alt keycode 112 = Console_10 +keycode 115 = slash question + control keycode 115 = Delete + alt keycode 115 = Meta_slash +keycode 123 = AltGr +keycode 0 = Insert +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" +string F6 = "\033[17~" +string F7 = "\033[18~" +string F8 = "\033[19~" +string F9 = "\033[20~" +string F10 = "\033[21~" +string F11 = "\033[23~" +string F12 = "\033[24~" +string F13 = "\033[25~" +string F14 = "\033[26~" +string F15 = "\033[28~" +string F16 = "\033[29~" +string F17 = "\033[31~" +string F18 = "\033[32~" +string F19 = "\033[33~" +string F20 = "\033[34~" +string Find = "\033[1~" +string Insert = "\033[2~" +string Remove = "\033[3~" +string Select = "\033[4~" +string Prior = "\033[5~" +string Next = "\033[6~" +string Macro = "\033[M" +string Pause = "\033[P" +compose '`' 'A' to 'À' +compose '`' 'a' to 'à' +compose '\'' 'A' to 'Á' +compose '\'' 'a' to 'á' +compose '^' 'A' to 'Â' +compose '^' 'a' to 'â' +compose '~' 'A' to 'Ã' +compose '~' 'a' to 'ã' +compose '"' 'A' to 'Ä' +compose '"' 'a' to 'ä' +compose 'O' 'A' to 'Å' +compose 'o' 'a' to 'å' +compose '0' 'A' to 'Å' +compose '0' 'a' to 'å' +compose 'A' 'A' to 'Å' +compose 'a' 'a' to 'å' +compose 'A' 'E' to 'Æ' +compose 'a' 'e' to 'æ' +compose ',' 'C' to 'Ç' +compose ',' 'c' to 'ç' +compose '`' 'E' to 'È' +compose '`' 'e' to 'è' +compose '\'' 'E' to 'É' +compose '\'' 'e' to 'é' +compose '^' 'E' to 'Ê' +compose '^' 'e' to 'ê' +compose '"' 'E' to 'Ë' +compose '"' 'e' to 'ë' +compose '`' 'I' to 'Ì' +compose '`' 'i' to 'ì' +compose '\'' 'I' to 'Í' +compose '\'' 'i' to 'í' +compose '^' 'I' to 'Î' +compose '^' 'i' to 'î' +compose '"' 'I' to 'Ï' +compose '"' 'i' to 'ï' +compose '-' 'D' to 'Ð' +compose '-' 'd' to 'ð' +compose '~' 'N' to 'Ñ' +compose '~' 'n' to 'ñ' +compose '`' 'O' to 'Ò' +compose '`' 'o' to 'ò' +compose '\'' 'O' to 'Ó' +compose '\'' 'o' to 'ó' +compose '^' 'O' to 'Ô' +compose '^' 'o' to 'ô' +compose '~' 'O' to 'Õ' +compose '~' 'o' to 'õ' +compose '"' 'O' to 'Ö' +compose '"' 'o' to 'ö' +compose '/' 'O' to 'Ø' +compose '/' 'o' to 'ø' +compose '`' 'U' to 'Ù' +compose '`' 'u' to 'ù' +compose '\'' 'U' to 'Ú' +compose '\'' 'u' to 'ú' +compose '^' 'U' to 'Û' +compose '^' 'u' to 'û' +compose '"' 'U' to 'Ü' +compose '"' 'u' to 'ü' +compose '\'' 'Y' to 'Ý' +compose '\'' 'y' to 'ý' +compose 'T' 'H' to 'Þ' +compose 't' 'h' to 'þ' +compose 's' 's' to 'ß' +compose '"' 'y' to 'ÿ' +compose 's' 'z' to 'ß' +compose 'i' 'j' to 'ÿ' diff --git a/package/kbd/files/kbd.postinst b/package/kbd/files/kbd.postinst index 2024d30cf..ec72bad23 100644 --- a/package/kbd/files/kbd.postinst +++ b/package/kbd/files/kbd.postinst @@ -1,4 +1,4 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh -add_rcconf kbd_map "de-latin1-nodeadkeys" +add_rcconf kbd_map "/etc/hpjornada.map" add_rcconf kbd NO 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/kodi/Makefile b/package/kodi/Makefile index 9fb6deccb..cd1aaa91e 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -4,39 +4,39 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi -PKG_VERSION:= 21.0b2 +PKG_VERSION:= 22.0a1 PKG_RELEASE:= 1 -PKG_HASH:= b9d6ecbb8769cdfe00cbbe5da5c330a7624eee50cffb87d87f6271033f1ee74b +PKG_HASH:= da88f6aee01995caadfc6e194b8e3b51dfd193164a6c8d559d2443dd7f58f9f8 PKG_DESCR:= software media player PKG_SECTION:= mm/video -PKG_DEPENDS:= python3 libsquish libressl libxz libfmt rapidjson +PKG_DEPENDS:= python3 libsquish libopenssl libfmt rapidjson libpcre PKG_DEPENDS+= libass libmpeg2 libmad libmodplug libcurl libxshmfence -PKG_DEPENDS+= libflac libbz2 libtiff libnettle librtmp liblzo +PKG_DEPENDS+= libflac libbz2 libtiff libnettle librtmp liblzo libXext PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libncurses libpng -PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate libuuid -PKG_DEPENDS+= taglib libjasper libmp3lame libgpg-error giflib -PKG_DEPENDS+= glib libdcadec libffmpeg libxvidcore libiconv harfbuzz +PKG_DEPENDS+= libpcre2 libcdio libfreetype libsamplerate libuuid +PKG_DEPENDS+= taglib libjasper libmp3lame libgpg-error giflib nghttp2 +PKG_DEPENDS+= glib libdcadec libffmpeg libxvidcore harfbuzz exiv2 PKG_DEPENDS+= flatbuffers fstrcmp spdlog mesa libinput libxkbcommon -PKG_DEPENDS+= xkeyboard-config tinyxml2 libdisplay-info libudfread -PKG_BUILDDEP:= python3 libass ffmpeg rtmpdump libiconv libudfread +PKG_DEPENDS+= xkeyboard-config tinyxml2 libdisplay-info libudfread json +PKG_BUILDDEP:= python3 libass ffmpeg rtmpdump libudfread exiv2 PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo fmt rapidjson PKG_BUILDDEP+= curl flac bzip2 libtiff yajl cmake-host libdisplay-info -PKG_BUILDDEP+= tinyxml tinyxml2 sqlite pcre libcdio freetype libpng +PKG_BUILDDEP+= tinyxml tinyxml2 sqlite pcre2 libcdio freetype libpng PKG_BUILDDEP+= libsamplerate taglib libjasper giflib xkeyboard-config PKG_BUILDDEP+= glib libmodplug libgpg-error xvidcore libxshmfence PKG_BUILDDEP+= swig-host liblzo-host libpng-host libjpeg-turbo-host PKG_BUILDDEP+= zip-host unzip-host giflib-host libsquish libdcadec -PKG_BUILDDEP+= libcrossguid libressl xz bzip2 liblzo harfbuzz +PKG_BUILDDEP+= openssl bzip2 liblzo harfbuzz pcre json PKG_BUILDDEP+= flatbuffers fstrcmp spdlog mesa libinput libxkbcommon PKG_NEEDS:= threads c++ data iconv PKG_URL:= http://kodi.tv/ PKG_SITES:= https://github.com/xbmc/xbmc/archive/ -DISTFILES:= $(PKG_VERSION)-Omega.tar.gz -WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Omega +DISTFILES:= $(PKG_VERSION)-Piers.tar.gz +WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Piers WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi4 raspberry-pi4-64 rockpi4-plus raspberry-pi5 +PKG_SYSTEM_DEPENDS:= qemu-x86_64 raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi4 raspberry-pi4-64 rockpi4-plus raspberry-pi5 PKG_FLAVOURS_KODI:= WITH_ALSA WITH_CEC WITH_PULSEAUDIO WITH_SMB PKG_FLAVOURS_KODI+= WITH_MICROHTTPD WITH_SSH WITH_AVAHI @@ -69,17 +69,17 @@ $(eval $(call PKG_template,KODI,kodi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS HOST_CXXFLAGS:= -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -I$(WRKSRC)/xbmc/linux CONFIG_STYLE:= cmake CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \ + -DENABLE_TESTING=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DVERBOSE=ON \ -DENABLE_DVDCSS=ON \ - -DENABLE_INTERNAL_CROSSGUID=OFF \ -DENABLE_INTERNAL_FFMPEG=OFF \ -DENABLE_INTERNAL_RapidJSON=OFF \ -DWITH_FFMPEG=$(STAGING_TARGET_DIR)/usr \ -DPYTHON_EXECUTABLE=$(STAGING_HOST_DIR)/usr/bin/python3 \ - -DPYTHON_INCLUDE_DIRS=$(STAGING_TARGET_DIR)/usr/include/python3.11 \ - -DPYTHON_PATH=$(STAGING_TARGET_DIR)/usr/lib/python3.11 \ - -DPYTHON_VER=3.11 \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_TARGET_DIR)/usr/include/python3.13 \ + -DPYTHON_PATH=$(STAGING_TARGET_DIR)/usr/lib/python3.13 \ + -DPYTHON_VER=3.13 \ -DKODI_DEPENDSBUILD=OFF \ -DENABLE_OPENSSL=ON \ -DENABLE_MYSQLCLIENT=OFF \ @@ -99,9 +99,9 @@ CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \ -DENABLE_PLIST=OFF \ -DNATIVEPREFIX=$(STAGING_HOST_DIR)/usr \ -DDEPENDS_PATH=$(STAGING_TARGET_DIR)/usr \ - -DWITH_TEXTUREPACKER=$(STAGING_HOST_DIR)/usr/bin/TexturePacker \ -DWITH_JSONSCHEMABUILDER=$(STAGING_HOST_DIR)/usr/bin/JsonSchemaBuilder \ - -DCMAKE_EXE_LINKER_FLAGS=-latomic \ + -DWITH_TEXTUREPACKER=$(STAGING_HOST_DIR)/usr/bin/TexturePacker \ + -DCMAKE_EXE_LINKER_FLAGS="-latomic" \ -DLIBDVDCSS_URL=$(DL_DIR)/libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz \ -DLIBDVDNAV_URL=$(DL_DIR)/libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz \ -DLIBDVDREAD_URL=$(DL_DIR)/libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz @@ -112,10 +112,17 @@ CMAKE_FLAGS+= -DWITH_ARCH=aarch64 \ -DENABLE_NEON=OFF endif ifeq ($(ADK_TARGET_ARCH_ARM),y) - -DWITH_ARCH=arm \ +CMAKE_FLAGS+= -DWITH_ARCH=arm \ -DWITH_CPU=arm \ -DENABLE_NEON=ON endif +ifeq ($(ADK_TARGET_ARCH_X86_64),y) +CMAKE_FLAGS+= -DWITH_ARCH=x86_64 \ + -DAPP_RENDER_SYSTEM=gl \ + -DCORE_PLATFORM_NAME=x11 \ + -DENABLE_OPENGL=ON \ + -DENABLE_X11=ON +endif ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) CMAKE_FLAGS+= -DCORE_PLATFORM_NAME=gbm \ @@ -162,24 +169,23 @@ CMAKE_FLAGS+= -DENABLE_SSH=OFF endif XAKE_FLAGS+= VERBOSE=1 -TARGET_LDFLAGS+= -latomic -liconv KODI_LIBDVDCSS_VERSION = 1.4.3-Next-Nexus-Alpha2-2 KODI_LIBDVDNAV_VERSION = 6.1.1-Next-Nexus-Alpha2-2 KODI_LIBDVDREAD_VERSION = 6.1.3-Next-Nexus-Alpha2-2 pre-configure: - #(cd $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src && PATH='$(HOST_PATH)' cmake .) - #PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src - #cp $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src/JsonSchemaBuilder \ - # $(STAGING_HOST_DIR)/usr/bin/JsonSchemaBuilder - #(cd $(WRKSRC)/tools/depends/native/TexturePacker/src && PATH='$(HOST_PATH)' cmake \ - # -DKODI_SOURCE_DIR=$(WRKSRC) \ - # -DCMAKE_MODULE_PATH=$(WRKSRC)/cmake/modules \ - # -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" .) - #PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/TexturePacker/src - #cp $(WRKSRC)/tools/depends/native/TexturePacker/src/TexturePacker \ - # $(STAGING_HOST_DIR)/usr/bin + (cd $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src && PATH='$(HOST_PATH)' cmake .) + PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src + cp $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/src/JsonSchemaBuilder \ + $(STAGING_HOST_DIR)/usr/bin/JsonSchemaBuilder + (cd $(WRKSRC)/tools/depends/native/TexturePacker/src && PATH='$(HOST_PATH)' cmake \ + -DKODI_SOURCE_DIR=$(WRKSRC) \ + -DCMAKE_MODULE_PATH=$(WRKSRC)/cmake/modules \ + -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" .) + PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/TexturePacker/src + cp $(WRKSRC)/tools/depends/native/TexturePacker/src/TexturePacker \ + $(STAGING_HOST_DIR)/usr/bin (cd $(DL_DIR) && wget -O libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz https://github.com/xbmc/libdvdcss/archive/refs/tags/$(KODI_LIBDVDCSS_VERSION).tar.gz) (cd $(DL_DIR) && wget -O libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz https://github.com/xbmc/libdvdnav/archive/refs/tags/$(KODI_LIBDVDNAV_VERSION).tar.gz) (cd $(DL_DIR) && wget -O libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz https://github.com/xbmc/libdvdread/archive/refs/tags/$(KODI_LIBDVDREAD_VERSION).tar.gz) diff --git a/package/kodi/files/kodi.init b/package/kodi/files/kodi.init index c3dfdf893..fc53d4486 100644 --- a/package/kodi/files/kodi.init +++ b/package/kodi/files/kodi.init @@ -13,7 +13,7 @@ autostart) ;; start) if [ ! -d /data/kodi ]; then - mkdir /data/kodi + mkdir -p /data/kodi fi cd / && /usr/lib/kodi/kodi-gbm & ;; diff --git a/package/kodi/patches/patch-CMakeLists_txt b/package/kodi/patches/patch-CMakeLists_txt deleted file mode 100644 index 7fa65595b..000000000 --- a/package/kodi/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,27 +0,0 @@ ---- xbmc-21.0b2-Omega.orig/CMakeLists.txt 2023-12-09 22:24:46.000000000 +0100 -+++ xbmc-21.0b2-Omega/CMakeLists.txt 2024-01-31 10:45:45.831435209 +0100 -@@ -178,7 +178,6 @@ endforeach() - # Required tools. Keep in alphabetical order please - set(required_buildtools FlatC - JsonSchemaBuilder -- TexturePacker - ) - - # Optional build tools -@@ -468,7 +467,6 @@ endif() - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR}/gen_skin.timestamp - COMMAND ${CMAKE_COMMAND} -DBUNDLEDIR=${_bundle_dir} -- -DTEXTUREPACKER_EXECUTABLE=$<TARGET_FILE:TexturePacker::TexturePacker::Executable> - -P ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/GeneratedPackSkins.cmake - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR} - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${CONFIG_VAR}/gen_skin.timestamp -@@ -481,7 +479,7 @@ add_custom_target(gen_skin_pack DEPENDS - - # Packaging target. This generates system addon, xbt creation, copy files to build tree - add_custom_target(generate-packaging ALL -- DEPENDS TexturePacker::TexturePacker::Executable export-files gen_skin_pack gen_system_addons) -+ DEPENDS export-files gen_skin_pack gen_system_addons) - # Make sure we build any libs before we look to export-files. - # We may need to export some shared libs/data (eg Python) - add_dependencies(export-files ${GLOBAL_TARGET_DEPS}) diff --git a/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp b/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp index 67e51c6e9..193f5987b 100644 --- a/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp +++ b/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp @@ -1,5 +1,5 @@ ---- xbmc-19.3-Matrix.orig/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2021-10-24 12:09:58.000000000 +0200 -+++ xbmc-19.3-Matrix/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2022-02-26 00:09:15.499548854 +0100 +--- xbmc-22.0a1-Piers.orig/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2025-08-18 23:49:12.000000000 +0200 ++++ xbmc-22.0a1-Piers/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp 2025-10-06 14:07:24.604055678 +0200 @@ -18,11 +18,11 @@ * */ diff --git a/package/kodi/patches/patch-xbmc_dbwrappers_dataset_h b/package/kodi/patches/patch-xbmc_dbwrappers_dataset_h new file mode 100644 index 000000000..f27f92975 --- /dev/null +++ b/package/kodi/patches/patch-xbmc_dbwrappers_dataset_h @@ -0,0 +1,10 @@ +--- xbmc-22.0a1-Piers.orig/xbmc/dbwrappers/dataset.h 2025-08-18 23:49:12.000000000 +0200 ++++ xbmc-22.0a1-Piers/xbmc/dbwrappers/dataset.h 2025-10-07 06:25:46.959580300 +0200 +@@ -14,6 +14,7 @@ + + #include "qry_dat.h" + ++#include <cstdarg> + #include <list> + #include <map> + #include <memory> diff --git a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp b/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp deleted file mode 100644 index 27c420df8..000000000 --- a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp +++ /dev/null @@ -1,31 +0,0 @@ ---- xbmc-21.0b2-Omega.orig/xbmc/platform/linux/CPUInfoLinux.cpp 2023-12-09 22:24:46.000000000 +0100 -+++ xbmc-21.0b2-Omega/xbmc/platform/linux/CPUInfoLinux.cpp 2024-01-30 15:52:43.704683194 +0100 -@@ -19,10 +19,7 @@ - #include <sstream> - #include <vector> - --#if (defined(__arm__) && defined(HAS_NEON)) || defined(__aarch64__) --#include <asm/hwcap.h> --#include <sys/auxv.h> --#elif defined(__i386__) || defined(__x86_64__) -+#if defined(__i386__) || defined(__x86_64__) - #include <cpuid.h> - #endif - -@@ -279,16 +276,6 @@ CCPUInfoLinux::CCPUInfoLinux() - - m_cpuModel = m_cpuModel.substr(0, m_cpuModel.find(char(0))); // remove extra null terminations - --#if defined(HAS_NEON) && defined(__arm__) -- if (getauxval(AT_HWCAP) & HWCAP_NEON) -- m_cpuFeatures |= CPU_FEATURE_NEON; --#endif -- --#if defined(HAS_NEON) && defined(__aarch64__) -- if (getauxval(AT_HWCAP) & HWCAP_ASIMD) -- m_cpuFeatures |= CPU_FEATURE_NEON; --#endif -- - // Set MMX2 when SSE is present as SSE is a superset of MMX2 and Intel doesn't set the MMX2 cap - if (m_cpuFeatures & CPU_FEATURE_SSE) - m_cpuFeatures |= CPU_FEATURE_MMX2; 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/libassuan/Makefile b/package/libassuan/Makefile index 373947719..103939dd6 100644 --- a/package/libassuan/Makefile +++ b/package/libassuan/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libassuan -PKG_VERSION:= 2.5.6 +PKG_VERSION:= 3.0.2 PKG_RELEASE:= 1 -PKG_HASH:= e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426 +PKG_HASH:= d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6 PKG_DESCR:= implementation of assuan protocol PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-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/libepoxy/Makefile b/package/libepoxy/Makefile index fa224ad12..b659682bb 100644 --- a/package/libepoxy/Makefile +++ b/package/libepoxy/Makefile @@ -20,6 +20,8 @@ $(eval $(call PKG_template,LIBEPOXY,libepoxy,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj +MESON_FLAGS+= -Dtests=false + CONFIG_STYLE:= meson BUILD_STYLE:= meson INSTALL_STYLE:= meson diff --git a/package/libffi/Makefile b/package/libffi/Makefile index 41487ecee..d944700bb 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libffi -PKG_VERSION:= 3.4.7 +PKG_VERSION:= 3.5.2 PKG_RELEASE:= 1 -PKG_HASH:= 138607dee268bdecf374adf9144c00e839e38541f75f24a1fcf18b78fda48b2d +PKG_HASH:= f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc PKG_DESCR:= foreign function interface library PKG_SECTION:= libs/misc HOST_BUILDDEP:= libtool-host @@ -25,10 +25,6 @@ $(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP HOST_CONFIGURE_ARGS+= --disable-builddir --with-pic --disable-symvers CONFIGURE_ARGS+= --disable-builddir --with-pic --disable-symvers -ifeq ($(ADK_PACKAGE_OPENJDK7),y) -CONFIGURE_ARGS+= --enable-static -endif - libffi-install: ${INSTALL_DIR} ${IDIR_LIBFFI}/usr/lib ${CP} ${WRKINST}/usr/lib*/libffi.so* ${IDIR_LIBFFI}/usr/lib diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 9ed07ce9c..16275b93a 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libgcrypt -PKG_VERSION:= 1.10.3 +PKG_VERSION:= 1.11.2 PKG_RELEASE:= 1 -PKG_HASH:= 8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa +PKG_HASH:= 6ba59dd192270e8c1d22ddb41a07d95dcdbc1f0fb02d03c4b54b235814330aac PKG_DESCR:= crypto library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index aa139d40e..b70992ef5 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libgpg-error -PKG_VERSION:= 1.47 +PKG_VERSION:= 1.55 PKG_RELEASE:= 1 -PKG_HASH:= 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb +PKG_HASH:= 95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78 PKG_DESCR:= helper library for common error codes and descriptions PKG_SECTION:= libs/misc PKG_URL:= http://www.gnupg.org/ diff --git a/package/libinih/Makefile b/package/libinih/Makefile index d546f244a..c54a62331 100644 --- a/package/libinih/Makefile +++ b/package/libinih/Makefile @@ -32,5 +32,7 @@ libinih-install: $(INSTALL_DIR) $(IDIR_LIBINIH)/usr/lib $(CP) $(WRKINST)/usr/lib/libinih*.so* \ $(IDIR_LIBINIH)/usr/lib + $(CP) $(WRKINST)/usr/lib/libINIReader*.so* \ + $(IDIR_LIBINIH)/usr/lib include $(ADK_TOPDIR)/mk/pkg-bottom.mk 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/libjpeg-turbo/Makefile b/package/libjpeg-turbo/Makefile index fc8968f9d..0a74335ca 100644 --- a/package/libjpeg-turbo/Makefile +++ b/package/libjpeg-turbo/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libjpeg-turbo -PKG_VERSION:= 3.0.3 +PKG_VERSION:= 3.1.2 PKG_RELEASE:= 1 -PKG_HASH:= a649205a90e39a548863a3614a9576a3fb4465f8e8e66d54999f127957c25b21 +PKG_HASH:= 560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6 PKG_DESCR:= jpeg image library PKG_SECTION:= libs/image -PKG_BUILDDEP:= yasm-host -HOST_BUILDDEP:= yasm-host +PKG_BUILDDEP:= cmake-host yasm-host +HOST_BUILDDEP:= cmake-host yasm-host PKG_URL:= http://libjpeg-turbo.org/ PKG_SITES:= https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/ PKG_OPTS:= dev 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/libogg/Makefile b/package/libogg/Makefile index e750fb7d3..d98bb61a1 100644 --- a/package/libogg/Makefile +++ b/package/libogg/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libogg -PKG_VERSION:= 1.3.1 +PKG_VERSION:= 1.3.6 PKG_RELEASE:= 1 -PKG_HASH:= 3a5bad78d81afb78908326d11761c0fb1a0662ee7150b6ad587cc586838cdcfa +PKG_HASH:= 5c8253428e181840cd20d41f3ca16557a9cc04bad4a3d04cce84808677fa1061 PKG_DESCR:= ogg bitstream handling library PKG_SECTION:= libs/audio PKG_URL:= http://www.xiph.org/ogg diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile index 89e388cd4..db5378c53 100644 --- a/package/libpciaccess/Makefile +++ b/package/libpciaccess/Makefile @@ -4,20 +4,24 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libpciaccess -PKG_VERSION:= 0.16 +PKG_VERSION:= 0.18.1 PKG_RELEASE:= 1 -PKG_HASH:= 84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27 +PKG_HASH:= 4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765a6fa76 PKG_DESCR:= pci access library PKG_SECTION:= x11/libs -PKG_SITES:= http://www.x.org/releases/individual/lib/ +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/lib/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + libpciaccess-install: ${INSTALL_DIR} ${IDIR_LIBPCIACCESS}/usr/lib ${CP} ${WRKINST}/usr/lib/libpciaccess.so* \ 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/libptytty/Makefile b/package/libptytty/Makefile index cb1126ce1..396e496e1 100644 --- a/package/libptytty/Makefile +++ b/package/libptytty/Makefile @@ -21,7 +21,8 @@ $(eval $(call PKG_template,LIBPTYTTY,libptytty,$(PKG_VERSION)-$(PKG_RELEASE),$(P TARGET_CFLAGS+= -lstdc++ CONFIG_STYLE:= cmake CMAKE_FLAGS+= -DTTY_GID_SUPPORT_EXITCODE=0 \ - -DTTY_GID_SUPPORT_EXITCODE__TRYRUN_OUTPUT=0 + -DUTMP_SUPPORT=0 \ + -DWTMP_SUPPORT=0 \ XAKE_FLAGS+= VERBOSE=1 libptytty-install: diff --git a/package/libsamplerate/Makefile b/package/libsamplerate/Makefile index 0b63904b6..a6a8bbb90 100644 --- a/package/libsamplerate/Makefile +++ b/package/libsamplerate/Makefile @@ -4,17 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libsamplerate -PKG_VERSION:= 0.1.9 +PKG_VERSION:= 0.2.2 PKG_RELEASE:= 1 -PKG_HASH:= 0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1 +PKG_HASH:= 3258da280511d24b49d6b08615bbe824d0cacc9842b0e4caf11c52cf2b043893 PKG_DESCR:= sample rate converter for audio PKG_SECTION:= libs/audio -PKG_URL:= http://www.mega-nerd.com/SRC/ -PKG_SITES:= http://www.mega-nerd.com/SRC/ +PKG_SITES:= https://github.com/libsndfile/libsamplerate/releases/download/$(PKG_VERSION)/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSAMPLERATE,libsamplerate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) 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/libsquish/Makefile b/package/libsquish/Makefile index 5ce5e6fcd..4b84d909f 100644 --- a/package/libsquish/Makefile +++ b/package/libsquish/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libsquish -PKG_VERSION:= 1.10 +PKG_VERSION:= 1.15 PKG_RELEASE:= 1 -PKG_HASH:= a0118a79d927058b656e94dc4ffce5da37839962e4952be1fedbbdd901b42848 +PKG_HASH:= 628796eeba608866183a61d080d46967c9dda6723bc0a3ec52324c85d2147269 PKG_DESCR:= c++ compression library PKG_SECTION:= libs/misc -PKG_SITES:= http://sources.openelec.tv/devel/ +PKG_SITES:= http://downloads.sourceforge.net/project/libsquish/ PKG_OPTS:= dev -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-openelec.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}-$(PKG_VERSION)-openelec +WRKDIST= ${WRKDIR}/ +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tgz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/libsquish/patches/patch-Makefile b/package/libsquish/patches/patch-Makefile deleted file mode 100644 index 702db40f5..000000000 --- a/package/libsquish/patches/patch-Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- libsquish-1.10-openelec.orig/Makefile 2015-01-09 09:52:04.000000000 -0600 -+++ libsquish-1.10-openelec/Makefile 2015-05-22 16:32:55.398921290 -0500 -@@ -10,6 +10,7 @@ LIB = libsquish.a - all : $(LIB) squish.pc - - install : $(LIB) squish.pc -+ mkdir -p $(INSTALL_DIR)/include $(INSTALL_DIR)/lib/pkgconfig - install squish.h $(INSTALL_DIR)/include - install libsquish.a $(INSTALL_DIR)/lib - install squish.pc $(INSTALL_DIR)/lib/pkgconfig 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/libtheora/Makefile b/package/libtheora/Makefile index a49ce0c81..c74f07dca 100644 --- a/package/libtheora/Makefile +++ b/package/libtheora/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libtheora -PKG_VERSION:= 1.1.1 -PKG_RELEASE:= 2 -PKG_HASH:= b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc +PKG_VERSION:= 1.2.0 +PKG_RELEASE:= 1 +PKG_HASH:= 279327339903b544c28a92aeada7d0dcfd0397b59c2f368cc698ac56f515906e PKG_DESCR:= open source video codec library PKG_SECTION:= libs/video PKG_DEPENDS:= libogg libvorbis @@ -15,7 +15,7 @@ PKG_URL:= http://www.theora.org/ PKG_SITES:= http://downloads.xiph.org/releases/theora/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/libtheora/patches/patch-Makefile_in b/package/libtheora/patches/patch-Makefile_in deleted file mode 100644 index 41162985c..000000000 --- a/package/libtheora/patches/patch-Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- libtheora-1.1.1.orig/Makefile.in 2009-10-01 20:04:07.000000000 +0200 -+++ libtheora-1.1.1/Makefile.in 2011-09-18 18:38:53.551740404 +0200 -@@ -164,7 +164,7 @@ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip - @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples - @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR = - --SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR) -+SUBDIRS = lib include m4 $(EXAMPLES_DIR) - - # we include the whole debian/ dir in EXTRA_DIST because there's a problem - # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am -@@ -200,7 +200,7 @@ DIST_COMMON = README AUTHORS COPYING Mak - missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \ - theoradec-uninstalled.pc.in theoradec.pc.in \ - theoraenc-uninstalled.pc.in theoraenc.pc.in --DIST_SUBDIRS = lib include doc tests m4 examples -+DIST_SUBDIRS = lib include m4 examples - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index 00ce5fc11..8f9ae30b2 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tiff -PKG_VERSION:= 4.3.0 +PKG_VERSION:= 4.7.1 PKG_RELEASE:= 1 -PKG_HASH:= 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 +PKG_HASH:= f698d94f3103da8ca7438d84e0344e453fe0ba3b7486e04c5bf7a9a3fabe9b69 PKG_DESCR:= library for reading/writing tiff images PKG_SECTION:= libs/image PKG_NEEDS:= c++ diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile index 9e5997350..1d808d66a 100644 --- a/package/libtirpc/Makefile +++ b/package/libtirpc/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libtirpc -PKG_VERSION:= 1.3.5 +PKG_VERSION:= 1.3.6 PKG_RELEASE:= 1 -PKG_HASH:= 9b31370e5a38d3391bf37edfa22498e28fe2142467ae6be7a17c9068ec0bf12f +PKG_HASH:= bbd26a8f0df5690a62a47f6aa30f797f3ef8d02560d1bc449a83066b5a1d3508 PKG_DESCR:= transport independent rpc library PKG_SECTION:= libs/net PKG_URL:= http://sourceforge.net/projects/libtirpc/ diff --git a/package/libtirpc/patches/patch-src_auth_none_c b/package/libtirpc/patches/patch-src_auth_none_c new file mode 100644 index 000000000..765711342 --- /dev/null +++ b/package/libtirpc/patches/patch-src_auth_none_c @@ -0,0 +1,11 @@ +--- libtirpc-1.3.6.orig/src/auth_none.c 2024-10-17 09:50:55.000000000 +0200 ++++ libtirpc-1.3.6/src/auth_none.c 2025-04-30 13:30:55.736451017 +0200 +@@ -62,7 +62,7 @@ static bool_t authnone_validate (AUTH *, + static bool_t authnone_refresh (AUTH *, void *); + static void authnone_destroy (AUTH *); + +-extern bool_t xdr_opaque_auth(); ++extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *); + + static struct auth_ops *authnone_ops(); + diff --git a/package/libtirpc/patches/patch-src_auth_time_c b/package/libtirpc/patches/patch-src_auth_time_c new file mode 100644 index 000000000..67bfd0e80 --- /dev/null +++ b/package/libtirpc/patches/patch-src_auth_time_c @@ -0,0 +1,20 @@ +--- libtirpc-1.3.6.orig/src/auth_time.c 2024-10-17 09:50:55.000000000 +0200 ++++ libtirpc-1.3.6/src/auth_time.c 2025-04-30 13:33:25.507704020 +0200 +@@ -248,7 +248,7 @@ __rpc_get_time_offset(td, srv, thost, ua + char ut[64], ipuaddr[64]; + endpoint teps[32]; + nis_server tsrv; +- void (*oldsig)() = NULL; /* old alarm handler */ ++ void (*oldsig)(int) = NULL; /* old alarm handler */ + struct sockaddr_in sin; + int s = RPC_ANYSOCK; + socklen_t len; +@@ -417,7 +417,7 @@ __rpc_get_time_offset(td, srv, thost, ua + } else { + int res; + +- oldsig = (void (*)())signal(SIGALRM, alarm_hndler); ++ oldsig = (void (*)(int))signal(SIGALRM, alarm_hndler); + saw_alarm = 0; /* global tracking the alarm */ + alarm(20); /* only wait 20 seconds */ + res = connect(s, (struct sockaddr *)&sin, sizeof(sin)); diff --git a/package/libtirpc/patches/patch-src_getpublickey_c b/package/libtirpc/patches/patch-src_getpublickey_c new file mode 100644 index 000000000..637d6be22 --- /dev/null +++ b/package/libtirpc/patches/patch-src_getpublickey_c @@ -0,0 +1,11 @@ +--- libtirpc-1.3.6.orig/src/getpublickey.c 2024-10-17 09:50:55.000000000 +0200 ++++ libtirpc-1.3.6/src/getpublickey.c 2025-04-30 13:30:55.736451017 +0200 +@@ -52,7 +52,7 @@ + /* + * Hack to let ypserv/rpc.nisd use AUTH_DES. + */ +-int (*__getpublickey_LOCAL)() = 0; ++int (*__getpublickey_LOCAL)(const char *, char *) = 0; + + /* + * Get somebody's public key diff --git a/package/libtirpc/patches/patch-src_key_call_c b/package/libtirpc/patches/patch-src_key_call_c new file mode 100644 index 000000000..8a1c12921 --- /dev/null +++ b/package/libtirpc/patches/patch-src_key_call_c @@ -0,0 +1,15 @@ +--- libtirpc-1.3.6.orig/src/key_call.c 2024-10-17 09:50:55.000000000 +0200 ++++ libtirpc-1.3.6/src/key_call.c 2025-04-30 13:33:25.507704020 +0200 +@@ -72,9 +72,9 @@ + * implementations of these functions, and to call those in key_call(). + */ + +-cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0; +-cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0; +-des_block *(*__key_gendes_LOCAL)() = 0; ++cryptkeyres *(*__key_encryptsession_pk_LOCAL)(uid_t, char *) = 0; ++cryptkeyres *(*__key_decryptsession_pk_LOCAL)(uid_t, char *) = 0; ++des_block *(*__key_gendes_LOCAL)(uid_t, char *) = 0; + + static int key_call( u_long, xdrproc_t, void *, xdrproc_t, void *); + diff --git a/package/libtirpc/patches/patch-src_svc_auth_none_c b/package/libtirpc/patches/patch-src_svc_auth_none_c new file mode 100644 index 000000000..c21c67692 --- /dev/null +++ b/package/libtirpc/patches/patch-src_svc_auth_none_c @@ -0,0 +1,13 @@ +--- libtirpc-1.3.6.orig/src/svc_auth_none.c 2024-10-17 09:50:55.000000000 +0200 ++++ libtirpc-1.3.6/src/svc_auth_none.c 2025-04-30 13:30:55.736451017 +0200 +@@ -37,8 +37,8 @@ + + #include <rpc/rpc.h> + +-static bool_t svcauth_none_destroy(); +-static bool_t svcauth_none_wrap(); ++static bool_t svcauth_none_destroy(SVCAUTH *); ++static bool_t svcauth_none_wrap(SVCAUTH *, XDR *, bool_t (*)(XDR *, ...), char *); + + struct svc_auth_ops svc_auth_none_ops = { + svcauth_none_wrap, diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index 163a030a3..4ef067c3a 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libvorbis -PKG_VERSION:= 1.3.5 +PKG_VERSION:= 1.3.7 PKG_RELEASE:= 1 -PKG_HASH:= 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1 +PKG_HASH:= b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b PKG_DESCR:= vorbis general audio compression codec library PKG_SECTION:= libs/audio PKG_BUILDDEP:= libogg diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 7f31d719c..a4dd44e9d 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libvpx -PKG_VERSION:= 1.14.0 +PKG_VERSION:= 1.15.2 PKG_RELEASE:= 1 -PKG_HASH:= 5f21d2db27071c8a46f1725928a10227ae45c5cd1cad3727e4aafbe476e321fa +PKG_HASH:= 26fcd3db88045dee380e581862a6ef106f49b74b6396ee95c2993a260b4636aa PKG_DESCR:= vp8/vp9 codec library PKG_SECTION:= libs/video PKG_BUILDDEP:= yasm-host @@ -20,7 +20,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBVPX,libvpx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ENV+= LD=$(TARGET_CC) +CONFIGURE_ENV+= LD="$(TARGET_CC)" CONFIG_STYLE:= minimal ifeq ($(ADK_TARGET_ARCH_AARCH64),y) diff --git a/package/libwebp/Makefile b/package/libwebp/Makefile index d894f3831..4f848ee5f 100644 --- a/package/libwebp/Makefile +++ b/package/libwebp/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libwebp -PKG_VERSION:= 1.2.2 +PKG_VERSION:= 1.6.0 PKG_RELEASE:= 1 -PKG_HASH:= 51e9297aadb7d9eb99129fe0050f53a11fcce38a0848fb2b0389e385ad93695e +PKG_HASH:= 93a852c2b3efafee3723efd4636de855b46f9fe1efddd607e1f42f60fc8f2136 PKG_DESCR:= new image format for the web PKG_SECTION:= libs/image PKG_BUILDDEP:= cmake-host @@ -19,9 +19,15 @@ DISTFILES:= v${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DBUILD_SHARED_LIBS=ON $(eval $(call PKG_template,LIBWEBP,libwebp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) libwebp-install: + $(INSTALL_DIR) $(IDIR_LIBWEBP)/usr/lib + $(CP) $(WRKINST)/usr/lib/libwebp*so* \ + $(IDIR_LIBWEBP)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsharpyuv*so* \ + $(IDIR_LIBWEBP)/usr/lib include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libwpe/Makefile b/package/libwpe/Makefile index c8e744ddd..b876264c0 100644 --- a/package/libwpe/Makefile +++ b/package/libwpe/Makefile @@ -4,11 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libwpe -PKG_VERSION:= 1.16.2 +PKG_VERSION:= 1.16.3 PKG_RELEASE:= 1 -PKG_HASH:= 960bdd11c3f2cf5bd91569603ed6d2aa42fd4000ed7cac930a804eac367888d7 +PKG_HASH:= c880fa8d607b2aa6eadde7d6d6302b1396ebc38368fe2332fa20e193c7ee1420 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/libx264/Makefile b/package/libx264/Makefile index 394cbcd82..83fdb14e0 100644 --- a/package/libx264/Makefile +++ b/package/libx264/Makefile @@ -4,7 +4,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libx264 -PKG_VERSION:= 7d0ff22e8c96de126be9d3de4952edd6d1b75a8c +PKG_VERSION:= 0480cb05fa188d37ae87e8f4fd8f1aea3711f7ee PKG_RELEASE:= 1 PKG_GIT:= hash PKG_DESCR:= h264 encoding library @@ -13,16 +13,16 @@ PKG_URL:= http://www.videolan.org/developers/x264.html PKG_SITES:= http://git.videolan.org/git/x264.git PKG_OPTS:= dev +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= minimal -ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) -CONFIGURE_ARGS+= --disable-asm -endif -CONFIGURE_ARGS+= --disable-cli \ +CONFIGURE_ARGS+= --disable-asm \ + --disable-cli \ --disable-opencl \ --enable-shared \ --prefix=/usr \ diff --git a/package/libx265/Makefile b/package/libx265/Makefile index bde8655cd..d7834d365 100644 --- a/package/libx265/Makefile +++ b/package/libx265/Makefile @@ -4,8 +4,8 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libx265 -PKG_VERSION:= 3.2 -PKG_HASH:= 364d79bcd56116a9e070fdeb1d9d2aaef1a786b4970163fb56ff0991a183133b +PKG_VERSION:= 4.1 +PKG_HASH:= a31699c6a89806b74b0151e5e6a7df65de4b49050482fe5ebf8a4379d7af8f29 PKG_RELEASE:= 1 PKG_DESCR:= h265 encoding library PKG_SECTION:= libs/video diff --git a/package/libx265/patches/patch-source_CMakeLists_txt b/package/libx265/patches/patch-source_CMakeLists_txt new file mode 100644 index 000000000..239456945 --- /dev/null +++ b/package/libx265/patches/patch-source_CMakeLists_txt @@ -0,0 +1,18 @@ +--- x265_4.1.orig/source/CMakeLists.txt 2024-11-22 13:07:34.000000000 +0100 ++++ x265_4.1/source/CMakeLists.txt 2025-10-05 03:09:19.216070894 +0200 +@@ -6,15 +6,9 @@ if(NOT CMAKE_BUILD_TYPE) + FORCE) + endif() + message(STATUS "cmake version ${CMAKE_VERSION}") +-if(POLICY CMP0025) +- cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang +-endif() + if(POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH + endif() +-if(POLICY CMP0054) +- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted +-endif() + + project (x265) + cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8 diff --git a/package/libxkbcommon/Makefile b/package/libxkbcommon/Makefile index 1650043a9..f1ffa28dd 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 libxcb 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/libxkbfile/Makefile b/package/libxkbfile/Makefile index 42812796d..e4391eddd 100644 --- a/package/libxkbfile/Makefile +++ b/package/libxkbfile/Makefile @@ -15,12 +15,15 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXKBFILE,libxkbfile,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) libxkbfile-install: ${INSTALL_DIR} ${IDIR_LIBXKBFILE}/usr/lib ${CP} ${WRKINST}/usr/lib/libxkbfile.so* ${IDIR_LIBXKBFILE}/usr/lib +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 078788d7e..5a7c744cb 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.15.1 PKG_RELEASE:= 1 -PKG_HASH:= 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c +PKG_HASH:= c008bac08fd5c7b4a87f7b8a71f283fa581d80d80ff8d2efd3b26224c39bc54c 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.15/ PKG_OPTS:= dev include $(ADK_TOPDIR)/mk/host.mk diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 3c2522122..0f698eba8 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libxslt -PKG_VERSION:= 1.1.38 +PKG_VERSION:= 1.1.43 PKG_RELEASE:= 1 -PKG_HASH:= 1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1 +PKG_HASH:= 5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a PKG_DESCR:= xslt library PKG_SECTION:= libs/data PKG_DEPENDS:= libxml2 @@ -28,7 +28,6 @@ $(eval $(call HOST_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXSLT,libxslt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,XSLTPROC,xsltproc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XSLTPROC},${PKGSC_XSLTPROC})) -#AUTOTOOL_STYLE:= autoreconf HOST_LDFLAGS+= -lxml2 HOST_CONFIGURE_ARGS+= --without-python \ --without-crypto \ diff --git a/package/lynx/Makefile b/package/lynx/Makefile index 945096303..ab68c1dc0 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= lynx -PKG_VERSION:= 2.9.1 +PKG_VERSION:= 2.9.2 PKG_RELEASE:= 1 -PKG_HASH:= 085fb3924b8684485c6be1b1ca745417da6ace768f94428ead95caf9dd8b56b7 +PKG_HASH:= 99f8f28f860094c533100d1cedf058c27fb242ce25e991e2d5f30ece4457a3bf PKG_DESCR:= text browser PKG_SECTION:= app/browser PKG_DEPENDS:= libncurses zlib @@ -18,7 +18,7 @@ PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/$(PKG_NAME)$(PKG_VERSION) -PKG_CHOICES_LYNX:= WITH_LIBRESSL WITH_OPENSSL WITH_GNUTLS WITHOUT_SSL +PKG_CHOICES_LYNX:= WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl @@ -34,9 +34,10 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -#TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/include/openssl -#TARGET_CPPFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT -#HOST_CFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT +TARGET_LDFLAGS+= -latomic +TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/include/openssl +TARGET_CPPFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT +HOST_CFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT ifeq (${ADK_PACKAGE_LYNX_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \ diff --git a/package/m4/Makefile b/package/m4/Makefile index 6973ed164..b9f57f5f4 100644 --- a/package/m4/Makefile +++ b/package/m4/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= m4 -PKG_VERSION:= 1.4.19 +PKG_VERSION:= 1.4.20 PKG_RELEASE:= 1 -PKG_HASH:= 63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96 +PKG_HASH:= e236ea3a1ccf5f6c270b1c4bb60726f371fa49459a8eaaebc90b216b328daf2b PKG_DESCR:= macro processor PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host @@ -22,7 +22,6 @@ $(eval $(call PKG_template,M4,m4,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${ CONFIGURE_ENV+= ac_cv_func_posix_spawn=yes \ ac_cv_func_posix_spawn_works=yes -TARGET_LDFLAGS+= -lrt m4-install: ${INSTALL_DIR} ${IDIR_M4}/usr/bin diff --git a/package/mesa/Makefile b/package/mesa/Makefile index 0f0955160..0bd924989 100644 --- a/package/mesa/Makefile +++ b/package/mesa/Makefile @@ -21,6 +21,11 @@ PKG_SITES:= https://archive.mesa3d.org/ PKG_LIBNAME:= mesa PKG_OPTS:= dev +PKG_CHOICES_MESA:= WITH_X11 WITH_WAYLAND +PKGCD_WITH_X11:= with X11 support +PKGCD_WITH_WAYLAND:= with wayland support +PKGCB_WITH_WAYLAND:= wayland wayland-protocols + PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm aarch64 include $(ADK_TOPDIR)/mk/package.mk @@ -33,13 +38,22 @@ BUILD_STYLE:= meson INSTALL_STYLE:= meson MESON_FLAGS+= -Dllvm=disabled \ - -Dgallium-drivers=panfrost,vc4,v3d \ + -Dgallium-drivers=panfrost,vc4,v3d,virgl \ -Dvulkan-drivers= \ -Dgbm=enabled \ - -Dplatforms=x11 + -Dglx=dri + +ifeq ($(ADK_PACKAGE_MESA_WITH_WAYLAND),y) +MESON_FLAGS+= -Dplatforms="wayland" +endif + +ifeq ($(ADK_PACKAGE_MESA_WITH_X11),y) +MESON_FLAGS+= -Dplatforms="x11" +endif 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 +64,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/mkfontscale/Makefile b/package/mkfontscale/Makefile index 431fba9cd..0d687b735 100644 --- a/package/mkfontscale/Makefile +++ b/package/mkfontscale/Makefile @@ -4,11 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mkfontscale -PKG_VERSION:= 1.1.0 +PKG_VERSION:= 1.2.3 PKG_RELEASE:= 1 -PKG_HASH:= 53515d688c8d0ed24f74374d9c33e36a20b024d59b8127d9f23b481ab5e98150 +PKG_HASH:= 3a026b468874eb672a1d0a57dbd3ddeda4f0df09886caf97d30097b70c2df3f8 PKG_DESCR:= font utility PKG_SECTION:= x11/fonts +PKG_DEPENDS:= freetype libfontenc PKG_BUILDDEP:= freetype libfontenc PKG_SITES:= http://www.x.org/releases/individual/app/ diff --git a/package/mutt/Makefile b/package/mutt/Makefile index a8578b6ad..25fb74dd7 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mutt -PKG_VERSION:= 2.2.12 +PKG_VERSION:= 2.2.15 PKG_RELEASE:= 1 -PKG_HASH:= 043af312f64b8e56f7fd0bf77f84a205d4c498030bd9586457665c47bb18ce38 +PKG_HASH:= a51686104e4203f4c2a3b176527be3b95d08e808e94fd2dcadb7c30566bf894d PKG_DESCR:= mail client for console PKG_SECTION:= net/mail PKG_DEPENDS:= libncurses @@ -14,7 +14,10 @@ PKG_BUILDDEP:= ncurses PKG_URL:= http://www.mutt.org/ PKG_SITES:= ftp://ftp.mutt.org/pub/mutt/ -PKG_CHOICES_MUTT:= WITH_LIBRESSL WITHOUT_SSL +PKG_CHOICES_MUTT:= WITH_OPENSSL WITH_LIBRESSL WITHOUT_SSL +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCB_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCB_WITH_LIBRESSL:= libressl PKGCS_WITH_LIBRESSL:= libressl ca-certificates @@ -31,6 +34,7 @@ CONFIGURE_ARGS+= --with-homespool="~/Maildir" \ --with-curses="$(STAGING_TARGET_DIR)/usr" \ --enable-pop \ --enable-imap \ + --enable-smtp \ --disable-doc ifeq ($(ADK_PACKAGE_MUTT_WITHOUT_SSL),y) diff --git a/package/nghttp2/Makefile b/package/nghttp2/Makefile index 76764db94..88e9256e4 100644 --- a/package/nghttp2/Makefile +++ b/package/nghttp2/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= nghttp2 -PKG_VERSION:= 1.65.0 +PKG_VERSION:= 1.67.1 PKG_RELEASE:= 1 -PKG_HASH:= f1b9df5f02e9942b31247e3d415483553bc4ac501c87aa39340b6d19c92a9331 +PKG_HASH:= 153972aad57e7bf9d911666df7613f2390acf37ea7e1a97a0c5567e90f98e830 PKG_DESCR:= http2 library PKG_SECTION:= libs/misc -PKG_SITES:= https://github.com/nghttp2/nghttp2/releases/download/v1.65.0/ +PKG_SITES:= https://github.com/nghttp2/nghttp2/releases/download/v$(PKG_VERSION)/ PKG_OPTS:= dev include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/ninja/Makefile b/package/ninja/Makefile index 2ab4e6df1..2eab0b4dc 100644 --- a/package/ninja/Makefile +++ b/package/ninja/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ninja -PKG_VERSION:= 1.8.2 -PKG_RELEASE:= 2 -PKG_HASH:= 86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4 +PKG_VERSION:= 1.13.1 +PKG_RELEASE:= 1 +PKG_HASH:= f0055ad0369bf2e372955ba55128d000cfcc21777057806015b45e4accbebf23 PKG_DESCR:= build utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= python3-host diff --git a/package/ninja/patches/patch-configure_py b/package/ninja/patches/patch-configure_py deleted file mode 100644 index cb743c891..000000000 --- a/package/ninja/patches/patch-configure_py +++ /dev/null @@ -1,8 +0,0 @@ ---- ninja-1.8.2.orig/configure.py 2017-09-11 03:20:10.000000000 +0200 -+++ ninja-1.8.2/configure.py 2021-09-21 11:39:51.729841404 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Copyright 2001 Google Inc. All Rights Reserved. - # diff --git a/package/openssh/Makefile b/package/openssh/Makefile index c987edf36..63c0682a0 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 9.9p1 +PKG_VERSION:= 10.0p1 PKG_RELEASE:= 1 -PKG_HASH:= b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02 +PKG_HASH:= 021a2e709a0edf4250b1256bd5a9e500411a90dddabea830ed59cef90eb9d85c PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security PKG_BUILDDEP:= zlib @@ -110,6 +110,8 @@ openssh-server-install: ${IDIR_OPENSSH_SERVER}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/libexec/sshd-session \ ${IDIR_OPENSSH_SERVER}/usr/libexec + ${INSTALL_BIN} ${WRKINST}/usr/libexec/sshd-auth \ + ${IDIR_OPENSSH_SERVER}/usr/libexec # ssh pubkey test -z $(ADK_RUNTIME_SSH_PUBKEY) || ( \ mkdir -p $(IDIR_OPENSSH_SERVER)/etc/ssh; \ diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 0c68a5800..c397e6dce 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openssl -PKG_VERSION:= 3.4.1 +PKG_VERSION:= 3.5.4 PKG_RELEASE:= 1 -PKG_HASH:= 002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3 +PKG_HASH:= 967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99 PKG_DESCR:= ssl/tls library PKG_SECTION:= libs/crypto PKG_URL:= https://openssl-library.org/ @@ -66,7 +66,7 @@ OPENSSL_OPTIONS+= no-asm endif host-configure: - (cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr' -fPIC -ldl) + (cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr' -fPIC -ldl no-docs no-tests) host-build: (cd $(WRKBUILD); $(MAKE)) diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 8001a51ca..bdc8c9b96 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openvpn -PKG_VERSION:= 2.6.10 +PKG_VERSION:= 2.6.15 PKG_RELEASE:= 1 -PKG_HASH:= 1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b +PKG_HASH:= e35513ee15995e3c71adfd8891b9f33522896c70b3baa2ed9a23c7a42c4d7bde PKG_DESCR:= vpn solution using ssl/tls -PKG_DEPENDS:= libressl libcap-ng -PKG_BUILDDEP:= libressl libcap-ng +PKG_DEPENDS:= libopenssl libcap-ng +PKG_BUILDDEP:= openssl libcap-ng PKG_KDEPENDS:= tun PKG_SECTION:= net/security PKG_URL:= http://openvpn.net/ @@ -31,6 +31,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_LDFLAGS+= -latomic CONFIGURE_ENV+= ac_cv_lib_nsl_inet_ntoa=no ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZ4),) diff --git a/package/pam/Makefile b/package/pam/Makefile index 933101e47..8a40b8157 100644 --- a/package/pam/Makefile +++ b/package/pam/Makefile @@ -8,7 +8,9 @@ PKG_VERSION:= 1.7.0 PKG_RELEASE:= 1 PKG_HASH:= 1dad9cb50b4a19accd7d7b9716777caf5a0f33d26f018f27d63e9e095998f12b PKG_DESCR:= pluggable authentication modules -PKG_BUILDDEP:= flex meson-host +PKG_DEPENDS_GLIBC:= libxcrypt +PKG_BUILDDEP:= meson-host +PKG_BUILDDEP_GLIBC:= libxcrypt PKG_SECTION:= sys/misc PKG_URL:= http://www.linux-pam.org/ PKG_SITES:= https://github.com/linux-pam/linux-pam/archive/refs/tags/ diff --git a/package/pcre/Makefile b/package/pcre/Makefile new file mode 100644 index 000000000..8964db4aa --- /dev/null +++ b/package/pcre/Makefile @@ -0,0 +1,49 @@ +# 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:= pcre +PKG_VERSION:= 8.45 +PKG_RELEASE:= 1 +PKG_HASH:= 4e6ce03e0336e8b4a3d6c2b70b1c5e18590a5673a98186da90d4f33c23defc09 +PKG_DESCR:= perl compatible regular expression library +PKG_SECTION:= libs/misc +PKG_URL:= http://www.pcre.org/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/} +PKG_LIBNAME:= libpcre +PKG_OPTS:= dev + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz + +PKG_SUBPKGS:= LIBPCRE LIBPCRECPP +PKGSD_LIBPCRECPP:= pcre c++ library + +include ${ADK_TOPDIR}/mk/host.mk +include ${ADK_TOPDIR}/mk/package.mk + +$(eval $(call HOST_template,PCRE,pcre,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRECPP},${PKG_SECTION})) + +CONFIGURE_ARGS+= --enable-utf \ + --enable-unicode-properties +XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} + +ifeq ($(ADK_PACKAGE_LIBPCRECPP),y) +CONFIGURE_ARGS+= --enable-cpp +else +CONFIGURE_ARGS+= --disable-cpp +endif + +libpcre-install: + ${INSTALL_DIR} ${IDIR_LIBPCRE}/usr/lib + ${CP} ${WRKINST}/usr/lib/libpcre{,posix}.so* ${IDIR_LIBPCRE}/usr/lib + +libpcrecpp-install: + ${INSTALL_DIR} ${IDIR_LIBPCRECPP}/usr/lib + ${CP} ${WRKINST}/usr/lib/libpcrecpp.so* ${IDIR_LIBPCRECPP}/usr/lib + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk + diff --git a/package/perl/Makefile b/package/perl/Makefile index f0ec8af32..4da8aaabd 100644 --- a/package/perl/Makefile +++ b/package/perl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= perl -PKG_VERSION:= 5.40.1 +PKG_VERSION:= 5.40.2 PKG_RELEASE:= 1 -PKG_HASH:= dfa20c2eef2b4af133525610bbb65dd13777ecf998c9c5b1ccf0d308e732ee3f +PKG_HASH:= 0551c717458e703ef7972307ab19385edfa231198d88998df74e12226abf563b PKG_DESCR:= perl interpreter PKG_SECTION:= dev/lang PKG_NEEDS:= threads @@ -14,7 +14,7 @@ PKG_URL:= http://www.perl.org/ PKG_SITES:= http://www.cpan.org/src/ PKG_NOPARALLEL:= 1 -PC_VERSION:= 1.6.1 +PC_VERSION:= 1.6.2 PC_SITE:= https://github.com/arsv/perl-cross/releases/download/$(PC_VERSION) include ${ADK_TOPDIR}/mk/host.mk diff --git a/package/pinentry/Makefile b/package/pinentry/Makefile index 93fd39c59..d0fae2eb6 100644 --- a/package/pinentry/Makefile +++ b/package/pinentry/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pinentry -PKG_VERSION:= 1.2.0 +PKG_VERSION:= 1.3.2 PKG_RELEASE:= 1 -PKG_HASH:= 10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470 +PKG_HASH:= 8e986ed88561b4da6e9efe0c54fa4ca8923035c99264df0b0464497c5fb94e9e PKG_DESCR:= pinentry application PKG_SECTION:= app/crypto PKG_URL:= https://www.gnupg.org diff --git a/package/python3/Makefile b/package/python3/Makefile index 46acb8e12..bbe408591 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= python3 -PKG_VERSION:= 3.12.9 +PKG_VERSION:= 3.13.8 PKG_RELEASE:= 1 -PKG_HASH:= 7220835d9f90b37c006e9842a8dff4580aaca4318674f947302b8d28f3f81112 +PKG_HASH:= b9910730526b298299b46b35595ced9055722df60c06ad6301f6a4e2c728a252 PKG_DESCR:= python scripting language PKG_SECTION:= dev/lang PKG_DEPENDS:= libffi zlib libexpat @@ -52,9 +52,9 @@ define PKG_mod_template INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install ${2}-install: - ${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python3.12/lib-dynload + ${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python3.13/lib-dynload for m in ${2}; do \ - ${INSTALL_DATA} $(WRKINST)/usr/lib/python3.12/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python3.12/lib-dynload ;\ + ${INSTALL_DATA} $(WRKINST)/usr/lib/python3.13/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python3.13/lib-dynload ;\ done endef @@ -98,15 +98,15 @@ endif python3-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/bin ${IDIR_PYTHON3}/usr/lib - ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/lib/python3.12 - ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/include/python3.12 + ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/lib/python3.13 + ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/include/python3.13 ${INSTALL_BIN} ${WRKINST}/usr/bin/python3 ${IDIR_PYTHON3}/usr/bin ${CP} ${WRKINST}/usr/lib/libpython*.so* ${IDIR_PYTHON3}/usr/lib - ${CP} ${WRKINST}/usr/lib/python3.12/* ${IDIR_PYTHON3}/usr/lib/python3.12 - ${CP} ${WRKINST}/usr/include/python3.12/pyconfig.h \ - ${IDIR_PYTHON3}/usr/include/python3.12 + ${CP} ${WRKINST}/usr/lib/python3.13/* ${IDIR_PYTHON3}/usr/lib/python3.13 + ${CP} ${WRKINST}/usr/include/python3.13/pyconfig.h \ + ${IDIR_PYTHON3}/usr/include/python3.13 @-for i in zlib _bz2 _curses _ssl _gdbm _sqlite pyexpat readline; do \ - rm ${IDIR_PYTHON3}/usr/lib/python3.12/lib-dynload/$${i}*so; \ + rm ${IDIR_PYTHON3}/usr/lib/python3.13/lib-dynload/$${i}*so; \ done include ${ADK_TOPDIR}/mk/host-bottom.mk diff --git a/package/ruby/Makefile b/package/ruby/Makefile index 261cf5b42..8553eb5c5 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ruby -PKG_VERSION:= 3.3.0 +PKG_VERSION:= 3.4.6 PKG_RELEASE:= 1 -PKG_HASH:= 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b +PKG_HASH:= 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 PKG_DESCR:= scripting language PKG_SECTION:= dev/lang PKG_DEPENDS:= libopenssl zlib @@ -14,7 +14,7 @@ PKG_BUILDDEP:= ruby-host openssl zlib HOST_BUILDDEP:= openssl-host yaml-host PKG_NEEDS:= threads PKG_URL:= http://www.ruby-lang.org/ -PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/3.3/ +PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/3.4/ include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile index 8b977427d..3e6e625d9 100644 --- a/package/rxvt-unicode/Makefile +++ b/package/rxvt-unicode/Makefile @@ -10,7 +10,7 @@ PKG_HASH:= fe1c93d12f385876457a989fc3ae05c0915d2692efc59289d0f70fabe5b44d2d PKG_DESCR:= terminal emulator with unicode support PKG_SECTION:= x11/apps PKG_DEPENDS:= libx11 fontconfig libxft libxml2 gdk-pixbuf libptytty -PKG_DEPENDS+= libffi libmount +PKG_DEPENDS+= libffi libmount glib PKG_BUILDDEP:= libX11 fontconfig libXft libxml2 gdk-pixbuf libptytty PKG_BUILDDEP+= libffi util-linux PKG_NEEDS:= c++ diff --git a/package/screen/Makefile b/package/screen/Makefile index a5dbf8043..9aa49a79f 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= screen -PKG_VERSION:= 5.0.0 +PKG_VERSION:= 5.0.1 PKG_RELEASE:= 1 -PKG_HASH:= f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971 +PKG_HASH:= 2dae36f4db379ffcd14b691596ba6ec18ac3a9e22bc47ac239789ab58409869d PKG_DESCR:= window manager for the terminal session PKG_SECTION:= sys/utils -PKG_DEPENDS:= libncurses elfutils -PKG_BUILDDEP:= ncurses elfutils +PKG_DEPENDS:= libncurses +PKG_BUILDDEP:= ncurses PKG_NEEDS:= mmu PKG_URL:= http://www.gnu.org/software/screen/ PKG_SITES:= ${MASTER_SITE_GNU:=screen/} diff --git a/package/spdlog/Makefile b/package/spdlog/Makefile index 3d96eecb9..ba38c8468 100644 --- a/package/spdlog/Makefile +++ b/package/spdlog/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= spdlog -PKG_VERSION:= 1.9.2 +PKG_VERSION:= 1.15.3 PKG_RELEASE:= 1 -PKG_HASH:= 6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38 +PKG_HASH:= 15a04e69c222eb6c01094b5c7ff8a249b36bb22788d72519646fb85feb267e67 PKG_DESCR:= very fast, header-only/compiled, C++ logging library PKG_BUILDDEP:= fmt PKG_SECTION:= libs/misc diff --git a/package/strace/Makefile b/package/strace/Makefile index 83649f619..11360944a 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= strace -PKG_VERSION:= 6.14 +PKG_VERSION:= 6.16 PKG_RELEASE:= 1 -PKG_HASH:= 244f3b5c20a32854ca9b7ca7a3ee091dd3d4bd20933a171ecee8db486c77d3c9 +PKG_HASH:= 3d7aee7e4f044b2f67f3d51a8a76eda18076e9fb2774de54ac351d777d4ebffa PKG_DESCR:= system call trace program PKG_SECTION:= app/debug PKG_URL:= https://strace.io diff --git a/package/taglib/Makefile b/package/taglib/Makefile index 9297caf75..1a1edec98 100644 --- a/package/taglib/Makefile +++ b/package/taglib/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= taglib -PKG_VERSION:= 1.13.1 +PKG_VERSION:= 2.1.1 PKG_RELEASE:= 1 -PKG_HASH:= c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b +PKG_HASH:= 3716d31f7c83cbf17b67c8cf44dd82b2a2f17e6780472287a16823e70305ddba PKG_DESCR:= audio meta-data library PKG_SECTION:= libs/audio PKG_DEPENDS:= zlib diff --git a/package/tinyx/Makefile b/package/tinyx/Makefile new file mode 100644 index 000000000..17f79a2df --- /dev/null +++ b/package/tinyx/Makefile @@ -0,0 +1,39 @@ +# 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:= tinyx +PKG_VERSION:= git +PKG_RELEASE:= 1 +PKG_HASH:= db206aeef89104e1bd4cab40508eb1160f8a6bc69848eaf16cbc35eda1c62864 +PKG_DESCR:= tiny x server +PKG_SECTION:= x11/drivers +PKG_DEPENDS:= libxcvt libfontenc xkeyboard-config xkbcomp libxau libxaw +PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext +PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libdrm libxtst +PKG_DEPENDS+= libxshmfence libfreetype libfontenc libxfont +PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto +PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto +PKG_BUILDDEP+= compositeproto evieext xf86dgaproto recordproto dri3proto +PKG_BUILDDEP+= xineramaproto presentproto xf86driproto glproto libXtst +PKG_BUILDDEP+= xorgproto libxcvt font-util-host libXfont +PKG_NEEDS:= threads c++ +PKG_SITES:= https://github.com/tinycorelinux/tinyx.git + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +PKG_CFLINE_TINYX:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,TINYX,tinyx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --with-fontdir=/usr/share/fonts/X11 + +tinyx-install: + $(INSTALL_DIR) $(IDIR_TINYX)/usr/bin + ${CP} ${WRKINST}/usr/bin/Xfbdev $(IDIR_TINYX)/usr/bin + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 5e8f57851..c1712235e 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -4,18 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= util-linux -PKG_VERSION:= 2.40.2 -PKG_RELEASE:= 2 -PKG_HASH:= d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 +PKG_VERSION:= 2.41.1 +PKG_RELEASE:= 1 +PKG_HASH:= be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57 PKG_DESCR:= basic utilities PKG_SECTION:= base/apps PKG_BUILDDEP:= ncurses PKG_NEEDS:= threads -PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.40/ +PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.41/ PKG_OPTS:= dev PKG_SUBPKGS:= FDISK AGETTY SFDISK SWAP_UTILS LOSETUP LSFD MCOOKIE MOUNT PKG_SUBPKGS+= LIBFDISK LIBUUID LIBBLKID LIBMOUNT LIBSMARTCOLS CFDISK MKFS +PKG_SUBPKGS+= SWITCHROOT PKGSD_LIBUUID:= uuid library PKGSC_LIBUUID:= libs/misc PKGSD_LIBBLKID:= blkid library @@ -24,6 +25,7 @@ PKGSD_LIBFDISK:= fdisk library PKGSC_LIBFDISK:= libs/misc PKGSD_LIBMOUNT:= mount library PKGSC_LIBMOUNT:= libs/misc +PKGSS_LIBMOUNT:= libblkid PKGSD_LIBSMARTCOLS:= smartcols library PKGSC_LIBSMARTCOLS:= libs/misc PKGSD_FDISK:= partition table manipulation utility @@ -51,8 +53,11 @@ PKGSC_MKFS:= sys/fs PKGSD_MOUNT:= mount/umount utilities PKGSS_MOUNT:= libblkid libmount libuuid libncurses PKGSC_MOUNT:= sys/fs +PKGSD_SWITCHROOT:= switch_root utility +PKGSC_SWITCHROOT:= sys/utils 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 @@ -67,6 +72,7 @@ $(eval $(call PKG_template,LOSETUP,losetup,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS $(eval $(call PKG_template,LSFD,lsfd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LSFD),$(PKGSD_LSFD),$(PKGSC_LSFD))) $(eval $(call PKG_template,MKFS,mkfs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MKFS),$(PKGSD_MKFS),$(PKGSC_MKFS))) $(eval $(call PKG_template,MOUNT,mount,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MOUNT),$(PKGSD_MOUNT),$(PKGSC_MOUNT))) +$(eval $(call PKG_template,SWITCHROOT,switchroot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MOUNT),$(PKGSD_MOUNT),$(PKGSC_MOUNT))) $(eval $(call PKG_template,MCOOKIE,mcookie,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_MCOOKIE),$(PKGSC_MCOOKIE))) $(eval $(call PKG_template,LIBUUID,libuuid,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBUUID),$(PKGSC_LIBUUID),$(PKG_OPTS))) $(eval $(call PKG_template,LIBBLKID,libblkid,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBBLKID),$(PKGSC_LIBBLKID),$(PKG_OPTS))) @@ -96,7 +102,6 @@ CONFIGURE_ARGS+= --exec-prefix=/usr \ --disable-cramfs \ --disable-login \ --disable-eject \ - --disable-switch_root \ --disable-nsenter \ --disable-unshare \ --disable-wall \ @@ -105,6 +110,7 @@ CONFIGURE_ARGS+= --exec-prefix=/usr \ --without-python \ --without-systemd \ --without-user \ + --enable-switch_root \ --enable-libfdisk \ --enable-libuuid \ --enable-libblkid \ @@ -161,6 +167,10 @@ mount-install: $(INSTALL_DIR) $(IDIR_MOUNT)/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/{u,}mount $(IDIR_MOUNT)/bin +switchroot-install: + $(INSTALL_DIR) $(IDIR_SWITCHROOT)/sbin + $(INSTALL_BIN) $(WRKINST)/sbin/switch_root $(IDIR_SWITCHROOT)/sbin + mcookie-install: $(INSTALL_DIR) $(IDIR_MCOOKIE)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/mcookie $(IDIR_MCOOKIE)/usr/bin diff --git a/package/wayland-protocols/Makefile b/package/wayland-protocols/Makefile index 364703e12..308ae62f1 100644 --- a/package/wayland-protocols/Makefile +++ b/package/wayland-protocols/Makefile @@ -4,15 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= wayland-protocols -PKG_VERSION:= 1.43 +PKG_VERSION:= 1.45 PKG_RELEASE:= 1 -PKG_HASH:= ba3c3425dd27c57b5291e93dba97be12479601e00bcab24d26471948cb643653 +PKG_HASH:= 460dad72a6c84b2a7d80745bee43d96ba117f4e3dfc4d7c45f83f66469ea27df 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/wayland/Makefile b/package/wayland/Makefile index 61bd7271c..24535f1cf 100644 --- a/package/wayland/Makefile +++ b/package/wayland/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= wayland -PKG_VERSION:= 1.23.1 +PKG_VERSION:= 1.24.0 PKG_RELEASE:= 1 -PKG_HASH:= 864fb2a8399e2d0ec39d56e9d9b753c093775beadc6022ce81f441929a81e5ed +PKG_HASH:= 82892487a01ad67b334eca83b54317a7c86a03a89cfadacfef5211f11a5d0536 PKG_DESCR:= wayland PKG_SECTION:= x11/libs -PKG_BUILDDEP:= wayland-host +PKG_BUILDDEP:= wayland-host libffi HOST_BUILDDEP:= meson-host expat-host libxml2-host libffi-host PKG_SITES:= https://gitlab.freedesktop.org/wayland/wayland/-/releases/$(PKG_VERSION)/downloads/ PKG_OPTS:= dev diff --git a/package/weston/Makefile b/package/weston/Makefile index 3355dd394..76f4e5bb6 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_RELEASE:= 1 -PKG_HASH:= a8150505b126a59df781fe8c30c8e6f87da7013e179039eb844a5bbbcc7c79b3 +PKG_VERSION:= 14.0.2 +PKG_RELEASE:= 2 +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 @@ -52,7 +56,7 @@ weston-install: $(CP) $(WRKINST)/usr/lib/*so* \ $(IDIR_WESTON)/usr/lib/ $(INSTALL_DIR) $(IDIR_WESTON)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/weston \ + $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ $(IDIR_WESTON)/usr/bin include $(ADK_TOPDIR)/mk/pkg-bottom.mk 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..163a3908e 100644 --- a/package/wpewebkit/Makefile +++ b/package/wpewebkit/Makefile @@ -4,13 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= wpewebkit -PKG_VERSION:= 2.48.0 +PKG_VERSION:= 2.50.0 PKG_RELEASE:= 1 -PKG_HASH:= 25bc557fd62f06ac8393a6f638ffceff3d9f367d6d35195315fa459c82f80850 +PKG_HASH:= a9af62c5e18551b7386b7db864e8ba8156f219b8e6c639934bf6f3a567969922 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 libblkid libepoxy +PKG_BUILDDEP:= cmake-host libwpe libsoup3 harfbuzz libjpeg-turbo +PKG_BUILDDEP+= libgcrypt libtasn1 libwebp gstreamer gst-plugins-base +PKG_BUILDDEP+= libxslt libpsl libepoxy unifdef-host libatomic PKG_URL:= https://wpewebkit.org PKG_SITES:= https://wpewebkit.org/releases/ PKG_OPTS:= dev @@ -19,6 +23,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,WPEWEBKIT,wpewebkit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +XAKE_FLAGS+= VERBOSE=1 CONFIG_STYLE:= cmake CMAKE_FLAGS+= -DPORT=WPE \ -DUSE_SYSTEM_SYSPROF_CAPTURE=NO \ @@ -30,17 +35,22 @@ CMAKE_FLAGS+= -DPORT=WPE \ -DENABLE_SPEECH_SYNTHESIS=OFF \ -DENABLE_JOURNALD_LOG=OFF \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ + -DENABLE_WEB_DRIVER=ON \ -DUSE_GSTREAMER_TRANSCODER=OFF \ -DUSE_LIBBACKTRACE=OFF \ -DUSE_JPEGXL=OFF \ -DUSE_LCMS=OFF \ -DUSE_WOFF2=OFF \ -DUSE_AVIF=OFF \ - -DUSE_ATK=OFF + -DUSE_ATK=OFF \ + -DUSE_SKIA=OFF wpewebkit-install: $(INSTALL_DIR) $(IDIR_WPEWEBKIT)/usr/lib $(CP) $(WRKINST)/usr/lib/libWPEWebKit*.so* \ $(IDIR_WPEWEBKIT)/usr/lib + $(INSTALL_DIR) $(IDIR_WPEWEBKIT)/usr/libexec/wpe-webkit-2.0 + $(INSTALL_BIN) $(WRKINST)/usr/libexec/wpe-webkit-2.0/* \ + $(IDIR_WPEWEBKIT)/usr/libexec/wpe-webkit-2.0 include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/wpewebkit/patches/patch-Source_bmalloc_libpas_src_libpas_pas_probabilistic_guard_malloc_allocator_c b/package/wpewebkit/patches/patch-Source_bmalloc_libpas_src_libpas_pas_probabilistic_guard_malloc_allocator_c new file mode 100644 index 000000000..548167711 --- /dev/null +++ b/package/wpewebkit/patches/patch-Source_bmalloc_libpas_src_libpas_pas_probabilistic_guard_malloc_allocator_c @@ -0,0 +1,20 @@ +--- wpewebkit-2.50.0.orig/Source/bmalloc/libpas/src/libpas/pas_probabilistic_guard_malloc_allocator.c 2025-08-11 09:56:57.555220800 +0200 ++++ wpewebkit-2.50.0/Source/bmalloc/libpas/src/libpas/pas_probabilistic_guard_malloc_allocator.c 2025-09-26 23:53:28.359719212 +0200 +@@ -47,17 +47,12 @@ + #include <unistd.h> + #endif + +-/* PlayStation does not currently support the backtrace API. Android API versions < 33 don't, either. Windows does not either. */ +-#if !PAS_PLATFORM(PLAYSTATION) && (!PAS_OS(ANDROID) || __ANDROID_API__ >= 33) && !PAS_OS(WINDOWS) +-#include <execinfo.h> +-#else + size_t backtrace(void** buffer, size_t size) + { + PAS_UNUSED_PARAM(buffer); + PAS_UNUSED_PARAM(size); + return 0; + } +-#endif + + static size_t free_wasted_mem = PAS_PGM_MAX_WASTED_MEMORY; + static size_t free_virtual_mem = PAS_PGM_MAX_VIRTUAL_MEMORY; diff --git a/package/xf86-input-libinput/Makefile b/package/xf86-input-libinput/Makefile new file mode 100644 index 000000000..8f6bac4c1 --- /dev/null +++ b/package/xf86-input-libinput/Makefile @@ -0,0 +1,30 @@ +# 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:= xf86-input-libinput +PKG_VERSION:= 1.5.0 +PKG_RELEASE:= 1 +PKG_HASH:= 2524c35f196554ea11aef3bba1cf324759454e1d49f98ac026ace2f6003580e6 +PKG_DESCR:= x11 driver for libinput +PKG_SECTION:= x11/drivers +PKG_DEPENDS:= xorg-server libudev libevdev mtdev libinput +PKG_BUILDDEP:= xorg-server eudev libevdev mtdev libinput +PKG_SITES:= https://www.x.org/releases/individual/driver/ + +PKG_CFLINE_XF86_INPUT_LIBINPUT:= depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XF86_INPUT_LIBINPUT,xf86-input-libinput,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +xf86-input-libinput-install: + ${INSTALL_DIR} ${IDIR_XF86_INPUT_LIBINPUT}/usr/lib/xorg/modules/input + ${CP} ${WRKINST}/usr/lib/xorg/modules/input/*.so \ + ${IDIR_XF86_INPUT_LIBINPUT}/usr/lib/xorg/modules/input/ + ${INSTALL_DIR} ${IDIR_XF86_INPUT_LIBINPUT}/usr/share/X11/xorg.conf.d + ${CP} ${WRKINST}/usr/share/X11/xorg.conf.d/40-libinput.conf \ + ${IDIR_XF86_INPUT_LIBINPUT}/usr/share/X11/xorg.conf.d + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk 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/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 diff --git a/package/xinit/patches/patch-xinitrc_in b/package/xinit/patches/patch-xinitrc_in new file mode 100644 index 000000000..9b76cf237 --- /dev/null +++ b/package/xinit/patches/patch-xinitrc_in @@ -0,0 +1,13 @@ +--- xinit-1.4.4.orig/xinitrc.in 2025-03-09 21:44:26.000000000 +0100 ++++ xinit-1.4.4/xinitrc.in 2025-09-27 00:32:37.482563426 +0200 +@@ -49,8 +49,5 @@ if [ -d "$xinitdir"/xinitrc.d ] ; then + unset f + fi + +-"$twm" & +-"$xclock" -geometry 50x50-1+1 & +-"$xterm" -geometry 80x50+494+51 & +-"$xterm" -geometry 80x20+494-0 & +-exec "$xterm" -geometry 80x66+0+0 -name login ++evilwm -fn fixed -term xterm & ++exec "$xterm" -geometry 80x18 diff --git a/package/xkbcomp/Makefile b/package/xkbcomp/Makefile index 03da06b23..50be6a1a1 100644 --- a/package/xkbcomp/Makefile +++ b/package/xkbcomp/Makefile @@ -4,23 +4,25 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xkbcomp -PKG_VERSION:= 1.0.5 -PKG_RELEASE:= 2 -PKG_HASH:= 817e2bda2ca51ffc1fc664e3f9ab88b359cd91246f0f4736fc747d6fbc59f2e7 +PKG_VERSION:= 1.4.7 +PKG_RELEASE:= 1 +PKG_HASH:= 0a288114e5f44e31987042c79aecff1ffad53a8154b8ec971c24a69a80f81f77 PKG_DESCR:= x11 keyboard compiler PKG_SECTION:= x11/misc PKG_BUILDDEP:= libxkbfile libX11 PKG_DEPENDS:= libxkbfile libx11 -PKG_SITES:= http://xorg.freedesktop.org/releases/X11R7.4/src/everything/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +HOST_BUILDDEP:= libxkbfile-host +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/app/ +include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call HOST_template,XKBCOMP,xkbcomp,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,XKBCOMP,xkbcomp,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) xkbcomp-install: ${INSTALL_DIR} ${IDIR_XKBCOMP}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/xkbcomp ${IDIR_XKBCOMP}/usr/bin +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index 182812e57..5724468e0 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xkeyboard-config -PKG_VERSION:= 2.37 +PKG_VERSION:= 2.45 PKG_RELEASE:= 1 -PKG_HASH:= eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c +PKG_HASH:= 169e075a92d957a57787c199e84e359df2931b7196c1c5b4a3d576ee6235a87c PKG_DESCR:= keyboard config PKG_SECTION:= x11/misc -PKG_BUILDDEP:= util-macros-host xkbcomp meson-host +PKG_BUILDDEP:= util-macros-host xkbcomp-host xkbcomp meson-host PKG_SITES:= http://www.x.org/releases/individual/data/xkeyboard-config/ include $(ADK_TOPDIR)/mk/package.mk @@ -23,9 +23,10 @@ BUILD_STYLE:= meson INSTALL_STYLE:= meson xkeyboard-config-install: - ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb - ${CP} ${WRKINST}/usr/share/X11/xkb/* \ - ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb - rm -rf ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/symbols/sun_vndr + ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11 + ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/xkeyboard-config-2 + ${CP} ${WRKINST}/usr/share/xkeyboard-config-2/* \ + ${IDIR_XKEYBOARD_CONFIG}/usr/share/xkeyboard-config-2 + (cd $(IDIR_XKEYBOARD_CONFIG)/usr/share/X11 && ln -sf ../xkeyboard-config-2 xkb) include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 13775e48a..a4b5ad899 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xorg-server -PKG_VERSION:= 21.1.16 +PKG_VERSION:= 21.1.18 PKG_RELEASE:= 1 -PKG_HASH:= b14a116d2d805debc5b5b2aac505a279e69b217dae2fae2dfcb62400471a9970 +PKG_HASH:= c878d1930d87725d4a5bf498c24f4be8130d5b2646a9fd0f2994deff90116352 PKG_DESCR:= xorg server PKG_SECTION:= x11/drivers PKG_DEPENDS:= libxfont2 pixman libpciaccess libxkbfile libxcvt @@ -14,13 +14,13 @@ PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libdrm PKG_DEPENDS+= libxshmfence libfreetype libfontenc libpciaccess -PKG_DEPENDS+= libepoxy +PKG_DEPENDS+= libepoxy libdbus PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto 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 dbus PKG_NEEDS:= threads c++ PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/xserver/ @@ -28,9 +28,6 @@ PKG_OPTS:= dev PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC -PKG_FLAVOURS_XORG_SERVER:= WITH_KDRIVE -PKGFD_WITH_KDRIVE:= build kdrive xfbdev server - PKG_CHOICES_XORG_SERVER:= WITH_OPENSSL WITH_LIBRESSL WITH_GCRYPT PKGCD_WITH_OPENSSL:= use openssl crypto for sha1 PKGCS_WITH_OPENSSL:= libopenssl @@ -47,6 +44,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CPPFLAGS+= -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t +TARGET_LDFLAGS+= -latomic -lstdc++ + +AUTOTOOL_STYLE:= autoreconf ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-sha1=libcrypto @@ -67,10 +67,10 @@ CONFIGURE_ARGS+= --enable-dga \ --enable-vgahw \ --enable-dpms \ --enable-xinerama \ + --enable-config-udev \ + --disable-debug \ --disable-docs \ - --disable-glamor \ --disable-config-hal \ - --disable-config-udev \ --disable-xace \ --disable-xephyr \ --disable-xf86bigfont \ @@ -82,6 +82,8 @@ CONFIGURE_ARGS+= --enable-dga \ --disable-xvmc \ --disable-selective-werror \ --disable-strict-compilation \ + --disable-systemd-logind \ + --without-systemd-daemon \ --enable-dri \ --enable-dri2 \ --enable-dri3 \ @@ -91,12 +93,6 @@ CONFIGURE_ARGS+= --enable-dga \ --with-fontrootdir=/usr/share/fonts/X11/ \ --with-vendor-web="$(ADK_VENDOR_URL)" -ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_KDRIVE},y) -CONFIGURE_ARGS+= --enable-kdrive --enable-kdrive-kbd --enable-kdrive-mouse --enable-kdrive-evdev -else -CONFIGURE_ARGS+= --disable-kdrive -endif - ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) CONFIGURE_ARGS+= --with-int10=stub endif @@ -125,6 +121,10 @@ ifeq (${ADK_TARGET_SYSTEM_SHARP_ZAURUS},y) ${CP} ./files/xorg.conf.sharp-zaurus \ $(IDIR_XORG_SERVER)/etc/X11/xorg.conf endif +ifeq (${ADK_TARGET_SYSTEM_RASPBERRY_PI5},y) + ${CP} ./files/xorg.conf.raspberry-pi5 \ + $(IDIR_XORG_SERVER)/etc/X11/xorg.conf +endif # add m4 file to host directory $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal $(CP) ${WRKINST}/usr/share/aclocal/xorg-server.m4 \ diff --git a/package/xorg-server/files/xorg.conf.raspberry-pi5 b/package/xorg-server/files/xorg.conf.raspberry-pi5 new file mode 100644 index 000000000..f23cd1328 --- /dev/null +++ b/package/xorg-server/files/xorg.conf.raspberry-pi5 @@ -0,0 +1,6 @@ +Section "OutputClass" + Identifier "vc4" + MatchDriver "vc4" + Driver "modesetting" + Option "PrimaryGPU" "true" +EndSection diff --git a/package/xorg-server/patches/patch-configure b/package/xorg-server/patches/patch-configure index 378c27c1c..f7b7beab0 100644 --- a/package/xorg-server/patches/patch-configure +++ b/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 diff --git a/package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am b/package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am new file mode 100644 index 000000000..c8cf55563 --- /dev/null +++ b/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 = \ diff --git a/package/xterm/Makefile b/package/xterm/Makefile index c01042855..0c6f1c634 100644 --- a/package/xterm/Makefile +++ b/package/xterm/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xterm -PKG_VERSION:= 396 +PKG_VERSION:= 401 PKG_RELEASE:= 1 -PKG_HASH:= 43f94b6d0eecb4219a99f46352e746f2ab5558e40d922d411acff96cc778a6a5 +PKG_HASH:= 3da2b5e64cb49b03aa13057d85e62e1f2e64f7c744719c00d338d11cd3e6ca1a PKG_DESCR:= terminal emulator PKG_SECTION:= x11/apps PKG_DEPENDS:= libxaw libxt libncurses libxft fontconfig libuuid diff --git a/package/xvidcore/Makefile b/package/xvidcore/Makefile index c7999cc4b..13e57b5a7 100644 --- a/package/xvidcore/Makefile +++ b/package/xvidcore/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xvidcore -PKG_VERSION:= 1.3.5 +PKG_VERSION:= 1.3.7 PKG_RELEASE:= 1 -PKG_HASH:= 165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894cf0 +PKG_HASH:= abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d PKG_DESCR:= xvid codec library PKG_SECTION:= libs/video PKG_URL:= http://www.xvid.org/ diff --git a/package/zip/Makefile b/package/zip/Makefile index 77f6c6f1c..991963c33 100644 --- a/package/zip/Makefile +++ b/package/zip/Makefile @@ -31,7 +31,7 @@ MAKE_FILE:= unix/Makefile ALL_TARGET:= generic_gcc host-build: - (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} CC="$(HOST_CC) -std=gnu89" ${MAKE} -f ${MAKE_FILE} \ ${HOST_MAKE_FLAGS} ${ALL_TARGET}) zip-hostinstall: diff --git a/package/zip/patches/patch-timezone_c b/package/zip/patches/patch-timezone_c new file mode 100644 index 000000000..9f549df5c --- /dev/null +++ b/package/zip/patches/patch-timezone_c @@ -0,0 +1,10 @@ +--- zip30.orig/timezone.c 2004-11-13 09:35:12.000000000 +0100 ++++ zip30/timezone.c 2025-10-05 03:57:25.603996335 +0200 +@@ -41,6 +41,7 @@ + #include "timezone.h" + #include <ctype.h> + #include <errno.h> ++#include <time.h> + + #ifdef IZTZ_DEFINESTDGLOBALS + long timezone = 0; diff --git a/package/zip/patches/patch-unix_configure b/package/zip/patches/patch-unix_configure new file mode 100644 index 000000000..d177b83f8 --- /dev/null +++ b/package/zip/patches/patch-unix_configure @@ -0,0 +1,14 @@ +--- zip30.orig/unix/configure 2008-06-20 05:32:20.000000000 +0200 ++++ zip30/unix/configure 2025-10-05 03:55:24.305239765 +0200 +@@ -519,7 +519,10 @@ done + + + echo Check for memset +-echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c ++cat > conftest.c << _EOF_ ++#include <string.h> ++int main(){ char k; memset(&k,0,0); return 0; } ++_EOF_ + $CC -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM" + |