diff options
Diffstat (limited to 'package')
221 files changed, 1757 insertions, 2668 deletions
diff --git a/package/Config.in.options b/package/Config.in.options index 39e6a0b96..a806da895 100644 --- a/package/Config.in.options +++ b/package/Config.in.options @@ -47,7 +47,7 @@ config ADK_LEAVE_ETC_ALONE config ADK_INSTALL_PACKAGE_INIT_SCRIPTS bool "ship custom init-scripts along with packages" - default y if !ADK_RUNTIME_INIT_SYSTEMD + default y depends on !ADK_LEAVE_ETC_ALONE help Turning this option to false will prevent the ADK from @@ -59,7 +59,7 @@ config ADK_INSTALL_PACKAGE_INIT_SCRIPTS config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS bool "ship custom network-scripts along with packages" - default y if !ADK_RUNTIME_INIT_SYSTEMD + default y depends on !ADK_LEAVE_ETC_ALONE help Turning this option to false will prevent the ADK from diff --git a/package/adktest/src/quit b/package/adktest/src/quit index 74c5f01b8..00468d36a 100755 --- a/package/adktest/src/quit +++ b/package/adktest/src/quit @@ -1,7 +1,7 @@ #!/bin/sh arch=$(uname -m) case $arch in - arc|blackfin|m68k|metag|openrisc|riscv64|s390x|sh4eb) + arc|blackfin|kvx|m68k|metag|riscv64|s390x|sh4eb) poweroff ;; *) diff --git a/package/afboot-stm32/patches/patch-Makefile b/package/afboot-stm32/patches/patch-Makefile index 8f543cc4e..c063052c9 100644 --- a/package/afboot-stm32/patches/patch-Makefile +++ b/package/afboot-stm32/patches/patch-Makefile @@ -1,11 +1,18 @@ ---- afboot-stm32-3566acd582e5536fb60864281788a30f5527df2d.orig/Makefile 2021-04-09 08:03:07.000000000 +0200 -+++ afboot-stm32-3566acd582e5536fb60864281788a30f5527df2d/Makefile 2021-04-09 08:12:57.359735373 +0200 -@@ -13,7 +13,8 @@ DTB_ADDR?=0x08004000 +--- afboot-stm32-3566acd582e5536fb60864281788a30f5527df2d.orig/Makefile 2021-12-31 07:02:01.000000000 +0100 ++++ afboot-stm32-3566acd582e5536fb60864281788a30f5527df2d/Makefile 2021-12-31 12:02:33.236273664 +0100 +@@ -7,13 +7,14 @@ OBJDUMP = $(CROSS_COMPILE)objdump + SIZE = $(CROSS_COMPILE)size + GDB = $(CROSS_COMPILE)gdb + OPENOCD = openocd +-KERNEL_ADDR?=0x08008000 ++KERNEL_ADDR?=0x0800C000 + DTB_ADDR?=0x08004000 + CFLAGS := -mthumb -mcpu=cortex-m4 CFLAGS += -ffunction-sections -fdata-sections CFLAGS += -Os -std=gnu99 -Wall -LINKERFLAGS := -nostartfiles --gc-sections -+CFLAGS += -fno-builtin ++CFLAGS += -mno-fdpic -fno-builtin +LINKERFLAGS := --gc-sections obj-y += gpio.o mpu.o qspi.o start_kernel.o diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 7046779ac..3ee12d26b 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -23,7 +23,8 @@ $(eval $(call PKG_template,APR_UTIL,apr-util,${PKG_VERSION}-${PKG_RELEASE},${PKG CONFIGURE_ARGS+= --without-berkeley-db \ --with-apr=${STAGING_TARGET_DIR}/usr \ - --with-expat=${STAGING_TARGET_DIR}/usr + --with-expat=${STAGING_TARGET_DIR}/usr \ + --without-iconv XAKE_FLAGS+= apr_builddir=${STAGING_TARGET_DIR}/usr/share/build-1 \ apr_builders=${STAGING_TARGET_DIR}/usr/share/build-1 diff --git a/package/atk/Makefile b/package/atk/Makefile index d199dec57..ad6335f1b 100644 --- a/package/atk/Makefile +++ b/package/atk/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= atk -PKG_VERSION:= 2.20.0 -PKG_EXTRAVER:= 2.20 +PKG_VERSION:= 2.36.0 +PKG_EXTRAVER:= 2.36 PKG_RELEASE:= 1 -PKG_HASH:= 493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0 +PKG_HASH:= fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 PKG_DESCR:= accessibility toolkit library PKG_SECTION:= libs/misc -PKG_BUILDDEP:= glib +PKG_BUILDDEP:= glib meson-host PKG_URL:= http://www.gnome.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=atk/$(PKG_EXTRAVER)/) PKG_LIBNAME:= libatk @@ -20,6 +20,14 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBATK,libatk,$(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+= -Dintrospection=false + libatk-install: $(INSTALL_DIR) $(IDIR_LIBATK)/usr/lib $(CP) $(WRKINST)/usr/lib/libatk-*.so* $(IDIR_LIBATK)/usr/lib diff --git a/package/avahi/Makefile b/package/avahi/Makefile index a5b7cd081..94b894c5b 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -4,12 +4,12 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= avahi -PKG_VERSION:= 0.6.32 +PKG_VERSION:= 0.8 PKG_RELEASE:= 1 -PKG_HASH:= d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454 +PKG_HASH:= 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda PKG_DESCR:= multicast dns daemon and dns-sd server PKG_SECTION:= net/dns -PKG_BUILDDEP:= libdaemon expat gdbm glib +PKG_BUILDDEP:= libdaemon expat gdbm glib libevent PKG_NEEDS:= c++ intl PKG_URL:= http://avahi.org/ PKG_SITES:= https://github.com/lathiat/avahi/releases/download/v$(PKG_VERSION)/ @@ -31,12 +31,12 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AVAHI,avahi,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_AVAHI),$(PKG_DESCR),$(PKG_SECTION))) $(eval $(call PKG_template,LIBAVAHI,libavahi,$(PKG_VERSION)-$(PKG_RELEASE),,$(PKGSD_LIBAVAHI),$(PKGSC_LIBAVAHI),$(PKG_OPTS))) -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --enable-glib \ --enable-libdaemon \ --enable-dbus \ --disable-qt3 \ --disable-qt4 \ + --disable-qt5 \ --disable-gtk \ --disable-gtk3 \ --disable-python \ diff --git a/package/avahi/patches/patch-Makefile_am b/package/avahi/patches/patch-Makefile_am deleted file mode 100644 index ff5160336..000000000 --- a/package/avahi/patches/patch-Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ ---- avahi-0.6.31.orig/Makefile.am 2011-12-30 22:26:44.000000000 +0100 -+++ avahi-0.6.31/Makefile.am 2014-03-04 09:57:29.000000000 +0100 -@@ -75,8 +75,7 @@ SUBDIRS = \ - avahi-compat-howl \ - avahi-autoipd \ - avahi-ui \ -- avahi-ui-sharp \ -- po -+ avahi-ui-sharp - - DX_INPUT = \ - $(srcdir)/avahi-common/address.h \ diff --git a/package/avahi/patches/patch-avahi-ui_Makefile_am b/package/avahi/patches/patch-avahi-ui_Makefile_am deleted file mode 100644 index c1744d9d0..000000000 --- a/package/avahi/patches/patch-avahi-ui_Makefile_am +++ /dev/null @@ -1,19 +0,0 @@ ---- avahi-0.6.31.orig/avahi-ui/Makefile.am 2012-02-14 23:22:16.000000000 +0100 -+++ avahi-0.6.31/avahi-ui/Makefile.am 2014-03-04 09:45:16.000000000 +0100 -@@ -79,9 +79,6 @@ libavahi_ui_gtk3_la_CFLAGS += -DDATABASE - endif - - bin_PROGRAMS = bssh --desktop_DATA += bssh.desktop bvnc.desktop --@INTLTOOL_DESKTOP_RULE@ -- - bssh_SOURCES = bssh.c - - if HAVE_GTK3 -@@ -108,6 +105,4 @@ endif # HAVE_GLIB - endif - endif - --@INTLTOOL_DESKTOP_RULE@ -- - CLEANFILES = $(desktop_DATA) $(desktop_DATA_in) diff --git a/package/avahi/patches/patch-configure_ac b/package/avahi/patches/patch-configure_ac deleted file mode 100644 index 53f1aea23..000000000 --- a/package/avahi/patches/patch-configure_ac +++ /dev/null @@ -1,14 +0,0 @@ ---- avahi-0.6.31.orig/configure.ac 2012-02-14 22:44:25.484742099 +0100 -+++ avahi-0.6.31/configure.ac 2014-06-15 20:50:12.072045207 +0200 -@@ -412,11 +412,9 @@ if test "x$have_kqueue" = "xyes" ; then - AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage]) - fi - --IT_PROG_INTLTOOL([0.35.0]) - GETTEXT_PACKAGE=avahi - AC_SUBST([GETTEXT_PACKAGE]) - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) --AM_GLIB_GNU_GETTEXT - - avahilocaledir='${prefix}/${DATADIRNAME}/locale' - AC_SUBST(avahilocaledir) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 24e4e2432..c3f77fe7c 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -40,7 +40,6 @@ do-install: ln -sf ../run $(IDIR_BASE_FILES)/var/run chmod 600 $(IDIR_BASE_FILES)/etc/shadow chmod 1777 ${IDIR_BASE_FILES}/tmp -ifeq ($(ADK_RUNTIME_INIT_SYSTEMD),) echo $(ADK_RUNTIME_TMPFS_SIZE) > $(IDIR_BASE_FILES)/etc/tmpfs mkdir -p $(IDIR_BASE_FILES)/etc/init.d cp ./files/init.d/* $(IDIR_BASE_FILES)/etc/init.d @@ -64,7 +63,6 @@ ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) else (cd $(IDIR_BASE_FILES)/etc; ln -sf ../tmp/resolv.conf .) endif -endif ifeq ($(ADK_RUNTIME_DEV_MDEV),y) $(CP) ./files/rcdev.mdev $(IDIR_BASE_FILES)/etc/init.d/rcdev $(SED) "s#@ADK_RUNTIME_DEV_MDEV_LOGGING@#"$(ADK_RUNTIME_DEV_MDEV_LOGGING_LINE)"#g" $(IDIR_BASE_FILES)/etc/init.d/rcdev diff --git a/package/bash/Makefile b/package/bash/Makefile index 99a4bfb97..5df526c7a 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bash -PKG_VERSION:= 5.1.8 +PKG_VERSION:= 5.1.16 PKG_RELEASE:= 1 -PKG_HASH:= 0cfb5c9bb1a29f800a97bd242d19511c997a1013815b805e0fdd32214113d6be +PKG_HASH:= 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 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 4ea08bf74..2a2b83b4f 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -5,14 +5,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bcm28xx-bootloader # not cloned, local src directory used -PKG_VERSION:= 784fe6cebd9e5726c0c7b9e449f7cdbf2cf6959d +PKG_VERSION:= 827fdd073638fa7b7292d1148fe0af7465111eae PKG_RELEASE:= 1 PKG_DESCR:= bootloader for bcm28xx PKG_SECTION:= base/boot PKG_URL:= https://github.com/raspberrypi/firmware PKG_SITES:= https://github.com/raspberrypi/firmware.git -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 +PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi4 raspberry-pi4-64 PKG_CHOICES_BCM28XX_BOOTLOADER:= DEFAULT EXTRA CUTDOWN PKGCD_DEFAULT:= default bootloader @@ -42,10 +42,16 @@ do-install: printf "dtparam=audio,i2s,spi,i2c\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_DEFAULT),y) +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y) + $(CP) $(WRKBUILD)/boot/{start4.elf,fixup4.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/ + printf "start_file=start4.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt + printf "fixup_file=fixup4.dat\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt +else $(CP) $(WRKBUILD)/boot/{start.elf,fixup.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/ printf "start_file=start.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "fixup_file=fixup.dat\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif +endif ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_EXTRA),y) $(CP) $(WRKBUILD)/boot/{start_x.elf,fixup_x.dat} $(IDIR_BCM28XX_BOOTLOADER)/boot/ printf "start_file=start_x.elf\n" >> $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt @@ -98,7 +104,7 @@ ifeq ($(ADK_TARGET_HARDWARE_RPI3_SERIAL),y) printf "enable_uart=1\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt endif -ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64)$(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64),y) +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y) printf "arm_control=0x200\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt printf "enable_uart=1\n" >> \ diff --git a/package/bcm28xx-bootloader/src/boot/bootcode.bin b/package/bcm28xx-bootloader/src/boot/bootcode.bin Binary files differindex 4800dab88..c559368e3 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 43beb3d3f..b5999eee2 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 83376f3df..f685540da 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 0deaa6727..674c06ee9 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 79d7b04a1..825f4f6eb 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 a1fa3f555..5dc1d28e3 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 0deaa6727..674c06ee9 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 9b8318f27..0fa4b4341 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 25e8b72c2..135f4aa37 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 9e0c14451..ded9745e0 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 cfbe7a32b..b3cabad1f 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 a679efb8b..cd78e32b9 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 8052a876d..712dc4d9a 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 87d73d795..4143be841 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 f62941bce..081fe59fa 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 6c4e1ffb8..665ad4eac 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 011083598..9f3bd6947 100644 --- a/package/bcm28xx-bootloader/src/boot/start_x.elf +++ b/package/bcm28xx-bootloader/src/boot/start_x.elf diff --git a/package/bcm28xx-vc/Makefile b/package/bcm28xx-vc/Makefile index c7337c859..e1ff14f13 100644 --- a/package/bcm28xx-vc/Makefile +++ b/package/bcm28xx-vc/Makefile @@ -4,7 +4,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bcm28xx-vc -PKG_VERSION:= 2448644657e5fbfd82299416d218396ee1115ece +PKG_VERSION:= 14b90ff9d9f031391a299e6e006965d02bfd1bb1 PKG_GIT:= hash PKG_RELEASE:= 1 PKG_DESCR:= videocore tools and libraries @@ -26,7 +26,7 @@ PKGSC_BCM28XX_VC_GL_LIBS:=libs/video PKGSS_BCM28XX_VC_GL_LIBS:=bcm28xx-vc-libs PKGSD_BCM28XX_VC_GL_LIBS:=videocore gl library -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 +PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi4 raspberry-pi4-64 include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/bcm28xx-vc/patches/patch-host_applications_android_apps_vidtex_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-host_applications_android_apps_vidtex_CMakeLists_txt deleted file mode 100644 index a36625f8e..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_android_apps_vidtex_CMakeLists_txt +++ /dev/null @@ -1,10 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/host_applications/android/apps/vidtex/CMakeLists.txt 2015-10-27 10:59:47.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/host_applications/android/apps/vidtex/CMakeLists.txt 2015-11-16 20:31:58.396542125 +0100 -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 2.8) - --SET(COMPILE_DEFINITIONS -Werror -Wall) -+SET(COMPILE_DEFINITIONS -Wall) - include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) - - set (VIDTEX_SOURCES diff --git a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_raspicam_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_raspicam_CMakeLists_txt deleted file mode 100644 index b92e1e625..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_raspicam_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-8d518460723779f95b49efafc04c183e83da3a18.orig/host_applications/linux/apps/raspicam/CMakeLists.txt 2017-06-27 18:59:31.000000000 +0200 -+++ bcm28xx-vc-8d518460723779f95b49efafc04c183e83da3a18/host_applications/linux/apps/raspicam/CMakeLists.txt 2017-06-30 23:35:09.949011873 +0200 -@@ -1,8 +1,6 @@ - - # raspistill/raspivid/raspiyuv - --SET(COMPILE_DEFINITIONS -Werror) -- - include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) - include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/apps/raspicam/) - include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/sm) diff --git a/package/bcm28xx-vc/patches/patch-interface_vmcs_host_linux_vcfiled_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-interface_vmcs_host_linux_vcfiled_CMakeLists_txt deleted file mode 100644 index 06bc3da60..000000000 --- a/package/bcm28xx-vc/patches/patch-interface_vmcs_host_linux_vcfiled_CMakeLists_txt +++ /dev/null @@ -1,9 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/interface/vmcs_host/linux/vcfiled/CMakeLists.txt 2015-10-27 10:59:48.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/interface/vmcs_host/linux/vcfiled/CMakeLists.txt 2015-11-16 20:16:31.801734911 +0100 -@@ -1,6 +1,4 @@ - --add_definitions(-Werror) -- - # vcfiled - serves files to videocore. used for media handlers from - # OpenMAX/IL and loading VLLs. - add_executable(vcfiled vcfiled.c) diff --git a/package/bison/Makefile b/package/bison/Makefile index f7716611e..5bc9cce8d 100644 --- a/package/bison/Makefile +++ b/package/bison/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bison -PKG_VERSION:= 3.0.4 +PKG_VERSION:= 3.8.2 PKG_RELEASE:= 1 -PKG_HASH:= a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1 +PKG_HASH:= 9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2 PKG_DESCR:= parser generator PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host bison-host diff --git a/package/bison/patches/patch-lib_fseterr_c b/package/bison/patches/patch-lib_fseterr_c deleted file mode 100644 index 06af7469f..000000000 --- a/package/bison/patches/patch-lib_fseterr_c +++ /dev/null @@ -1,11 +0,0 @@ ---- bison-3.0.4.orig/lib/fseterr.c 2015-01-04 16:43:50.000000000 +0000 -+++ bison-3.0.4/lib/fseterr.c 2019-05-06 08:24:42.407830562 +0000 -@@ -29,7 +29,7 @@ fseterr (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags |= _IO_ERR_SEEN; - #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ - fp_->_flags |= __SERR; diff --git a/package/bison/patches/patch-lib_vasnprintf_c b/package/bison/patches/patch-lib_vasnprintf_c deleted file mode 100644 index cb21d90fa..000000000 --- a/package/bison/patches/patch-lib_vasnprintf_c +++ /dev/null @@ -1,28 +0,0 @@ ---- bison-3.0.4.orig/lib/vasnprintf.c 2015-01-04 17:46:03.000000000 +0100 -+++ bison-3.0.4/lib/vasnprintf.c 2018-02-24 21:13:43.000000000 +0100 -@@ -4858,7 +4858,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ -+ && !defined __UCLIBC__) \ -+ || (defined __APPLE__ && defined __MACH__) \ -+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; -@@ -4872,6 +4875,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - in format strings in writable memory may crash the program - (if compiled with _FORTIFY_SOURCE=2), so we should avoid it - in this situation. */ -+ /* On Mac OS X 10.3 or newer, we know that snprintf's return -+ value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 -+ and gl_SNPRINTF_TRUNCATION_C99 pass. -+ Therefore we can avoid using %n in this situation. -+ On Mac OS X 10.13 or newer, the use of %n in format strings -+ in writable memory by default crashes the program, so we -+ should avoid it in this situation. */ - /* On native Windows systems (such as mingw), we can avoid using - %n because: - - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 5aad49e2f..c1e6bb617 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.33.0 +PKG_VERSION:= 1.35.0 PKG_RELEASE:= 1 -PKG_HASH:= d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd +PKG_HASH:= faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base/apps PKG_URL:= http://www.busybox.net/ @@ -69,7 +69,6 @@ do-build: do-install: PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} install $(MAKE_TRACE) $(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/ -ifeq ($(ADK_RUNTIME_INIT_SYSTEMD),) ifeq ($(BUSYBOX_IFUP),y) $(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d ifeq ($(ADK_RUNTIME_WAIT_FOR_ETHERNET),y) @@ -78,7 +77,6 @@ else $(INSTALL_BIN) ./files/network $(IDIR_BUSYBOX)/etc/init.d/network endif endif -endif ifeq ($(ADK_DEBUG),y) ${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \ $(IDIR_BUSYBOX)/bin/busybox diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in index f2788041a..fe68eeb18 100644 --- a/package/busybox/config/archival/Config.in +++ b/package/busybox/config/archival/Config.in @@ -204,6 +204,20 @@ config BUSYBOX_FEATURE_CPIO_P depends on BUSYBOX_FEATURE_CPIO_O help Passthrough mode. Rarely used. + +config BUSYBOX_FEATURE_CPIO_IGNORE_DEVNO + bool "Support --ignore-devno like GNU cpio" + default y + depends on BUSYBOX_FEATURE_CPIO_O && BUSYBOX_LONG_OPTS + help + Optionally ignore device numbers when creating archives. + +config BUSYBOX_FEATURE_CPIO_RENUMBER_INODES + bool "Support --renumber-inodes like GNU cpio" + default y + depends on BUSYBOX_FEATURE_CPIO_O && BUSYBOX_LONG_OPTS + help + Optionally renumber inodes when creating archives. config BUSYBOX_DPKG bool "dpkg (43 kb)" default y diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index 6293694de..ec8aa6802 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -6,6 +6,47 @@ menu "Coreutils" +config BUSYBOX_FEATURE_VERBOSE + bool "Support verbose options (usually -v) for various applets" + default y + help + Enable cp -v, rm -v and similar messages. + Also enables long option (--verbose) if it exists. + Without this option, -v is accepted but ignored. + +comment "Common options for date and touch" + +config BUSYBOX_FEATURE_TIMEZONE + bool "Allow timezone in dates" + default y + depends on BUSYBOX_DESKTOP + help + Permit the use of timezones when parsing user-provided data + strings, e.g. '1996-04-09 12:45:00 -0500'. + + This requires support for the '%z' extension to strptime() which + may not be available in all implementations. + +comment "Common options for cp and mv" + depends on BUSYBOX_CP || BUSYBOX_MV + +config BUSYBOX_FEATURE_PRESERVE_HARDLINKS + bool "Preserve hard links" + default y + depends on BUSYBOX_CP || BUSYBOX_MV + help + Allow cp and mv to preserve hard links. + +comment "Common options for df, du, ls" + depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS + +config BUSYBOX_FEATURE_HUMAN_READABLE + bool "Support human readable output (example 13k, 23M, 235G)" + default y + depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS + help + Allow df, du, and ls to have human readable output. + config BUSYBOX_BASENAME bool "basename (438 bytes)" default y @@ -63,8 +104,10 @@ config BUSYBOX_CHROOT config BUSYBOX_CKSUM bool "cksum (4.1 kb)" default y - help - cksum is used to calculate the CRC32 checksum of a file. + +config BUSYBOX_CRC32 + bool "crc32 (4.1 kb)" + default y config BUSYBOX_COMM bool "comm (4.2 kb)" default y @@ -95,6 +138,13 @@ config BUSYBOX_CUT help cut is used to print selected parts of lines from each file to stdout. + +config BUSYBOX_FEATURE_CUT_REGEX + bool "cut -F" + default y + depends on BUSYBOX_CUT + help + Allow regex based delimiters. config BUSYBOX_DATE bool "date (7 kb)" default y @@ -191,6 +241,26 @@ config BUSYBOX_FEATURE_DF_FANCY -a Show all filesystems -i Inodes -B <SIZE> Blocksize + +config BUSYBOX_FEATURE_SKIP_ROOTFS + bool "Skip rootfs in mount table" + default y + depends on BUSYBOX_DF + help + Ignore rootfs entry in mount table. + + In Linux, kernel has a special filesystem, rootfs, which is initially + mounted on /. It contains initramfs data, if kernel is configured + to have one. Usually, another file system is mounted over / early + in boot process, and therefore most tools which manipulate + mount table, such as df, will skip rootfs entry. + + However, some systems do not mount anything on /. + If you need to configure busybox for one of these systems, + you may find it useful to turn this option off to make df show + initramfs statistics. + + Otherwise, choose Y. config BUSYBOX_DIRNAME bool "dirname (329 bytes)" default y @@ -739,16 +809,8 @@ config BUSYBOX_TOUCH touch is used to create or change the access and/or modification timestamp of specified files. -config BUSYBOX_FEATURE_TOUCH_NODEREF - bool "Add support for -h" - default y - depends on BUSYBOX_TOUCH - help - Enable touch to have the -h option. - This requires libc support for lutimes() function. - config BUSYBOX_FEATURE_TOUCH_SUSV3 - bool "Add support for SUSV3 features (-d -t -r)" + bool "Add support for SUSV3 features (-a -d -m -t -r)" default y depends on BUSYBOX_TOUCH help @@ -895,34 +957,4 @@ config BUSYBOX_YES yes is used to repeatedly output a specific string, or the default string 'y'. -comment "Common options" - -config BUSYBOX_FEATURE_VERBOSE - bool "Support verbose options (usually -v) for various applets" - default y - help - Enable cp -v, rm -v and similar messages. - Also enables long option (--verbose) if it exists. - Without this option, -v is accepted but ignored. - -comment "Common options for cp and mv" - depends on BUSYBOX_CP || BUSYBOX_MV - -config BUSYBOX_FEATURE_PRESERVE_HARDLINKS - bool "Preserve hard links" - default y - depends on BUSYBOX_CP || BUSYBOX_MV - help - Allow cp and mv to preserve hard links. - -comment "Common options for df, du, ls" - depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS - -config BUSYBOX_FEATURE_HUMAN_READABLE - bool "Support human readable output (example 13k, 23M, 235G)" - default y - depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS - help - Allow df, du, and ls to have human readable output. - endmenu diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in index 3e48e371d..2858f60d1 100644 --- a/package/busybox/config/editors/Config.in +++ b/package/busybox/config/editors/Config.in @@ -110,6 +110,14 @@ config BUSYBOX_FEATURE_VI_COLON Enable a limited set of colon commands. This does not provide an "ex" mode. +config BUSYBOX_FEATURE_VI_COLON_EXPAND + bool "Expand \"%\" and \"#\" in colon commands" + default y + depends on BUSYBOX_FEATURE_VI_COLON + help + Expand the special characters \"%\" (current filename) + and \"#\" (alternate filename) in colon commands. + config BUSYBOX_FEATURE_VI_YANKMARK bool "Enable yank/put commands and mark cmds" default y @@ -217,6 +225,14 @@ config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX Unless you want more (or less) frequent "undo points" while typing, you should probably leave this unchanged. +config BUSYBOX_FEATURE_VI_VERBOSE_STATUS + bool "Enable verbose status reporting" + default y + depends on BUSYBOX_VI + help + Enable more verbose reporting of the results of yank, change, + delete, undo and substitution commands. + config BUSYBOX_FEATURE_ALLOW_EXEC bool "Allow vi and awk to execute shell commands" default y diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in index 8a81483e2..d4aa403a5 100644 --- a/package/busybox/config/findutils/Config.in +++ b/package/busybox/config/findutils/Config.in @@ -23,21 +23,53 @@ config BUSYBOX_FEATURE_FIND_PRINT0 interpreted by other programs. config BUSYBOX_FEATURE_FIND_MTIME - bool "Enable -mtime: modified time matching" + bool "Enable -mtime: modification time matching" default y depends on BUSYBOX_FIND help Allow searching based on the modification time of files, in days. +config BUSYBOX_FEATURE_FIND_ATIME + bool "Enable -atime: access time matching" + default y + depends on BUSYBOX_FEATURE_FIND_MTIME + help + Allow searching based on the access time of + files, in days. + +config BUSYBOX_FEATURE_FIND_CTIME + bool "Enable -ctime: status change timestamp matching" + default y + depends on BUSYBOX_FEATURE_FIND_MTIME + help + Allow searching based on the status change timestamp of + files, in days. + config BUSYBOX_FEATURE_FIND_MMIN - bool "Enable -mmin: modified time matching by minutes" + bool "Enable -mmin: modification time matching by minutes" default y depends on BUSYBOX_FIND help Allow searching based on the modification time of files, in minutes. +config BUSYBOX_FEATURE_FIND_AMIN + bool "Enable -amin: access time matching by minutes" + default y + depends on BUSYBOX_FEATURE_FIND_MMIN + help + Allow searching based on the access time of + files, in minutes. + +config BUSYBOX_FEATURE_FIND_CMIN + bool "Enable -cmin: status change timestamp matching by minutes" + default y + depends on BUSYBOX_FEATURE_FIND_MMIN + help + Allow searching based on the status change timestamp of + files, in minutes. + config BUSYBOX_FEATURE_FIND_PERM bool "Enable -perm: permissions matching" default y @@ -79,6 +111,13 @@ config BUSYBOX_FEATURE_FIND_INUM default y depends on BUSYBOX_FIND +config BUSYBOX_FEATURE_FIND_SAMEFILE + bool "Enable -samefile: reference file matching" + default y + depends on BUSYBOX_FIND + help + Support the 'find -samefile' option for searching by a reference file. + config BUSYBOX_FEATURE_FIND_EXEC bool "Enable -exec: execute commands" default y diff --git a/package/busybox/config/klibc-utils/Config.in b/package/busybox/config/klibc-utils/Config.in index fdaddc397..f2ff057fb 100644 --- a/package/busybox/config/klibc-utils/Config.in +++ b/package/busybox/config/klibc-utils/Config.in @@ -13,7 +13,7 @@ config BUSYBOX_MINIPS Alias to "ps". config BUSYBOX_NUKE bool "nuke (2.9 kb)" - default y + default n # off by default: too "accidentally destructive" help Alias to "rm -rf". config BUSYBOX_RESUME diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in index 1dd61c62e..8e4fe855e 100644 --- a/package/busybox/config/libbb/Config.in +++ b/package/busybox/config/libbb/Config.in @@ -117,32 +117,73 @@ config BUSYBOX_SHA3_SMALL 64-bit x86: +270 bytes of code, 45% faster 32-bit x86: +450 bytes of code, 75% faster -config BUSYBOX_FEATURE_FAST_TOP - bool "Faster /proc scanning code (+100 bytes)" - default n # all "fast or small" options default to small +config BUSYBOX_FEATURE_NON_POSIX_CP + bool "Non-POSIX, but safer, copying to special nodes" + default y help - This option makes top and ps ~20% faster (or 20% less CPU hungry), - but code size is slightly bigger. + With this option, "cp file symlink" will delete symlink + and create a regular file. This does not conform to POSIX, + but prevents a symlink attack. + Similarly, "cp file device" will not send file's data + to the device. (To do that, use "cat file >device") -config BUSYBOX_FEATURE_ETC_NETWORKS - bool "Support /etc/networks" +config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE + bool "Give more precise messages when copy fails (cp, mv etc)" default n help - Enable support for network names in /etc/networks. This is - a rarely used feature which allows you to use names - instead of IP/mask pairs in route command. + Error messages with this feature enabled: -config BUSYBOX_FEATURE_ETC_SERVICES - bool "Consult /etc/services even for well-known ports" - default n + $ cp file /does_not_exist/file + cp: cannot create '/does_not_exist/file': Path does not exist + $ cp file /vmlinuz/file + cp: cannot stat '/vmlinuz/file': Path has non-directory component + + If this feature is not enabled, they will be, respectively: + + cp: cannot create '/does_not_exist/file': No such file or directory + cp: cannot stat '/vmlinuz/file': Not a directory + + This will cost you ~60 bytes. + +config BUSYBOX_FEATURE_USE_SENDFILE + bool "Use sendfile system call" + default y + help + When enabled, busybox will use the kernel sendfile() function + instead of read/write loops to copy data between file descriptors + (for example, cp command does this a lot). + If sendfile() doesn't work, copying code falls back to read/write + loop. sendfile() was originally implemented for faster I/O + from files to sockets, but since Linux 2.6.33 it was extended + to work for many more file types. + +config BUSYBOX_FEATURE_COPYBUF_KB + int "Copy buffer size, in kilobytes" + range 1 1024 + default 4 help - Look up e.g. "telnet" and "http" in /etc/services file - instead of assuming ports 23 and 80. - This is almost never necessary (everybody uses standard ports), - and it makes sense to avoid reading this file. - If you disable this option, in the cases where port is explicitly - specified as a service name (e.g. "telnet HOST PORTNAME"), - it will still be looked up in /etc/services. + Size of buffer used by cp, mv, install, wget etc. + Buffers which are 4 kb or less will be allocated on stack. + Bigger buffers will be allocated with mmap, with fallback to 4 kb + stack buffer if mmap fails. + +config BUSYBOX_MONOTONIC_SYSCALL + bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" + default y + help + Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring + time intervals (time, ping, traceroute etc need this). + Probably requires Linux 2.6+. If not selected, gettimeofday + will be used instead (which gives wrong results if date/time + is reset). + +config BUSYBOX_IOCTL_HEX2STR_ERROR + bool "Use ioctl names rather than hex values in error messages" + default y + help + Use ioctl names rather than hex values in error messages + (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this + saves about 1400 bytes. config BUSYBOX_FEATURE_EDITING bool "Command line editing" @@ -358,96 +399,3 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN For example, this means that entering 'l', 's', ' ', 0xff, [Enter] at shell prompt will list file named 0xff (single char name with char value 255), not file named '?'. - -config BUSYBOX_FEATURE_NON_POSIX_CP - bool "Non-POSIX, but safer, copying to special nodes" - default y - help - With this option, "cp file symlink" will delete symlink - and create a regular file. This does not conform to POSIX, - but prevents a symlink attack. - Similarly, "cp file device" will not send file's data - to the device. (To do that, use "cat file >device") - -config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE - bool "Give more precise messages when copy fails (cp, mv etc)" - default n - help - Error messages with this feature enabled: - - $ cp file /does_not_exist/file - cp: cannot create '/does_not_exist/file': Path does not exist - $ cp file /vmlinuz/file - cp: cannot stat '/vmlinuz/file': Path has non-directory component - - If this feature is not enabled, they will be, respectively: - - cp: cannot create '/does_not_exist/file': No such file or directory - cp: cannot stat '/vmlinuz/file': Not a directory - - This will cost you ~60 bytes. - -config BUSYBOX_FEATURE_USE_SENDFILE - bool "Use sendfile system call" - default y - help - When enabled, busybox will use the kernel sendfile() function - instead of read/write loops to copy data between file descriptors - (for example, cp command does this a lot). - If sendfile() doesn't work, copying code falls back to read/write - loop. sendfile() was originally implemented for faster I/O - from files to sockets, but since Linux 2.6.33 it was extended - to work for many more file types. - -config BUSYBOX_FEATURE_COPYBUF_KB - int "Copy buffer size, in kilobytes" - range 1 1024 - default 4 - help - Size of buffer used by cp, mv, install, wget etc. - Buffers which are 4 kb or less will be allocated on stack. - Bigger buffers will be allocated with mmap, with fallback to 4 kb - stack buffer if mmap fails. - -config BUSYBOX_FEATURE_SKIP_ROOTFS - bool "Skip rootfs in mount table" - default y - help - Ignore rootfs entry in mount table. - - In Linux, kernel has a special filesystem, rootfs, which is initially - mounted on /. It contains initramfs data, if kernel is configured - to have one. Usually, another file system is mounted over / early - in boot process, and therefore most tools which manipulate - mount table, such as df, will skip rootfs entry. - - However, some systems do not mount anything on /. - If you need to configure busybox for one of these systems, - you may find it useful to turn this option off to make df show - initramfs statistics. - - Otherwise, choose Y. - -config BUSYBOX_MONOTONIC_SYSCALL - bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" - default y - help - Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring - time intervals (time, ping, traceroute etc need this). - Probably requires Linux 2.6+. If not selected, gettimeofday - will be used instead (which gives wrong results if date/time - is reset). - -config BUSYBOX_IOCTL_HEX2STR_ERROR - bool "Use ioctl names rather than hex values in error messages" - default y - help - Use ioctl names rather than hex values in error messages - (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this - saves about 1400 bytes. - -config BUSYBOX_FEATURE_HWIB - bool "Support infiniband HW" - default y - help - Support for printing infiniband addresses in network applets. diff --git a/package/busybox/config/mailutils/Config.in b/package/busybox/config/mailutils/Config.in index 1b793ef7c..29890dcbd 100644 --- a/package/busybox/config/mailutils/Config.in +++ b/package/busybox/config/mailutils/Config.in @@ -1,6 +1,13 @@ # DO NOT EDIT. This file is generated from Config.src menu "Mail Utilities" +config BUSYBOX_FEATURE_MIME_CHARSET + string "Default charset" + default "us-ascii" + depends on BUSYBOX_MAKEMIME || BUSYBOX_REFORMIME || BUSYBOX_SENDMAIL + help + Default charset of the message. + config BUSYBOX_MAKEMIME bool "makemime (5.4 kb)" default y @@ -41,11 +48,4 @@ config BUSYBOX_SENDMAIL help Barebones sendmail. -config BUSYBOX_FEATURE_MIME_CHARSET - string "Default charset" - default "us-ascii" - depends on BUSYBOX_MAKEMIME || BUSYBOX_REFORMIME || BUSYBOX_SENDMAIL - help - Default charset of the message. - endmenu diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index 549042515..a236373ae 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -12,6 +12,12 @@ config BUSYBOX_ADJTIMEX help Adjtimex reads and optionally sets adjustment parameters for the Linux clock adjustment algorithm. +config BUSYBOX_ASCII + bool "ascii" + default y + help + Print ascii table. + config BUSYBOX_BBCONFIG bool "bbconfig (9.7 kb)" default n @@ -783,4 +789,19 @@ config BUSYBOX_WATCHDOG certain amount of time, the watchdog device assumes the system has hung, and will cause the hardware to reboot. +config BUSYBOX_FEATURE_WATCHDOG_OPEN_TWICE + bool "Open watchdog device twice, closing it gracefully in between" + depends on BUSYBOX_WATCHDOG + default n # this behavior was essentially a hack for a broken driver + help + When enabled, the watchdog device is opened and then immediately + magic-closed, before being opened a second time. This may be necessary + for some watchdog devices, but can cause spurious warnings in the + kernel log if the nowayout feature is enabled. If this workaround + is really needed for you machine to work properly, consider whether + it should be fixed in the kernel driver instead. Even when disabled, + the behaviour is easily emulated with a "printf 'V' > /dev/watchdog" + immediately before starting the busybox watchdog daemon. Say n unless + you know that you absolutely need this. + endmenu diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 4832a82d0..7675cd4b9 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -47,6 +47,32 @@ config BUSYBOX_VERBOSE_RESOLUTION_ERRORS "can't resolve 'hostname.com'" and want to know more. This may increase size of your executable a bit. +config BUSYBOX_FEATURE_ETC_NETWORKS + bool "Support /etc/networks" + default n + help + Enable support for network names in /etc/networks. This is + a rarely used feature which allows you to use names + instead of IP/mask pairs in route command. + +config BUSYBOX_FEATURE_ETC_SERVICES + bool "Consult /etc/services even for well-known ports" + default n + help + Look up e.g. "telnet" and "http" in /etc/services file + instead of assuming ports 23 and 80. + This is almost never necessary (everybody uses standard ports), + and it makes sense to avoid reading this file. + If you disable this option, in the cases where port is explicitly + specified as a service name (e.g. "telnet HOST PORTNAME"), + it will still be looked up in /etc/services. + +config BUSYBOX_FEATURE_HWIB + bool "Support infiniband HW" + default y + help + Support for printing infiniband addresses in network applets. + config BUSYBOX_FEATURE_TLS_SHA1 bool "In TLS code, support ciphers which use deprecated SHA1" depends on BUSYBOX_TLS @@ -173,6 +199,12 @@ config BUSYBOX_HTTPD help HTTP server. +config BUSYBOX_FEATURE_HTTPD_PORT_DEFAULT + int "Default port" + default 80 + range 1 65535 + depends on BUSYBOX_HTTPD + config BUSYBOX_FEATURE_HTTPD_RANGES bool "Support 'Ranges:' header" default y @@ -939,6 +971,12 @@ config BUSYBOX_FEATURE_TELNETD_STANDALONE help Selecting this will make telnetd able to run standalone. +config BUSYBOX_FEATURE_TELNETD_PORT_DEFAULT + int "Default port" + default 23 + range 1 65535 + depends on BUSYBOX_FEATURE_TELNETD_STANDALONE + config BUSYBOX_FEATURE_TELNETD_INETD_WAIT bool "Support -w SEC option (inetd wait mode)" default y @@ -1086,6 +1124,13 @@ config BUSYBOX_FEATURE_WGET_STATUSBAR default y depends on BUSYBOX_WGET +config BUSYBOX_FEATURE_WGET_FTP + bool "Enable FTP protocol (+1k)" + default y + depends on BUSYBOX_WGET + help + To support FTPS, enable FEATURE_WGET_HTTPS as well. + config BUSYBOX_FEATURE_WGET_AUTHENTICATION bool "Enable HTTP authentication" default y @@ -1114,6 +1159,7 @@ config BUSYBOX_FEATURE_WGET_HTTPS select BUSYBOX_TLS help wget will use internal TLS code to connect to https:// URLs. + It also enables FTPS support, but it's not well tested yet. Note: On NOMMU machines, ssl_helper applet should be available in the $PATH for this to work. Make sure to select that applet. diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in index 52f1ef5b2..5d57cf731 100644 --- a/package/busybox/config/networking/udhcp/Config.in +++ b/package/busybox/config/networking/udhcp/Config.in @@ -142,6 +142,14 @@ config BUSYBOX_FEATURE_UDHCPC6_RFC5970 comment "Common options for DHCP applets" depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 || BUSYBOX_DHCPRELAY +config BUSYBOX_UDHCPC_DEFAULT_INTERFACE + string "Default interface name" + default "eth0" + depends on BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 + help + The interface that will be used if no other interface is + specified on the commandline. + config BUSYBOX_FEATURE_UDHCP_PORT bool "Enable '-P port' option for udhcpd and udhcpc" default n diff --git a/package/busybox/config/procps/Config.in b/package/busybox/config/procps/Config.in index 56086da2c..0c1733b9f 100644 --- a/package/busybox/config/procps/Config.in +++ b/package/busybox/config/procps/Config.in @@ -6,6 +6,21 @@ menu "Process Utilities" +config BUSYBOX_FEATURE_FAST_TOP + bool "Faster /proc scanning code (+100 bytes)" + default n # all "fast or small" options default to small + help + This option makes top and ps ~20% faster (or 20% less CPU hungry), + but code size is slightly bigger. + +config BUSYBOX_FEATURE_SHOW_THREADS + bool "Support thread display in ps/pstree/top" + default y + depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE + help + Enables the ps -T option, showing of threads in pstree, + and 'h' command in top. + config BUSYBOX_FREE bool "free (3.1 kb)" default y @@ -259,12 +274,4 @@ config BUSYBOX_WATCH watch is used to execute a program periodically, showing output to the screen. -config BUSYBOX_FEATURE_SHOW_THREADS - bool "Support thread display in ps/pstree/top" - default y - depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE - help - Enables the ps -T option, showing of threads in pstree, - and 'h' command in top. - endmenu diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 0ce917dc3..b26195889 100644 --- a/package/busybox/config/shell/Config.in +++ b/package/busybox/config/shell/Config.in @@ -88,7 +88,7 @@ config BUSYBOX_SHELL_ASH config BUSYBOX_ASH bool "ash (78 kb)" - default n + default y depends on !BUSYBOX_NOMMU select BUSYBOX_SHELL_ASH help @@ -299,11 +299,6 @@ config BUSYBOX_HUSH_BRACE_EXPANSION help Enable {abc,def} extension. -config BUSYBOX_HUSH_LINENO_VAR - bool "$LINENO variable" - default y - depends on BUSYBOX_HUSH_BASH_COMPAT - config BUSYBOX_HUSH_BASH_SOURCE_CURDIR bool "'source' and '.' builtins search current directory after $PATH" default n # do not encourage non-standard behavior @@ -311,6 +306,11 @@ config BUSYBOX_HUSH_BASH_SOURCE_CURDIR help This is not compliant with standards. Avoid if possible. +config BUSYBOX_HUSH_LINENO_VAR + bool "$LINENO variable (bashism)" + default y + depends on BUSYBOX_SHELL_HUSH + config BUSYBOX_HUSH_INTERACTIVE bool "Interactive mode" default y diff --git a/package/clamav/Makefile b/package/clamav/Makefile index 132224245..1812b4dcb 100644 --- a/package/clamav/Makefile +++ b/package/clamav/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= clamav -PKG_VERSION:= 0.103.0 +PKG_VERSION:= 0.103.4 PKG_RELEASE:= 1 -PKG_HASH:= 32a9745277bfdda80e77ac9ca2f5990897418e9416880f3c31553ca673e80546 +PKG_HASH:= def0ad15500fa6aff81d8e68b9f83aa75ee5b607a01335c1d26dbcc959932f85 PKG_DESCR:= anti-virus software PKG_SECTION:= sys/misc PKG_DEPENDS:= libressl zlib libpcre libncurses libcurl libmspack diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 46fa04118..3948ed519 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= collectd -PKG_VERSION:= 5.7.0 +PKG_VERSION:= 5.12.0 PKG_RELEASE:= 1 -PKG_HASH:= 25a05fbdc6baad571554342bbac6141928bf95a47fc60ee3b32e46d0c89ef2b2 +PKG_HASH:= 5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6 PKG_DESCR:= system statistics collection daemon PKG_SECTION:= sys/misc PKG_BUILDDEP:= libtool diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index f5a1585a2..a30864aa6 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= coreutils PKG_VERSION:= 9.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce PKG_DESCR:= file, shell and text utilities PKG_SECTION:= base/apps diff --git a/package/coreutils/patches/patch-src_ls_c b/package/coreutils/patches/patch-src_ls_c new file mode 100644 index 000000000..94cb5b58f --- /dev/null +++ b/package/coreutils/patches/patch-src_ls_c @@ -0,0 +1,20 @@ +--- coreutils-9.0.orig/src/ls.c 2021-09-24 13:31:05.000000000 +0200 ++++ coreutils-9.0/src/ls.c 2022-02-24 04:39:40.532579515 +0100 +@@ -2273,7 +2273,7 @@ decode_switches (int argc, char **argv) + if (linelen < 0) + { + /* Suppress bogus warning re comparing ws.ws_col to big integer. */ +-# if __GNUC_PREREQ (4, 6) ++# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) + # pragma GCC diagnostic push + # pragma GCC diagnostic ignored "-Wtype-limits" + # endif +@@ -2282,7 +2282,7 @@ decode_switches (int argc, char **argv) + && 0 <= ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws) + && 0 < ws.ws_col) + linelen = ws.ws_col <= MIN (PTRDIFF_MAX, SIZE_MAX) ? ws.ws_col : 0; +-# if __GNUC_PREREQ (4, 6) ++# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) + # pragma GCC diagnostic pop + # endif + } diff --git a/package/cpio/Makefile b/package/cpio/Makefile index c1764b566..026ad8001 100644 --- a/package/cpio/Makefile +++ b/package/cpio/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cpio -PKG_VERSION:= 2.11 +PKG_VERSION:= 2.13 PKG_RELEASE:= 1 -PKG_HASH:= 601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978 +PKG_HASH:= e87470d9c984317f658567c03bfefb6b0c829ff17dbf6b0de48d71a4c8f3db88 PKG_DESCR:= archive utility PKG_SECTION:= app/archive PKG_URL:= http://www.gnu.org/software/cpio/ diff --git a/package/cpio/patches/patch-gnu_stdio_in_h b/package/cpio/patches/patch-gnu_stdio_in_h deleted file mode 100644 index fa9b89fb8..000000000 --- a/package/cpio/patches/patch-gnu_stdio_in_h +++ /dev/null @@ -1,13 +0,0 @@ ---- cpio-2.11.orig/gnu/stdio.in.h 2010-03-10 10:27:03.000000000 +0100 -+++ cpio-2.11/gnu/stdio.in.h 2013-07-16 12:56:00.000000000 +0200 -@@ -138,8 +138,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ -+/* - #undef gets - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+*/ - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ diff --git a/package/cpio/patches/patch-src_filetypes_h b/package/cpio/patches/patch-src_filetypes_h deleted file mode 100644 index f33bfa9f3..000000000 --- a/package/cpio/patches/patch-src_filetypes_h +++ /dev/null @@ -1,8 +0,0 @@ ---- cpio-2.11.orig/src/filetypes.h 2010-02-12 11:19:23.000000000 +0100 -+++ cpio-2.11/src/filetypes.h 2010-06-08 18:26:43.633473938 +0200 -@@ -82,4 +82,4 @@ - #define lstat stat - #endif - int lstat (); --int stat (); -+//int stat (); diff --git a/package/cpio/patches/patch-src_global_c b/package/cpio/patches/patch-src_global_c new file mode 100644 index 000000000..4ccb834c9 --- /dev/null +++ b/package/cpio/patches/patch-src_global_c @@ -0,0 +1,12 @@ +--- cpio-2.13.orig/src/global.c 2019-11-03 16:07:23.000000000 +0100 ++++ cpio-2.13/src/global.c 2022-02-04 18:57:14.542900211 +0100 +@@ -184,9 +184,6 @@ unsigned int warn_option = 0; + /* Extract to standard output? */ + bool to_stdout_option = false; + +-/* The name this program was run with. */ +-char *program_name; +- + /* A pointer to either lstat or stat, depending on whether + dereferencing of symlinks is done for input files. */ + int (*xstat) (); diff --git a/package/curl/Makefile b/package/curl/Makefile index 916567912..0c2c28493 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.79.1 +PKG_VERSION:= 7.82.0 PKG_RELEASE:= 1 -PKG_HASH:= 0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689 +PKG_HASH:= 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_DEPENDS:= libcurl @@ -47,18 +47,18 @@ $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS HOST_CONFIGURE_ARGS+= --without-ssl ifeq (${ADK_PACKAGE_CURL_WITH_LIBRESSL},y) -CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \ +CONFIGURE_ARGS+= --with-openssl="${STAGING_TARGET_DIR}/usr" \ --without-gnutls \ --without-axtls endif ifeq (${ADK_PACKAGE_CURL_WITH_GNUTLS},y) CONFIGURE_ARGS+= --with-gnutls="${STAGING_TARGET_DIR}/usr" \ - --without-ssl \ + --without-openssl \ --without-axtls endif ifeq (${ADK_PACKAGE_CURL_WITH_WOLFSSL},y) CONFIGURE_ARGS+= --with-cyassl="${STAGING_TARGET_DIR}/usr" \ - --without-ssl \ + --without-openssl \ --without-gnutls \ --without-axtls endif diff --git a/package/dbus/Makefile b/package/dbus/Makefile index c32a5fdcd..ba47bc369 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= dbus PKG_VERSION:= 1.10.20 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= e574b9780b5425fde4d973bb596e7ea0f09e00fe2edd662da9016e976c460b48 PKG_DESCR:= desktop bus daemon PKG_SECTION:= sys/misc @@ -24,10 +24,6 @@ PKGSD_LIBDBUS:= DBUS library PKGSC_LIBDBUS:= libs/misc PKGSS_LIBDBUS:= libexpat libuuid -PKG_FLAVOURS_DBUS:= WITH_SYSTEMD -PKGFD_WITH_SYSTEMD:= enable systemd support -PKGFB_WITH_SYSTEMD:= systemd - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -36,14 +32,8 @@ $(eval $(call PKG_template,LIBDBUS,libdbus,${PKG_VERSION}-${PKG_RELEASE},${PKGSS TARGET_LDFLAGS+= -luuid AUTOTOOL_STYLE:= autoreconf -ifeq ($(ADK_PACKAGE_DBUS_WITH_SYSTEMD),y) -CONFIGURE_ARGS+= --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system -TARGET_LDFLAGS+= -lsystemd -else -CONFIGURE_ARGS+= --disable-systemd -endif - -CONFIGURE_ARGS+= --disable-tests \ +CONFIGURE_ARGS+= --disable-systemd \ + --disable-tests \ --disable-asserts \ --enable-abstract-sockets \ --with-dbus-user=dbus \ @@ -76,10 +66,6 @@ dbus-install: ${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc ${CP} ${WRKINST}/usr/share/dbus-1 ${IDIR_DBUS}/usr/share ${CP} ${WRKINST}/usr/bin/dbus-* ${IDIR_DBUS}/usr/bin -ifeq ($(ADK_PACKAGE_DBUS_WITH_SYSTEMD),y) - ${INSTALL_DIR} ${IDIR_DBUS}/usr/lib/systemd - ${CP} ${WRKINST}/usr/lib/systemd/* ${IDIR_DBUS}/usr/lib/systemd -endif # workaround for dev subpackage ${INSTALL_DIR} $(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus $(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \ diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 31316f69c..0535edb69 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -24,6 +24,8 @@ 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 CONFIGURE_ENV+= PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config CONFIGURE_ARGS+= --enable-ssl diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 7c80b2be3..0476daf5e 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= dnsmasq -PKG_VERSION:= 2.81 +PKG_VERSION:= 2.86 PKG_RELEASE:= 1 -PKG_HASH:= 749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb +PKG_HASH:= 28d52cfc9e2004ac4f85274f52b32e1647b4dbc9761b82e7de1e41c49907eb08 PKG_DESCR:= lightweight dns, dhcp and tftp server PKG_SECTION:= net/dns PKG_KDEPENDS:= inotify-user diff --git a/package/dropbear/files/dropbear.service b/package/dropbear/files/dropbear.service deleted file mode 100644 index eeb86cfa7..000000000 --- a/package/dropbear/files/dropbear.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Dropbear SSH daemon -After=syslog.target network.target - -[Service] -EnvironmentFile=-/etc/default/dropbear -ExecStart=/usr/sbin/dropbear -F -R $DROPBEAR_ARGS -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile index f432bc7d2..5360d31ee 100644 --- a/package/ethtool/Makefile +++ b/package/ethtool/Makefile @@ -4,10 +4,12 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ethtool -PKG_VERSION:= 4.16 +PKG_VERSION:= 5.15 PKG_RELEASE:= 1 -PKG_HASH:= fe967a6722db2099fa63d847b6628e3e31cf9f53571a37503347dcc3e4015a03 +PKG_HASH:= 686fd6110389d49c2a120f00c3cd5dfe43debada8e021e4270d74bbe452a116d PKG_DESCR:= display or change ethernet card settings +PKG_DEPENDS:= libmnl +PKG_BUILDDEP:= libmnl PKG_SECTION:= net/misc PKG_SITES:= https://www.kernel.org/pub/software/network/ethtool/ diff --git a/package/expat/Makefile b/package/expat/Makefile index 2bb86dd21..2ab8949ef 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -4,19 +4,17 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= expat -PKG_VERSION:= 2.2.5 +PKG_VERSION:= 2.4.6 PKG_RELEASE:= 1 -PKG_HASH:= d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6 +PKG_HASH:= de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b PKG_DESCR:= xml parsing library PKG_SECTION:= libs/data PKG_NEEDS:= c++ PKG_URL:= http://expat.sourceforge.net -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=expat/} +PKG_SITES:= https://github.com/libexpat/libexpat/releases/download/R_2_4_6/ PKG_LIBNAME:= libexpat PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index ddb3e72e3..11ceb7813 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 3.4.2 -PKG_RELEASE:= 2 -PKG_HASH:= eb0370bf223809b9ebb359fed5318f826ac038ce77933b3afd55ab1a0a21785a +PKG_VERSION:= 4.4.1 +PKG_RELEASE:= 1 +PKG_HASH:= 8fc9f20ac5ed95115a9e285647add0eedd5cc1a98a039ada14c132452f98ac42 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs/video PKG_NEEDS:= threads @@ -17,13 +17,10 @@ PKG_SITES:= http://www.ffmpeg.org/releases/ PKG_LIBNAME:= libffmpeg PKG_OPTS:= dev -PKG_SUBPKGS:= LIBFFMPEG FFSERVER FFPROBE FFMPEG +PKG_SUBPKGS:= LIBFFMPEG FFPROBE FFMPEG PKGSD_FFMPEG:= video converter PKGSC_FFMPEG:= mm/video PKGSS_FFMPEG:= libffmpeg -PKGSD_FFSERVER:= streaming server -PKGSC_FFSERVER:= mm/video -PKGSS_FFSERVER:= libffmpeg PKGSD_FFPROBE:= simple multimedia stream analyzer PKGSC_FFPROBE:= mm/video PKGSS_FFPROBE:= libffmpeg @@ -97,7 +94,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBFFMPEG,libffmpeg,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_FDEPENDS),$(PKGSD_LIBFFMPEG),$(PKGSC_LIBFFMPEG),$(PKG_OPTS))) $(eval $(call PKG_template,FFMPEG,ffmpeg,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_FFMPEG),$(PKGSC_FFMPEG))) -$(eval $(call PKG_template,FFSERVER,ffserver,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_FFSERVER),$(PKGSC_FFSERVER))) $(eval $(call PKG_template,FFPROBE,ffprobe,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_FFPROBE),$(PKGSC_FFPROBE))) ifeq ($(ADK_DEBUG),y) @@ -106,6 +102,7 @@ else TARGET_CFLAGS:= $(subst Os,O2,$(TARGET_CFLAGS)) endif TARGET_CPPFLAGS+= -D_POSIX_SOURCE -D_GNU_SOURCE +TARGET_LDFLAGS+= -latomic ifeq ($(ADK_TARGET_CPU_WITH_MMX),y) CONFIGURE_CPU_OPTS+= --enable-mmx @@ -171,6 +168,8 @@ endif ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),y) CONFIGURE_CPU_OPTS+= --enable-neon +else ifeq ($(ADK_TARGET_ARCH_AARCH64),y) +CONFIGURE_CPU_OPTS+= --enable-neon else CONFIGURE_CPU_OPTS+= --disable-neon endif @@ -252,14 +251,6 @@ ffmpeg-install: $(INSTALL_BIN) $(WRKINST)/usr/bin/ffmpeg \ $(IDIR_FFMPEG)/usr/bin -ffserver-install: - $(INSTALL_DIR) $(IDIR_FFSERVER)/etc - $(INSTALL_DATA) $(WRKBUILD)/doc/ffserver.conf \ - $(IDIR_FFSERVER)/etc - $(INSTALL_DIR) $(IDIR_FFSERVER)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/ffserver \ - $(IDIR_FFSERVER)/usr/bin - ffprobe-install: $(INSTALL_DIR) $(IDIR_FFPROBE)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/ffprobe \ diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure new file mode 100644 index 000000000..645eb4d6a --- /dev/null +++ b/package/ffmpeg/patches/patch-configure @@ -0,0 +1,15 @@ +--- ffmpeg-4.4.1.orig/configure 2021-10-24 22:47:11.000000000 +0200 ++++ ffmpeg-4.4.1/configure 2022-02-25 12:51:17.554887194 +0100 +@@ -4984,9 +4984,10 @@ elif enabled arm; then + fi + } + +- [ "$cpu" = generic ] && cpu=$(probe_arm_arch) +- + case $cpu in ++ generic) ++ subarch=$(probe_arm_arch | sed 's/[^a-z0-9]//g') ++ ;; + armv*) + cpuflags="-march=$cpu" + subarch=$(echo $cpu | sed 's/[^a-z0-9]//g') diff --git a/package/flac/Makefile b/package/flac/Makefile index 6ecb5ace9..d6a89159d 100644 --- a/package/flac/Makefile +++ b/package/flac/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= flac -PKG_VERSION:= 1.3.2 +PKG_VERSION:= 1.3.4 PKG_RELEASE:= 1 -PKG_HASH:= 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f +PKG_HASH:= 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 PKG_DESCR:= free lossless audio codec utility PKG_SECTION:= mm/audio PKG_DEPENDS:= libflac PKG_URL:= https://xiph.org/flac/ -PKG_SITES:= http://downloads.xiph.org/releases/flac/ +PKG_SITES:= https://ftp.osuosl.org/pub/xiph/releases/flac/ PKG_LIBNAME:= libflac PKG_OPTS:= dev @@ -25,6 +25,7 @@ $(eval $(call PKG_template,FLAC,flac,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ARGS+= --enable-asm-optimizations \ + --disable-stack-smash-protection \ --disable-xmms-plugin \ --disable-cpplibs \ --disable-ogg diff --git a/package/flatbuffers/Makefile b/package/flatbuffers/Makefile new file mode 100644 index 000000000..f4811d7a8 --- /dev/null +++ b/package/flatbuffers/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:= flatbuffers +PKG_VERSION:= 2.0.6 +PKG_RELEASE:= 1 +PKG_HASH:= e2dc24985a85b278dd06313481a9ca051d048f9474e0f199e372fea3ea4248c9 +PKG_DESCR:= cross platform serialization library +PKG_SECTION:= libs/misc +PKG_BUILDDEP:= flatbuffers-host +PKG_URL:= https://github.com/google/flatbuffers +PKG_SITES:= https://github.com/google/flatbuffers/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,FLATBUFFERS,flatbuffers,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,FLATBUFFERS,flatbuffers,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +HOST_CONFIG_STYLE:= cmake +CONFIG_STYLE:= cmake + +CMAKE_FLAGS+= -DFLATBUFFERS_BUILD_TESTS=OFF \ + -DFLATBUFFERS_BUILD_FLATC=OFF \ + -DFLATBUFFERS_BUILD_FLATHASH=OFF + +HOST_CMAKE_FLAGS+= -DFLATBUFFERS_BUILD_TESTS=OFF \ + -DFLATBUFFERS_BUILD_FLATC=ON \ + -DFLATBUFFERS_BUILD_FLATHASH=ON + +flatbuffers-install: + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/fltk/Makefile b/package/fltk/Makefile index be3670a46..ce17671e8 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fltk -PKG_VERSION:= 1.3.3 +PKG_VERSION:= 1.3.8 PKG_RELEASE:= 1 -PKG_HASH:= f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 +PKG_HASH:= f3c1102b07eb0e7a50538f9fc9037c18387165bc70d4b626e94ab725b9d4d1bf PKG_DESCR:= fast light toolkit PKG_SECTION:= libs/misc PKG_DEPENDS:= mesa libx11 libxi freeglut libfreetype diff --git a/package/fmt/Makefile b/package/fmt/Makefile index 2831edea5..4aa6aab5b 100644 --- a/package/fmt/Makefile +++ b/package/fmt/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fmt -PKG_VERSION:= 5.0.0 +PKG_VERSION:= 8.1.1 PKG_RELEASE:= 1 -PKG_HASH:= fc33d64d5aa2739ad2ca1b128628a7fc1b7dca1ad077314f09affc57d59cf88a +PKG_HASH:= 3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346 PKG_DESCR:= modern formatting library PKG_SECTION:= libs/misc PKG_URL:= http://fmtlib.net/latest/index.html diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile index 1f4a9a1f1..d0cd64f30 100644 --- a/package/font-adobe-100dpi/Makefile +++ b/package/font-adobe-100dpi/Makefile @@ -22,9 +22,11 @@ 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) ${WRKINST}/usr/share/fonts/X11/100dpi/* \ + $(CP) ${STAGING_TARGET_DIR}/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 e8220968a..68ae9963b 100644 --- a/package/font-adobe-75dpi/Makefile +++ b/package/font-adobe-75dpi/Makefile @@ -22,9 +22,11 @@ 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) ${WRKINST}/usr/share/fonts/X11/75dpi/* \ + $(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/75dpi/* \ $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-util/Makefile b/package/font-util/Makefile index ec2559275..5b9289f89 100644 --- a/package/font-util/Makefile +++ b/package/font-util/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= font-util -PKG_VERSION:= 1.3.1 +PKG_VERSION:= 1.3.2 PKG_RELEASE:= 1 -PKG_HASH:= 34ebb0c9c14e0a392cdd5ea055c92489ad88d55ae148b2f1cfded0f3f63f2b5b +PKG_HASH:= f115a3735604de1e852a4bf669be0269d8ce8f21f8e0e74ec5934b31dadc1e76 PKG_DESCR:= font utility PKG_SECTION:= x11/fonts PKG_URL:= http://www.x.org/ diff --git a/package/font-util/patches/patch-fontutil_pc_in b/package/font-util/patches/patch-fontutil_pc_in index 4662db361..2b2ed3d53 100644 --- a/package/font-util/patches/patch-fontutil_pc_in +++ b/package/font-util/patches/patch-fontutil_pc_in @@ -1,11 +1,14 @@ ---- font-util-1.1.1.orig/fontutil.pc.in 2009-10-11 06:32:56.000000000 +0200 -+++ font-util-1.1.1/fontutil.pc.in 2010-12-02 22:28:16.000000000 +0100 -@@ -4,7 +4,7 @@ libdir=@libdir@ +--- font-util-1.3.2.orig/fontutil.pc.in 2019-08-26 00:25:25.000000000 +0200 ++++ font-util-1.3.2/fontutil.pc.in 2022-03-01 21:10:24.228234038 +0100 +@@ -2,9 +2,9 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ datarootdir=@datarootdir@ - datadir=@datadir@ +-datadir=@datadir@ ++datadir=${prefix}/share fontrootdir=@fontrootdir@ -mapdir=@MAPDIR@ -+mapdir=${prefix}/../@MAPDIR@ ++mapdir=${fontrootdir}/util Name: FontUtil Description: Font utilities dirs diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 2642bf634..16e765148 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= fontconfig -PKG_VERSION:= 2.12.3 -PKG_RELEASE:= 2 -PKG_HASH:= ffc3cbf6dd9fcd516ee42f48306a715e66698b238933d6fa7cef02ea8b3b818e +PKG_VERSION:= 2.13.1 +PKG_RELEASE:= 1 +PKG_HASH:= 9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f PKG_DESCR:= library for configuring and customizing font access PKG_SECTION:= libs/fonts PKG_DEPENDS:= libxml2 diff --git a/package/freetype/Makefile b/package/freetype/Makefile index da2c0a71e..4289bb955 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= freetype -PKG_VERSION:= 2.7 +PKG_VERSION:= 2.11.1 PKG_RELEASE:= 1 -PKG_HASH:= 7b657d5f872b0ab56461f3bd310bd1c5ec64619bd15f0d8e08282d494d9cfea4 +PKG_HASH:= f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b PKG_DESCR:= free, high-quality and portable font engine PKG_SECTION:= libs/fonts PKG_DEPENDS:= zlib @@ -27,11 +27,19 @@ $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE} HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --with-zlib \ --without-png \ - --without-bzip2 + --without-bzip2 \ + --enable-freetype-config CONFIGURE_ARGS+= --with-zlib \ --without-png \ --with-harfbuzz=no \ - --without-bzip2 + --without-bzip2 \ + --enable-freetype-config + +hostpost-install: + $(SED) 's:^includedir=.*:includedir="$${prefix}/include":' \ + -e 's:^libdir=.*:libdir="$${exec_prefix}/lib":' \ + $(STAGING_HOST_DIR)/usr/bin/freetype-config + libfreetype-install: ${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib diff --git a/package/freetype/patches/patch-builds_unix_freetype-config_in b/package/freetype/patches/patch-builds_unix_freetype-config_in deleted file mode 100644 index 74135b0fd..000000000 --- a/package/freetype/patches/patch-builds_unix_freetype-config_in +++ /dev/null @@ -1,16 +0,0 @@ ---- freetype-2.6.1.orig/builds/unix/freetype-config.in 2015-09-25 07:58:57.000000000 +0200 -+++ freetype-2.6.1/builds/unix/freetype-config.in 2015-10-23 10:37:49.000000000 +0200 -@@ -13,10 +13,10 @@ LC_ALL=C - export LC_ALL - - prefix="%prefix%" --exec_prefix="%exec_prefix%" -+exec_prefix="${prefix}/bin" - exec_prefix_set="no" --includedir="%includedir%" --libdir="%libdir%" -+includedir="${prefix}/include" -+libdir="${prefix}/lib" - - usage() - { diff --git a/package/freetype/patches/patch-builds_unix_freetype2_in b/package/freetype/patches/patch-builds_unix_freetype2_in index 306057eb3..9dc78c081 100644 --- a/package/freetype/patches/patch-builds_unix_freetype2_in +++ b/package/freetype/patches/patch-builds_unix_freetype2_in @@ -1,14 +1,13 @@ ---- freetype-2.6.1.orig/builds/unix/freetype2.in 2015-09-25 07:58:57.000000000 +0200 -+++ freetype-2.6.1/builds/unix/freetype2.in 2015-10-23 10:43:36.000000000 +0200 -@@ -1,7 +1,8 @@ +--- freetype-2.11.1.orig/builds/unix/freetype2.in 2021-02-13 09:16:54.000000000 +0100 ++++ freetype-2.11.1/builds/unix/freetype2.in 2022-03-01 21:51:10.996321135 +0100 +@@ -1,7 +1,7 @@ prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+includedir=${prefix}/include -+ ++exec_prefix=%prefix% ++libdir=%prefix%/lib ++includedir=%prefix%/include Name: FreeType 2 - URL: http://freetype.org + URL: https://freetype.org diff --git a/package/fribidi/Makefile b/package/fribidi/Makefile index bef3bb69f..75bd11536 100644 --- a/package/fribidi/Makefile +++ b/package/fribidi/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= fribidi -PKG_VERSION:= 1.0.9 +PKG_VERSION:= 1.0.11 PKG_RELEASE:= 1 -PKG_HASH:= c5e47ea9026fb60da1944da9888b4e0a18854a0e2410bbfe7ad90a054d36e0c7 +PKG_HASH:= 30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d PKG_DESCR:= unicode bidirectional algorithm PKG_SECTION:= libs/misc PKG_URL:= http://www.fribidi.org/ -PKG_SITES:= https://github.com/fribidi/fribidi/releases/download/v1.0.9/ +PKG_SITES:= https://github.com/fribidi/fribidi/releases/download/v1.0.11/ PKG_OPTS:= dev include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/fstrcmp/Makefile b/package/fstrcmp/Makefile new file mode 100644 index 000000000..23eb0f6f1 --- /dev/null +++ b/package/fstrcmp/Makefile @@ -0,0 +1,24 @@ +# 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:= fstrcmp +PKG_VERSION:= 0.7 +PKG_RELEASE:= 1 +PKG_HASH:= e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476 +PKG_DESCR:= make fuzzy comparisons of strings +PKG_SECTION:= libs/misc +PKG_SITES:= http://fstrcmp.sourceforge.net/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).D001.tar.gz +WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION).D001 + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FSTRCMP,fstrcmp,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +fstrcmp-install: + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/fstrcmp/patches/patch-Makefile_in b/package/fstrcmp/patches/patch-Makefile_in new file mode 100644 index 000000000..d947c7d30 --- /dev/null +++ b/package/fstrcmp/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- fstrcmp-0.7.D001.orig/Makefile.in 2014-03-05 01:13:45.000000000 +0100 ++++ fstrcmp-0.7.D001/Makefile.in 2022-02-26 01:14:24.379687998 +0100 +@@ -588,7 +588,7 @@ bin/test_user$(EXEEXT): $(test_user_obj) + $(LIBTOOL) --mode=link --tag=CC $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ \ + $(test_user_obj) lib/libfstrcmp.la $(LDFLAGS) $(LIBS) + +-all: all-bin all-doc ++all: all-bin + + all-bin: bin/fstrcmp$(EXEEXT) bin/test_prelude$(EXEEXT) bin/test_user$(EXEEXT) + diff --git a/package/fwupdate/files/fwupdate.service b/package/fwupdate/files/fwupdate.service deleted file mode 100644 index f54519547..000000000 --- a/package/fwupdate/files/fwupdate.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Firmware Update Validation -After=dropbear.service - -[Service] -ExecStart=/usr/sbin/fwvalidate - -[Install] -WantedBy=multi-user.target diff --git a/package/gcr/Makefile b/package/gcr/Makefile index 438d06c96..97de6c379 100644 --- a/package/gcr/Makefile +++ b/package/gcr/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gcr -PKG_VERSION:= 3.20.0 -PKG_EXTRAVER:= 3.20 -PKG_RELEASE:= 2 -PKG_HASH:= 90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379 +PKG_VERSION:= 3.40.0 +PKG_EXTRAVER:= 3.40 +PKG_RELEASE:= 1 +PKG_HASH:= b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5 PKG_DESCR:= gnome keyring library PKG_SECTION:= libs/crypto -PKG_BUILDDEP:= p11-kit intltool-host libgtk3 +PKG_BUILDDEP:= p11-kit intltool-host libgtk3 meson-host PKG_URL:= https://wiki.gnome.org/action/show/Projects/GnomeKeyring PKG_SITES:= http://ftp.acc.umu.se/pub/gnome/sources/gcr/$(PKG_EXTRAVER)/ @@ -18,6 +18,15 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,GCR,gcr,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dintrospection=false \ + -Dgtk_doc=false + gcr-install: $(INSTALL_DIR) $(IDIR_GCR)/usr/lib $(CP) $(WRKINST)/usr/lib/lib*.so* \ diff --git a/package/gdb/Makefile b/package/gdb/Makefile index e15d7420d..90739fd29 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gdb -PKG_VERSION:= 11.1 +PKG_VERSION:= 11.2 PKG_RELEASE:= 1 -PKG_HASH:= cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94 +PKG_HASH:= 1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32 PKG_DESCR:= program debugger PKG_SECTION:= app/debug PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index 907140cf4..71422e55d 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gdbserver -PKG_VERSION:= 11.1 +PKG_VERSION:= 11.2 PKG_RELEASE:= 1 -PKG_HASH:= cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94 +PKG_HASH:= 1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32 PKG_DESCR:= remote program debugger utility PKG_SECTION:= app/debug PKG_NEEDS:= c++ diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index 647b01aff..ee6d9c043 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -11,7 +11,7 @@ PKG_HASH:= d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879 PKG_DESCR:= image loading and pixel buffer manipulation library PKG_SECTION:= libs/image PKG_BUILDDEP:= libjpeg-turbo libtiff glib libpng -HOST_BUILDDEP:= glib-host libffi-host +HOST_BUILDDEP:= libiconv-host glib-host libffi-host PKG_NEEDS:= c++ PKG_SITES:= $(MASTER_SITE_GNOME:=gdk-pixbuf/$(PKG_EXTRAVER)/) PKG_OPTS:= dev diff --git a/package/git/Makefile b/package/git/Makefile index db209ca7e..cda5ecee3 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 2.31.1 +PKG_VERSION:= 2.34.0 PKG_RELEASE:= 1 -PKG_HASH:= 9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680 +PKG_HASH:= fd6cb9b26665794c61f9ca917dcf00e7c19b0c02be575ad6ba9354fa6962411f PKG_DESCR:= fast version control system PKG_SECTION:= dev/scm PKG_BUILDDEP:= curl expat libressl -PKG_DEPENDS:= libcurl libexpat libressl +PKG_DEPENDS:= curl libexpat libressl PKG_NEEDS:= threads PKG_URL:= http://git-scm.com/ PKG_SITES:= https://www.kernel.org/pub/software/scm/git/ diff --git a/package/glib/Makefile b/package/glib/Makefile index 5dbfc4745..429bb7365 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.56.1 +PKG_VERSION:= 2.70.0 PKG_RELEASE:= 1 -PKG_EXTRAVER:= 2.56 -PKG_HASH:= 40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d +PKG_EXTRAVER:= 2.70 +PKG_HASH:= 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc PKG_DEPENDS:= libpcre zlib libffi @@ -24,42 +24,33 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -ifeq ($(ADK_PACKAGE_LIBICONV),y) -CONFIGURE_ARGS+= --with-libiconv=yes -else -CONFIGURE_ARGS+= --with-libiconv=no -endif -CONFIGURE_ARGS+= --disable-mem-pools \ - --disable-rebuilds \ - --disable-fam \ - --disable-dtrace \ - --disable-compile-warnings \ - --with-pcre=system \ - --with-threads=posix -CONFIGURE_ENV+= glib_cv_long_long_format=ll \ - glib_cv_stack_grows=no \ - glib_cv_have_strlcpy=no \ - glib_cv_uscore=no \ - ac_cv_func_posix_getpwuid_r=yes \ - ac_cv_func_posix_getgrgid_r=yes +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -HOST_STYLE:= auto -HOST_CPPFLAGS+= -I$(STAGING_HOST_DIR)/usr/include/libmount -ifneq ($(OS_FOR_BUILD),CYGWIN) -HOST_CFLAGS+= -fPIC -endif -HOST_CONFIGURE_ARGS+= --disable-fam \ - --disable-selinux \ - --disable-dtrace \ - --enable-static \ - --with-pcre=internal \ - --with-libiconv=yes \ - --disable-shared \ - --disable-compile-warnings +TARGET_CFLAGS+= -Wno-error=format-nonliteral -hostpost-install: - $(CP) $(STAGING_HOST_DIR)/usr/lib/glib-2.0/include/glibconfig.h \ - $(STAGING_HOST_DIR)/usr/include/glib-2.0/ +HOST_CONFIG_STYLE:= manual +HOST_STYLE:= manual +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS:= -Dtests=false -Dxattr=false -Doss_fuzz=disabled + +host-configure: + (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix $(STAGING_HOST_DIR)/usr _build) + +host-build: + (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) + +glib-hostinstall: + (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson install -C _build) + +do-configure: + (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix /usr \ + --libdir lib --cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf -Dtests=false _build) + +do-build: + (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) glib-install: $(INSTALL_DIR) $(IDIR_GLIB)/usr/lib diff --git a/package/glib/patches/patch-gobject-2_0_pc_in b/package/glib/patches/patch-gobject-2_0_pc_in deleted file mode 100644 index 7c00fc7b5..000000000 --- a/package/glib/patches/patch-gobject-2_0_pc_in +++ /dev/null @@ -1,10 +0,0 @@ ---- glib-2.56.1.orig/gobject-2.0.pc.in 2016-10-22 07:12:49.000000000 +0200 -+++ glib-2.56.1/gobject-2.0.pc.in 2021-11-04 05:31:24.191433397 +0100 -@@ -7,6 +7,6 @@ Name: GObject - Description: GLib Type, Object, Parameter and Signal Library - Requires: glib-2.0 - Version: @VERSION@ --Libs: -L${libdir} -lgobject-2.0 -+Libs: -L${libdir} -lgobject-2.0 -lffi - Libs.private: @LIBFFI_LIBS@ - Cflags: diff --git a/package/glib/patches/patch-meson_build b/package/glib/patches/patch-meson_build new file mode 100644 index 000000000..7a68e0a57 --- /dev/null +++ b/package/glib/patches/patch-meson_build @@ -0,0 +1,10 @@ +--- glib-2.70.0.orig/meson.build 2021-09-17 12:17:56.849962700 +0200 ++++ glib-2.70.0/meson.build 2022-02-28 20:24:15.048295012 +0100 +@@ -449,6 +449,7 @@ if cc.get_id() == 'gcc' or cc.get_id() = + '-Werror=missing-include-dirs', + '-Werror=missing-prototypes', + '-Werror=pointer-arith', ++ '-Wno-error=format-nonliteral', + ] + warning_c_link_args = [ + '-Wl,-z,nodelete', diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 874ec2f8a..81331baa8 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -47,14 +47,12 @@ 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 libcrypt libdl libm libanl libnsl libresolv libutil libnss_dns libnss_files; do \ - $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ - #$(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file-$(PKG_GLIBCVER).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done else ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH) - for file in libnss_dns libnss_files; do \ - $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ - $(CP) $(STAGING_TARGET_DIR)/$(ADK_TARGET_LIBC_ABI_PATH)/$$file-$(PKG_GLIBCVER).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ + -for file in libnss_dns libnss_files; do \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done endif ${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin @@ -72,11 +70,7 @@ glibc-gconv-install: glibc-dev-install: ${INSTALL_DIR} $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH) $(IDIR_GLIBC_DEV)/usr/lib -ifeq ($(ADK_TARGET_ARCH_RISCV64),y) - ${CP} ${STAGING_TARGET_DIR}/usr/lib/*/libc.so ${IDIR_GLIBC_DEV}/usr/lib -else - ${CP} ${STAGING_TARGET_DIR}/usr/lib/*/libc.so ${IDIR_GLIBC_DEV}/usr/lib -endif + ${CP} ${STAGING_TARGET_DIR}/usr/lib/libc.so ${IDIR_GLIBC_DEV}/usr/lib ifeq ($(ADK_TARGET_ABI_O32),y) ifeq ($(ADK_TARGET_BIG_ENDIAN),y) $(SED) "s#@@ELFTARGET@@#elf32-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so diff --git a/package/gst-plugins-base/Makefile b/package/gst-plugins-base/Makefile index 182ed4656..c612cd63e 100644 --- a/package/gst-plugins-base/Makefile +++ b/package/gst-plugins-base/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gst-plugins-base -PKG_VERSION:= 1.8.2 +PKG_VERSION:= 1.19.3 PKG_RELEASE:= 1 -PKG_HASH:= 9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d +PKG_HASH:= e277f198623a26c1b0a1e19734656392e9368bebf3677cd94262a1316a960827 PKG_DESCR:= gstreamer base plugins PKG_SECTION:= libs/video PKG_DEPENDS:= gstreamer @@ -19,8 +19,13 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,GST_PLUGINS_BASE,gst-plugins-base,$(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 + TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -CONFIGURE_ARGS+= --without-x gst-plugins-base-install: $(INSTALL_DIR) $(IDIR_GST_PLUGINS_BASE)/usr/lib/gstreamer-1.0/ diff --git a/package/gst-plugins-good/Makefile b/package/gst-plugins-good/Makefile index 53a6b0943..8feb16c2f 100644 --- a/package/gst-plugins-good/Makefile +++ b/package/gst-plugins-good/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gst-plugins-good -PKG_VERSION:= 1.8.2 +PKG_VERSION:= 1.19.3 PKG_RELEASE:= 1 -PKG_HASH:= 8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944 +PKG_HASH:= 79ea32a77fa47e6596530e38113bf97c113fd95658087d9a91ffb8af47d11d07 PKG_DESCR:= gstreamer good plugins PKG_SECTION:= libs/video PKG_DEPENDS:= gstreamer @@ -19,8 +19,13 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,GST_PLUGINS_GOOD,gst-plugins-good,$(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 + TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -CONFIGURE_ARGS+= --without-x gst-plugins-good-install: $(INSTALL_DIR) $(IDIR_GST_PLUGINS_GOOD)/usr/lib/gstreamer-1.0/ diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile index 41711b0e4..12b640b83 100644 --- a/package/harfbuzz/Makefile +++ b/package/harfbuzz/Makefile @@ -4,19 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= harfbuzz -PKG_VERSION:= 1.4.2 +PKG_VERSION:= 3.4.0 PKG_RELEASE:= 1 -PKG_HASH:= 8f234dcfab000fdec24d43674fffa2fdbdbd654eb176afbde30e8826339cb7b3 +PKG_HASH:= 810bcd3d22fae3c2c18c3688455abc1cd0d7fb2fae25404890b0d77e6443bd0a PKG_DESCR:= opentype text shaping engine PKG_SECTION:= libs/fonts -PKG_SITES:= http://www.freedesktop.org/software/harfbuzz/release/ +PKG_SITES:= https://github.com/harfbuzz/harfbuzz/archive/refs/tags/ PKG_DEPENDS:= cairo icu4c PKG_BUILDDEP:= cairo icu4c HOST_BUILDDEP:= cairo-host icu4c-host PKG_NEEDS:= c++ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +DISTFILES:= ${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -24,8 +24,19 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -HOST_LDFLAGS+= -lpthread -lrt -HOST_STYLE:= auto +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +HOST_STYLE:= meson +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +MESON_FLAGS+= -Dfreetype=disabled \ + -Dtests=disabled + +host-postinstall: + $(CP) $(WRKBUILD)/meson-private/harfbuzz.pc \ + $(STAGING_HOST_DIR)/usr/lib/pkgconfig/ harfbuzz-install: $(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib diff --git a/package/harfbuzz/patches/patch-Makefile_in b/package/harfbuzz/patches/patch-Makefile_in deleted file mode 100644 index 9ef495e70..000000000 --- a/package/harfbuzz/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- harfbuzz-1.2.3.orig/Makefile.in 2016-02-25 04:26:05.967296536 +0100 -+++ harfbuzz-1.2.3/Makefile.in 2016-04-03 19:27:12.062508784 +0200 -@@ -373,7 +373,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - NULL = - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = src util test docs win32 -+SUBDIRS = src - EXTRA_DIST = \ - autogen.sh \ - harfbuzz.doap \ diff --git a/package/harfbuzz/patches/patch-src_harfbuzz_pc_in b/package/harfbuzz/patches/patch-src_harfbuzz_pc_in deleted file mode 100644 index 291829515..000000000 --- a/package/harfbuzz/patches/patch-src_harfbuzz_pc_in +++ /dev/null @@ -1,18 +0,0 @@ ---- harfbuzz-1.2.3.orig/src/harfbuzz.pc.in 2016-01-06 13:00:36.113138042 +0100 -+++ harfbuzz-1.2.3/src/harfbuzz.pc.in 2016-03-12 21:55:46.457327612 +0100 -@@ -1,13 +1,10 @@ - prefix=%prefix% --exec_prefix=%exec_prefix% --libdir=%libdir% --includedir=%includedir% - - Name: harfbuzz - Description: HarfBuzz text shaping library - Version: %VERSION% - --Libs: -L${libdir} -lharfbuzz -+Libs: -L${prefix}/lib -lharfbuzz - Libs.private: %libs_private% - Requires.private: %requires_private% --Cflags: -I${includedir}/harfbuzz -+Cflags: -I${prefix}/include/harfbuzz diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile index 060fe36c0..df273806b 100644 --- a/package/hdparm/Makefile +++ b/package/hdparm/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= hdparm -PKG_VERSION:= 9.50 +PKG_VERSION:= 9.63 PKG_RELEASE:= 1 -PKG_HASH:= 0892b44bd817c251264a24f6ecbbb010958033e0395d2030f25f1c5608ac780e +PKG_HASH:= 70785deaebba5877a89c123568b41dee990da55fc51420f13f609a1072899691 PKG_DESCR:= get/set ata/sata drive parameters PKG_SECTION:= sys/hw PKG_URL:= http://sourceforge.net/projects/hdparm diff --git a/package/hush/Makefile b/package/hush/Makefile index 2e90466e9..de0cf3db9 100644 --- a/package/hush/Makefile +++ b/package/hush/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= hush -PKG_VERSION:= 1.33.0 +PKG_VERSION:= 1.35.0 PKG_RELEASE:= 1 -PKG_HASH:= d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd +PKG_HASH:= faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 PKG_DESCR:= hush standalone shell PKG_SECTION:= base/shells PKG_URL:= http://www.busybox.net/ diff --git a/package/hush/files/config b/package/hush/files/config index c4385b11f..af18f79bf 100644 --- a/package/hush/files/config +++ b/package/hush/files/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.33.0 -# Fri Apr 9 22:37:09 2021 +# Busybox version: 1.35.0 +# Sat Jan 8 19:16:27 2022 # CONFIG_HAVE_DOT_CONFIG=y @@ -94,9 +94,12 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 CONFIG_SHA3_SMALL=1 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_NON_POSIX_CP=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set @@ -120,14 +123,6 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_FEATURE_NON_POSIX_CP=y -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -CONFIG_FEATURE_USE_SENDFILE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y # # Applets @@ -162,6 +157,8 @@ CONFIG_BZIP2_SMALL=0 # CONFIG_CPIO is not set # CONFIG_FEATURE_CPIO_O is not set # CONFIG_FEATURE_CPIO_P is not set +# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set +# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_GZIP is not set @@ -197,6 +194,14 @@ CONFIG_GZIP_FAST=0 # # Coreutils # +# CONFIG_FEATURE_VERBOSE is not set + +# +# Common options for date and touch +# +# CONFIG_FEATURE_TIMEZONE is not set +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set +# CONFIG_FEATURE_HUMAN_READABLE is not set # CONFIG_BASENAME is not set # CONFIG_CAT is not set # CONFIG_FEATURE_CATN is not set @@ -207,11 +212,13 @@ CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set # CONFIG_CHROOT is not set # CONFIG_CKSUM is not set +# CONFIG_CRC32 is not set # CONFIG_COMM is not set # CONFIG_CP is not set # CONFIG_FEATURE_CP_LONG_OPTIONS is not set # CONFIG_FEATURE_CP_REFLINK is not set # CONFIG_CUT is not set +# CONFIG_FEATURE_CUT_REGEX is not set # CONFIG_DATE is not set # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set @@ -223,6 +230,7 @@ CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_DD_STATUS is not set # CONFIG_DF is not set # CONFIG_FEATURE_DF_FANCY is not set +# CONFIG_FEATURE_SKIP_ROOTFS is not set # CONFIG_DIRNAME is not set # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set @@ -312,7 +320,6 @@ CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_TEST_64 is not set # CONFIG_TIMEOUT is not set # CONFIG_TOUCH is not set -# CONFIG_FEATURE_TOUCH_NODEREF is not set # CONFIG_FEATURE_TOUCH_SUSV3 is not set # CONFIG_TR is not set # CONFIG_FEATURE_TR_CLASSES is not set @@ -339,13 +346,6 @@ CONFIG_UNAME_OSNAME="" # CONFIG_YES is not set # -# Common options -# -# CONFIG_FEATURE_VERBOSE is not set -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set -# CONFIG_FEATURE_HUMAN_READABLE is not set - -# # Console Utilities # # CONFIG_CHVT is not set @@ -408,6 +408,7 @@ CONFIG_DEFAULT_SETFONT_DIR="" CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_8BIT is not set # CONFIG_FEATURE_VI_COLON is not set +# CONFIG_FEATURE_VI_COLON_EXPAND is not set # CONFIG_FEATURE_VI_YANKMARK is not set # CONFIG_FEATURE_VI_SEARCH is not set # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -421,6 +422,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_UNDO is not set # CONFIG_FEATURE_VI_UNDO_QUEUE is not set CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 +# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set # CONFIG_FEATURE_ALLOW_EXEC is not set # @@ -429,7 +431,11 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 # CONFIG_FIND is not set # CONFIG_FEATURE_FIND_PRINT0 is not set # CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_ATIME is not set +# CONFIG_FEATURE_FIND_CTIME is not set # CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_AMIN is not set +# CONFIG_FEATURE_FIND_CMIN is not set # CONFIG_FEATURE_FIND_PERM is not set # CONFIG_FEATURE_FIND_TYPE is not set # CONFIG_FEATURE_FIND_EXECUTABLE is not set @@ -437,6 +443,7 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 # CONFIG_FEATURE_FIND_MAXDEPTH is not set # CONFIG_FEATURE_FIND_NEWER is not set # CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_SAMEFILE is not set # CONFIG_FEATURE_FIND_EXEC is not set # CONFIG_FEATURE_FIND_EXEC_PLUS is not set # CONFIG_FEATURE_FIND_USER is not set @@ -719,6 +726,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +# CONFIG_ASCII is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set # CONFIG_BC is not set @@ -814,6 +822,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -822,6 +831,9 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set +# CONFIG_FEATURE_HWIB is not set # CONFIG_FEATURE_TLS_SHA1 is not set # CONFIG_ARP is not set # CONFIG_ARPING is not set @@ -840,6 +852,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_HOSTNAME is not set # CONFIG_DNSDOMAINNAME is not set # CONFIG_HTTPD is not set +CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0 # CONFIG_FEATURE_HTTPD_RANGES is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set @@ -932,6 +945,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR="" # CONFIG_FEATURE_TELNET_WIDTH is not set # CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set @@ -952,6 +966,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR="" # CONFIG_WGET is not set # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set # CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_FTP is not set # CONFIG_FEATURE_WGET_AUTHENTICATION is not set # CONFIG_FEATURE_WGET_TIMEOUT is not set # CONFIG_FEATURE_WGET_HTTPS is not set @@ -973,6 +988,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="" # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set +CONFIG_UDHCPC_DEFAULT_INTERFACE="" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 @@ -990,17 +1006,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" # # Mail Utilities # +CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_MAKEMIME is not set # CONFIG_POPMAILDIR is not set # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set # CONFIG_REFORMIME is not set # CONFIG_FEATURE_REFORMIME_COMPAT is not set # CONFIG_SENDMAIL is not set -CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_SHOW_THREADS is not set # CONFIG_FREE is not set # CONFIG_FUSER is not set # CONFIG_IOSTAT is not set @@ -1039,7 +1057,6 @@ CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_UPTIME is not set # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set # CONFIG_WATCH is not set -# CONFIG_FEATURE_SHOW_THREADS is not set # # Runit Utilities @@ -1104,8 +1121,8 @@ CONFIG_HUSH=y CONFIG_SHELL_HUSH=y CONFIG_HUSH_BASH_COMPAT=y CONFIG_HUSH_BRACE_EXPANSION=y -CONFIG_HUSH_LINENO_VAR=y CONFIG_HUSH_BASH_SOURCE_CURDIR=y +CONFIG_HUSH_LINENO_VAR=y CONFIG_HUSH_INTERACTIVE=y CONFIG_HUSH_SAVEHISTORY=y CONFIG_HUSH_JOB=y diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 5275de348..3e7d88f80 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kexec-tools PKG_VERSION:= 2.0.23 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b PKG_DESCR:= kernel exec tools PKG_SECTION:= sys/misc @@ -15,8 +15,6 @@ PKG_KDEPENDS:= kexec PKG_URL:= http://kernel.org/pub/linux/utils/kernel/kexec/ PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/kernel/kexec/} -PKG_ARCH_DEPENDS:= !aarch64 !m68k - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,KEXEC_TOOLS,kexec-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 4e9a57a4c..91a9951e2 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -4,19 +4,20 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi -PKG_VERSION:= 18.0a1 +PKG_VERSION:= 19.3 PKG_RELEASE:= 1 -PKG_HASH:= 8892498d5248eea29c30db7c128a5910afc60d1b0b894aea472604bb879a0310 +PKG_HASH:= 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b PKG_DESCR:= software media player PKG_SECTION:= mm/video -PKG_DEPENDS:= python2 libsquish libressl libxz libfmt rapidjson +PKG_DEPENDS:= python3 libsquish libressl libxz libfmt rapidjson PKG_DEPENDS+= libass libmpeg2 libmad libmodplug libcurl PKG_DEPENDS+= libflac libbz2 libtiff libnettle librtmp liblzo PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libncurses libpng PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate libuuid -PKG_DEPENDS+= taglib libjasper libmp3lame libgpg-error python2-mod-sqlite +PKG_DEPENDS+= taglib libjasper libmp3lame libgpg-error PKG_DEPENDS+= glib libdcadec bcm28xx-vc-gl-libs libffmpeg libxvidcore -PKG_BUILDDEP:= python2 libass ffmpeg rtmpdump bcm28xx-vc +PKG_DEPENDS+= flatbuffers fstrcmp spdlog mesa libinput libxkbcommon +PKG_BUILDDEP:= python3 libass ffmpeg rtmpdump bcm28xx-vc PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo fmt rapidjson PKG_BUILDDEP+= curl flac bzip2 libtiff yajl cmake-host PKG_BUILDDEP+= tinyxml sqlite pcre libcdio freetype libpng @@ -25,15 +26,16 @@ PKG_BUILDDEP+= glib libmodplug libgpg-error xvidcore 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 +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)-Leia.tar.gz -WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Leia +DISTFILES:= $(PKG_VERSION)-Matrix.tar.gz +WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Matrix WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi3p raspberry-pi3p-64 +PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi4 PKG_FLAVOURS_KODI:= WITH_ALSA WITH_CEC WITH_PULSEAUDIO WITH_SMB PKG_FLAVOURS_KODI+= WITH_MICROHTTPD WITH_SSH WITH_AVAHI @@ -87,14 +89,20 @@ CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \ -DENABLE_OPTICAL=OFF \ -DENABLE_DBUS=OFF \ -DENABLE_EVENTCLIENTS=OFF \ - -DENABLE_UDEV=OFF \ + -DENABLE_UDEV=ON \ -DENABLE_PLIST=OFF \ -DNATIVEPREFIX=$(STAGING_HOST_DIR)/usr \ -DDEPENDS_PATH=$(STAGING_HOST_DIR) \ - -DWITH_TEXTUREPACKER=$(STAGING_HOST_DIR)/usr/bin/TexturePacker + -DWITH_TEXTUREPACKER=$(STAGING_HOST_DIR)/usr/bin/TexturePacker \ + -DCMAKE_EXE_LINKER_FLAGS=-latomic \ + -DLIBDVDCSS_URL=$(DL_DIR)/libdvdcss-1.4.2-Leia-Beta-5.tar.gz \ + -DLIBDVDNAV_URL=$(DL_DIR)/libdvdnav-6.0.0-Leia-Alpha-3.tar.gz \ + -DLIBDVDREAD_URL=$(DL_DIR)/libdvdread-6.0.0-Leia-Alpha-3.tar.gz + ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) -CMAKE_FLAGS+= -DCORE_PLATFORM_NAME=rbpi \ +CMAKE_FLAGS+= -DCORE_PLATFORM_NAME=gbm \ + -DAPP_RENDER_SYSTEM=gles \ -DWITH_ARCH=arm \ -DWITH_CPU=arm \ -DENABLE_NEON=ON \ @@ -140,12 +148,13 @@ CMAKE_FLAGS+= -DENABLE_SSH=OFF endif XAKE_FLAGS+= VERBOSE=1 +TARGET_LDFLAGS+= -latomic pre-configure: (cd $(WRKSRC)/tools/depends/native/JsonSchemaBuilder && PATH='$(HOST_PATH)' cmake .) PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/JsonSchemaBuilder cp $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \ - $(STAGING_HOST_DIR)/usr/bin + $(STAGING_HOST_DIR)/usr/bin/JsonSchemaBuilder::JsonSchemaBuilder (cd $(WRKSRC)/tools/depends/native/TexturePacker && PATH='$(HOST_PATH)' cmake \ -DCORE_SOURCE_DIR=$(WRKSRC) \ -DCMAKE_MODULE_PATH=$(WRKSRC)/cmake/modules \ @@ -153,6 +162,9 @@ pre-configure: PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/TexturePacker cp $(WRKSRC)/tools/depends/native/TexturePacker/TexturePacker \ $(STAGING_HOST_DIR)/usr/bin + (cd $(DL_DIR) && wget -O libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.2-Leia-Beta-5.tar.gz) + (cd $(DL_DIR) && wget -O libdvdnav-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/refs/tags/6.0.0-Leia-Alpha-3.tar.gz) + (cd $(DL_DIR) && wget -O libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdread/archive/refs/tags/6.0.0-Leia-Alpha-3.tar.gz) kodi-install: $(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/share/kodi diff --git a/package/kodi/patches/patch-cmake_KodiConfig_cmake_in b/package/kodi/patches/patch-cmake_KodiConfig_cmake_in deleted file mode 100644 index 3ebae759b..000000000 --- a/package/kodi/patches/patch-cmake_KodiConfig_cmake_in +++ /dev/null @@ -1,20 +0,0 @@ ---- xbmc-18.0a1-Leia.orig/cmake/KodiConfig.cmake.in 2018-03-04 10:21:28.000000000 +0100 -+++ xbmc-18.0a1-Leia/cmake/KodiConfig.cmake.in 2018-05-23 08:10:01.842094111 +0200 -@@ -8,7 +8,7 @@ if(NOT @APP_NAME_UC@_PREFIX) - set(@APP_NAME_UC@_PREFIX @APP_PREFIX@) - endif() - if(NOT @APP_NAME_UC@_INCLUDE_DIR) -- set(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@) -+ set(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@) - endif() - if(NOT @APP_NAME_UC@_LIB_DIR) - set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) -@@ -20,7 +20,7 @@ set(APP_RENDER_SYSTEM @APP_RENDER_SYSTEM - if(NOT WIN32) - set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") - endif() --list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake) -+list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake) - - string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@") - add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON) 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 new file mode 100644 index 000000000..67e51c6e9 --- /dev/null +++ b/package/kodi/patches/patch-tools_depends_native_TexturePacker_src_decoder_GifHelper_cpp @@ -0,0 +1,15 @@ +--- 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 +@@ -18,11 +18,11 @@ + * + */ + +-#include "GifHelper.h" + + #include <algorithm> + #include <cstdlib> + #include <cstring> ++#include "GifHelper.h" + + #define UNSIGNED_LITTLE_ENDIAN(lo, hi) ((lo) | ((hi) << 8)) + #define GIF_MAX_MEMORY 82944000U // about 79 MB, which is equivalent to 10 full hd frames. diff --git a/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp b/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp deleted file mode 100644 index fa943b89a..000000000 --- a/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- xbmc-18.0a1-Leia.orig/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2018-03-04 10:21:28.000000000 +0100 -+++ xbmc-18.0a1-Leia/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2018-05-26 06:48:45.750618626 +0200 -@@ -1213,7 +1213,8 @@ void CAESinkALSA::EnumerateDevicesEx(AED - * found by the enumeration process. Skip them as well ("hw", "dmix", - * "plughw", "dsnoop"). */ - -- else if (baseName != "default" -+ else if (true) -+/* baseName != "default" - && baseName != "sysdefault" - && baseName != "surround40" - && baseName != "surround41" -@@ -1223,7 +1224,7 @@ void CAESinkALSA::EnumerateDevicesEx(AED - && baseName != "hw" - && baseName != "dmix" - && baseName != "plughw" -- && baseName != "dsnoop") -+ && baseName != "dsnoop")*/ - { - EnumerateDevice(list, name, desc ? desc : name, config); - } -@@ -1380,7 +1381,7 @@ void CAESinkALSA::EnumerateDevice(AEDevi - info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") - { - /* We already know this is HDMI, strip it */ -- info.m_displayName.erase(info.m_displayName.size()-5); -+ /*info.m_displayName.erase(info.m_displayName.size()-5);*/ - } - - /* "CONEXANT Analog", "USB Audio", "HDMI 0", "ALC889 Digital" ... */ diff --git a/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp b/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp new file mode 100644 index 000000000..afd13ea30 --- /dev/null +++ b/package/kodi/patches/patch-xbmc_platform_linux_CPUInfoLinux_cpp @@ -0,0 +1,31 @@ +--- xbmc-19.3-Matrix.orig/xbmc/platform/linux/CPUInfoLinux.cpp 2021-10-24 12:09:58.000000000 +0200 ++++ xbmc-19.3-Matrix/xbmc/platform/linux/CPUInfoLinux.cpp 2022-02-26 13:55:19.357313177 +0100 +@@ -18,10 +18,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 + +@@ -252,16 +249,6 @@ CCPUInfoLinux::CCPUInfoLinux() + } + #endif + +-#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/lame/Makefile b/package/lame/Makefile index e9838154f..40474a7d3 100644 --- a/package/lame/Makefile +++ b/package/lame/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= lame -PKG_VERSION:= 3.99 +PKG_VERSION:= 3.100 PKG_RELEASE:= 1 -PKG_HASH:= d71d804c25cac69592939865033787849cef52b6c9b783ed31ea8dcebeadbbba +PKG_HASH:= ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e PKG_DESCR:= mp3 encoder PKG_SECTION:= mm/audio PKG_DEPENDS:= libncurses diff --git a/package/libXrandr/Makefile b/package/libXrandr/Makefile index 85340713e..c6169652f 100644 --- a/package/libXrandr/Makefile +++ b/package/libXrandr/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= 2baa7fb3eca78fe7e11a09b373ba898b717f7eeba4a4bfd68187e04b4789b0d3 PKG_DESCR:= xrandr library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= randrproto libXrender +PKG_BUILDDEP:= randrproto libXrender libXext PKG_SITES:= http://www.x.org/releases/individual/lib/ PKG_LIBNAME:= libxrandr PKG_OPTS:= dev diff --git a/package/libcec/Makefile b/package/libcec/Makefile index 422bf679b..302f03e4e 100644 --- a/package/libcec/Makefile +++ b/package/libcec/Makefile @@ -4,24 +4,29 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libcec -PKG_VERSION:= d156e7cb684f86a9d73f8dcf087d4799c62d9721 +PKG_VERSION:= 6.0.2 PKG_RELEASE:= 1 -PKG_GIT:= hash +PKG_HASH:= 090696d7a4fb772d7acebbb06f91ab92e025531c7c91824046b9e4e71ecb3377 PKG_DESCR:= control your device with your tv remote control PKG_SECTION:= libs/video -PKG_DEPENDS:= libudev libplatform -PKG_BUILDDEP:= eudev cmake-host platform +PKG_DEPENDS:= libudev p8-platform +PKG_BUILDDEP:= eudev cmake-host p8-platform PKG_URL:= http://libcec.pulse-eight.com/ -PKG_SITES:= https://github.com/Pulse-Eight/libcec.git +PKG_SITES:= https://github.com/Pulse-Eight/libcec/archive/refs/tags/ PKG_OPTS:= dev +PKG_DEPENDS_RASPBERRY_PI4:= bcm28xx-vc +PKG_BUILDDEP_RASPBERRY_PI4:= bcm28xx-vc PKG_DEPENDS_RASPBERRY_PI3:= bcm28xx-vc PKG_BUILDDEP_RASPBERRY_PI3:= bcm28xx-vc PKG_DEPENDS_RASPBERRY_PI2:= bcm28xx-vc PKG_BUILDDEP_RASPBERRY_PI2:= bcm28xx-vc PKG_DEPENDS_RASPBERRY_PI:= bcm28xx-vc PKG_BUILDDEP_RASPBERRY_PI:= bcm28xx-vc -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi3p solidrun-imx6 +PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi4 solidrun-imx6 + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz +WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/libcec/patches/libcec-00-imx6-support.patch b/package/libcec/patches/libcec-00-imx6-support.patch deleted file mode 100644 index 2c24635c4..000000000 --- a/package/libcec/patches/libcec-00-imx6-support.patch +++ /dev/null @@ -1,879 +0,0 @@ -From a7f3315333c1a79259a763c6542a6cd71855b357 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev <stefan@saraev.ca> -Date: Thu, 7 May 2015 11:35:04 +0300 -Subject: [PATCH] imx support - -note. I am NOT the author of the patch. just rebased it ---- - include/cectypes.h | 14 +- - src/libcec/CECTypeUtils.h | 2 + - src/libcec/adapter/AdapterFactory.cpp | 29 +- - src/libcec/adapter/IMX/AdapterMessageQueue.h | 134 +++++++++ - .../adapter/IMX/IMXCECAdapterCommunication.cpp | 328 +++++++++++++++++++++ - .../adapter/IMX/IMXCECAdapterCommunication.h | 119 ++++++++ - src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp | 42 +++ - src/libcec/adapter/IMX/IMXCECAdapterDetection.h | 36 +++ - src/libcec/cmake/CheckPlatformSupport.cmake | 10 + - src/libcec/cmake/DisplayPlatformSupport.cmake | 6 + - src/libcec/env.h.in | 3 + - 11 files changed, 720 insertions(+), 3 deletions(-) - create mode 100644 src/libcec/adapter/IMX/AdapterMessageQueue.h - create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp - create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterCommunication.h - create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp - create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterDetection.h - -diff --git a/include/cectypes.h b/include/cectypes.h -index acff259..0cfee8c 100644 ---- a/include/cectypes.h -+++ b/include/cectypes.h -@@ -309,6 +309,17 @@ namespace CEC { - #define CEC_EXYNOS_VIRTUAL_COM "Exynos" - - /*! -+ * the path to use for the i.MX CEC wire -+ */ -+#define CEC_IMX_PATH "/dev/mxc_hdmi_cec" -+ -+/*! -+ * the name of the virtual COM port to use for the i.MX CEC wire -+ */ -+#define CEC_IMX_VIRTUAL_COM "i.MX" -+ -+ -+/*! - * Mimimum client version - */ - #define CEC_MIN_LIB_VERSION 3 -@@ -876,7 +887,8 @@ typedef enum cec_adapter_type - ADAPTERTYPE_P8_DAUGHTERBOARD = 0x2, - ADAPTERTYPE_RPI = 0x100, - ADAPTERTYPE_TDA995x = 0x200, -- ADAPTERTYPE_EXYNOS = 0x300 -+ ADAPTERTYPE_EXYNOS = 0x300, -+ ADAPTERTYPE_IMX = 0x400 - } cec_adapter_type; - - /** force exporting through swig */ -diff --git a/src/libcec/CECTypeUtils.h b/src/libcec/CECTypeUtils.h -index fd8046a..48cb215 100644 ---- a/src/libcec/CECTypeUtils.h -+++ b/src/libcec/CECTypeUtils.h -@@ -765,6 +765,8 @@ namespace CEC - return "Raspberry Pi"; - case ADAPTERTYPE_TDA995x: - return "TDA995x"; -+ case ADAPTERTYPE_IMX: -+ return "i.MX"; - default: - return "unknown"; - } -diff --git a/src/libcec/adapter/AdapterFactory.cpp b/src/libcec/adapter/AdapterFactory.cpp -index da05725..92e378b 100644 ---- a/src/libcec/adapter/AdapterFactory.cpp -+++ b/src/libcec/adapter/AdapterFactory.cpp -@@ -58,6 +58,11 @@ - #include "Exynos/ExynosCECAdapterCommunication.h" - #endif - -+#if defined(HAVE_IMX_API) -+#include "IMX/IMXCECAdapterDetection.h" -+#include "IMX/IMXCECAdapterCommunication.h" -+#endif -+ - using namespace CEC; - - int8_t CAdapterFactory::FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */) -@@ -127,7 +132,22 @@ int8_t CAdapterFactory::DetectAdapters(cec_adapter_descriptor *deviceList, uint8 - #endif - - --#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) -+ -+#if defined(HAVE_IMX_API) -+ if (iAdaptersFound < iBufSize && CIMXCECAdapterDetection::FindAdapter() && -+ (!strDevicePath || !strcmp(strDevicePath, CEC_IMX_VIRTUAL_COM))) -+ { -+ snprintf(deviceList[iAdaptersFound].strComPath, sizeof(deviceList[iAdaptersFound].strComPath), CEC_IMX_PATH); -+ snprintf(deviceList[iAdaptersFound].strComName, sizeof(deviceList[iAdaptersFound].strComName), CEC_IMX_VIRTUAL_COM); -+ deviceList[iAdaptersFound].iVendorId = IMX_ADAPTER_VID; -+ deviceList[iAdaptersFound].iProductId = IMX_ADAPTER_PID; -+ deviceList[iAdaptersFound].adapterType = ADAPTERTYPE_IMX; -+ iAdaptersFound++; -+ } -+#endif -+ -+ -+#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) && !defined(HAVE_IMX_API) - #error "libCEC doesn't have support for any type of adapter. please check your build system or configuration" - #endif - -@@ -151,11 +171,16 @@ IAdapterCommunication *CAdapterFactory::GetInstance(const char *strPort, uint16_ - return new CRPiCECAdapterCommunication(m_lib->m_cec); - #endif - -+#if defined(HAVE_IMX_API) -+ if (!strcmp(strPort, CEC_IMX_VIRTUAL_COM)) -+ return new CIMXCECAdapterCommunication(m_lib->m_cec); -+#endif -+ - #if defined(HAVE_P8_USB) - return new CUSBCECAdapterCommunication(m_lib->m_cec, strPort, iBaudRate); - #endif - --#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) && !defined(HAVE_EXYNOS_API) -+#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API) && !defined(HAVE_EXYNOS_API) && !defined(HAVE_IMX_API) - return NULL; - #endif - } -diff --git a/src/libcec/adapter/IMX/AdapterMessageQueue.h b/src/libcec/adapter/IMX/AdapterMessageQueue.h -new file mode 100644 -index 0000000..af6742c ---- /dev/null -+++ b/src/libcec/adapter/IMX/AdapterMessageQueue.h -@@ -0,0 +1,134 @@ -+#pragma once -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * This program is dual-licensed; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ * Alternatively, you can license this library under a commercial license, -+ * please contact Pulse-Eight Licensing for more information. -+ * -+ * For more information contact: -+ * Pulse-Eight Licensing <license@pulse-eight.com> -+ * http://www.pulse-eight.com/ -+ * http://www.pulse-eight.net/ -+ */ -+ -+#include "platform/threads/mutex.h" -+ -+namespace CEC -+{ -+ using namespace PLATFORM; -+ -+ class CAdapterMessageQueueEntry -+ { -+ public: -+ CAdapterMessageQueueEntry(const cec_command &command) -+ : m_bWaiting(true), m_retval((uint32_t)-1), m_bSucceeded(false) -+ { -+ m_hash = hashValue( -+ uint32_t(command.opcode_set ? command.opcode : CEC_OPCODE_NONE), -+ command.initiator, command.destination); -+ } -+ -+ virtual ~CAdapterMessageQueueEntry(void) {} -+ -+ /*! -+ * @brief Query result from worker thread -+ */ -+ uint32_t Result() const -+ { -+ return m_retval; -+ } -+ -+ /*! -+ * @brief Signal waiting threads -+ */ -+ void Broadcast(void) -+ { -+ CLockObject lock(m_mutex); -+ m_condition.Broadcast(); -+ } -+ -+ /*! -+ * @brief Signal waiting thread(s) when message matches this entry -+ */ -+ bool CheckMatch(uint32_t opcode, cec_logical_address initiator, -+ cec_logical_address destination, uint32_t response) -+ { -+ uint32_t hash = hashValue(opcode, initiator, destination); -+ -+ if (hash == m_hash) -+ { -+ CLockObject lock(m_mutex); -+ -+ m_retval = response; -+ m_bSucceeded = true; -+ m_condition.Signal(); -+ return true; -+ } -+ -+ return false; -+ } -+ -+ /*! -+ * @brief Wait for a response to this command. -+ * @param iTimeout The timeout to use while waiting. -+ * @return True when a response was received before the timeout passed, false otherwise. -+ */ -+ bool Wait(uint32_t iTimeout) -+ { -+ CLockObject lock(m_mutex); -+ -+ bool bReturn = m_bSucceeded ? true : m_condition.Wait(m_mutex, m_bSucceeded, iTimeout); -+ m_bWaiting = false; -+ return bReturn; -+ } -+ -+ /*! -+ * @return True while a thread is waiting for a signal or isn't waiting yet, false otherwise. -+ */ -+ bool IsWaiting(void) -+ { -+ CLockObject lock(m_mutex); -+ return m_bWaiting; -+ } -+ -+ /*! -+ * @return Hash value for given cec_command -+ */ -+ static uint32_t hashValue(uint32_t opcode, -+ cec_logical_address initiator, -+ cec_logical_address destination) -+ { -+ return 1 | ((uint32_t)initiator << 8) | -+ ((uint32_t)destination << 16) | ((uint32_t)opcode << 16); -+ } -+ -+ private: -+ bool m_bWaiting; /**< true while a thread is waiting or when it hasn't started waiting yet */ -+ PLATFORM::CCondition<bool> m_condition; /**< the condition to wait on */ -+ PLATFORM::CMutex m_mutex; /**< mutex for changes to this class */ -+ uint32_t m_hash; -+ uint32_t m_retval; -+ bool m_bSucceeded; -+ }; -+ -+}; -diff --git a/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp -new file mode 100644 -index 0000000..2daa8cb ---- /dev/null -+++ b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp -@@ -0,0 +1,328 @@ -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * -+ * You can redistribute this file and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ */ -+ -+#include "env.h" -+ -+#if defined(HAVE_IMX_API) -+#include "IMXCECAdapterCommunication.h" -+ -+#include "CECTypeUtils.h" -+#include "LibCEC.h" -+#include "platform/sockets/cdevsocket.h" -+#include "platform/util/StdString.h" -+#include "platform/util/buffer.h" -+ -+/* -+ * Ioctl definitions from kernel header -+ */ -+#define HDMICEC_IOC_MAGIC 'H' -+#define HDMICEC_IOC_SETLOGICALADDRESS _IOW(HDMICEC_IOC_MAGIC, 1, unsigned char) -+#define HDMICEC_IOC_STARTDEVICE _IO(HDMICEC_IOC_MAGIC, 2) -+#define HDMICEC_IOC_STOPDEVICE _IO(HDMICEC_IOC_MAGIC, 3) -+#define HDMICEC_IOC_GETPHYADDRESS _IOR(HDMICEC_IOC_MAGIC, 4, unsigned char[4]) -+ -+#define MAX_CEC_MESSAGE_LEN 17 -+ -+#define MESSAGE_TYPE_RECEIVE_SUCCESS 1 -+#define MESSAGE_TYPE_NOACK 2 -+#define MESSAGE_TYPE_DISCONNECTED 3 -+#define MESSAGE_TYPE_CONNECTED 4 -+#define MESSAGE_TYPE_SEND_SUCCESS 5 -+ -+typedef struct hdmi_cec_event{ -+ int event_type; -+ int msg_len; -+ unsigned char msg[MAX_CEC_MESSAGE_LEN]; -+}hdmi_cec_event; -+ -+ -+using namespace std; -+using namespace CEC; -+using namespace PLATFORM; -+ -+#include "AdapterMessageQueue.h" -+ -+#define LIB_CEC m_callback->GetLib() -+ -+// these are defined in nxp private header file -+#define CEC_MSG_SUCCESS 0x00 /*Message transmisson Succeed*/ -+#define CEC_CSP_OFF_STATE 0x80 /*CSP in Off State*/ -+#define CEC_BAD_REQ_SERVICE 0x81 /*Bad .req service*/ -+#define CEC_MSG_FAIL_UNABLE_TO_ACCESS 0x82 /*Message transmisson failed: Unable to access CEC line*/ -+#define CEC_MSG_FAIL_ARBITRATION_ERROR 0x83 /*Message transmisson failed: Arbitration error*/ -+#define CEC_MSG_FAIL_BIT_TIMMING_ERROR 0x84 /*Message transmisson failed: Bit timming error*/ -+#define CEC_MSG_FAIL_DEST_NOT_ACK 0x85 /*Message transmisson failed: Destination Address not aknowledged*/ -+#define CEC_MSG_FAIL_DATA_NOT_ACK 0x86 /*Message transmisson failed: Databyte not acknowledged*/ -+ -+ -+CIMXCECAdapterCommunication::CIMXCECAdapterCommunication(IAdapterCommunicationCallback *callback) : -+ IAdapterCommunication(callback)/*, -+ m_bLogicalAddressChanged(false)*/ -+{ -+ CLockObject lock(m_mutex); -+ -+ m_iNextMessage = 0; -+ //m_logicalAddresses.Clear(); -+ m_logicalAddress = CECDEVICE_UNKNOWN; -+ m_bLogicalAddressRegistered = false; -+ m_bInitialised = false; -+ m_dev = new CCDevSocket(CEC_IMX_PATH); -+} -+ -+CIMXCECAdapterCommunication::~CIMXCECAdapterCommunication(void) -+{ -+ Close(); -+ -+ CLockObject lock(m_mutex); -+ delete m_dev; -+ m_dev = 0; -+} -+ -+bool CIMXCECAdapterCommunication::IsOpen(void) -+{ -+ return IsInitialised() && m_dev->IsOpen(); -+} -+ -+bool CIMXCECAdapterCommunication::Open(uint32_t iTimeoutMs, bool UNUSED(bSkipChecks), bool bStartListening) -+{ -+ if (m_dev->Open(iTimeoutMs)) -+ { -+ if (!bStartListening || CreateThread()) { -+ if (m_dev->Ioctl(HDMICEC_IOC_STARTDEVICE, NULL) == 0) { -+ m_bInitialised = true; -+ return true; -+ } -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to start device\n", __func__); -+ } -+ m_dev->Close(); -+ } -+ -+ return false; -+} -+ -+ -+void CIMXCECAdapterCommunication::Close(void) -+{ -+ StopThread(0); -+ -+ CLockObject lock(m_mutex); -+ if (!m_bInitialised) { -+ return; -+ } -+ if (m_dev->Ioctl(HDMICEC_IOC_STOPDEVICE, NULL) != 0) { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: Unable to stop device\n", __func__); -+ } -+ m_dev->Close(); -+ m_bInitialised = false; -+} -+ -+ -+std::string CIMXCECAdapterCommunication::GetError(void) const -+{ -+ std::string strError(m_strError); -+ return strError; -+} -+ -+ -+cec_adapter_message_state CIMXCECAdapterCommunication::Write( -+ const cec_command &data, bool &UNUSED(bRetry), uint8_t UNUSED(iLineTimeout), bool UNUSED(bIsReply)) -+{ -+ //cec_frame frame; -+ unsigned char message[MAX_CEC_MESSAGE_LEN]; -+ int msg_len = 1; -+ cec_adapter_message_state rc = ADAPTER_MESSAGE_STATE_ERROR; -+ -+ if ((size_t)data.parameters.size + data.opcode_set + 1 > sizeof(message)) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: data size too large !", __func__); -+ return ADAPTER_MESSAGE_STATE_ERROR; -+ } -+ -+ message[0] = (data.initiator << 4) | (data.destination & 0x0f); -+ if (data.opcode_set) -+ { -+ message[1] = data.opcode; -+ msg_len++; -+ memcpy(&message[2], data.parameters.data, data.parameters.size); -+ msg_len+=data.parameters.size; -+ } -+ -+ if (m_dev->Write(message, msg_len) == msg_len) -+ { -+ rc = ADAPTER_MESSAGE_STATE_SENT_ACKED; -+ } -+ else -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: sent command error !", __func__); -+ -+ return rc; -+} -+ -+ -+uint16_t CIMXCECAdapterCommunication::GetFirmwareVersion(void) -+{ -+ /* FIXME add ioctl ? */ -+ return 0; -+} -+ -+ -+cec_vendor_id CIMXCECAdapterCommunication::GetVendorId(void) -+{ -+ return CEC_VENDOR_UNKNOWN; -+} -+ -+ -+uint16_t CIMXCECAdapterCommunication::GetPhysicalAddress(void) -+{ -+ uint32_t info; -+ uint16_t phy_addr; -+ -+ if (m_dev->Ioctl(HDMICEC_IOC_GETPHYADDRESS, &info) != 0) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_GETPHYADDRESS failed !", __func__); -+ return CEC_INVALID_PHYSICAL_ADDRESS; -+ } -+ /* Rebuild 16 bit raw value from fsl 32 bits value */ -+ phy_addr = ((info & 0x0f) << 12) | (info & 0x0f00) | -+ ((info & 0x0f0000) >> 12) | ((info & 0x0f000000) >> 24); -+ -+ return phy_addr; -+} -+ -+ -+cec_logical_addresses CIMXCECAdapterCommunication::GetLogicalAddresses(void) -+{ -+ cec_logical_addresses addresses; -+ addresses.Clear(); -+ -+ CLockObject lock(m_mutex); -+ if ((m_logicalAddress & (CECDEVICE_UNKNOWN | CECDEVICE_UNREGISTERED)) == 0) -+ addresses.Set(m_logicalAddress); -+ -+ return addresses; -+} -+ -+void CIMXCECAdapterCommunication::HandleLogicalAddressLost(cec_logical_address UNUSED(oldAddress)) -+{ -+ UnregisterLogicalAddress(); -+} -+ -+bool CIMXCECAdapterCommunication::UnregisterLogicalAddress(void) -+{ -+ CLockObject lock(m_mutex); -+ if (!m_bLogicalAddressRegistered) -+ return true; -+ -+ if (m_dev->Ioctl(HDMICEC_IOC_SETLOGICALADDRESS, (void *)CECDEVICE_BROADCAST) != 0) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_SETLOGICALADDRESS failed !", __func__); -+ return false; -+ } -+ -+ m_logicalAddress = CECDEVICE_UNKNOWN; -+ m_bLogicalAddressRegistered = false; -+ return true; -+} -+ -+bool CIMXCECAdapterCommunication::RegisterLogicalAddress(const cec_logical_address address) -+{ -+ CLockObject lock(m_mutex); -+ -+ if (m_logicalAddress == address && m_bLogicalAddressRegistered) -+ { -+ return true; -+ } -+ -+ if (m_dev->Ioctl(HDMICEC_IOC_SETLOGICALADDRESS, (void *)address) != 0) -+ { -+ LIB_CEC->AddLog(CEC_LOG_ERROR, "%s: HDMICEC_IOC_SETLOGICALADDRESS failed !", __func__); -+ return false; -+ } -+ -+ m_logicalAddress = address; -+ m_bLogicalAddressRegistered = true; -+ return true; -+} -+ -+bool CIMXCECAdapterCommunication::SetLogicalAddresses(const cec_logical_addresses &addresses) -+{ -+ int log_addr = addresses.primary; -+ -+ return RegisterLogicalAddress((cec_logical_address)log_addr); -+} -+ -+void *CIMXCECAdapterCommunication::Process(void) -+{ -+ bool bHandled; -+ hdmi_cec_event event; -+ int ret; -+ -+ uint32_t opcode, status; -+ cec_logical_address initiator, destination; -+ -+ while (!IsStopped()) -+ { -+ ret = m_dev->Read((char *)&event, sizeof(event), 5000); -+ if (ret > 0) -+ { -+ -+ initiator = cec_logical_address(event.msg[0] >> 4); -+ destination = cec_logical_address(event.msg[0] & 0x0f); -+ -+ //LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: Read data : type : %d initiator %d dest %d", __func__, event.event_type, initiator, destination); -+ if (event.event_type == MESSAGE_TYPE_RECEIVE_SUCCESS) -+ /* Message received */ -+ { -+ cec_command cmd; -+ -+ cec_command::Format( -+ cmd, initiator, destination, -+ ( event.msg_len > 1 ) ? cec_opcode(event.msg[1]) : CEC_OPCODE_NONE); -+ -+ for( uint8_t i = 2; i < event.msg_len; i++ ) -+ cmd.parameters.PushBack(event.msg[i]); -+ -+ if (!IsStopped()) -+ m_callback->OnCommandReceived(cmd); -+ } -+ -+ if (event.event_type == MESSAGE_TYPE_CONNECTED) -+ /* HDMI has just been reconnected - Notify phy address*/ -+ { -+ uint16_t iNewAddress = GetPhysicalAddress(); -+ m_callback->HandlePhysicalAddressChanged(iNewAddress); -+ } -+ /* We are not interested in other events */ -+ } /*else { -+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "%s: Read returned %d", __func__, ret); -+ }*/ -+ -+ } -+ -+ return 0; -+} -+ -+#endif // HAVE_IMX_API -diff --git a/src/libcec/adapter/IMX/IMXCECAdapterCommunication.h b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.h -new file mode 100644 -index 0000000..9e899a3 ---- /dev/null -+++ b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.h -@@ -0,0 +1,119 @@ -+#pragma once -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * -+ * You can redistribute this file and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ */ -+ -+#if defined(HAVE_IMX_API) -+ -+#include "platform/threads/mutex.h" -+#include "platform/threads/threads.h" -+#include "platform/sockets/socket.h" -+#include "adapter/AdapterCommunication.h" -+#include <map> -+ -+#define IMX_ADAPTER_VID 0x0471 /*FIXME TBD*/ -+#define IMX_ADAPTER_PID 0x1001 -+ -+ -+ -+namespace PLATFORM -+{ -+ class CCDevSocket; -+}; -+ -+ -+namespace CEC -+{ -+ class CAdapterMessageQueueEntry; -+ -+ class CIMXCECAdapterCommunication : public IAdapterCommunication, public PLATFORM::CThread -+ { -+ public: -+ /*! -+ * @brief Create a new USB-CEC communication handler. -+ * @param callback The callback to use for incoming CEC commands. -+ */ -+ CIMXCECAdapterCommunication(IAdapterCommunicationCallback *callback); -+ virtual ~CIMXCECAdapterCommunication(void); -+ -+ /** @name IAdapterCommunication implementation */ -+ ///{ -+ bool Open(uint32_t iTimeoutMs = CEC_DEFAULT_CONNECT_TIMEOUT, bool bSkipChecks = false, bool bStartListening = true); -+ void Close(void); -+ bool IsOpen(void); -+ std::string GetError(void) const; -+ cec_adapter_message_state Write(const cec_command &data, bool &bRetry, uint8_t iLineTimeout, bool bIsReply); -+ -+ bool SetLineTimeout(uint8_t UNUSED(iTimeout)) { return true; } -+ bool StartBootloader(void) { return false; } -+ bool SetLogicalAddresses(const cec_logical_addresses &addresses); -+ cec_logical_addresses GetLogicalAddresses(void); -+ bool PingAdapter(void) { return IsInitialised(); } -+ uint16_t GetFirmwareVersion(void); -+ uint32_t GetFirmwareBuildDate(void) { return 0; } -+ bool IsRunningLatestFirmware(void) { return true; } -+ bool PersistConfiguration(const libcec_configuration & UNUSED(configuration)) { return false; } -+ bool GetConfiguration(libcec_configuration & UNUSED(configuration)) { return false; } -+ std::string GetPortName(void) { return std::string("IMX"); } -+ uint16_t GetPhysicalAddress(void); -+ bool SetControlledMode(bool UNUSED(controlled)) { return true; } -+ cec_vendor_id GetVendorId(void); -+ bool SupportsSourceLogicalAddress(const cec_logical_address address) { return address > CECDEVICE_TV && address <= CECDEVICE_BROADCAST; } -+ cec_adapter_type GetAdapterType(void) { return ADAPTERTYPE_IMX; } -+ uint16_t GetAdapterVendorId(void) const { return IMX_ADAPTER_VID; } -+ uint16_t GetAdapterProductId(void) const { return IMX_ADAPTER_PID; } -+ void HandleLogicalAddressLost(cec_logical_address UNUSED(oldAddress)); -+ void SetActiveSource(bool UNUSED(bSetTo), bool UNUSED(bClientUnregistered)) {} -+ bool RegisterLogicalAddress(const cec_logical_address address); -+ ///} -+ -+ /** @name PLATFORM::CThread implementation */ -+ ///{ -+ void *Process(void); -+ ///} -+ -+ private: -+ bool IsInitialised(void) const { return m_bInitialised; }; -+ bool UnregisterLogicalAddress(void); -+ -+ std::string m_strError; /**< current error message */ -+ -+ //cec_logical_addresses m_logicalAddresses; -+ cec_logical_address m_logicalAddress; -+ -+ PLATFORM::CMutex m_mutex; -+ PLATFORM::CCDevSocket *m_dev; /**< the device connection */ -+ bool m_bLogicalAddressRegistered; -+ bool m_bInitialised; -+ -+ PLATFORM::CMutex m_messageMutex; -+ uint32_t m_iNextMessage; -+ std::map<uint32_t, CAdapterMessageQueueEntry *> m_messages; -+ }; -+ -+}; -+ -+#endif -diff --git a/src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp b/src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp -new file mode 100644 -index 0000000..6c93c45 ---- /dev/null -+++ b/src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp -@@ -0,0 +1,42 @@ -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * -+ * You can redistribute this file and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ */ -+ -+#include "env.h" -+#include <stdio.h> -+ -+#if defined(HAVE_IMX_API) -+#include "IMXCECAdapterDetection.h" -+ -+ -+using namespace CEC; -+ -+bool CIMXCECAdapterDetection::FindAdapter(void) -+{ -+ return access(CEC_IMX_PATH, 0) == 0; -+} -+ -+#endif -diff --git a/src/libcec/adapter/IMX/IMXCECAdapterDetection.h b/src/libcec/adapter/IMX/IMXCECAdapterDetection.h -new file mode 100644 -index 0000000..d54891d ---- /dev/null -+++ b/src/libcec/adapter/IMX/IMXCECAdapterDetection.h -@@ -0,0 +1,36 @@ -+#pragma once -+/* -+ * This file is part of the libCEC(R) library. -+ * -+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. -+ * libCEC(R) is an original work, containing original code. -+ * -+ * libCEC(R) is a trademark of Pulse-Eight Limited. -+ * -+ * IMX adpater port is Copyright (C) 2013 by Stephan Rafin -+ * -+ * You can redistribute this file and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * -+ */ -+ -+namespace CEC -+{ -+ class CIMXCECAdapterDetection -+ { -+ public: -+ static bool FindAdapter(void); -+ }; -+} -diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake -index 828cdb2..8b47795 100644 ---- a/src/libcec/cmake/CheckPlatformSupport.cmake -+++ b/src/libcec/cmake/CheckPlatformSupport.cmake -@@ -8,6 +8,7 @@ - # HAVE_RANDR 1 if xrandr is supported - # HAVE_LIBUDEV 1 if udev is supported - # HAVE_RPI_API 1 if Raspberry Pi is supported -+# HAVE_IMX_API 1 if i.MX is supported - # HAVE_TDA995X_API 1 if TDA995X is supported - # HAVE_EXYNOS_API 1 if Exynos is supported - # HAVE_P8_USB_DETECT 1 if Pulse-Eight devices can be auto-detected -@@ -87,6 +88,15 @@ else() - list(APPEND CEC_SOURCES ${CEC_SOURCES_ADAPTER_RPI}) - endif() - -+ # i.MX -+ if (HAVE_IMX_API) -+ set(LIB_INFO "${LIB_INFO}, 'IMX'") -+ set(CEC_SOURCES_ADAPTER_IMX adapter/IMX/IMXCECAdapterDetection.cpp -+ adapter/IMX/IMXCECAdapterCommunication.cpp) -+ source_group("Source Files\\adapter\\IMX" FILES ${CEC_SOURCES_ADAPTER_IMX}) -+ list(APPEND CEC_SOURCES ${CEC_SOURCES_ADAPTER_IMX}) -+ endif() -+ - # TDA995x - check_include_files("tda998x_ioctl.h;comps/tmdlHdmiCEC/inc/tmdlHdmiCEC_Types.h" HAVE_TDA995X_API) - if (HAVE_TDA995X_API) -diff --git a/src/libcec/cmake/DisplayPlatformSupport.cmake b/src/libcec/cmake/DisplayPlatformSupport.cmake -index feee111..0309c56 100644 ---- a/src/libcec/cmake/DisplayPlatformSupport.cmake -+++ b/src/libcec/cmake/DisplayPlatformSupport.cmake -@@ -32,6 +32,12 @@ else() - message(STATUS "Raspberry Pi support: no") - endif() - -+if (HAVE_IMX_API) -+ message(STATUS "i.MX support: yes") -+else() -+ message(STATUS "i.MX support: no") -+endif() -+ - if (HAVE_TDA995X_API) - message(STATUS "TDA995x support: yes") - else() -diff --git a/src/libcec/env.h.in b/src/libcec/env.h.in -index a1a1f26..f90e729 100644 ---- a/src/libcec/env.h.in -+++ b/src/libcec/env.h.in -@@ -60,6 +60,9 @@ - /* Define to 1 for Raspberry Pi support */ - #cmakedefine HAVE_RPI_API @HAVE_RPI_API@ - -+/* Define to 1 for IMX support */ -+#cmakedefine HAVE_IMX_API @HAVE_IMX_API@ -+ - /* Define to 1 for TDA995x support */ - #cmakedefine HAVE_TDA995X_API @HAVE_TDA995X_API@ - --- -2.1.4 - diff --git a/package/libcec/patches/patch-src_cec-client_CMakeLists_txt b/package/libcec/patches/patch-src_cec-client_CMakeLists_txt deleted file mode 100644 index c6faee0ef..000000000 --- a/package/libcec/patches/patch-src_cec-client_CMakeLists_txt +++ /dev/null @@ -1,10 +0,0 @@ ---- libcec-185559110dc88aeca0915a90b3b369d2d42c0f7c.orig/src/cec-client/CMakeLists.txt 2015-05-22 14:47:17.000000000 -0500 -+++ libcec-185559110dc88aeca0915a90b3b369d2d42c0f7c/src/cec-client/CMakeLists.txt 2015-05-22 15:02:00.606971031 -0500 -@@ -44,6 +44,7 @@ if (NOT WIN32) - # curses - if (HAVE_CURSES_API) - target_link_libraries(cec-client curses) -+ target_link_libraries(cec-client tinfo) - endif() - - # rt diff --git a/package/libepoxy/Makefile b/package/libepoxy/Makefile index 2d69a3aa4..fa224ad12 100644 --- a/package/libepoxy/Makefile +++ b/package/libepoxy/Makefile @@ -4,22 +4,26 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libepoxy -PKG_VERSION:= 1.2 +PKG_VERSION:= 1.5.9 PKG_RELEASE:= 1 -PKG_HASH:= 42c328440f60a5795835c5ec4bdfc1329e75bba16b6e22b3a87ed17e9679e8f6 +PKG_HASH:= d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4 PKG_DESCR:= opengl function pointer management PKG_SECTION:= libs/misc -PKG_BUILDDEP:= util-macros-host mesa -PKG_SITES:= http://crux.nu/files/ +PKG_DEPENDS:= mesa +PKG_BUILDDEP:= util-macros-host mesa meson-host +PKG_SITES:= https://github.com/anholt/libepoxy/releases/download/$(PKG_VERSION)/ PKG_OPTS:= dev -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBEPOXY,libepoxy,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -AUTOTOOL_STYLE:= autogen +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + libepoxy-install: $(INSTALL_DIR) $(IDIR_LIBEPOXY)/usr/lib diff --git a/package/libevdev/Makefile b/package/libevdev/Makefile new file mode 100644 index 000000000..b78cca1b1 --- /dev/null +++ b/package/libevdev/Makefile @@ -0,0 +1,25 @@ +# 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:= libevdev +PKG_VERSION:= 1.12.0 +PKG_RELEASE:= 1 +PKG_HASH:= 2f729e3480695791f9482e8388bd723402b89f0eaf118057bbdea3cecee9b237 +PKG_DESCR:= wrapper library for evdev devices +PKG_SECTION:= libs/misc +PKG_URL:= add project url +PKG_SITES:= https://www.freedesktop.org/software/libevdev/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBEVDEV,libevdev,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +libevdev-install: + $(INSTALL_DIR) $(IDIR_LIBEVDEV)/usr/lib + $(CP) $(WRKINST)/usr/lib/libevdev*.so* \ + $(IDIR_LIBEVDEV)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index 496e69c82..5be1496ec 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -54,7 +54,7 @@ ifeq ($(ADK_TARGET_ARCH_SPARC64),y) LIBGPG_PREFIX:= sparc64-unknown-linux-gnu endif ifeq ($(ADK_TARGET_ARCH_X86),y) -LIBGPG_PREFIX:= i686-pc-linux-gnu +LIBGPG_PREFIX:= i686-unknown-linux-gnu endif ifeq ($(ADK_TARGET_ARCH_X86_64),y) LIBGPG_PREFIX:= x86_64-pc-linux-gnu diff --git a/package/libgtk3/Makefile b/package/libgtk3/Makefile index 2d90fdf39..e0e087dd7 100644 --- a/package/libgtk3/Makefile +++ b/package/libgtk3/Makefile @@ -4,18 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libgtk3 -PKG_VERSION:= 3.20.6 -PKG_EXTRAVER:= 3.20 +PKG_VERSION:= 3.24.31 +PKG_EXTRAVER:= 3.24 PKG_RELEASE:= 1 -PKG_HASH:= 3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2 +PKG_HASH:= 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 PKG_DESCR:= multi-platform toolkit for creating graphical user interfaces PKG_SECTION:= libs/misc PKG_DEPENDS:= glib cairo libxi libepoxy pango at-spi2-core PKG_DEPENDS+= at-spi2-atk libxext libxrender libx11 -PKG_DEPENDS+= libxcomposite libxdamage +PKG_DEPENDS+= libxcomposite libxdamage fribidi PKG_BUILDDEP:= cairo atk pango libXext renderproto libXrender PKG_BUILDDEP+= gdk-pixbuf libXcomposite libXdamage libX11 libXi PKG_BUILDDEP+= at-spi2-core at-spi2-atk gdk-pixbuf-host libepoxy +PKG_BUILDDEP+= fribidi PKG_NEEDS:= c++ PKG_URL:= http://www.gtk.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=gtk+/$(PKG_EXTRAVER)/) @@ -35,6 +36,7 @@ $(eval $(call PKG_template,LIBGTK3,libgtk3,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_D HOST_CFLAGS+= -I$(STAGING_HOST_DIR)/usr/include/glib-2.0 -I$(STAGING_HOST_DIR)/usr/include/gdk-pixbuf-2.0 HOST_LDFLAGS+= -lgobject-2.0 -lgmodule-2.0 -pthread -lrt -lglib-2.0 -lgdk_pixbuf-2.0 +CONFIGURE_ENV+= GLIB_COMPILE_RESOURCES=$(STAGING_HOST_DIR)/usr/bin/glib-compile-resources CONFIGURE_ARGS+= --disable-gtk-doc-html \ --disable-gtk-doc \ --disable-modules \ diff --git a/package/libinput/Makefile b/package/libinput/Makefile new file mode 100644 index 000000000..b28e30373 --- /dev/null +++ b/package/libinput/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:= libinput +PKG_VERSION:= 1.19.2 +PKG_RELEASE:= 1 +PKG_HASH:= 0fc39f0af3ee1a77c60c34bc45391a4d0879169f7c0f7bbbeb5eef590b98b883 +PKG_DESCR:= input library +PKG_DEPENDS:= mtdev libevdev +PKG_BUILDDEP:= mtdev libevdev +PKG_SECTION:= libs/misc +PKG_SITES:= https://www.freedesktop.org/software/libinput/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBINPUT,libinput,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +MESON_FLAGS+= -Dlibwacom=false \ + -Dtests=false \ + -Ddebug-gui=false + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +libinput-install: + $(INSTALL_DIR) $(IDIR_LIBINPUT)/usr/share/libinput + $(CP) $(WRKINST)/usr/share/libinput/* \ + $(IDIR_LIBINPUT)/usr/share/libinput/ + $(INSTALL_DIR) $(IDIR_LIBINPUT)/usr/lib + $(CP) $(WRKINST)/usr/lib/libinput*.so* \ + $(IDIR_LIBINPUT)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libmpdclient/Makefile b/package/libmpdclient/Makefile index 2d9f31c75..7a89ee3d8 100644 --- a/package/libmpdclient/Makefile +++ b/package/libmpdclient/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libmpdclient -PKG_VERSION:= 2.13 +PKG_VERSION:= 2.20 PKG_RELEASE:= 1 -PKG_HASH:= 5115bd52bc20a707c1ecc7587e6389c17305348e2132a66cf767c62fc55ed45d +PKG_HASH:= 18793f68e939c3301e34d8fcadea1f7daa24143941263cecadb80126194e277d PKG_DESCR:= library for interfacing music player daemon PKG_SECTION:= libs/audio PKG_BUILDDEP:= meson-host diff --git a/package/libmpdclient/patches/patch-src_socket_c b/package/libmpdclient/patches/patch-src_socket_c deleted file mode 100644 index 5417eccd7..000000000 --- a/package/libmpdclient/patches/patch-src_socket_c +++ /dev/null @@ -1,10 +0,0 @@ ---- libmpdclient-2.8.orig/src/socket.c 2010-01-01 15:17:56.000000000 +0100 -+++ libmpdclient-2.8/src/socket.c 2013-09-18 11:03:04.000000000 +0200 -@@ -35,6 +35,7 @@ - #include <stdlib.h> - #include <stdio.h> - #include <fcntl.h> -+#include <sys/select.h> - #include <unistd.h> - - #ifdef WIN32 diff --git a/package/libmpdclient/patches/patch-src_sync_c b/package/libmpdclient/patches/patch-src_sync_c deleted file mode 100644 index b9c5ec10d..000000000 --- a/package/libmpdclient/patches/patch-src_sync_c +++ /dev/null @@ -1,11 +0,0 @@ ---- libmpdclient-2.8.orig/src/sync.c 2010-01-01 15:17:56.000000000 +0100 -+++ libmpdclient-2.8/src/sync.c 2013-09-18 11:04:49.000000000 +0200 -@@ -34,6 +34,8 @@ - #include <stdlib.h> - #include <stdio.h> - #include <fcntl.h> -+#include <time.h> -+#include <sys/select.h> - #include <unistd.h> - - static bool diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile index 13abcdbeb..89e388cd4 100644 --- a/package/libpciaccess/Makefile +++ b/package/libpciaccess/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libpciaccess -PKG_VERSION:= 0.13.4 +PKG_VERSION:= 0.16 PKG_RELEASE:= 1 -PKG_HASH:= 74d92bda448e6fdb64fee4e0091255f48d625d07146a121653022ed3a0ca1f2f +PKG_HASH:= 84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27 PKG_DESCR:= pci access library PKG_SECTION:= x11/libs PKG_SITES:= http://www.x.org/releases/individual/lib/ diff --git a/package/libressl/Makefile b/package/libressl/Makefile index 4eeec9cfd..48e719dbc 100644 --- a/package/libressl/Makefile +++ b/package/libressl/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libressl -PKG_VERSION:= 3.4.1 -PKG_RELEASE:= 2 -PKG_HASH:= 107ceae6ca800e81cb563584c16afa36d6c7138fade94a2b3e9da65456f7c61c +PKG_VERSION:= 3.5.2 +PKG_RELEASE:= 1 +PKG_HASH:= 56feab8e21c3fa6549f8b7d7511658b8e98518162838a795314732654adf3e5f PKG_DESCR:= ssl/tls library PKG_SECTION:= libs/crypto PKG_URL:= http://www.libressl.org diff --git a/package/libsndfile/Makefile b/package/libsndfile/Makefile index 00faca413..bea414e08 100644 --- a/package/libsndfile/Makefile +++ b/package/libsndfile/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libsndfile -PKG_VERSION:= 1.0.27 +PKG_VERSION:= 1.0.28 PKG_RELEASE:= 1 -PKG_HASH:= a391952f27f4a92ceb2b4c06493ac107896ed6c76be9a613a4731f076d30fac0 +PKG_HASH:= 1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9 PKG_DESCR:= reading and writing files containing sampled sound PKG_SECTION:= libs/audio PKG_URL:= http://www.mega-nerd.com/libsndfile/ diff --git a/package/libwebp/Makefile b/package/libwebp/Makefile index 967a686d5..76b18bee4 100644 --- a/package/libwebp/Makefile +++ b/package/libwebp/Makefile @@ -4,24 +4,24 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libwebp -PKG_VERSION:= 0.3.1 +PKG_VERSION:= 1.2.2 PKG_RELEASE:= 1 -PKG_HASH:= b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7 +PKG_HASH:= 51e9297aadb7d9eb99129fe0050f53a11fcce38a0848fb2b0389e385ad93695e PKG_DESCR:= new image format for the web PKG_SECTION:= libs/image +PKG_BUILDEP:= cmake-host PKG_URL:= https://developers.google.com/speed/webp/ -PKG_SITES:= https://webp.googlecode.com/files/ +PKG_SITES:= https://github.com/webmproject/libwebp/archive/refs/tags/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= v${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk +CONFIG_STYLE:= cmake + $(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 include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libxkbcommon/Makefile b/package/libxkbcommon/Makefile new file mode 100644 index 000000000..2f91328c4 --- /dev/null +++ b/package/libxkbcommon/Makefile @@ -0,0 +1,34 @@ +# 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:= libxkbcommon +PKG_VERSION:= 1.3.1 +PKG_RELEASE:= 1 +PKG_HASH:= b3c710d27a2630054e1e1399c85b7f330ef03359b460f0c1b3b587fd01fe9234 +PKG_DESCR:= library for handling of keyboard descriptions +PKG_SECTION:= libs/misc +PKG_BUILDDEP:= meson-host +PKG_SITES:= https://xkbcommon.org/download/ +PKG_OPTS:= dev + +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 + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +libxkbcommon-install: + $(INSTALL_DIR) $(IDIR_LIBXKBCOMMON)/usr/lib + $(CP) $(WRKINST)/usr/lib/libxkbcommon*.so* \ + $(IDIR_LIBXKBCOMMON)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/ltp/Makefile b/package/ltp/Makefile index c13b9489e..0c5a4664f 100644 --- a/package/ltp/Makefile +++ b/package/ltp/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ltp -PKG_VERSION:= 20210524 +PKG_VERSION:= 20220121 PKG_RELEASE:= 1 PKG_DESCR:= linux test project -PKG_HASH:= 831678c64b85a8c24957c71632752537b2266890f2d2f352da9ed0ec45458189 +PKG_HASH:= ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a PKG_DEPENDS:= bash mke2fs mkfs PKG_NEEDS:= threads PKG_SECTION:= base/tests @@ -28,7 +28,8 @@ CONFIGURE_ARGS+= --with-open-posix-testsuite \ --without-power-management-testsuite \ --without-python \ --without-perl \ - --without-expect + --without-expect \ + --disable-metadata pre-configure: PATH="$(HOST_PATH)" $(MAKE) -C $(WRKBUILD) autotools diff --git a/package/ltp/patches/patch-Makefile b/package/ltp/patches/patch-Makefile new file mode 100644 index 000000000..0c47a972d --- /dev/null +++ b/package/ltp/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- ltp-full-20220121.orig/Makefile 2022-01-21 20:33:16.000000000 +0100 ++++ ltp-full-20220121/Makefile 2022-02-23 15:14:48.211207957 +0100 +@@ -62,7 +62,7 @@ $(1):: | $$(abs_top_builddir)/$$(basenam + endif + endef + +-COMMON_TARGETS += testcases tools metadata ++COMMON_TARGETS += testcases tools + + # Don't want to nuke the original files if we're installing in-build-tree. + ifneq ($(BUILD_TREE_STATE),$(BUILD_TREE_SRCDIR_INSTALL)) diff --git a/package/ltp/patches/patch-runtest_mm b/package/ltp/patches/patch-runtest_mm index 968b15e1e..39e829377 100644 --- a/package/ltp/patches/patch-runtest_mm +++ b/package/ltp/patches/patch-runtest_mm @@ -1,6 +1,6 @@ ---- ltp-full-20170929.orig/runtest/mm 2017-09-29 17:11:53.000000000 +0200 -+++ ltp-full-20170929/runtest/mm 2017-10-05 18:58:09.655415743 +0200 -@@ -100,4 +100,4 @@ overcommit_memory06 overcommit_memory -R +--- ltp-full-20220121.orig/runtest/mm 2022-01-21 20:33:16.000000000 +0100 ++++ ltp-full-20220121/runtest/mm 2022-02-23 14:13:22.672798426 +0100 +@@ -101,4 +101,4 @@ overcommit_memory06 overcommit_memory -R max_map_count max_map_count -i 10 diff --git a/package/ltp/patches/patch-runtest_sched b/package/ltp/patches/patch-runtest_sched deleted file mode 100644 index 829b1b3dd..000000000 --- a/package/ltp/patches/patch-runtest_sched +++ /dev/null @@ -1,13 +0,0 @@ ---- ltp-full-20190930.orig/runtest/sched 2019-09-30 13:30:25.000000000 +0200 -+++ ltp-full-20190930/runtest/sched 2019-10-29 14:36:35.718142489 +0100 -@@ -6,8 +6,8 @@ pth_str03 pth_str03 - time-schedule01 time-schedule - trace_sched01 trace_sched -c 1 - --hackbench01 hackbench 50 process 1000 --hackbench02 hackbench 20 thread 1000 -+#hackbench01 hackbench 50 process 500 -+#hackbench02 hackbench 20 thread 500 - - sched_cli_serv run_sched_cliserv.sh - # Run this stress test for 2 minutes diff --git a/package/ltp/patches/patch-runtest_syscalls b/package/ltp/patches/patch-runtest_syscalls index 3137ed3dc..24cf2017a 100644 --- a/package/ltp/patches/patch-runtest_syscalls +++ b/package/ltp/patches/patch-runtest_syscalls @@ -1,6 +1,6 @@ ---- ltp-full-20190930.orig/runtest/syscalls 2019-09-30 13:30:25.000000000 +0200 -+++ ltp-full-20190930/runtest/syscalls 2019-10-29 14:36:35.746144285 +0100 -@@ -330,7 +330,7 @@ fork08 fork08 +--- ltp-full-20220121.orig/runtest/syscalls 2022-01-21 20:33:16.000000000 +0100 ++++ ltp-full-20220121/runtest/syscalls 2022-02-23 14:13:22.704797624 +0100 +@@ -369,7 +369,7 @@ fork08 fork08 fork09 fork09 fork10 fork10 fork11 fork11 diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c index 0244804de..5befae030 100644 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c +++ b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c @@ -1,6 +1,6 @@ ---- ltp-full-20190930.orig/testcases/kernel/syscalls/fanotify/fanotify02.c 2019-09-30 13:30:25.000000000 +0200 -+++ ltp-full-20190930/testcases/kernel/syscalls/fanotify/fanotify02.c 2019-10-29 14:36:35.762145321 +0100 -@@ -10,6 +10,7 @@ +--- ltp-full-20220121.orig/testcases/kernel/syscalls/fanotify/fanotify02.c 2022-01-21 20:33:16.000000000 +0100 ++++ ltp-full-20220121/testcases/kernel/syscalls/fanotify/fanotify02.c 2022-02-23 14:13:22.712797424 +0100 +@@ -13,6 +13,7 @@ #define _GNU_SOURCE #include "config.h" diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c index 89c03fc74..d67ac8024 100644 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c +++ b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c @@ -1,6 +1,6 @@ ---- ltp-full-20190930.orig/testcases/kernel/syscalls/fanotify/fanotify04.c 2019-09-30 13:30:25.000000000 +0200 -+++ ltp-full-20190930/testcases/kernel/syscalls/fanotify/fanotify04.c 2019-10-29 14:36:35.806148130 +0100 -@@ -11,6 +11,7 @@ +--- ltp-full-20220121.orig/testcases/kernel/syscalls/fanotify/fanotify04.c 2022-01-21 20:33:16.000000000 +0100 ++++ ltp-full-20220121/testcases/kernel/syscalls/fanotify/fanotify04.c 2022-02-23 14:13:22.724797124 +0100 +@@ -13,6 +13,7 @@ #define _GNU_SOURCE #include "config.h" diff --git a/package/m4/Makefile b/package/m4/Makefile index a6af849a3..6973ed164 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.18 +PKG_VERSION:= 1.4.19 PKG_RELEASE:= 1 -PKG_HASH:= f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07 +PKG_HASH:= 63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96 PKG_DESCR:= macro processor PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host diff --git a/package/m4/patches/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/package/m4/patches/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch deleted file mode 100644 index 5c5c11b99..000000000 --- a/package/m4/patches/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Mon, 5 Mar 2018 10:56:29 -0800 -Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Daniel P. Berrangé in: -https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html -* lib/fbufmode.c (fbufmode): -* lib/fflush.c (clear_ungetc_buffer_preserving_position) -(disable_seek_optimization, rpl_fflush): -* lib/fpending.c (__fpending): -* lib/fpurge.c (fpurge): -* lib/freadable.c (freadable): -* lib/freadahead.c (freadahead): -* lib/freading.c (freading): -* lib/freadptr.c (freadptr): -* lib/freadseek.c (freadptrinc): -* lib/fseeko.c (fseeko): -* lib/fseterr.c (fseterr): -* lib/fwritable.c (fwritable): -* lib/fwriting.c (fwriting): -Check _IO_EOF_SEEN instead of _IO_ftrylockfile. -* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: -Define if not already defined. - -[yann.morin.1998@free.fr: partially backport from upstream gnulib] -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> - ---- - lib/fflush.c | 6 +++--- - lib/fpending.c | 2 +- - lib/fpurge.c | 2 +- - lib/freadahead.c | 2 +- - lib/freading.c | 2 +- - lib/fseeko.c | 4 ++-- - lib/stdio-impl.h | 6 ++++++ - 7 files changed, 15 insertions(+), 9 deletions(-) - -diff --git a/lib/fflush.c b/build-aux/gnulib/lib/fflush.c -index 983ade0ff..a6edfa105 100644 ---- a/lib/fflush.c -+++ b/lib/fflush.c -@@ -33,7 +33,7 @@ - #undef fflush - - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ - static void -@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) - - #endif - --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) - - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) - if (stream == NULL || ! freading (stream)) - return fflush (stream); - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - -diff --git a/lib/fpending.c b/build-aux/gnulib/lib/fpending.c -index c84e3a5b4..789f50e4e 100644 ---- a/lib/fpending.c -+++ b/lib/fpending.c -@@ -32,7 +32,7 @@ __fpending (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return fp->_IO_write_ptr - fp->_IO_write_base; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -diff --git a/lib/fpurge.c b/build-aux/gnulib/lib/fpurge.c -index b1d417c7a..3aedcc373 100644 ---- a/lib/fpurge.c -+++ b/lib/fpurge.c -@@ -62,7 +62,7 @@ fpurge (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ -diff --git a/lib/freadahead.c b/build-aux/gnulib/lib/freadahead.c -index c2ecb5b28..23ec76ee5 100644 ---- a/lib/freadahead.c -+++ b/lib/freadahead.c -@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *); - size_t - freadahead (FILE *fp) - { --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return (fp->_IO_read_end - fp->_IO_read_ptr) -diff --git a/lib/freading.c b/build-aux/gnulib/lib/freading.c -index 73c28acdd..c24d0c88a 100644 ---- a/lib/freading.c -+++ b/lib/freading.c -@@ -31,7 +31,7 @@ freading (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); -diff --git a/lib/fseeko.c b/build-aux/gnulib/lib/fseeko.c -index 0101ab55f..193f4e8ce 100644 ---- a/lib/fseeko.c -+++ b/lib/fseeko.c -@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -diff --git a/lib/stdio-impl.h b/build-aux/gnulib/lib/stdio-impl.h -index 78d896e9f..05c5752a2 100644 ---- a/lib/stdio-impl.h -+++ b/lib/stdio-impl.h -@@ -18,6 +18,12 @@ - the same implementation of stdio extension API, except that some fields - have different naming conventions, or their access requires some casts. */ - -+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this -+ problem by defining it ourselves. FIXME: Do not rely on glibc -+ internals. */ -+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN -+# define _IO_IN_BACKUP 0x100 -+#endif - - /* BSD stdio derived implementations. */ - --- -2.14.1 - diff --git a/package/m4/patches/patch-lib_vasnprintf_c b/package/m4/patches/patch-lib_vasnprintf_c deleted file mode 100644 index 07b989cc6..000000000 --- a/package/m4/patches/patch-lib_vasnprintf_c +++ /dev/null @@ -1,28 +0,0 @@ ---- m4-1.4.18.orig/lib/vasnprintf.c 2016-12-31 14:54:42.000000000 +0100 -+++ m4-1.4.18/lib/vasnprintf.c 2018-02-24 20:59:00.000000000 +0100 -@@ -4858,7 +4858,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ -+ && !defined __UCLIBC__) \ -+ || (defined __APPLE__ && defined __MACH__) \ -+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; -@@ -4872,6 +4875,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - in format strings in writable memory may crash the program - (if compiled with _FORTIFY_SOURCE=2), so we should avoid it - in this situation. */ -+ /* On Mac OS X 10.3 or newer, we know that snprintf's return -+ value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 -+ and gl_SNPRINTF_TRUNCATION_C99 pass. -+ Therefore we can avoid using %n in this situation. -+ On Mac OS X 10.13 or newer, the use of %n in format strings -+ in writable memory by default crashes the program, so we -+ should avoid it in this situation. */ - /* On native Windows systems (such as mingw), we can avoid using - %n because: - - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, diff --git a/package/mesa/Makefile b/package/mesa/Makefile index 9a93ed590..91950f36e 100644 --- a/package/mesa/Makefile +++ b/package/mesa/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mesa PKG_VERSION:= 18.3.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= aaf17638dcf5a90b93b6389e152fdc9ef147768b09598f24d2c5cf482fcfc705 PKG_DESCR:= 3d graphics library PKG_SECTION:= libs/video @@ -48,6 +48,8 @@ mesa-install: $(IDIR_MESA)/usr/lib $(CP) $(WRKINST)/usr/lib/libglapi.so* \ $(IDIR_MESA)/usr/lib + $(CP) $(WRKINST)/usr/lib/libgbm.so* \ + $(IDIR_MESA)/usr/lib ${CP} $(WRKINST)/usr/lib/dri/*.so \ ${IDIR_MESA}/usr/lib/dri/ diff --git a/package/meson/src/cross-compilation.conf.in b/package/meson/src/cross-compilation.conf.in index a636ca329..eb14312bc 100644 --- a/package/meson/src/cross-compilation.conf.in +++ b/package/meson/src/cross-compilation.conf.in @@ -9,11 +9,13 @@ cpp = '@TARGET_CROSS@g++' ar = '@TARGET_CROSS@ar' strip = '@TARGET_CROSS@strip' pkgconfig = '@STAGING_HOST_DIR@/usr/bin/pkg-config' + [properties] c_args = [@TARGET_CFLAGS@] c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] +needs_exe_wrapper = true [host_machine] system = 'linux' diff --git a/package/midori/Makefile b/package/midori/Makefile deleted file mode 100644 index 6f45300e0..000000000 --- a/package/midori/Makefile +++ /dev/null @@ -1,49 +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:= midori -PKG_VERSION:= 0.5.11 -PKG_RELEASE:= 2 -PKG_HASH:= 3b8f3a0fe8283fcbb0f9c88b2165e2689d3e18f7c1b5d275fff97cf20e7be198 -PKG_DESCR:= graphical web browser -PKG_SECTION:= x11/apps -PKG_DEPENDS:= libnotify webkitgtk gcr pango libatk cairo libsqlite -PKG_DEPENDS+= gdk-pixbuf libgtk3 p11-kit libxcomposite at-spi2-atk -PKG_DEPENDS+= libpng icu4c gstreamer gst-plugins-base dbus libgnutls -PKG_DEPENDS+= libxslt libjpeg-turbo libtasn1 libnettle enchant -PKG_DEPENDS+= libgmp at-spi2-core libxext -PKG_BUILDDEP:= cmake-host vala-host libnotify webkitgtk gcr -PKG_BUILDDEP+= librsvg-host librsvg pango atk cairo sqlite -PKG_BUILDDEP+= gdk-pixbuf libgtk3 p11-kit libpng icu4c gstreamer -PKG_BUILDDEP+= libXext -PKG_URL:= http://www.midori-browser.org -PKG_SITES:= http://distfiles.openadk.org/ - -PKG_ARCH_DEPENDS:= !mips - -WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,MIDORI,midori,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= cmake -CMAKE_FLAGS+= -DUSE_GTK3=ON \ - -DHALF_BRO_INCOM_WEBKIT2=ON \ - -DENABLE_NLS=OFF \ - -DUSE_ZEITGEIST=OFF - -midori-install: - $(INSTALL_DIR) $(IDIR_MIDORI)/usr/lib - $(CP) $(WRKINST)/usr/lib/* \ - $(IDIR_MIDORI)/usr/lib - $(INSTALL_DIR) $(IDIR_MIDORI)/usr/share - $(CP) $(WRKINST)/usr/share/* \ - $(IDIR_MIDORI)/usr/share - $(INSTALL_DIR) $(IDIR_MIDORI)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/midori \ - $(IDIR_MIDORI)/usr/bin - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/midori/patches/patch-CMakeLists_txt b/package/midori/patches/patch-CMakeLists_txt deleted file mode 100644 index 2129969f6..000000000 --- a/package/midori/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,13 +0,0 @@ ---- midori-0.5.11.orig/CMakeLists.txt 2015-08-30 13:56:26.000000000 +0200 -+++ midori-0.5.11/CMakeLists.txt 2016-04-03 15:01:39.481595419 +0200 -@@ -206,8 +206,8 @@ if (HALF_BRO_INCOM_WEBKIT2) - elseif (USE_GTK3) - pkg_check_modules(DEPS_GTK REQUIRED - gtk+-3.0>=3.10.0 -- webkitgtk-3.0>=1.8.1 -- javascriptcoregtk-3.0 -+ webkitgtk-4.0>=1.8.1 -+ javascriptcoregtk-4.0 - ) - add_definitions("-DGTK_VERSION=\"${DEPS_GTK_gtk+-3.0_VERSION}\"") - add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkitgtk-3.0_VERSION}\"") diff --git a/package/minijail/Makefile b/package/minijail/Makefile new file mode 100644 index 000000000..4582ff62f --- /dev/null +++ b/package/minijail/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:= minijail +PKG_VERSION:= v17 +PKG_RELEASE:= 1 +PKG_HASH:= 1ee5a5916491a32c121c7422b4d8c16481c0396a3acab34bf1c44589dcf810ae +PKG_DESCR:= sandboxing and containment tool +PKG_SECTION:= sys/misc +PKG_DEPENDS:= libcap +PKG_BUILDDEP:= libcap +PKG_URL:= https://google.github.io/minijail/ +PKG_SITES:= https://github.com/google/minijail/archive/refs/tags/ + +DISTFILES:= linux-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-linux-${PKG_VERSION} + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MINIJAIL,minijail,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual + +minijail-install: + $(INSTALL_DIR) $(IDIR_MINIJAIL)/lib + $(CP) $(WRKBUILD)/libminijailpreload.so \ + $(IDIR_MINIJAIL)/lib + $(INSTALL_DIR) $(IDIR_MINIJAIL)/lib + $(CP) $(WRKBUILD)/libminijail.so \ + $(IDIR_MINIJAIL)/lib + $(INSTALL_DIR) $(IDIR_MINIJAIL)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/minijail0 \ + $(IDIR_MINIJAIL)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/minijail/patches/patch-common_mk b/package/minijail/patches/patch-common_mk new file mode 100644 index 000000000..23dc08e77 --- /dev/null +++ b/package/minijail/patches/patch-common_mk @@ -0,0 +1,15 @@ +--- minijail-linux-v17.orig/common.mk 2021-08-11 08:01:06.000000000 +0200 ++++ minijail-linux-v17/common.mk 2022-01-13 04:53:35.432449083 +0100 +@@ -306,12 +306,6 @@ check_libs_cxx = $(call check_compile,$( + check_cc = $(call check_compile_cc,'int main() { return 0; }',$(1),$(2)) + check_cxx = $(call check_compile_cxx,'int main() { return 0; }',$(1),$(2)) + +-# Choose the stack protector flags based on whats supported by the compiler. +-SSP_CFLAGS := $(call check_cc,-fstack-protector-strong) +-ifeq ($(SSP_CFLAGS),) +- SSP_CFLAGS := $(call check_cc,-fstack-protector-all) +-endif +- + # To update these from an including Makefile: + # CXXFLAGS += -mahflag # Append to the list + # CXXFLAGS := -mahflag $(CXXFLAGS) # Prepend to the list diff --git a/package/minijail/patches/patch-libminijail_c b/package/minijail/patches/patch-libminijail_c new file mode 100644 index 000000000..67b06094e --- /dev/null +++ b/package/minijail/patches/patch-libminijail_c @@ -0,0 +1,12 @@ +--- minijail-linux-v17.orig/libminijail.c 2021-08-11 08:01:06.000000000 +0200 ++++ minijail-linux-v17/libminijail.c 2022-01-13 04:24:57.190934413 +0100 +@@ -2620,9 +2620,6 @@ static int fd_is_open(int fd) + return fcntl(fd, F_GETFD) != -1 || errno != EBADF; + } + +-static_assert(FD_SETSIZE >= MAX_PRESERVED_FDS * 2 - 1, +- "If true, ensure_no_fd_conflict will always find an unused fd."); +- + /* If parent_fd will be used by a child fd, move it to an unused fd. */ + static int ensure_no_fd_conflict(const fd_set *child_fds, + int child_fd, int *parent_fd) diff --git a/package/mpc/Makefile b/package/mpc/Makefile index 7ccdb9a1e..6c8da29a4 100644 --- a/package/mpc/Makefile +++ b/package/mpc/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mpc -PKG_VERSION:= 0.28 +PKG_VERSION:= 0.34 PKG_RELEASE:= 1 -PKG_HASH:= a4337d06c85dc81a638821d30fce8a137a58d13d510be34a11c1cce95cabc547 +PKG_HASH:= 691e3f3654bc10d022bb0310234d0bc2d8c075a698f09924d9ebed8f506fda20 PKG_DESCR:= music player client PKG_SECTION:= mm/audio PKG_DEPENDS:= libmpdclient @@ -18,8 +18,11 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,MPC,mpc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --disable-iconv -CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson mpc-install: $(INSTALL_DIR) $(IDIR_MPC)/usr/bin diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 82e02ab0a..7f849dd3b 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -4,17 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mpd -PKG_VERSION:= 0.20.13 +PKG_VERSION:= 0.23.5 PKG_RELEASE:= 1 -PKG_HASH:= 46c1c534d80a52de00263e8ef43a6011ff9d765232443749539ef26b1b48ff40 +PKG_HASH:= f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 PKG_DESCR:= music player daemon PKG_SECTION:= mm/audio -PKG_DEPENDS:= libmpdclient boost libncurses libexpat -PKG_BUILDDEP:= libmpdclient boost ncurses expat +PKG_DEPENDS:= libmpdclient boost libncurses libexpat libsqlite +PKG_BUILDDEP:= libmpdclient boost ncurses expat sqlite PKG_FDEPENDS:= libmpdclient PKG_NEEDS:= threads c++ data PKG_URL:= http://www.musicpd.org/ -PKG_SITES:= http://www.musicpd.org/download/mpd/0.20/ +PKG_SITES:= http://www.musicpd.org/download/mpd/0.23/ PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG @@ -91,7 +91,7 @@ PKGFD_WITH_CURL:= enable CURL support PKGFS_WITH_CURL:= libcurl PKGFB_WITH_CURL:= curl ifeq ($(ADK_PACKAGE_MPD_WITH_CURL),y) -PKG_FDEPENDS+= libcurl +PKG_FDEPENDS+= curl endif PKGFD_WITH_SAMPLERATE:= enable samplerate support @@ -135,142 +135,128 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,MPD,mpd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_FDEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE TARGET_CFLAGS+= -std=gnu99 -CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no -CONFIGURE_ARGS+= --disable-fifo \ - --disable-oss \ - --disable-icu \ - --disable-bzip2 \ - --disable-libwrap \ - --disable-smbclient \ - --disable-mpc \ - --disable-wavpack \ - --disable-modplug \ - --disable-sqlite \ - --disable-mpg123 \ - --disable-soundcloud \ - --enable-inotify \ - --enable-pipe-output + +MESON_FLAGS+= -Dfifo=false \ + -Doss=disabled ifneq ($(ADK_PACKAGE_MPD_WITH_JACK),) -CONFIGURE_ARGS+= --enable-jack +MESON_FLAGS+= -Djack=enabled else -CONFIGURE_ARGS+= --disable-jack +MESON_FLAGS+= -Djack=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_SNDFILE),) -CONFIGURE_ARGS+= --enable-sndfile +MESON_FLAGS+= -Dsndfile=enabled else -CONFIGURE_ARGS+= --disable-sndfile +MESON_FLAGS+= -Dsndfile=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_HTTPD),) -CONFIGURE_ARGS+= --enable-httpd-output +MESON_FLAGS+= -Dhttpd=true else -CONFIGURE_ARGS+= --disable-httpd-output +MESON_FLAGS+= -Dhttpd=false endif ifneq ($(ADK_PACKAGE_MPD_WITH_AVAHI),) -CONFIGURE_ARGS+= --with-zeroconf=avahi +MESON_FLAGS+= -Dzeroconf=avahi else -CONFIGURE_ARGS+= --with-zeroconf=no +MESON_FLAGS+= -Dzeroconf=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_PULSE),) -CONFIGURE_ARGS+= --enable-pulse +MESON_FLAGS+= -Dpulse=enabled else -CONFIGURE_ARGS+= --disable-pulse +MESON_FLAGS+= -Dpulse=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),) -CONFIGURE_ARGS+= --enable-alsa +MESON_FLAGS+= -Dalsa=enabled else -CONFIGURE_ARGS+= --disable-alsa +MESON_FLAGS+= -Dalsa=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_AO),) -CONFIGURE_ARGS+= --enable-ao +MESON_FLAGS+= -Dao=enabled else -CONFIGURE_ARGS+= --disable-ao +MESON_FLAGS+= -Dao=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),) -CONFIGURE_ARGS+= --enable-id3 --enable-mad +MESON_FLAGS+= -Dmad=enabled else -CONFIGURE_ARGS+= --disable-id3 --disable-mad +MESON_FLAGS+= -Dmad=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_MP4),) -CONFIGURE_ARGS+= --enable-aac +MESON_FLAGS+= -Dfaad=enabled else -CONFIGURE_ARGS+= --disable-aac +MESON_FLAGS+= -Dfaad=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_OGG),) -CONFIGURE_ARGS+= --enable-vorbis +MESON_FLAGS+= -Dvorbis=enabled else -CONFIGURE_ARGS+= --disable-vorbis +MESON_FLAGS+= -Dvorbis=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_TREMOR),) -CONFIGURE_ARGS+= \ - --disable-vorbis \ - --with-tremor \ - --with-tremor-includes=$(STAGING_TARGET_DIR)/usr/include \ - --with-tremor-libraries=$(STAGING_TARGET_DIR)/usr/lib +MESON_FLAGS+= -Dtremor=enabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_FLAC),) -CONFIGURE_ARGS+= --enable-flac +MESON_FLAGS+= -Dflac=enabled else -CONFIGURE_ARGS+= --disable-flac +MESON_FLAGS+= -Dflac=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_WAV),) -CONFIGURE_ARGS+= --enable-audiofile +MESON_FLAGS+= -Daudiofile=enabled else -CONFIGURE_ARGS+= --disable-audiofile +MESON_FLAGS+= -Daudiofile=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_SHOUT),) -CONFIGURE_ARGS+= --enable-shout \ - --enable-lame-encoder \ - --enable-vorbis-encoder +MESON_FLAGS+= -Dshout=enabled else -CONFIGURE_ARGS+= --disable-shout \ - --disable-lame-encoder \ - --disable-vorbis-encoder +MESON_FLAGS+= -Dshout=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_CURL),) -CONFIGURE_ARGS+= --enable-curl +MESON_FLAGS+= -Dcurl=enabled else -CONFIGURE_ARGS+= --disable-curl +MESON_FLAGS+= -Dcurl=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_MMS),) -CONFIGURE_ARGS+= --enable-mms +MESON_FLAGS+= -Dmms=enabled else -CONFIGURE_ARGS+= --disable-mms +MESON_FLAGS+= -Dmms=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_FFMPEG),) -CONFIGURE_ARGS+= --enable-ffmpeg +MESON_FLAGS+= -Dffmpeg=enabled else -CONFIGURE_ARGS+= --disable-ffmpeg +MESON_FLAGS+= -Dffmpeg=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_SAMPLERATE),) -CONFIGURE_ARGS+= --enable-lsr +MESON_FLAGS+= -Dlibsamplerate=enabled else -CONFIGURE_ARGS+= --disable-lsr +MESON_FLAGS+= -Dlibsamplerate=disabled endif ifneq ($(ADK_PACKAGE_MPD_WITH_OPUS),) -CONFIGURE_ARGS+= --enable-opus +MESON_FLAGS+= -Dopus=enabled else -CONFIGURE_ARGS+= --disable-opus +MESON_FLAGS+= -Dopus=disabled endif mpd-install: diff --git a/package/mpd/files/mpd.conf b/package/mpd/files/mpd.conf index 4c6cfe471..7e1c947d5 100644 --- a/package/mpd/files/mpd.conf +++ b/package/mpd/files/mpd.conf @@ -8,7 +8,6 @@ db_file "/data/mpd/database" pid_file "/var/run/mpd/mpd.pid" log_file "syslog" filesystem_charset "UTF-8" -id3v1_encoding "UTF-8" mixer_type "software" # An example of an ALSA output diff --git a/package/mpd/patches/patch-src_lib_alsa_Error_cxx b/package/mpd/patches/patch-src_lib_alsa_Error_cxx new file mode 100644 index 000000000..9803394d1 --- /dev/null +++ b/package/mpd/patches/patch-src_lib_alsa_Error_cxx @@ -0,0 +1,10 @@ +--- mpd-0.23.5.orig/src/lib/alsa/Error.cxx 2021-12-01 20:00:00.000000000 +0100 ++++ mpd-0.23.5/src/lib/alsa/Error.cxx 2022-01-09 00:34:09.731074233 +0100 +@@ -29,6 +29,7 @@ + + #include "Error.hxx" + ++#include <stdarg.h> + #include <alsa/error.h> + + namespace Alsa { diff --git a/package/mtdev/Makefile b/package/mtdev/Makefile new file mode 100644 index 000000000..b4e2bfd3c --- /dev/null +++ b/package/mtdev/Makefile @@ -0,0 +1,26 @@ +# 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:= mtdev +PKG_VERSION:= 1.1.6 +PKG_RELEASE:= 1 +PKG_HASH:= 1325f389a2f25cd5f5a8ea4d29aad24aa7c3ec30401d679400dd79eb9c0a8dbb +PKG_DESCR:= library which transforms all variants of kernel MT events +PKG_SECTION:= libs/misc +PKG_SITES:= https://bitmath.org/code/mtdev/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MTDEV,mtdev,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +mtdev-install: + $(INSTALL_DIR) $(IDIR_MTDEV)/usr/lib + $(CP) $(WRKINST)/usr/lib/libmtdev*.so* \ + $(IDIR_MTDEV)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/mutt/Makefile b/package/mutt/Makefile index e268f761e..f88c17281 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mutt -PKG_VERSION:= 1.8.3 +PKG_VERSION:= 2.1.5 PKG_RELEASE:= 1 -PKG_HASH:= 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42 +PKG_HASH:= 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 PKG_DESCR:= mail client for console PKG_SECTION:= net/mail PKG_DEPENDS:= libncurses diff --git a/package/neon/Makefile b/package/neon/Makefile index 936a1e030..3501eceed 100644 --- a/package/neon/Makefile +++ b/package/neon/Makefile @@ -4,16 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= neon -PKG_VERSION:= 0.30.1 +PKG_VERSION:= 0.32.1 PKG_RELEASE:= 1 -PKG_HASH:= 00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd +PKG_HASH:= 05c54bc115030c89e463a4fb28d3a3f8215879528ba5ca70d676d3d21bf3af52 PKG_DESCR:= http and webdav library PKG_SECTION:= libs/misc PKG_DEPENDS:= libxml2 zlib libressl PKG_BUILDDEP:= libxml2 zlib libressl PKG_NEEDS:= threads -PKG_URL:= http://webdav.org/neon/ -PKG_SITES:= http://webdav.org/neon/ +PKG_URL:= https://notroj.github.io/neon/ +PKG_SITES:= https://notroj.github.io/neon/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/nmap/Makefile b/package/nmap/Makefile index eb6f34892..d8164a379 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= nmap -PKG_VERSION:= 7.40 +PKG_VERSION:= 7.92 PKG_RELEASE:= 1 -PKG_HASH:= 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 +PKG_HASH:= a5479f2f8a6b0b2516767d2f7189c386c1dc858d997167d7ec5cfc798c7571a1 PKG_DESCR:= utility for network exploration or security auditing PKG_SECTION:= net/security -PKG_DEPENDS:= libdnet libpcap libpcre -PKG_BUILDDEP:= libdnet libpcap pcre +PKG_DEPENDS:= libdnet libpcap libpcre zlib +PKG_BUILDDEP:= libdnet libpcap pcre zlib PKG_NEEDS:= c++ PKG_URL:= http://nmap.org/ PKG_SITES:= http://download.insecure.org/nmap/dist/ @@ -26,16 +26,18 @@ TARGET_LDFLAGS+= -lpthread CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no CONFIGURE_ARGS+= --without-openssl \ --without-zenmap \ + --without-nping \ --without-ndiff \ --without-liblua \ --with-libpcap="${STAGING_TARGET_DIR}/usr" \ --with-libpcre="${STAGING_TARGET_DIR}/usr" \ + --with-zlib="${STAGING_TARGET_DIR}/usr" \ --enable-static nmap-install: ${INSTALL_DIR} ${IDIR_NMAP}/usr/share/nmap ${INSTALL_DIR} ${IDIR_NMAP}/usr/bin - for file in mac-prefixes os-db protocols rpc service-probes services; do \ + for file in payloads mac-prefixes os-db protocols rpc service-probes services; do \ ${CP} ${WRKINST}/usr/share/nmap/nmap-$$file ${IDIR_NMAP}/usr/share/nmap; \ done ${INSTALL_BIN} ${WRKINST}/usr/bin/nmap ${IDIR_NMAP}/usr/bin/ diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 863074bee..867088309 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -4,15 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= opensc -PKG_VERSION:= 0.15.0 +PKG_VERSION:= 0.22.0 PKG_RELEASE:= 1 -PKG_HASH:= 7c8600a37d11f82410699ee5c60bfebc46f6714d0d87b4125dd99215c87d4db8 +PKG_HASH:= 8d4e5347195ebea332be585df61dcc470331c26969e4b0447c851fb0844c7186 PKG_DESCR:= utilities to access smart cards PKG_SECTION:= app/crypto PKG_BUILDDEP:= openct pcsc-lite readline libressl PKG_DEPENDS:= libopensc libopenct pcsc-lite libreadline libressl PKG_URL:= https://github.com/OpenSC/OpenSC/wiki -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=opensc/} +PKG_SITES:= https://github.com/OpenSC/OpenSC/releases/download/$(PKG_VERSION)/ PKG_LIBNAME:= libopensc PKG_OPTS:= dev @@ -29,7 +29,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,OPENSC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBOPENSC,libopensc,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSC},${PKGSD_LIBOPENSC},${PKGSC_LIBOPENSC},${PKG_OPTS})) -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --disable-man \ --disable-iconv \ --disable-pcsc \ diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 74f8fe117..dacaed7b3 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 8.8p1 +PKG_VERSION:= 9.0p1 PKG_RELEASE:= 1 -PKG_HASH:= 4590890ea9bb9ace4f71ae331785a3a5823232435161960ed5fc86588f331fe9 +PKG_HASH:= 03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security PKG_BUILDDEP:= zlib libressl diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 5a48daf15..41ec00201 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -4,22 +4,20 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openswan -PKG_VERSION:= 2.6.51.5 +PKG_VERSION:= 3.0.0 PKG_RELEASE:= 1 -PKG_HASH:= 4124f4ce970089f301c34b9c48f54b021cf6b2b8813877942337f8022104f70d +PKG_HASH:= 69fe7a71e54aaf0ea93b874db4963057c1ff4904b3617b36f2c9be2010c23331 PKG_DESCR:= ipsec software PKG_SECTION:= net/security PKG_DEPENDS:= libgmp PKG_BUILDDEP:= gmp PKG_NEEDS:= threads PKG_URL:= http://www.openswan.org/ -PKG_SITES:= http://www.openswan.org/download/ +PKG_SITES:= https://github.com/xelerance/Openswan/archive/refs/tags/ PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -# GLOB_BRACE usage -PKG_LIBC_DEPENDS:= uclibc-ng glibc +DISTFILES:= v${PKG_VERSION}.tar.gz +WRKDIST= $(WRKDIR)/Openswan-$(PKG_VERSION) include ${ADK_TOPDIR}/mk/package.mk @@ -32,7 +30,9 @@ XAKE_FLAGS+= KERNELSRC="${LINUX_DIR}" \ MODPROBE="insmod" \ OSDEP="linux" \ WERROR="" \ - BUILDENV="linux" + BUILDENV="linux" \ + ARCH=$(ADK_TARGET_KARCH) \ + V=1 ALL_TARGET:= programs openswan-install: diff --git a/package/openswan/patches/patch-Makefile_inc b/package/openswan/patches/patch-Makefile_inc index 2b3529ed1..ca00c7598 100644 --- a/package/openswan/patches/patch-Makefile_inc +++ b/package/openswan/patches/patch-Makefile_inc @@ -1,15 +1,20 @@ ---- openswan-2.6.51.5.orig/Makefile.inc 2019-06-14 21:35:45.000000000 +0200 -+++ openswan-2.6.51.5/Makefile.inc 2019-10-07 20:44:06.511702433 +0200 -@@ -194,10 +194,10 @@ BISONOSFLAGS= - #Example for a cross compile: - #USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib - GCC_LINT ?= -DGCC_LINT --USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA} -+USERCOMPILE?=-g -fPIC -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA} +--- Openswan-3.0.0.orig/Makefile.inc 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/Makefile.inc 2022-03-21 19:40:09.287360911 +0100 +@@ -188,7 +188,7 @@ BISONOSFLAGS= + # USER* should be empty for end users/vendors to use + + OPTIMIZE?=-g -O3 +-GCCOPTIONS=${OPTIMIZE} -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA} ++GCCOPTIONS=${OPTIMIZE} -fPIE -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA} + # extra compile flags, for userland and kernel stuff, e.g. -g for debug info + # you can add to this in the defaults file using += + # -DGCC_LINT uses gcc-specific declarations to improve compile-time diagnostics. +@@ -199,7 +199,7 @@ GCC_LINT ?= -DGCC_LINT + USERCOMPILE?=${GCCOPTIONS} # on fedora/rhel #USERCOMPILE?=-g -O2 -g -pipe -Wall -Wp,-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fPIE -pie -DSUPPORT_BROKEN_ANDROID_ICS -KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM -+KLIPSCOMPILE=-O2 -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM ++KLIPSCOMPILE=-O2 -fPIE -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM # Additional debugging for developers (warning: can crash openswan!) #USERCOMPILE?=-g -DLEAK_DETECTIVE ${LIBEFENCE} # You can also run this before starting openswan on glibc systems: diff --git a/package/openswan/patches/patch-include_arpa_nameser_h b/package/openswan/patches/patch-include_arpa_nameser_h deleted file mode 100644 index a59cd15b2..000000000 --- a/package/openswan/patches/patch-include_arpa_nameser_h +++ /dev/null @@ -1,128 +0,0 @@ ---- openswan-2.6.38.orig/include/arpa/nameser.h 2012-03-23 22:33:43.000000000 +0100 -+++ openswan-2.6.38/include/arpa/nameser.h 2014-03-26 19:50:18.000000000 +0100 -@@ -55,7 +55,6 @@ - - #include <sys/param.h> - #include <sys/types.h> --#include <sys/cdefs.h> - - /* - * Revision information. This is the release date in YYYYMMDD format. -@@ -505,62 +504,66 @@ typedef enum __ns_cert_types { - #define ns_makecanon __ns_makecanon - #define ns_samename __ns_samename - --__BEGIN_DECLS --int ns_msg_getflag __P((ns_msg, int)); --u_int ns_get16 __P((const u_char *)); --u_long ns_get32 __P((const u_char *)); --void ns_put16 __P((u_int, u_char *)); --void ns_put32 __P((u_long, u_char *)); --int ns_initparse __P((const u_char *, int, ns_msg *)); --int ns_skiprr __P((const u_char *, const u_char *, ns_sect, int)); --int ns_parserr __P((ns_msg *, ns_sect, int, ns_rr *)); --int ns_sprintrr __P((const ns_msg *, const ns_rr *, -- const char *, const char *, char *, size_t)); --int ns_sprintrrf __P((const u_char *, size_t, const char *, -+#ifdef __cplusplus -+extern "C" { -+#endif -+int ns_msg_getflag (ns_msg, int); -+u_int ns_get16 (const u_char *); -+u_long ns_get32 (const u_char *); -+void ns_put16 (u_int, u_char *); -+void ns_put32 (u_long, u_char *); -+int ns_initparse (const u_char *, int, ns_msg *); -+int ns_skiprr (const u_char *, const u_char *, ns_sect, int); -+int ns_parserr (ns_msg *, ns_sect, int, ns_rr *); -+int ns_sprintrr (const ns_msg *, const ns_rr *, -+ const char *, const char *, char *, size_t); -+int ns_sprintrrf (const u_char *, size_t, const char *, - ns_class, ns_type, u_long, const u_char *, - size_t, const char *, const char *, -- char *, size_t)); --int ns_format_ttl __P((u_long, char *, size_t)); --int ns_parse_ttl __P((const char *, u_long *)); --u_int32_t ns_datetosecs __P((const char *cp, int *errp)); --int ns_name_ntol __P((const u_char *, u_char *, size_t)); --int ns_name_ntop __P((const u_char *, char *, size_t)); --int ns_name_pton __P((const char *, u_char *, size_t)); --int ns_name_unpack __P((const u_char *, const u_char *, -- const u_char *, u_char *, size_t)); --int ns_name_pack __P((const u_char *, u_char *, int, -- const u_char **, const u_char **)); --int ns_name_uncompress __P((const u_char *, const u_char *, -- const u_char *, char *, size_t)); --int ns_name_compress __P((const char *, u_char *, size_t, -- const u_char **, const u_char **)); --int ns_name_skip __P((const u_char **, const u_char *)); --void ns_name_rollback __P((const u_char *, const u_char **, -- const u_char **)); --int ns_sign __P((u_char *, int *, int, int, void *, -- const u_char *, int, u_char *, int *, time_t)); --int ns_sign2 __P((u_char *, int *, int, int, void *, -+ char *, size_t); -+int ns_format_ttl (u_long, char *, size_t); -+int ns_parse_ttl (const char *, u_long *); -+u_int32_t ns_datetosecs (const char *cp, int *errp); -+int ns_name_ntol (const u_char *, u_char *, size_t); -+int ns_name_ntop (const u_char *, char *, size_t); -+int ns_name_pton (const char *, u_char *, size_t); -+int ns_name_unpack (const u_char *, const u_char *, -+ const u_char *, u_char *, size_t); -+int ns_name_pack (const u_char *, u_char *, int, -+ const u_char **, const u_char **); -+int ns_name_uncompress (const u_char *, const u_char *, -+ const u_char *, char *, size_t); -+int ns_name_compress (const char *, u_char *, size_t, -+ const u_char **, const u_char **); -+int ns_name_skip (const u_char **, const u_char *); -+void ns_name_rollback (const u_char *, const u_char **, -+ const u_char **); -+int ns_sign (u_char *, int *, int, int, void *, -+ const u_char *, int, u_char *, int *, time_t); -+int ns_sign2 (u_char *, int *, int, int, void *, - const u_char *, int, u_char *, int *, time_t, -- u_char **, u_char **)); --int ns_sign_tcp __P((u_char *, int *, int, int, -- ns_tcp_tsig_state *, int)); --int ns_sign_tcp2 __P((u_char *, int *, int, int, -+ u_char **, u_char **); -+int ns_sign_tcp (u_char *, int *, int, int, -+ ns_tcp_tsig_state *, int); -+int ns_sign_tcp2 (u_char *, int *, int, int, - ns_tcp_tsig_state *, int, -- u_char **, u_char **)); --int ns_sign_tcp_init __P((void *, const u_char *, int, -- ns_tcp_tsig_state *)); --u_char *ns_find_tsig __P((u_char *, u_char *)); --int ns_verify __P((u_char *, int *, void *, -+ u_char **, u_char **); -+int ns_sign_tcp_init (void *, const u_char *, int, -+ ns_tcp_tsig_state *); -+u_char *ns_find_tsig (u_char *, u_char *); -+int ns_verify (u_char *, int *, void *, - const u_char *, int, u_char *, int *, -- time_t *, int)); --int ns_verify_tcp __P((u_char *, int *, ns_tcp_tsig_state *, int)); --int ns_verify_tcp_init __P((void *, const u_char *, int, -- ns_tcp_tsig_state *)); --int ns_samedomain __P((const char *, const char *)); --int ns_subdomain __P((const char *, const char *)); --int ns_makecanon __P((const char *, char *, size_t)); --int ns_samename __P((const char *, const char *)); --__END_DECLS -+ time_t *, int); -+int ns_verify_tcp (u_char *, int *, ns_tcp_tsig_state *, int); -+int ns_verify_tcp_init (void *, const u_char *, int, -+ ns_tcp_tsig_state *); -+int ns_samedomain (const char *, const char *); -+int ns_subdomain (const char *, const char *); -+int ns_makecanon (const char *, char *, size_t); -+int ns_samename (const char *, const char *); -+#ifdef __cplusplus -+} -+#endif - - #ifdef BIND_4_COMPAT - #include <arpa/nameser_compat.h> diff --git a/package/openswan/patches/patch-lib_libalgoparse_kernel_alg_c b/package/openswan/patches/patch-lib_libalgoparse_kernel_alg_c new file mode 100644 index 000000000..dbb01fb0d --- /dev/null +++ b/package/openswan/patches/patch-lib_libalgoparse_kernel_alg_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/libalgoparse/kernel_alg.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/libalgoparse/kernel_alg.c 2022-03-22 16:18:54.795141065 +0100 +@@ -27,7 +27,7 @@ + #include <netinet/in.h> + #include <arpa/inet.h> + #include <unistd.h> +-#include <sys/queue.h> ++#include "queue.h" + + #include <openswan.h> + diff --git a/package/openswan/patches/patch-lib_libalgoparse_klips_interface_c b/package/openswan/patches/patch-lib_libalgoparse_klips_interface_c new file mode 100644 index 000000000..9f901deef --- /dev/null +++ b/package/openswan/patches/patch-lib_libalgoparse_klips_interface_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/libalgoparse/klips_interface.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/libalgoparse/klips_interface.c 2022-03-22 16:19:33.414205801 +0100 +@@ -22,7 +22,7 @@ + #include <netinet/in.h> + #include <arpa/inet.h> + #include <unistd.h> +-#include <sys/queue.h> ++#include "queue.h" + + #include <openswan.h> + diff --git a/package/openswan/patches/patch-lib_libipsecconf_keywords_c b/package/openswan/patches/patch-lib_libipsecconf_keywords_c new file mode 100644 index 000000000..671e9564b --- /dev/null +++ b/package/openswan/patches/patch-lib_libipsecconf_keywords_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/libipsecconf/keywords.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/libipsecconf/keywords.c 2022-03-22 16:20:38.212636657 +0100 +@@ -20,7 +20,7 @@ + * + */ + +-#include <sys/queue.h> ++#include "queue.h" + #include <string.h> + #include <assert.h> + #include <stdlib.h> diff --git a/package/openswan/patches/patch-lib_libipsecconf_oeconns_c b/package/openswan/patches/patch-lib_libipsecconf_oeconns_c new file mode 100644 index 000000000..f7e9ca9c9 --- /dev/null +++ b/package/openswan/patches/patch-lib_libipsecconf_oeconns_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/libipsecconf/oeconns.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/libipsecconf/oeconns.c 2022-03-22 16:21:06.271957222 +0100 +@@ -16,7 +16,7 @@ + #include <string.h> + #include <limits.h> + #include <assert.h> +-#include <sys/queue.h> ++#include "queue.h" + + #include "ipsecconf/parser.h" + #include "ipsecconf/confread.h" diff --git a/package/openswan/patches/patch-lib_libopenswan_kernel_alg_c b/package/openswan/patches/patch-lib_libopenswan_kernel_alg_c deleted file mode 100644 index 36cf64ee4..000000000 --- a/package/openswan/patches/patch-lib_libopenswan_kernel_alg_c +++ /dev/null @@ -1,11 +0,0 @@ ---- openswan-2.6.38.orig/lib/libopenswan/kernel_alg.c 2012-03-23 22:33:43.000000000 +0100 -+++ openswan-2.6.38/lib/libopenswan/kernel_alg.c 2014-03-26 20:04:18.000000000 +0100 -@@ -27,7 +27,7 @@ - #include <netinet/in.h> - #include <arpa/inet.h> - #include <unistd.h> --#include <sys/queue.h> -+#include "queue.h" - - #include <openswan.h> - diff --git a/package/openswan/patches/patch-lib_liboswlog_oswlog_c b/package/openswan/patches/patch-lib_liboswlog_oswlog_c new file mode 100644 index 000000000..4fb7e2ef7 --- /dev/null +++ b/package/openswan/patches/patch-lib_liboswlog_oswlog_c @@ -0,0 +1,11 @@ +--- Openswan-3.0.0.orig/lib/liboswlog/oswlog.c 2021-01-22 19:25:50.000000000 +0100 ++++ Openswan-3.0.0/lib/liboswlog/oswlog.c 2022-03-22 16:21:39.003164693 +0100 +@@ -25,7 +25,7 @@ + #include <string.h> + #include <unistd.h> + #include <signal.h> /* used only if MSG_NOSIGNAL not defined */ +-#include <sys/queue.h> ++#include "queue.h" + #include <libgen.h> + #include <sys/stat.h> + #include <sys/types.h> diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 0d2cb25a5..92b03daf4 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openvpn -PKG_VERSION:= 2.4.7 +PKG_VERSION:= 2.5.6 PKG_RELEASE:= 1 -PKG_HASH:= a42f53570f669eaf10af68e98d65b531015ff9e12be7a62d9269ea684652f648 +PKG_HASH:= 333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d PKG_DESCR:= vpn solution using ssl/tls PKG_DEPENDS:= libressl PKG_BUILDDEP:= libressl @@ -15,6 +15,8 @@ PKG_SECTION:= net/security PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz + PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_LZ4 WITH_MANAGEMENT WITH_SMALL PKGFD_WITH_LZO:= enable lzo compression support PKGFS_WITH_LZO:= liblzo diff --git a/package/openvpn/patches/patch-src_openvpn_ssl_openssl_c b/package/openvpn/patches/patch-src_openvpn_ssl_openssl_c deleted file mode 100644 index efcbc2600..000000000 --- a/package/openvpn/patches/patch-src_openvpn_ssl_openssl_c +++ /dev/null @@ -1,29 +0,0 @@ ---- openvpn-2.4.7.orig/src/openvpn/ssl_openssl.c 2019-02-20 13:28:23.000000000 +0100 -+++ openvpn-2.4.7/src/openvpn/ssl_openssl.c 2019-10-07 21:44:52.473323073 +0200 -@@ -459,7 +459,7 @@ tls_ctx_restrict_ciphers_tls13(struct tl - return; - } - --#if (OPENSSL_VERSION_NUMBER < 0x1010100fL) -+#if (OPENSSL_VERSION_NUMBER < 0x1010100fL) || defined(LIBRESSL_VERSION_NUMBER) - crypto_msg(M_WARN, "Not compiled with OpenSSL 1.1.1 or higher. " - "Ignoring TLS 1.3 only tls-ciphersuites '%s' setting.", - ciphers); -@@ -1846,7 +1846,7 @@ show_available_tls_ciphers_list(const ch - crypto_msg(M_FATAL, "Cannot create SSL_CTX object"); - } - --#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL) -+#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)) - if (tls13) - { - SSL_CTX_set_min_proto_version(tls_ctx.ctx, TLS1_3_VERSION); -@@ -1867,7 +1867,7 @@ show_available_tls_ciphers_list(const ch - crypto_msg(M_FATAL, "Cannot create SSL object"); - } - --#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) -+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER) - STACK_OF(SSL_CIPHER) *sk = SSL_get_ciphers(ssl); - #else - STACK_OF(SSL_CIPHER) *sk = SSL_get1_supported_ciphers(ssl); diff --git a/package/opus/Makefile b/package/opus/Makefile index cae0fca62..0785c74d8 100644 --- a/package/opus/Makefile +++ b/package/opus/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= opus -PKG_VERSION:= 1.1.5 +PKG_VERSION:= 1.3.1 PKG_RELEASE:= 1 -PKG_HASH:= eb84981ca0f40a3e5d5e58d2e8582cb2fee05a022825a6dfe14d14b04eb563e4 +PKG_HASH:= 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d PKG_DESCR:= open, royalty-free, highly versatile audio codec PKG_SECTION:= libs/audio PKG_URL:= http://opus-codec.org/ diff --git a/package/platform/Makefile b/package/p8-platform/Makefile index c23c3e21a..af0bd5a87 100644 --- a/package/platform/Makefile +++ b/package/p8-platform/Makefile @@ -3,24 +3,27 @@ include $(ADK_TOPDIR)/rules.mk -PKG_NAME:= platform -PKG_VERSION:= aafa6e9f3b86f2258f5f75809849743b1779072b +PKG_NAME:= p8-platform +PKG_VERSION:= 2.1.0.1 PKG_RELEASE:= 1 -PKG_GIT:= hash +PKG_HASH:= 064f8d2c358895c7e0bea9ae956f8d46f3f057772cb97f2743a11d478a0f68a0 PKG_DESCR:= platform library used by libcec PKG_SECTION:= libs/misc PKG_URL:= https://github.com/Pulse-Eight/platform -PKG_SITES:= https://github.com/Pulse-Eight/platform.git +PKG_SITES:= https://github.com/Pulse-Eight/platform/archive/refs/tags/ PKG_LIBNAME:= libplatform PKG_OPTS:= dev +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz +WRKDIST= $(WRKDIR)/platform-$(PKG_NAME)-$(PKG_VERSION) + include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBPLATFORM,libplatform,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +$(eval $(call PKG_template,P8_PLATFORM,p8-platform,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) CONFIG_STYLE:= cmake -libplatform-install: +p8-platform-install: : include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/pango/Makefile b/package/pango/Makefile index 352edeb4d..44fac2f88 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pango -PKG_VERSION:= 1.40.3 -PKG_EXTRAVER:= 1.40 +PKG_VERSION:= 1.50.4 +PKG_EXTRAVER:= 1.50 PKG_RELEASE:= 1 -PKG_HASH:= abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3 +PKG_HASH:= f4ad63e87dc2b145300542a4fb004d07a9f91b34152fae0ddbe50ecdd851c162 PKG_DESCR:= library for laying out and rendering of text PKG_SECTION:= libs/fonts -PKG_BUILDDEP:= libXft glib cairo harfbuzz fontconfig -HOST_BUILDDEP:= cairo-host harfbuzz-host +PKG_BUILDDEP:= libXft glib cairo harfbuzz fontconfig fribidi +HOST_BUILDDEP:= cairo-host harfbuzz-host glib-host meson-host PKG_NEEDS:= c++ PKG_URL:= http://www.pango.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=pango/$(PKG_EXTRAVER)/) @@ -23,10 +23,12 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,PANGO,pango,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,PANGO,pango,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -HOST_LDFLAGS+= -lffi -HOST_STYLE:= auto -AUTOTOOLS_STYLE:= autoreconf -CONFIGURE_ARGS+= --disable-man +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +HOST_STYLE:= meson +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson pango-install: $(INSTALL_DIR) $(IDIR_PANGO)/etc/pango $(IDIR_PANGO)/usr/lib diff --git a/package/pcre/Makefile b/package/pcre/Makefile index 435d5dcb2..c9814fbae 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= pcre -PKG_VERSION:= 8.41 +PKG_VERSION:= 8.45 PKG_RELEASE:= 1 -PKG_HASH:= 244838e1f1d14f7e2fa7681b857b3a8566b74215f28133f14a8f5e59241b682c +PKG_HASH:= 4e6ce03e0336e8b4a3d6c2b70b1c5e18590a5673a98186da90d4f33c23defc09 PKG_DESCR:= perl compatible regular expression library PKG_SECTION:= libs/misc PKG_URL:= http://www.pcre.org/ diff --git a/package/pkgconf/Makefile b/package/pkgconf/Makefile index bded34468..cebfeb44d 100644 --- a/package/pkgconf/Makefile +++ b/package/pkgconf/Makefile @@ -4,16 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pkgconf -PKG_VERSION:= 0.9.6 +PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 -PKG_HASH:= 8f5f48e52ddef0c3cbffe93f32d5148041e0030b8798b49b0b5fe72f4968d7ec +PKG_HASH:= 5f1ef65d73a880fa5e7012102a17f7b32010e5e46139aed85851a541ba828a63 PKG_DESCR:= smart pkg-config replacement PKG_SECTION:= dev/tools HOST_BUILDDEP:= sed-host -PKG_URL:= https://github.com/pkgconf/pkgconf -PKG_SITES:= http://rabbit.dereferenced.org/~nenolod/distfiles/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_URL:= http://pkgconf.org/ +PKG_SITES:= https://distfiles.dereferenced.org/pkgconf/ include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/popt/Makefile b/package/popt/Makefile index 0a36d6b81..d9582474b 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -10,6 +10,7 @@ PKG_HASH:= 36245242c59b5a33698388e415a3e1efa2d48fc4aead91aeb2810b4c0744f4e3 PKG_DESCR:= command line option parsing library PKG_SECTION:= libs/misc PKG_URL:= http://rpm5.org/ +PKG_BUILDDEP:= gettext-host PKG_SITES:= https://github.com/rpm-software-management/popt/archive/refs/tags/ PKG_LIBNAME:= libpopt PKG_OPTS:= dev diff --git a/package/protobuf/Makefile b/package/protobuf/Makefile index 780618167..c1249cb8f 100644 --- a/package/protobuf/Makefile +++ b/package/protobuf/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= protobuf -PKG_VERSION:= 3.1.0 +PKG_VERSION:= 3.19.4 PKG_RELEASE:= 1 -PKG_HASH:= fb2a314f4be897491bb2446697be693d489af645cb0e165a85e7e64e07eb134d +PKG_HASH:= 3bd7828aa5af4b13b99c191e8b1e884ebfa9ad371b0ce264605d347f135d2568 PKG_DESCR:= extensible mechanism for serializing structured data PKG_SECTION:= libs/misc PKG_URL:= https://developers.google.com/protocol-buffers/ diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index 68030d227..9f03b1638 100644 --- a/package/pulseaudio/Makefile +++ b/package/pulseaudio/Makefile @@ -4,16 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pulseaudio -PKG_VERSION:= 10.0 +PKG_VERSION:= 15.0 PKG_RELEASE:= 1 -PKG_HASH:= a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57 +PKG_HASH:= a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0 PKG_DESCR:= sound system PKG_SECTION:= mm/audio PKG_DEPENDS:= libltdl json-c libsndfile libspeex libncurses PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile -PKG_DEPENDS+= alsa-lib -PKG_BUILDDEP:= libtool json-c libsndfile speex +PKG_DEPENDS+= alsa-lib libICE libSM libxtst +PKG_BUILDDEP:= libtool json-c libsndfile speex check meson-host PKG_BUILDDEP+= flac libvorbis libogg util-linux ncurses alsa-lib +PKG_BUILDDEP+= libICE libSM libXtst PKG_NEEDS:= threads PKG_URL:= http://www.freedesktop.org/wiki/Software/PulseAudio/ PKG_SITES:= http://freedesktop.org/software/pulseaudio/releases/ @@ -23,40 +24,18 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -# use libtool from host directory -AUTOTOOL_STYLE:= autoreconf +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson -ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),y) -CONFIGURE_ARGS+= --enable-neon-opt -else -CONFIGURE_ARGS+= --disable-neon-opt -endif +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -CONFIGURE_ARGS+= --disable-manpages \ - --disable-tests \ - --disable-x11 \ - --disable-avahi \ - --disable-lirc \ - --disable-openssl \ - --disable-orc \ - --disable-tcpwrap \ - --disable-oss-output \ - --disable-oss-wrapper \ - --disable-esound \ - --disable-jack \ - --disable-gconf \ - --disable-udev \ - --disable-rpath \ - --disable-dbus \ - --disable-hal-compat \ - --disable-samplerate \ - --without-caps \ - --with-database=simple \ - --enable-alsa \ - --with-speex \ - --with-access-group=audio +MESON_FLAGS+= -Ddatabase=simple \ + -Ddoxygen=false \ + -Dgcov=false \ + -Dtests=false pulseaudio-install: $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/pulse diff --git a/package/pulseaudio/patches/patch-Makefile_am b/package/pulseaudio/patches/patch-Makefile_am deleted file mode 100644 index 11132dad5..000000000 --- a/package/pulseaudio/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- pulseaudio-10.0.orig/Makefile.am 2017-01-18 04:45:11.000000000 +0100 -+++ pulseaudio-10.0/Makefile.am 2017-06-06 19:51:59.372820444 +0200 -@@ -42,7 +42,7 @@ EXTRA_DIST = \ - src/daemon/.gitignore \ - src/pulse/.gitignore - --SUBDIRS = src doxygen man po -+SUBDIRS = src - - MAINTAINERCLEANFILES = - noinst_DATA = diff --git a/package/pulseaudio/patches/patch-configure_ac b/package/pulseaudio/patches/patch-configure_ac deleted file mode 100644 index 2ba044a9b..000000000 --- a/package/pulseaudio/patches/patch-configure_ac +++ /dev/null @@ -1,55 +0,0 @@ ---- pulseaudio-10.0.orig/configure.ac 2017-01-13 04:02:18.000000000 +0100 -+++ pulseaudio-10.0/configure.ac 2017-06-06 20:05:26.400612037 +0200 -@@ -97,24 +97,8 @@ AS_IF([test "x$M4" = "xno"], AC_MSG_ERRO - - PKG_PROG_PKG_CONFIG - --# gettext -- --if test "x$enable_nls" != "xno"; then --IT_PROG_INTLTOOL([0.35.0]) -- --AM_GNU_GETTEXT_VERSION([0.18.1]) --AM_GNU_GETTEXT([external]) -- --GETTEXT_PACKAGE=pulseaudio --AC_SUBST([GETTEXT_PACKAGE]) --AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) --else --# workaround till an intltool m4 bug is fixed upstream --# (https://bugs.launchpad.net/intltool/+bug/904647) - USE_NLS=no - AC_SUBST(USE_NLS) --fi -- - - #### Determine host OS #### - -@@ -1486,27 +1470,10 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x - AC_CONFIG_FILES([ - Makefile - src/Makefile --man/Makefile - libpulse.pc - libpulse-simple.pc - libpulse-mainloop-glib.pc --doxygen/Makefile --doxygen/doxygen.conf - src/pulse/version.h --po/Makefile.in --man/pulseaudio.1.xml --man/esdcompat.1.xml --man/pax11publish.1.xml --man/pacat.1.xml --man/pacmd.1.xml --man/pactl.1.xml --man/pasuspender.1.xml --man/padsp.1.xml --man/pulse-daemon.conf.5.xml --man/pulse-client.conf.5.xml --man/default.pa.5.xml --man/pulse-cli-syntax.5.xml --man/start-pulseaudio-x11.1.xml - ]) - - AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat]) diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile index 7bf566a0d..2a590ea7e 100644 --- a/package/rrdtool/Makefile +++ b/package/rrdtool/Makefile @@ -41,7 +41,9 @@ CONFIGURE_ARGS+= --enable-rrdcgi \ --disable-ruby \ --disable-tcl \ --disable-python \ - --disable-libwrap + --disable-libwrap \ + --disable-docs \ + --disable-examples TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/freetype2 TARGET_LDFLAGS+= -lglib-2.0 -lm diff --git a/package/ruby/Makefile b/package/ruby/Makefile index b5e7689ce..186cb5b1f 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ruby -PKG_VERSION:= 3.0.2 +PKG_VERSION:= 3.0.3 PKG_RELEASE:= 1 -PKG_HASH:= 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 +PKG_HASH:= 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c PKG_DESCR:= scripting language PKG_SECTION:= dev/lang PKG_DEPENDS:= libressl zlib diff --git a/package/samba/Makefile b/package/samba/Makefile index e21f06ed2..2a04e10c6 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= file and print server PKG_SECTION:= net/fs PKG_DEPENDS:= libuuid libpopt libgnutls libtirpc PKG_DEPENDS+= libtalloc libkrb5 -PKG_BUILDDEP:= util-linux talloc p5-parse-yapp-host +PKG_BUILDDEP:= util-linux talloc p5-parse-yapp-host gnutls krb5 PKG_NEEDS:= threads intl PKG_URL:= http://www.samba.org/ PKG_SITES:= http://samba.org/samba/ftp/stable/ diff --git a/package/screen/Makefile b/package/screen/Makefile index 209d211b6..1756f3166 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -4,13 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= screen -PKG_VERSION:= 4.7.0 +PKG_VERSION:= 4.9.0 PKG_RELEASE:= 1 -PKG_HASH:= da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1 +PKG_HASH:= f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4 PKG_DESCR:= window manager for the terminal session PKG_SECTION:= sys/utils PKG_DEPENDS:= libncurses libelf PKG_BUILDDEP:= ncurses libelf +PKG_NEEDS:= mmu PKG_URL:= http://www.gnu.org/software/screen/ PKG_SITES:= ${MASTER_SITE_GNU:=screen/} @@ -20,6 +21,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,SCREEN,screen,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf TARGET_LDFLAGS+= -ltinfo CONFIGURE_ENV+= $(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_${flag}=yes) CONFIGURE_ARGS+= --with-sys-screenrc=/etc/screenrc diff --git a/package/shairport-sync/Makefile b/package/shairport-sync/Makefile index c85f46ca1..75c6801f8 100644 --- a/package/shairport-sync/Makefile +++ b/package/shairport-sync/Makefile @@ -4,7 +4,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= shairport-sync -PKG_VERSION:= 3.3.6 +PKG_VERSION:= 3.3.8 PKG_RELEASE:= 1 PKG_GIT:= tag PKG_DESCR:= airplay daemon diff --git a/package/simpleinit/files/rc b/package/simpleinit/files/rc index e5d4f67d6..08d67601a 100755 --- a/package/simpleinit/files/rc +++ b/package/simpleinit/files/rc @@ -1,9 +1,8 @@ #!/bin/sh echo Starting OpenADK -hostname openadk mount -t proc proc /proc mount -t sysfs sys /sys -mkdir -m 755 /dev/pts +mkdir /dev/pts mount -t devpts devpts /dev/pts mount -t tmpfs tmpfs /tmp chmod 1777 /tmp diff --git a/package/sngrep/Makefile b/package/sngrep/Makefile index f87eb7292..c4689be62 100644 --- a/package/sngrep/Makefile +++ b/package/sngrep/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= sngrep -PKG_VERSION:= 1.4.3 +PKG_VERSION:= 1.4.10 PKG_RELEASE:= 1 -PKG_HASH:= 7385ac202de6d6a1feffb2fd514600563133d9dfa7fb47be052de839abcc1d52 +PKG_HASH:= cedbe521c9730deda004bff71e88c8c56ae66d3d147ddc6f5f965df2ca67a8df PKG_DESCR:= displaying sip calls message flows from terminal PKG_SECTION:= net/debug PKG_BUILDDEP:= libpcap ncurses diff --git a/package/socat/Makefile b/package/socat/Makefile index 9ffac2fd9..5cfdef06a 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= socat -PKG_VERSION:= 1.7.3.2 +PKG_VERSION:= 1.7.4.3 PKG_RELEASE:= 1 -PKG_HASH:= ce3efc17e3e544876ebce7cd6c85b3c279fda057b2857fcaaf67b9ab8bdaf034 +PKG_HASH:= d697245144731423ddbbceacabbd29447089ea223e9a439b28f9ff90d0dd216e PKG_DESCR:= multipurpose relay PKG_SECTION:= net/misc PKG_NEEDS:= threads diff --git a/package/spdlog/Makefile b/package/spdlog/Makefile new file mode 100644 index 000000000..3d96eecb9 --- /dev/null +++ b/package/spdlog/Makefile @@ -0,0 +1,31 @@ +# 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:= spdlog +PKG_VERSION:= 1.9.2 +PKG_RELEASE:= 1 +PKG_HASH:= 6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38 +PKG_DESCR:= very fast, header-only/compiled, C++ logging library +PKG_BUILDDEP:= fmt +PKG_SECTION:= libs/misc +PKG_SITES:= https://github.com/gabime/spdlog/archive/refs/tags/ +PKG_OPTS:= dev + +DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,SPDLOG,spdlog,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DSPDLOG_BUILD_TESTS=OFF \ + -DSPDLOG_BUILD_EXAMPLE=OFF \ + -DSPDLOG_BUILD_BENCH=OFF \ + -DSPDLOG_FMT_EXTERNAL=ON + + +spdlog-install: + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index cf035471f..d60160971 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -4,21 +4,21 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= sqlite -PKG_VERSION:= 3.15.0 +PKG_VERSION:= 3.37.1 PKG_RELEASE:= 1 -PKG_HASH:= 77162da9b4a0336d7e77d5252b690662850f62b47c12d9125f74ab9de78ded27 +PKG_HASH:= 40f22a13bf38bbcd4c7ac79bcfb42a72d5aa40930c1f3f822e30ccce295f0f2e PKG_DESCR:= embeddable sql database cli PKG_SECTION:= sys/misc PKG_BUILDDEP:= ncurses readline -PKG_DEPENDS:= libsqlite +PKG_DEPENDS:= libsqlite libreadline libncurses PKG_URL:= http://www.sqlite.org/ -PKG_SITES:= http://www.sqlite.org/2016/ +PKG_SITES:= http://www.sqlite.org/2021/ PKG_LIBNAME:= libsqlite PKG_OPTS:= dev PKG_NOPARALLEL:= 1 -DISTFILES:= sqlite-autoconf-3150000.tar.gz -WRKDIST= ${WRKDIR}/sqlite-autoconf-3150000 +DISTFILES:= sqlite-autoconf-3370100.tar.gz +WRKDIST= ${WRKDIR}/sqlite-autoconf-3370100 PKG_SUBPKGS:= SQLITE_CLI LIBSQLITE PKGSD_LIBSQLITE:= emeddable sql library diff --git a/package/strace/Makefile b/package/strace/Makefile index 4bcee572d..583348da3 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= strace -PKG_VERSION:= 5.14 +PKG_VERSION:= 5.16 PKG_RELEASE:= 1 -PKG_HASH:= 901bee6db5e17debad4530dd9ffb4dc9a96c4a656edbe1c3141b7cb307b11e73 +PKG_HASH:= dc7db230ff3e57c249830ba94acab2b862da1fcaac55417e9b85041a833ca285 PKG_DESCR:= system call trace program PKG_SECTION:= app/debug PKG_URL:= https://strace.io diff --git a/package/strace/patches/patch-src_stage_output_c b/package/strace/patches/patch-src_stage_output_c new file mode 100644 index 000000000..0762e4a6c --- /dev/null +++ b/package/strace/patches/patch-src_stage_output_c @@ -0,0 +1,20 @@ +--- strace-5.15.orig/src/stage_output.c 2021-02-16 09:00:00.000000000 +0100 ++++ strace-5.15/src/stage_output.c 2021-12-15 15:05:58.500813814 +0100 +@@ -26,7 +26,7 @@ strace_open_memstream(struct tcb *tcp) + { + FILE *fp = NULL; + +-#if HAVE_OPEN_MEMSTREAM ++#if defined(HAVE_OPEN_MEMSTREAM) + tcp->staged_output_data = xmalloc(sizeof(*tcp->staged_output_data)); + fp = open_memstream(&tcp->staged_output_data->memfptr, + &tcp->staged_output_data->memfloc); +@@ -49,7 +49,7 @@ strace_open_memstream(struct tcb *tcp) + void + strace_close_memstream(struct tcb *tcp, bool publish) + { +-#if HAVE_OPEN_MEMSTREAM ++#if defined(HAVE_OPEN_MEMSTREAM) + if (!tcp->staged_output_data) { + debug_msg("memstream already closed"); + return; diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile index 0ae988fe6..790700436 100644 --- a/package/strongswan/Makefile +++ b/package/strongswan/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= strongswan -PKG_VERSION:= 5.8.1 +PKG_VERSION:= 5.9.5 PKG_RELEASE:= 1 -PKG_HASH:= d86490a09160016d1c1a20020fef832559a22531eb9a1b1659256e3ca1c8c97d +PKG_HASH:= 6db028c9033dfd7cab578ca7e4b0075922cffec7af8bffc7d67cac67f348a5be PKG_DESCR:= ipsec based vpn software PKG_SECTION:= net/security PKG_KDEPENDS:= net-key inet-esp xfrm-user inet-xfrm-mode-transport diff --git a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c index 2c88daa81..44915d63c 100644 --- a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c +++ b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c @@ -1,6 +1,6 @@ ---- strongswan-5.8.1.orig/src/libstrongswan/plugins/openssl/openssl_plugin.c 2019-08-27 15:26:53.000000000 +0200 -+++ strongswan-5.8.1/src/libstrongswan/plugins/openssl/openssl_plugin.c 2019-10-08 02:05:20.954742229 +0200 -@@ -310,7 +310,7 @@ static private_key_t *openssl_private_ke +--- strongswan-5.9.5.orig/src/libstrongswan/plugins/openssl/openssl_plugin.c 2022-01-08 12:54:02.000000000 +0100 ++++ strongswan-5.9.5/src/libstrongswan/plugins/openssl/openssl_plugin.c 2022-03-21 16:41:08.736944525 +0100 +@@ -329,7 +329,7 @@ static private_key_t *openssl_private_ke case EVP_PKEY_EC: return openssl_ec_private_key_create(key, FALSE); #endif @@ -9,7 +9,7 @@ case EVP_PKEY_ED25519: case EVP_PKEY_ED448: return openssl_ed_private_key_create(key, FALSE); -@@ -462,7 +462,7 @@ static private_key_t *openssl_private_ke +@@ -481,7 +481,7 @@ static private_key_t *openssl_private_ke case EVP_PKEY_EC: return openssl_ec_private_key_create(key, TRUE); #endif @@ -18,7 +18,7 @@ case EVP_PKEY_ED25519: case EVP_PKEY_ED448: return openssl_ed_private_key_create(key, TRUE); -@@ -814,7 +814,7 @@ plugin_t *openssl_plugin_create() +@@ -980,7 +980,7 @@ plugin_t *openssl_plugin_create() }, ); diff --git a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c.orig b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c.orig index 401bd7a64..2c88daa81 100644 --- a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c.orig +++ b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_plugin_c.orig @@ -1,6 +1,24 @@ ---- strongswan-5.5.0.orig/src/libstrongswan/plugins/openssl/openssl_plugin.c 2016-06-30 16:20:10.000000000 +0200 -+++ strongswan-5.5.0/src/libstrongswan/plugins/openssl/openssl_plugin.c 2016-09-30 05:36:45.015692462 +0200 -@@ -573,7 +573,7 @@ plugin_t *openssl_plugin_create() +--- strongswan-5.8.1.orig/src/libstrongswan/plugins/openssl/openssl_plugin.c 2019-08-27 15:26:53.000000000 +0200 ++++ strongswan-5.8.1/src/libstrongswan/plugins/openssl/openssl_plugin.c 2019-10-08 02:05:20.954742229 +0200 +@@ -310,7 +310,7 @@ static private_key_t *openssl_private_ke + case EVP_PKEY_EC: + return openssl_ec_private_key_create(key, FALSE); + #endif +-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER) + case EVP_PKEY_ED25519: + case EVP_PKEY_ED448: + return openssl_ed_private_key_create(key, FALSE); +@@ -462,7 +462,7 @@ static private_key_t *openssl_private_ke + case EVP_PKEY_EC: + return openssl_ec_private_key_create(key, TRUE); + #endif +-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER) + case EVP_PKEY_ED25519: + case EVP_PKEY_ED448: + return openssl_ed_private_key_create(key, TRUE); +@@ -814,7 +814,7 @@ plugin_t *openssl_plugin_create() }, ); diff --git a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_rsa_private_key_c b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_rsa_private_key_c new file mode 100644 index 000000000..1e459f0ef --- /dev/null +++ b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_rsa_private_key_c @@ -0,0 +1,11 @@ +--- strongswan-5.9.5.orig/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c 2021-12-29 12:08:27.000000000 +0100 ++++ strongswan-5.9.5/src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c 2022-03-21 16:48:57.605794714 +0100 +@@ -280,7 +280,7 @@ METHOD(private_key_t, sign, bool, + return build_emsa_pkcs1_signature(this, NID_sha384, data, signature); + case SIGN_RSA_EMSA_PKCS1_SHA2_512: + return build_emsa_pkcs1_signature(this, NID_sha512, data, signature); +-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_SHA3) ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_SHA3) && !defined(LIBRESSL_VERSION_NUMBER) + case SIGN_RSA_EMSA_PKCS1_SHA3_224: + return build_emsa_pkcs1_signature(this, NID_sha3_224, data, signature); + case SIGN_RSA_EMSA_PKCS1_SHA3_256: diff --git a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_rsa_public_key_c b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_rsa_public_key_c new file mode 100644 index 000000000..3571cad01 --- /dev/null +++ b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_rsa_public_key_c @@ -0,0 +1,11 @@ +--- strongswan-5.9.5.orig/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c 2021-12-29 12:08:27.000000000 +0100 ++++ strongswan-5.9.5/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c 2022-03-21 16:49:30.581005593 +0100 +@@ -281,7 +281,7 @@ METHOD(public_key_t, verify, bool, + return verify_emsa_pkcs1_signature(this, NID_sha384, data, signature); + case SIGN_RSA_EMSA_PKCS1_SHA2_512: + return verify_emsa_pkcs1_signature(this, NID_sha512, data, signature); +-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_SHA3) ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_SHA3) && !defined(LIBRESSL_VERSION_NUMBER) + case SIGN_RSA_EMSA_PKCS1_SHA3_224: + return verify_emsa_pkcs1_signature(this, NID_sha3_224, data, signature); + case SIGN_RSA_EMSA_PKCS1_SHA3_256: diff --git a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_x_diffie_hellman_c b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_x_diffie_hellman_c index f4738c4ca..d5dc7efa0 100644 --- a/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_x_diffie_hellman_c +++ b/package/strongswan/patches/patch-src_libstrongswan_plugins_openssl_openssl_x_diffie_hellman_c @@ -1,5 +1,5 @@ ---- strongswan-5.8.1.orig/src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c 2018-12-14 16:48:24.000000000 +0100 -+++ strongswan-5.8.1/src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c 2019-10-08 02:05:54.116867134 +0200 +--- strongswan-5.9.5.orig/src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c 2022-01-08 12:54:02.000000000 +0100 ++++ strongswan-5.9.5/src/libstrongswan/plugins/openssl/openssl_x_diffie_hellman.c 2022-03-21 16:41:08.744944336 +0100 @@ -17,7 +17,7 @@ /* basic support for X25519 was added with 1.1.0a, but we require features (e.g. @@ -8,4 +8,4 @@ +#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(OPENSSL_NO_ECDH) && !defined(LIBRESSL_VERSION_NUMBER) #include "openssl_x_diffie_hellman.h" - + #include "openssl_util.h" diff --git a/package/strongswan/patches/patch-src_starter_netkey_c b/package/strongswan/patches/patch-src_starter_netkey_c deleted file mode 100644 index adb7e09eb..000000000 --- a/package/strongswan/patches/patch-src_starter_netkey_c +++ /dev/null @@ -1,18 +0,0 @@ ---- strongswan-5.5.0.orig/src/starter/netkey.c 2016-04-22 22:01:35.000000000 +0200 -+++ strongswan-5.5.0/src/starter/netkey.c 2016-09-30 05:30:43.681874545 +0200 -@@ -42,6 +42,7 @@ bool starter_netkey_init(void) - } - - /* make sure that all required IPsec modules are loaded */ -+ /* - if (stat(PROC_MODULES, &stb) == 0) - { - ignore_result(system("modprobe -qv ah4")); -@@ -50,6 +51,7 @@ bool starter_netkey_init(void) - ignore_result(system("modprobe -qv xfrm4_tunnel")); - ignore_result(system("modprobe -qv xfrm_user")); - } -+ */ - - DBG2(DBG_APP, "found netkey IPsec stack"); - return TRUE; diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 6dee93e16..0c42d76a1 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= subversion -PKG_VERSION:= 1.9.5 +PKG_VERSION:= 1.14.1 PKG_RELEASE:= 1 -PKG_HASH:= 280ba586c5d51d7b976b65d22d5e8e42f3908ed1c968d71120dcf534ce857a83 +PKG_HASH:= dee2796abaa1f5351e6cc2a60b1917beb8238af548b20d3e1ec22760ab2f0cad PKG_DESCR:= revision control program PKG_SECTION:= dev/scm -PKG_DEPENDS:= zlib apr apr-util libexpat libsqlite neon -PKG_BUILDDEP:= apr-util expat apr zlib sqlite neon +PKG_DEPENDS:= zlib apr apr-util libexpat libsqlite neon liblz4 +PKG_BUILDDEP:= apr-util expat apr zlib sqlite neon lz4 PKG_URL:= http://subversion.apache.org/ PKG_SITES:= http://artfiles.org/apache.org/subversion/ @@ -23,6 +23,7 @@ $(eval $(call PKG_template,SUBVERSION,subversion,${PKG_VERSION}-${PKG_RELEASE},$ TARGET_LDFLAGS+= -ltinfo CONFIGURE_ARGS+= --with-apr=${STAGING_TARGET_DIR}/usr/bin/apr-1-config \ --with-apr-util=${STAGING_TARGET_DIR}/usr/bin/apr-1-config \ + --with-utf8proc=internal \ --disable-mod-activation \ --disable-keychain \ --without-apxs \ diff --git a/package/systemd/Makefile b/package/systemd/Makefile deleted file mode 100644 index 09834cdfa..000000000 --- a/package/systemd/Makefile +++ /dev/null @@ -1,155 +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:= systemd -PKG_VERSION:= 249 -PKG_RELEASE:= 1 -PKG_HASH:= 174091ce5f2c02123f76d546622b14078097af105870086d18d55c1c2667d855 -PKG_DESCR:= system and service manager -PKG_SECTION:= base/init -PKG_DEPENDS:= libcap libmount libuuid libblkid libncurses libkmod -PKG_BUILDDEP:= intltool-host gperf-host libcap util-linux -PKG_BUILDDEP+= python3-host gettext-host kmod meson-host ninja-host -PKG_BUILDDEP+= python3-jinja2-host -PKG_KDEPENDS:= inotify-user cgroups namespaces fhandle tmpfs-posix-acl tmpfs-xattr -PKG_KDEPENDS+= uts-ns autofs4-fs fanotify -PKG_LIBC_DEPENDS:= glibc -PKG_NEEDS:= locale intl -PKG_URL:= https://wiki.freedesktop.org/www/Software/systemd/ -PKG_SITES:= https://github.com/systemd/systemd/archive/ - -PKG_CFLINE_SYSTEMD:= select BUSYBOX_SULOGIN if ADK_RUNTIME_BASE_BUSYBOX - -PKG_FLAVOURS_SYSTEMD:= WITH_PAM WITH_XZ WITH_ZLIB -PKGFD_WITH_PAM:= enable pam support -PKGFS_WITH_PAM:= pam -PKGFB_WITH_PAM:= pam -PKGFD_WITH_XZ:= enable xz support -PKGFS_WITH_XZ:= xz -PKGFB_WITH_XZ:= xz -PKGFD_WITH_ZLIB:= enable zlib support -PKGFS_WITH_ZLIB:= zlib -PKGFB_WITH_ZLIB:= zlib - -DISTFILES:= v$(PKG_VERSION).tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,SYSTEMD,systemd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) - -WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj - -CONFIG_STYLE:= meson -BUILD_STYLE:= meson -INSTALL_STYLE:= meson - -MESON_FLAGS+= -Drootlibdir='/usr/lib' \ - -Dsysvinit-path='' \ - -Dsplit-bin=true \ - -Dsplit-usr=true \ - -Dman=false \ - -Dima=false \ - -Dlibcryptsetup=false \ - -Defi=false \ - -Dgnu-efi=false \ - -Dldconfig=false \ - -Ddefault-dnssec=no \ - -Dtests=false \ - -Dkmod-path=/usr/bin/kmod \ - -Dkexec-path=/usr/sbin/kexec \ - -Dsulogin-path=/sbin/sulogin \ - -Dmount-path=/bin/mount \ - -Dumount-path=/bin/umount \ - -Dacl=false \ - -Daudit=false \ - -Didn=false \ - -Dmode=release \ - -Dnss-systemd=true \ - -Dresolve=false \ - -Dseccomp=false \ - -Dxkbcommon=false \ - -Dbzip2=false \ - -Dlz4=false \ - -Dlibcurl=false \ - -Dgcrypt=false \ - -Dqrencode=false \ - -Dmicrohttpd=false \ - -Dselinux=false \ - -Dhwdb=false \ - -Dportabled=false \ - -Dbinfmt=false \ - -Dvconsole=false \ - -Dquotacheck=false \ - -Dbacklight=false \ - -Drfkill=false \ - -Dmachined=false \ - -Dimportd=false \ - -Dhostnamed=false \ - -Dlocaled=false \ - -Dcoredump=false \ - -Dsmack=false \ - -Dsysusers=false \ - -Dhibernate=false \ - -Dpolkit=true \ - -Dnetworkd=true \ - -Dtimesyncd=true \ - -Dtmpfiles=true \ - -Dnss-systemd=true \ - -Dfirstboot=true \ - -Drandomseed=true \ - -Dlogind=true \ - -Dtimedated=true - - -ifeq ($(ADK_PACKAGE_SYSTEMD_WITH_PAM),y) -MESON_FLAGS+= -Dpam=true -else -MESON_FLAGS+= -Dpam=false -endif - -ifeq ($(ADK_PACKAGE_SYSTEMD_WITH_XZ),y) -MESON_FLAGS+= -Dxz=true -else -MESON_FLAGS+= -Dxz=false -endif - -ifeq ($(ADK_PACKAGE_SYSTEMD_WITH_ZLIB),y) -MESON_FLAGS+= -Dzlib=true -else -MESON_FLAGS+= -Dzlib=false -endif - -systemd-install: - $(INSTALL_DIR) $(IDIR_SYSTEMD)/etc - touch $(IDIR_SYSTEMD)/etc/machine-id - $(CP) $(WRKINST)/etc/* \ - $(IDIR_SYSTEMD)/etc - $(INSTALL_DIR) $(IDIR_SYSTEMD)/lib/systemd - $(CP) $(WRKINST)/lib/systemd/* \ - $(IDIR_SYSTEMD)/lib/systemd - $(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/lib - $(CP) $(WRKINST)/usr/lib/*.so* \ - $(IDIR_SYSTEMD)/usr/lib - $(CP) $(WRKINST)/usr/lib/{systemd,kernel,sysctl.d,tmpfiles.d} \ - $(IDIR_SYSTEMD)/usr/lib - $(INSTALL_DIR) $(IDIR_SYSTEMD)/sbin - $(CP) $(WRKINST)/sbin/* \ - $(IDIR_SYSTEMD)/sbin - $(INSTALL_DIR) $(IDIR_SYSTEMD)/bin - $(CP) $(WRKINST)/bin/* \ - $(IDIR_SYSTEMD)/bin - $(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/bin - $(CP) $(WRKINST)/usr/bin/* \ - $(IDIR_SYSTEMD)/usr/bin - $(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/share - $(CP) $(WRKINST)/usr/share/* \ - $(IDIR_SYSTEMD)/usr/share - $(CP) ./files/*.network \ - $(IDIR_SYSTEMD)/etc/systemd/network - (cd $(IDIR_SYSTEMD)/lib/systemd/system && ln -sf multi-user.target default.target) - $(CP) $(WRKBUILD)/systemd $(IDIR_SYSTEMD)/usr/lib/systemd/ - mv $(IDIR_SYSTEMD)/lib/systemd/libsystemd-shared-249.so $(IDIR_SYSTEMD)/lib - -include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/systemd/files/systemd.postinst b/package/systemd/files/systemd.postinst deleted file mode 100644 index 76e213117..000000000 --- a/package/systemd/files/systemd.postinst +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_group utmp $gid -gid=$(get_next_gid) -add_group systemd-journal $gid -gid=$(get_next_gid) -add_group systemd-bus-proxy $gid -add_user systemd-bus-proxy $(get_next_uid) $gid / -gid=$(get_next_gid) -add_group systemd-journal-gateway $gid -add_user systemd-journal-gateway $(get_next_uid) $gid / -gid=$(get_next_gid) -add_group systemd-journal-remote $gid -add_user systemd-journal-remote $(get_next_uid) $gid / -gid=$(get_next_gid) -add_group systemd-journal-upload $gid -add_user systemd-journal-upload $(get_next_uid) $gid / -gid=$(get_next_gid) -add_group systemd-network $gid -add_user systemd-network $(get_next_uid) $gid / -gid=$(get_next_gid) -add_group systemd-resolve $gid -add_user systemd-resolve $(get_next_uid) $gid / -gid=$(get_next_gid) -add_group systemd-timesync $gid -add_user systemd-timesync $(get_next_uid) $gid / diff --git a/package/systemd/files/wired.network b/package/systemd/files/wired.network deleted file mode 100644 index 9613cc040..000000000 --- a/package/systemd/files/wired.network +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Name=en* - -[Network] -DHCP=ipv4 diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile index 933fb95e4..47894b558 100644 --- a/package/tinyproxy/Makefile +++ b/package/tinyproxy/Makefile @@ -4,33 +4,30 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= tinyproxy -PKG_VERSION:= 1.8.4 +PKG_VERSION:= 1.11.0 PKG_RELEASE:= 1 -PKG_HASH:= 1999c88c43e31ff4cb5e8379b76776a65fa3d326eea868cb5f88ef58a8f631de +PKG_HASH:= c1ec81cfc4c551d2c24e0227a5aeeaad8723bd9a39b61cd729e516b82eaa3f32 PKG_DESCR:= lightweight http and https proxy PKG_SECTION:= net/proxy PKG_URL:= https://tinyproxy.github.io -PKG_SITES:= https://github.com/tinyproxy/tinyproxy/archive/ - -DISTFILES:= $(PKG_VERSION).tar.gz +PKG_SITES:= https://github.com/tinyproxy/tinyproxy/releases/download/$(PKG_VERSION)/ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,TINYPROXY,tinyproxy,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -AUTOTOOL_STYLE:= autoreconf -CONFIGURE_ARGS+= --disable-regexcheck +CONFIGURE_ARGS+= --disable-manpage_support CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes tinyproxy-install: - $(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/sbin - $(INSTALL_DIR) $(IDIR_TINYPROXY)/etc + $(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/bin + $(INSTALL_DIR) $(IDIR_TINYPROXY)/etc/tinyproxy $(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/share/tinyproxy $(INSTALL_DATA) ./files/tinyproxy.conf \ - $(IDIR_TINYPROXY)/etc - $(INSTALL_BIN) $(WRKINST)/usr/sbin/tinyproxy \ - $(IDIR_TINYPROXY)/usr/sbin/ + $(IDIR_TINYPROXY)/etc/tinyproxy/ + $(INSTALL_BIN) $(WRKINST)/usr/bin/tinyproxy \ + $(IDIR_TINYPROXY)/usr/bin/ $(INSTALL_DATA) $(WRKINST)/usr/share/tinyproxy/{default,stats,debug}.html \ $(IDIR_TINYPROXY)/usr/share/tinyproxy/ diff --git a/package/tinyproxy/files/tinyproxy.conf b/package/tinyproxy/files/tinyproxy.conf index 798231b12..c9ee8d178 100644 --- a/package/tinyproxy/files/tinyproxy.conf +++ b/package/tinyproxy/files/tinyproxy.conf @@ -137,28 +137,6 @@ PidFile "/var/run/tinyproxy/tinyproxy.pid" MaxClients 100 # -# These settings set the upper and lower limit for the number of -# spare servers which should be available. If the number of spare servers -# falls below MinSpareServers then new ones will be created. If the number -# of servers exceeds MaxSpareServers then the extras will be killed off. -# -MinSpareServers 5 -MaxSpareServers 20 - -# -# Number of servers to start initially. -# -StartServers 10 - -# -# MaxRequestsPerChild is the number of connections a thread will handle -# before it is killed. In practise this should be set to 0, which disables -# thread reaping. If you do notice problems with memory leakage, then set -# this to something like 10000 -# -MaxRequestsPerChild 0 - -# # The following is the authorization controls. If there are any access # control keywords then the default action is to DENY. Otherwise, the # default action is ALLOW. diff --git a/package/tinyproxy/files/tinyproxy.init b/package/tinyproxy/files/tinyproxy.init index e0a8b9a81..9a140db56 100644 --- a/package/tinyproxy/files/tinyproxy.init +++ b/package/tinyproxy/files/tinyproxy.init @@ -13,10 +13,10 @@ autostart) start) mkdir -p /var/run/tinyproxy chown tinyproxy.tinyproxy /var/run/tinyproxy - /usr/sbin/tinyproxy + /usr/bin/tinyproxy ;; stop) - kill $(pgrep -f /usr/sbin/tinyproxy) + kill $(pgrep -f /usr/bin/tinyproxy) ;; restart) sh $0 stop diff --git a/package/tinyproxy/patches/patch-Makefile_am b/package/tinyproxy/patches/patch-Makefile_am deleted file mode 100644 index 443ae2e78..000000000 --- a/package/tinyproxy/patches/patch-Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- tinyproxy-1.8.3.orig/Makefile.am 2011-08-16 14:14:34.000000000 +0200 -+++ tinyproxy-1.8.3/Makefile.am 2014-04-07 08:43:20.000000000 +0200 -@@ -2,7 +2,6 @@ SUBDIRS = \ - src \ - data \ - etc \ -- docs \ - m4macros \ - tests - diff --git a/package/tinyproxy/patches/patch-configure_ac b/package/tinyproxy/patches/patch-configure_ac deleted file mode 100644 index b3fd83dc9..000000000 --- a/package/tinyproxy/patches/patch-configure_ac +++ /dev/null @@ -1,27 +0,0 @@ ---- tinyproxy-1.8.3.orig/configure.ac 2011-08-16 14:14:58.000000000 +0200 -+++ tinyproxy-1.8.3/configure.ac 2014-04-07 08:43:06.000000000 +0200 -@@ -282,24 +282,12 @@ AC_SUBST(CPPFLAGS) - AC_SUBST(LIBS) - AC_SUBST(ADDITIONAL_OBJECTS) - --# Check for asciidoc --AC_PATH_PROG(A2X, a2x, no) --AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") --if test x"$A2X" = x"no"; then -- AC_MSG_ERROR([Test for asciidoc failed. See the file 'INSTALL' for help.]) --fi -- - AC_CONFIG_FILES([ - Makefile - src/Makefile - data/Makefile - data/templates/Makefile - etc/Makefile --docs/Makefile --docs/man5/Makefile --docs/man5/tinyproxy.conf.txt --docs/man8/Makefile --docs/man8/tinyproxy.txt - m4macros/Makefile - tests/Makefile - tests/scripts/Makefile diff --git a/package/tmux/Makefile b/package/tmux/Makefile index e208b566f..bd8d418f4 100644 --- a/package/tmux/Makefile +++ b/package/tmux/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= tmux -PKG_VERSION:= 2.9 +PKG_VERSION:= 3.2a PKG_RELEASE:= 1 -PKG_HASH:= 34901232f486fd99f3a39e864575e658b5d49f43289ccc6ee57c365f2e2c2980 +PKG_HASH:= 551553a4f82beaa8dadc9256800bcc284d7c000081e47aa6ecbb6ff36eacd05f PKG_DESCR:= terminal multiplexer PKG_SECTION:= sys/utils PKG_BUILDDEP:= libevent ncurses PKG_DEPENDS:= libevent libncurses -PKG_NEEDS:= threads +PKG_NEEDS:= threads locale PKG_URL:= http://tmux.github.io PKG_SITES:= https://github.com/tmux/tmux/releases/download/$(PKG_VERSION)/ @@ -21,6 +21,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,TMUX,tmux,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +AUTOTOOL_STYLE:= autoreconf TARGET_LDFLAGS+= -ltinfo CONFIGURE_ARGS+= --disable-static diff --git a/package/tmux/patches/patch-configure_ac b/package/tmux/patches/patch-configure_ac new file mode 100644 index 000000000..1d70b17ca --- /dev/null +++ b/package/tmux/patches/patch-configure_ac @@ -0,0 +1,22 @@ +--- tmux-3.2a.orig/configure.ac 2021-06-10 10:20:51.000000000 +0200 ++++ tmux-3.2a/configure.ac 2022-03-16 12:00:53.916934376 +0100 +@@ -150,18 +150,10 @@ AC_REPLACE_FUNCS([ \ + strlcpy \ + strndup \ + strsep \ ++ strtonum \ + ]) + AC_FUNC_STRNLEN + +-# Check if strtonum works. +-AC_MSG_CHECKING([for working strtonum]) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( +- [#include <stdlib.h>], +- [return (strtonum("0", 0, 1, NULL) == 0 ? 0 : 1);] +- )], +- [AC_DEFINE(HAVE_STRTONUM) AC_MSG_RESULT(yes)], +- [AC_LIBOBJ(strtonum) AC_MSG_RESULT(no)] +-) + + # Clang sanitizers wrap reallocarray even if it isn't available on the target + # system. When compiled it always returns NULL and crashes the program. To diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile index d838eabf8..a1e7de77b 100644 --- a/package/tzdata/Makefile +++ b/package/tzdata/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= tzdata -PKG_VERSION:= 2019c +PKG_VERSION:= 2021e PKG_RELEASE:= 1 -PKG_HASH:= 79c7806dab09072308da0e3d22c37d3b245015a591891ea147d3b133b60ffc7c f6ebd3668e02d5ed223d3b7b1947561bf2d2da2f4bd1db61efefd9e06c167ed4 +PKG_HASH:= 07ec42b737d0d3c6be9c337f8abb5f00554a0f9cc4fcf01a703d69403b6bb2b1 584666393a5424d13d27ec01183da17703273664742e049d4f62f62dab631775 PKG_DESCR:= timezone data (/usr/share/zoneinfo) PKG_SECTION:= base/apps PKG_URL:= http://www.iana.org/time-zones/ diff --git a/package/tzdata/patches/patch-Makefile b/package/tzdata/patches/patch-Makefile index faf30fcd9..9083a7597 100644 --- a/package/tzdata/patches/patch-Makefile +++ b/package/tzdata/patches/patch-Makefile @@ -1,6 +1,6 @@ ---- w-tzdata-2019c-1.orig/Makefile 2019-07-01 09:06:38.000000000 +0200 -+++ w-tzdata-2019c-1/Makefile 2020-02-04 09:33:12.012662611 +0100 -@@ -365,7 +365,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn +--- w-tzdata-2021e-1.orig/Makefile 2021-09-25 16:47:39.000000000 +0200 ++++ w-tzdata-2021e-1/Makefile 2022-01-09 06:05:17.958089388 +0100 +@@ -370,7 +370,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn # January's first Monday when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. @@ -9,7 +9,7 @@ # Linker flags. Default to $(LFLAGS) for backwards compatibility # to release 2012h and earlier. -@@ -380,7 +380,7 @@ LEAPSECONDS= +@@ -385,7 +385,7 @@ LEAPSECONDS= # The zic command and its arguments. zic= ./zic @@ -18,8 +18,8 @@ # To shrink the size of installed TZif files, # append "-r @N" to omit data before N-seconds-after-the-Epoch. -@@ -579,7 +579,7 @@ SHELL= /bin/sh - all: tzselect yearistype zic zdump libtz.a $(TABDATA) \ +@@ -562,7 +562,7 @@ SHELL= /bin/sh + all: tzselect zic zdump libtz.a $(TABDATA) \ vanguard.zi main.zi rearguard.zi -ALL: all date $(ENCHILADA) @@ -27,7 +27,7 @@ install: all $(DATA) $(REDO) $(MANS) mkdir -p '$(DESTDIR)$(BINDIR)' \ -@@ -646,6 +646,12 @@ zdump: $(TZDOBJS) +@@ -637,6 +637,12 @@ zdump: $(TZDOBJS) zic: $(TZCOBJS) $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) @@ -37,6 +37,6 @@ + $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) asctime.c -o asctime_build.o + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ zic_build.o localtime_build.o asctime_build.o + - yearistype: yearistype.sh - cp yearistype.sh yearistype - chmod +x yearistype + leapseconds: $(LEAP_DEPS) + $(AWK) -v EXPIRES_LINE=$(EXPIRES_LINE) \ + -f leapseconds.awk leap-seconds.list >$@.out diff --git a/package/u-boot-h8300/Makefile b/package/u-boot-h8300/Makefile index e26b4fd59..bfd0824df 100644 --- a/package/u-boot-h8300/Makefile +++ b/package/u-boot-h8300/Makefile @@ -4,6 +4,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot +# last working hash fa0e8426833edc1be3c2ea3acaf248157048a15a PKG_VERSION:= h8300 PKG_GIT:= branch PKG_RELEASE:= 1 @@ -13,7 +14,6 @@ HOST_BUILDDEP:= libressl-host dtc-host PKG_BUILDDEP:= u-boot-h8300-host PKG_SITES:= git://git.pf.osdn.jp/gitroot/y/ys/ysato/uboot.git - PKG_SYSTEM_DEPENDS:= hitachi-edosk2674 include $(ADK_TOPDIR)/mk/host.mk @@ -23,7 +23,6 @@ $(eval $(call HOST_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) UBOOT:= u-boot.bin -CONFIG:= clearfog_defconfig HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" diff --git a/package/u-boot-h8300/patches/dtc.patch b/package/u-boot-h8300/patches/dtc.patch new file mode 100644 index 000000000..725c3af2f --- /dev/null +++ b/package/u-boot-h8300/patches/dtc.patch @@ -0,0 +1,11 @@ +diff -Nur u-boot-h8300.orig/scripts/dtc/dtc-lexer.l u-boot-h8300/scripts/dtc/dtc-lexer.l +--- u-boot-h8300.orig/scripts/dtc/dtc-lexer.l 2022-02-11 13:17:30.000000000 +0100 ++++ u-boot-h8300/scripts/dtc/dtc-lexer.l 2022-02-11 13:42:14.302389873 +0100 +@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ diff --git a/package/u-boot-h8300/patches/patch-include_image_h b/package/u-boot-h8300/patches/patch-include_image_h new file mode 100644 index 000000000..e087a033d --- /dev/null +++ b/package/u-boot-h8300/patches/patch-include_image_h @@ -0,0 +1,13 @@ +--- u-boot-h8300.orig/include/image.h 2022-02-11 13:17:30.000000000 +0100 ++++ u-boot-h8300/include/image.h 2022-02-13 01:58:23.457168935 +0100 +@@ -194,9 +194,9 @@ enum { + IH_ARCH_ARM64, /* ARM64 */ + IH_ARCH_ARC, /* Synopsys DesignWare ARC */ + IH_ARCH_X86_64, /* AMD x86_64, Intel and Via */ ++ IH_ARCH_H8300, /* H8/300 */ + IH_ARCH_XTENSA, /* Xtensa */ + IH_ARCH_RISCV, /* RISC-V */ +- IH_ARCH_H8300, /* H8/300 */ + IH_ARCH_COUNT, + }; + diff --git a/package/uclibc-ng-test/Makefile b/package/uclibc-ng-test/Makefile index 09472778b..9f0adccba 100644 --- a/package/uclibc-ng-test/Makefile +++ b/package/uclibc-ng-test/Makefile @@ -22,6 +22,9 @@ CONFIG_STYLE:= manual # disable math tests XAKE_FLAGS+= NO_MATH=1 +ifeq ($(ADK_TARGET_LIB_GLIBC),y) +XAKE_FLAGS+= NO_CRYPT=1 +endif ifeq ($(ADK_TARGET_LIB_MUSL),y) XAKE_FLAGS+= NO_MATH=1 endif @@ -40,6 +43,9 @@ endif ifeq ($(ADK_TARGET_LIBC_WITH_LOCALE),) XAKE_FLAGS+= NO_LOCALE=1 endif +ifeq ($(ADK_TARGET_ARCH_KVX),y) +XAKE_FLAGS+= NO_TLS=1 +endif uclibc-ng-test-install: ${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/etc diff --git a/package/wayland-protocols/Makefile b/package/wayland-protocols/Makefile new file mode 100644 index 000000000..458ccc51b --- /dev/null +++ b/package/wayland-protocols/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:= wayland-protocols +PKG_VERSION:= 1.23 +PKG_RELEASE:= 1 +PKG_HASH:= 6c0af1915f96f615927a6270d025bd973ff1c58e521e4ca1fc9abfc914633f76 +PKG_DESCR:= wayland protocols +PKG_SECTION:= x11/libs +PKG_BUILDDEP:= meson-host wayland-host +PKG_SITES:= https://wayland.freedesktop.org/releases/ +PKG_OPTS:= dev + +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))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +MESON_FLAGS+= -Dtests=false + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +wayland-protocols-install: + $(INSTALL_DIR) $(IDIR_WAYLAND_PROTOCOLS)/usr/share/wayland-protocols + $(CP) $(WRKINST)/usr/share/wayland-protocols/* \ + $(IDIR_WAYLAND_PROTOCOLS)/usr/share/wayland-protocols/ + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/wayland-protocols/patches/patch-meson_build b/package/wayland-protocols/patches/patch-meson_build new file mode 100644 index 000000000..ad075be1c --- /dev/null +++ b/package/wayland-protocols/patches/patch-meson_build @@ -0,0 +1,11 @@ +--- wayland-protocols-1.23.orig/meson.build 2021-09-15 14:52:03.136998200 +0200 ++++ wayland-protocols-1.23/meson.build 2021-11-14 04:45:19.472983046 +0100 +@@ -93,7 +93,7 @@ pkgconfig_configuration.set('abs_top_src + pkgconfig_configuration.set('PACKAGE', 'wayland-protocols') + pkgconfig_configuration.set('WAYLAND_PROTOCOLS_VERSION', wayland_protocols_version) + +-pkg_install_dir = join_paths(get_option('datadir'), 'pkgconfig') ++pkg_install_dir = join_paths(get_option('libdir'), 'pkgconfig') + configure_file( + input: 'wayland-protocols.pc.in', + output: 'wayland-protocols.pc', diff --git a/package/wayland-protocols/patches/patch-wayland-protocols_pc_in b/package/wayland-protocols/patches/patch-wayland-protocols_pc_in new file mode 100644 index 000000000..ce3da7fb2 --- /dev/null +++ b/package/wayland-protocols/patches/patch-wayland-protocols_pc_in @@ -0,0 +1,10 @@ +--- wayland-protocols-1.23.orig/wayland-protocols.pc.in 2021-09-15 14:52:03.145998200 +0200 ++++ wayland-protocols-1.23/wayland-protocols.pc.in 2021-11-14 04:59:17.121707638 +0100 +@@ -1,6 +1,6 @@ + prefix=@prefix@ + datarootdir=@datarootdir@ +-pkgdatadir=${pc_sysrootdir}${datarootdir}/@PACKAGE@ ++pkgdatadir=${datarootdir}/@PACKAGE@ + + Name: Wayland Protocols + Description: Wayland protocol files diff --git a/package/wayland/Makefile b/package/wayland/Makefile new file mode 100644 index 000000000..c23942924 --- /dev/null +++ b/package/wayland/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:= wayland +PKG_VERSION:= 1.19.0 +PKG_RELEASE:= 1 +PKG_HASH:= baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15 +PKG_DESCR:= wayland +PKG_SECTION:= x11/libs +PKG_BUILDDEP:= wayland-host meson-host +HOST_BUILDDEP:= expat-host libxml2-host +PKG_SITES:= https://wayland.freedesktop.org/releases/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,WAYLAND,wayland,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,WAYLAND,wayland,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +HOST_CONFIGURE_ARGS+= --disable-documentation +MESON_FLAGS+= -Ddocumentation=false \ + -Dscanner=false + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +wayland-install: + $(INSTALL_DIR) $(IDIR_WAYLAND)/usr/lib + $(CP) $(WRKINST)/usr/lib/libwayland*.so* \ + $(IDIR_WAYLAND)/usr/lib + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/wayland/patches/patch-src_wayland-client_pc_in b/package/wayland/patches/patch-src_wayland-client_pc_in new file mode 100644 index 000000000..0b665638c --- /dev/null +++ b/package/wayland/patches/patch-src_wayland-client_pc_in @@ -0,0 +1,8 @@ +--- wayland-1.19.0.orig/src/wayland-client.pc.in 2021-01-27 17:49:04.000000000 +0100 ++++ wayland-1.19.0/src/wayland-client.pc.in 2021-11-14 05:40:27.300530861 +0100 +@@ -9,4 +9,4 @@ Name: Wayland Client + Description: Wayland client side library + Version: @WAYLAND_VERSION@ + Cflags: -I${includedir} +-Libs: -L${libdir} -lwayland-client ++Libs: -L${libdir} -lwayland-client -lffi diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile index 4009987c2..b6ad084a5 100644 --- a/package/webkitgtk/Makefile +++ b/package/webkitgtk/Makefile @@ -4,18 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= webkitgtk -PKG_VERSION:= 2.18.0 +PKG_VERSION:= 2.34.6 PKG_RELEASE:= 1 -PKG_HASH:= b583e46a3de36a3e80ba33b084ead60512a2046aca01ff61e50e519436e5038d +PKG_HASH:= 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 PKG_DESCR:= web browser engine PKG_SECTION:= libs/misc PKG_DEPENDS:= glib icu4c zlib libwebp libgtk3 libsoup PKG_DEPENDS+= libsecret libxt harfbuzz cairo libgcrypt -PKG_DEPENDS+= gst-plugins-base gstreamer libnotify +PKG_DEPENDS+= gstreamer libnotify libwebp gst-plugins-base PKG_BUILDDEP:= glib icu4c zlib libwebp libgtk3 cmake-host PKG_BUILDDEP+= libsoup libsecret libXt harfbuzz libnotify -PKG_BUILDDEP+= gst-plugins-base gstreamer cairo enchant -PKG_BUILDDEP+= gnutls libgcrypt +PKG_BUILDDEP+= gstreamer cairo enchant libwebp gst-plugins-base +PKG_BUILDDEP+= gnutls libgcrypt ruby-host PKG_URL:= http://www.webkitgtk.org/ PKG_SITES:= http://webkitgtk.org/releases/ PKG_OPTS:= dev @@ -41,6 +41,14 @@ CMAKE_FLAGS+= -DPORT=GTK \ -DUSE_LIBNOTIFY=OFF \ -DENABLE_JIT=OFF \ -DUSE_LIBHYPHEN=OFF \ + -DUSE_SOUP2=ON \ + -DUSE_WPE_RENDERER=OFF \ + -DENABLE_GAMEPAD=OFF \ + -DUSE_OPENJPEG=OFF \ + -DUSE_WOFF2=OFF \ + -DUSE_SYSTEMD=OFF \ + -DUSE_LCMS=OFF \ + -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ -DENABLE_INTROSPECTION=OFF webkitgtk-install: diff --git a/package/webkitgtk/patches/patch-Source_PlatformGTK_cmake b/package/webkitgtk/patches/patch-Source_PlatformGTK_cmake deleted file mode 100644 index 863e86475..000000000 --- a/package/webkitgtk/patches/patch-Source_PlatformGTK_cmake +++ /dev/null @@ -1,7 +0,0 @@ ---- webkitgtk-2.12.0.orig/Source/PlatformGTK.cmake 2016-03-17 08:51:05.000000000 +0100 -+++ webkitgtk-2.12.0/Source/PlatformGTK.cmake 2016-04-03 10:54:31.244767406 +0200 -@@ -1,4 +1,3 @@ --add_subdirectory(${WEBCORE_DIR}/platform/gtk/po) - - # This allows exposing a 'gir' target which builds all GObject introspection files. - if (ENABLE_INTROSPECTION) diff --git a/package/weston/Makefile b/package/weston/Makefile new file mode 100644 index 000000000..7233c8107 --- /dev/null +++ b/package/weston/Makefile @@ -0,0 +1,60 @@ +# 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:= weston +PKG_VERSION:= 9.0.0 +PKG_RELEASE:= 1 +PKG_HASH:= 82b17ab1766f13557fc620c21e3c89165342d3a3ead79ba01181b4f7d2144487 +PKG_DESCR:= wayland compositor +PKG_SECTION:= x11/drivers +PKG_DEPENDS:= wayland libxkbcommon libinput libpng libjpeg-turbo +PKG_DEPENDS+= libwebp pam libxcursor libudev xkeyboard-config cairo +PKG_BUILDDEP:= wayland libxkbcommon libinput libpng libjpeg-turbo +PKG_BUILDDEP+= libwebp pam libXcursor eudev cairo +PKG_SITES:= https://github.com/wayland-project/weston/archive/refs/tags/ + +PKG_CFLINE_WESTON:= select ADK_PACKAGE_CAIRO_WITH_PNG@ + +DISTFILES:= $(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,WESTON,weston,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +MESON_FLAGS+= -Dlauncher-logind=false \ + -Dsystemd=false \ + -Dbackend-drm-screencast-vaapi=false \ + -Dbackend-rdp=false \ + -Dcolor-management-lcms=false \ + -Dcolor-management-colord=false \ + -Dremoting=false \ + -Dpipewire=false \ + -Ddemo-clients=false + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +weston-install: + $(INSTALL_DIR) $(IDIR_WESTON)/usr/share + $(CP) $(WRKINST)/usr/share/* \ + $(IDIR_WESTON)/usr/share/ + $(INSTALL_DIR) $(IDIR_WESTON)/usr/libexec + $(CP) $(WRKINST)/usr/libexec/* \ + $(IDIR_WESTON)/usr/libexec/ + $(INSTALL_DIR) $(IDIR_WESTON)/usr/lib + $(CP) $(WRKINST)/usr/lib/weston \ + $(IDIR_WESTON)/usr/lib/ + $(CP) $(WRKINST)/usr/lib/libweston-9 \ + $(IDIR_WESTON)/usr/lib/ + $(CP) $(WRKINST)/usr/lib/libweston*so* \ + $(IDIR_WESTON)/usr/lib/ + $(INSTALL_DIR) $(IDIR_WESTON)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/weston \ + $(IDIR_WESTON)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 67947e882..db4a7c63b 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xcb-proto PKG_VERSION:= 1.12 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= cfa49e65dd390233d560ce4476575e4b76e505a0e0bacdfb5ba6f8d0af53fd59 PKG_DESCR:= xml-xcb protocol descriptions PKG_SECTION:= dev/header @@ -30,16 +30,13 @@ include $(ADK_TOPDIR)/mk/python.mk HOST_STYLE:= auto CONFIGURE_ENV+= PYTHON=$(PYTHON) -# pkg-config variables are not fixed up with sysroot hostpost-install: - $(SED) 's|^\(xcbincludedir=\)|\1$(STAGING_HOST_DIR)|' \ - $(STAGING_HOST_DIR)/usr/lib/pkgconfig/xcb-proto.pc + ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/share/xcb + ${CP} ${WRKBUILD}/src/*.xml ${STAGING_HOST_DIR}/usr/share/xcb post-build: ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/xcb ${CP} ${WRKBUILD}/src/*.xml ${STAGING_TARGET_DIR}/usr/share/xcb - $(SED) 's|^\(xcbincludedir=\)|\1$(STAGING_TARGET_DIR)|' \ - $(WRKBUILD)/xcb-proto.pc xcb-python-install: $(INSTALL_DIR) ${STAGING_TARGET_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen diff --git a/package/xterm/Makefile b/package/xterm/Makefile index d1374b286..6902f259c 100644 --- a/package/xterm/Makefile +++ b/package/xterm/Makefile @@ -4,17 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xterm -PKG_VERSION:= 369 +PKG_VERSION:= 371 PKG_RELEASE:= 1 -PKG_HASH:= 71ed6a48d064893d2149741a002781a973496fd24d52dadd364f63439a764e26 +PKG_HASH:= 32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5 PKG_DESCR:= terminal emulator PKG_SECTION:= x11/apps PKG_DEPENDS:= libxaw libxt libncurses libxft fontconfig libuuid PKG_BUILDDEP:= ncurses libXt libXmu libXaw libXft util-linux libSM PKG_URL:= http://invisible-island.net/xterm/xterm.html -PKG_SITES:= https://invisible-island.net/datafiles/release/ +PKG_SITES:= http://invisible-mirror.net/archives/xterm/ -DISTFILES:= ${PKG_NAME}.tar.gz +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tgz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/xwayland/Makefile b/package/xwayland/Makefile new file mode 100644 index 000000000..2e0848cdd --- /dev/null +++ b/package/xwayland/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:= xwayland +PKG_VERSION:= 21.1.3 +PKG_RELEASE:= 1 +PKG_HASH:= ebc2757f39fd4c7db1654fd86591589c211aa20172d43a54f77ae567cedbf8a2 +PKG_DESCR:= wayland server +PKG_SECTION:= x11/drivers +PKG_DEPENDS:= wayland wayland-protocols libepoxy libtirpc +PKG_DEPENDS+= pixman libxkbfile libxfont2 font-util libressl +PKG_DEPENDS+= libxdmcp libxshmfence libx11 libxcb libxext +PKG_DEPENDS+= libxau libfreetype libfontenc +PKG_BUILDDEP:= wayland wayland-protocols libepoxy libtirpc +PKG_BUILDDEP+= pixman xorgproto libxkbfile libXfont2 font-util +PKG_BUILDDEP+= libressl libXdmcp libxshmfence libX11 libxcb +PKG_BUILDDEP+= libXext libXau freetype libfontenc +PKG_URL:= https://xorg.freedesktop.org/ +PKG_SITES:= https://www.x.org/releases/individual/xserver/ + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XWAYLAND,xwayland,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + + +xwayland-install: + $(INSTALL_DIR) $(IDIR_XWAYLAND)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/Xwayland \ + $(IDIR_XWAYLAND)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/xwayland/patches/patch-hw_xwayland_xwayland-glx_c b/package/xwayland/patches/patch-hw_xwayland_xwayland-glx_c new file mode 100644 index 000000000..57cca337d --- /dev/null +++ b/package/xwayland/patches/patch-hw_xwayland_xwayland-glx_c @@ -0,0 +1,12 @@ +--- xwayland-21.1.3.orig/hw/xwayland/xwayland-glx.c 2021-11-08 11:37:14.863922600 +0100 ++++ xwayland-21.1.3/hw/xwayland/xwayland-glx.c 2021-11-14 05:31:50.673075155 +0100 +@@ -45,6 +45,9 @@ + + #include "xwayland-screen.h" + ++#define EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT 0x333B ++#define EGL_COLOR_COMPONENT_TYPE_EXT 0x3339 ++ + /* Can't get these from <GL/glx.h> since it pulls in client headers */ + #define GLX_RGBA_BIT 0x00000001 + #define GLX_WINDOW_BIT 0x00000001 diff --git a/package/xwayland/patches/patch-include_misc_h b/package/xwayland/patches/patch-include_misc_h new file mode 100644 index 000000000..6707a70ed --- /dev/null +++ b/package/xwayland/patches/patch-include_misc_h @@ -0,0 +1,51 @@ +--- xwayland-21.1.3.orig/include/misc.h 2021-11-08 11:37:14.869922600 +0100 ++++ xwayland-21.1.3/include/misc.h 2021-11-14 05:17:02.367154956 +0100 +@@ -298,34 +298,12 @@ __builtin_constant_p(int x) + } + #endif + +-static inline uint64_t +-bswap_64(uint64_t x) +-{ +- return (((x & 0xFF00000000000000ull) >> 56) | +- ((x & 0x00FF000000000000ull) >> 40) | +- ((x & 0x0000FF0000000000ull) >> 24) | +- ((x & 0x000000FF00000000ull) >> 8) | +- ((x & 0x00000000FF000000ull) << 8) | +- ((x & 0x0000000000FF0000ull) << 24) | +- ((x & 0x000000000000FF00ull) << 40) | +- ((x & 0x00000000000000FFull) << 56)); +-} +- + #define swapll(x) do { \ + if (sizeof(*(x)) != 8) \ + wrong_size(); \ + *(x) = bswap_64(*(x)); \ + } while (0) + +-static inline uint32_t +-bswap_32(uint32_t x) +-{ +- return (((x & 0xFF000000) >> 24) | +- ((x & 0x00FF0000) >> 8) | +- ((x & 0x0000FF00) << 8) | +- ((x & 0x000000FF) << 24)); +-} +- + static inline Bool + checked_int64_add(int64_t *out, int64_t a, int64_t b) + { +@@ -361,13 +339,6 @@ checked_int64_subtract(int64_t *out, int + *(x) = bswap_32(*(x)); \ + } while (0) + +-static inline uint16_t +-bswap_16(uint16_t x) +-{ +- return (((x & 0xFF00) >> 8) | +- ((x & 0x00FF) << 8)); +-} +- + #define swaps(x) do { \ + if (sizeof(*(x)) != 2) \ + wrong_size(); \ diff --git a/package/yajl/Makefile b/package/yajl/Makefile index f81ccf66b..321d24971 100644 --- a/package/yajl/Makefile +++ b/package/yajl/Makefile @@ -6,16 +6,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= yajl PKG_VERSION:= 2.1.0 PKG_RELEASE:= 1 -PKG_HASH:= 510a13e0be57cd4ba99e60ac806a3635854af51316d3131d3742a90298ccde38 +PKG_HASH:= 3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a PKG_DESCR:= small event-driven json parser PKG_SECTION:= libs/data PKG_BUILDDEP:= cmake-host ruby-host PKG_URL:= http://lloyd.github.com/yajl/ -PKG_SITES:= http://github.com/lloyd/yajl/tarball/$(PKG_VERSION)/ +PKG_SITES:= https://github.com/lloyd/yajl/archive/refs/tags/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -WRKDIST= $(WRKDIR)/lloyd-yajl-66cb08c/ +DISTFILES:= ${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/package.mk |