Merge branch 'master' of https://github.com/hgy59/spksrc into update_vim

SynoCommunity · Jan 19, 2025 · d741b36 · d741b36
2 parents db82735 + bdc87a5
commit d741b36
Show file tree

Hide file tree

Showing 74 changed files with 723 additions and 369 deletions.
diff --git a/.github/actions/download.sh b/.github/actions/download.sh
@@ -33,7 +33,7 @@ if [ -z "${build_packages}" ]; then
 else
     for package in ${build_packages}; do
         echo "===> Download wheels: ${package}"
-        make -C spk/${package} wheeldownload
+        make -C spk/${package} download-wheels
     done
 fi
 

diff --git a/.github/actions/prepare.sh b/.github/actions/prepare.sh
@@ -25,13 +25,7 @@ SPK_TO_BUILD="${USER_SPK_TO_BUILD} ${GH_SPK_PACKAGES} "
 # get dependency list
 # dependencies in this list include the cross or native folder (i.e. native/python cross/glib)
 echo "Building dependency list..."
-DEPENDENCY_LIST=
-for package in $(find spk/ -maxdepth 1 -type d | cut -c 5- | sort)
-do
-    if [ ! -f "./spk/${package}/BROKEN" ]; then
-        DEPENDENCY_LIST+=$(DEPENDENCY_WALK=1 make -s -C spk/${package} dependency-list 2> /dev/null)$'\n'
-    fi
-done
+DEPENDENCY_LIST=$(make dependency-list 2> /dev/null)
 
 # search for dependent spk packages
 for package in ${GH_DEPENDENCY_FOLDERS}

diff --git a/Makefile b/Makefile
@@ -79,12 +79,9 @@ dependency-tree:
 	done
 
 # build dependency list for all packages
-# - exclude broken packages
+# - broken packages are excluded
 dependency-list:
-	@for spk in $(filter-out $(dir $(wildcard spk/*/BROKEN)),$(dir $(wildcard spk/*/Makefile))) ; \
-	do \
-	    $(MAKE) -s -C $${spk} dependency-list ; \
-	done
+	@mk/dependency-list.sh
 
 # define a template that instantiates a 'python3-avoton-6.1' -style target for
 # every ($2) arch, every ($1) spk

diff --git a/cross/gpac/Makefile b/cross/gpac/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME = gpac
 PKG_VERS = 2.2.1
-PKG_REV = 1
+GPAC_GIT_REVISION = "1 (SynoCommunity)"
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/gpac/gpac/archive
@@ -11,18 +11,22 @@ HOMEPAGE = https://gpac.io
 COMMENT  = Home of MP4Box.
 LICENSE  = LGPLv2
 
-# incompatible toolchain
+# toolchains lacking atomic support
 UNSUPPORTED_ARCHS = $(PPC_ARCHS) $(ARMv5_ARCHS) $(ARMv7L_ARCHS)
 
 DEPENDS = cross/zlib
 
-CONFIGURE_ARGS  = --enable-pic
-CONFIGURE_ARGS += --extra-cflags="-Wno-pointer-sign"
+GNU_CONFIGURE = 1
 
-PRE_COMPILE_TARGET = gpac_precompile
+CONFIGURE_ARGS = --enable-pic
+# suppress some compiler warnings:
+CONFIGURE_ARGS += --extra-cflags="-Wno-pointer-sign -Wno-array-bounds -Wno-maybe-uninitialized"
+
+PRE_COMPILE_TARGET = gpac_pre_compile
 
 include ../../mk/spksrc.cross-cc.mk
 
-.PHONY: gpac_precompile 
-gpac_precompile:
-	@echo "#define GPAC_GIT_REVISION \"$(PKG_REV) (SynoCommunity)\"" > $(WORK_DIR)/$(PKG_DIR)/include/gpac/revision.h
+.PHONY: gpac_pre_compile 
+gpac_pre_compile:
+	@$(MSG) "Patch revision.h to avoid UNKNOWN_REV (used when build is not in gpac git repository)"
+	@sed -e 's/"UNKNOWN_REV"/$(GPAC_GIT_REVISION)/' -i $(WORK_DIR)/$(PKG_DIR)/include/gpac/revision.h
diff --git a/cross/gpac/PLIST b/cross/gpac/PLIST
@@ -4,8 +4,4 @@ lib:lib/gpac/gm_validator.so
 lnk:lib/libgpac.so
 lnk:lib/libgpac.so.12
 lib:lib/libgpac.so.12.10.1
-lnk:lib/libz.so
-lnk:lib/libz.so.1
-lib:lib/libz.so.1.2.13
 rsc:share/gpac/
-rsc:share/man/
diff --git a/cross/gpac/patches/001-configure.patch b/cross/gpac/patches/001-configure.patch
@@ -1,3 +1,5 @@
+# prefere tools defined as environment variables
+# 
 --- configure
 +++ configure
 @@ -48,13 +48,13 @@ if test "$cxx_orig" = "" ; then

diff --git a/cross/libexpat/Makefile b/cross/libexpat/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = libexpat
-PKG_VERS = 2.6.2
+PKG_VERS = 2.6.4
 PKG_EXT = tar.xz
 PKG_DIST_NAME = expat-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(PKG_VERS))

diff --git a/cross/libexpat/PLIST b/cross/libexpat/PLIST
@@ -1,3 +1,3 @@
 lnk:lib/libexpat.so
 lnk:lib/libexpat.so.1
-lib:lib/libexpat.so.1.9.2
+lib:lib/libexpat.so.1.10.0
diff --git a/cross/libexpat/digests b/cross/libexpat/digests
@@ -1,3 +1,3 @@
-libexpat-2.6.2.tar.xz SHA1 d9e5f953dcacda3c9e69b4886382c3d8847b81bd
-libexpat-2.6.2.tar.xz SHA256 ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364
-libexpat-2.6.2.tar.xz MD5 0cb75c8feb842c0794ba89666b762a2d
+libexpat-2.6.4.tar.xz SHA1 97d653e8f5a30dfdec7d6e525151efeac7890942
+libexpat-2.6.4.tar.xz SHA256 a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee
+libexpat-2.6.4.tar.xz MD5 101fe3e320a2800f36af8cf4045b45c7
diff --git a/cross/libssh2/Makefile b/cross/libssh2/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME = libssh2
-PKG_VERS = 1.11.0
-PKG_EXT = tar.gz
+PKG_VERS = 1.11.1
+PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.libssh2.org/download
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

diff --git a/cross/libssh2/digests b/cross/libssh2/digests
@@ -1,3 +1,3 @@
-libssh2-1.11.0.tar.gz SHA1 fbdb4751a4bc93e895e9c3426f7f80b437d250fe
-libssh2-1.11.0.tar.gz SHA256 3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461
-libssh2-1.11.0.tar.gz MD5 a01d543fd891ca48fe47726540d50b17
+libssh2-1.11.1.tar.xz SHA1 31d6c93e981fe259d679a21afd9098821c869483
+libssh2-1.11.1.tar.xz SHA256 9954cb54c4f548198a7cbebad248bdc87dd64bd26185708a294b2b50771e3769
+libssh2-1.11.1.tar.xz MD5 54111b78a406f8a23e603d342de90056
diff --git a/cross/libssh2/patches/001-remove-warning-not-supported-with-old-gcc.patch b/cross/libssh2/patches/001-remove-warning-not-supported-with-old-gcc.patch
@@ -0,0 +1,12 @@
+# remove -Wtrampolines not supported by gcc v4.3.2 of ppc853x-5.2
+# 
+--- cmake/PickyWarnings.cmake.orig	2024-10-16 08:03:21.000000000 +0000
++++ cmake/PickyWarnings.cmake	2025-01-05 19:21:34.842788054 +0000
+@@ -176,7 +176,6 @@
+           -Wmissing-parameter-type         #             gcc  4.3
+           -Wold-style-declaration          #             gcc  4.3
+           -Wstrict-aliasing=3              #             gcc  4.0
+-          -Wtrampolines                    #             gcc  4.3
+         )
+       endif()
+       if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5 AND MINGW)
diff --git a/cross/monit/Makefile b/cross/monit/Makefile
@@ -1,11 +1,11 @@
 PKG_NAME = monit
-PKG_VERS = 5.29.0
+PKG_VERS = 5.34.4
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://mmonit.com/monit/dist
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/openssl
+DEPENDS = cross/openssl3
 
 UNSUPPORTED_ARCHS = $(PPC_ARCHS)
 

diff --git a/cross/monit/digests b/cross/monit/digests
@@ -1,3 +1,3 @@
-monit-5.29.0.tar.gz SHA1 818517cdd9bb010bfcdf093c2eb9753f825035ac
-monit-5.29.0.tar.gz SHA256 f665e6dd1f26a74b5682899a877934167de2b2582e048652ecf036318477885f
-monit-5.29.0.tar.gz MD5 8a0546d0d52216b22ebd57acc0bb1e03
+monit-5.34.4.tar.gz SHA1 eb276acba53a71fe73661f72963761bcce583384
+monit-5.34.4.tar.gz SHA256 ef607cfaabfd3767d40b9b9e32032f748beebc4d686831f6111e0e68fbd1b469
+monit-5.34.4.tar.gz MD5 0a4980f1c1d9da55bc39afae2a49f9e2
diff --git a/cross/python2/Makefile b/cross/python2/Makefile
@@ -7,7 +7,7 @@ PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
 PKG_DIR = Python-$(PKG_VERS)
 
 DEPENDS  = cross/zlib cross/openssl cross/sqlite cross/readline cross/ncursesw cross/bzip2
-DEPENDS += cross/berkeleydb-5.3 native/$(PKG_NAME)
+DEPENDS += cross/berkeleydb-5.3 native/python2
 
 HOMEPAGE = http://www.python.org
 COMMENT  = Python Programming Language

diff --git a/cross/python38/Makefile b/cross/python38/Makefile
@@ -6,7 +6,7 @@ PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
 PKG_DIR = Python-$(PKG_VERS)
 
-BUILD_DEPENDS = native/$(PKG_NAME)
+BUILD_DEPENDS = native/python38
 
 DEPENDS  = cross/zlib cross/sqlite cross/readline cross/ncursesw cross/bzip2 cross/xz
 # required for uuid module

diff --git a/cross/stockfish-webgui/digests b/cross/stockfish-webgui/digests
@@ -1,3 +1,3 @@
-stockfish-webgui-gite474343.tar.gz SHA1 50fa54b5d6fbebe817fa0438619bcc5a74224f95
-stockfish-webgui-gite474343.tar.gz SHA256 f2abdc0f2bd29804f7473d87e84d3d105775f4b242c7be879c5459975f0e7399
-stockfish-webgui-gite474343.tar.gz MD5 5293d2fb00b57335e6d05e587b59e081
+stockfish-webgui-gite474343.tar.gz SHA1 cf17da9801ae61e20b04c7a794bbf128d7bcf507
+stockfish-webgui-gite474343.tar.gz SHA256 a9e240b642773e6faae59ab3fc851054ff7743bb436953190d9b0dd8ab4509f7
+stockfish-webgui-gite474343.tar.gz MD5 d8cdcb7ecd833e858e2e852a07419273
diff --git a/cross/znc/Makefile b/cross/znc/Makefile
@@ -9,7 +9,7 @@ ifeq ($(strip $(PYTHON_PACKAGE)),)
 PYTHON_PACKAGE = python311
 endif
 
-BUILD_DEPENDS = cross/$(PYTHON_PACKAGE)
+BUILD_DEPENDS = cross/python311
 DEPENDS = cross/openssl3 cross/libicu cross/zlib
 
 # configure: No compiler with C++11 support was found

diff --git a/diyspk/bandwhich/Makefile b/diyspk/bandwhich/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = bandwhich
 SPK_VERS = 0.20.0
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/bandwhich
 
 # unknown relocation type 95 ...
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)

diff --git a/diyspk/bottom/Makefile b/diyspk/bottom/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = bottom
 SPK_VERS = 0.6.8
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/bottom
 
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 

diff --git a/diyspk/cpulimit/Makefile b/diyspk/cpulimit/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = cpulimit
 SPK_VERS = 0.2
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/cpulimit
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = CPU usage limiter for Linux.

diff --git a/diyspk/duf/Makefile b/diyspk/duf/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = duf
 SPK_VERS = 0.8.1
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/duf
 
 UNSUPPORTED_ARCHS = $(PPC_ARCHS)
 

diff --git a/diyspk/dutree/Makefile b/diyspk/dutree/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = dutree
 SPK_VERS = 0.2.18
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/dutree
 
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 

diff --git a/diyspk/etherwake/Makefile b/diyspk/etherwake/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = etherwake
 SPK_VERS = 1.09
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/etherwake
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Generate and transmit a Wake-On-LAN (WOL) Magic Packet

diff --git a/diyspk/fritzctl/Makefile b/diyspk/fritzctl/Makefile
@@ -1,9 +1,9 @@
 SPK_NAME = fritzctl
 SPK_VERS = 1.4.23
 SPK_REV = 1
-SPK_ICON = src/$(SPK_NAME).png
+SPK_ICON = src/fritzctl.png
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/fritzctl
 
 MAINTAINER = bpicode
 DESCRIPTION = A lightweight, easy to use console client for the AVM FRITZ!Box Home Automation.

diff --git a/diyspk/jupp/Makefile b/diyspk/jupp/Makefile
@@ -3,7 +3,7 @@ SPK_VERS = 40
 SPK_REV = 2
 SPK_ICON = src/jupp.png
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/jupp
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = text editor jupp comes with the editor flavours known from joe, specifically, jmacs, joe, jpico, jstar, and rjoe.

diff --git a/diyspk/mtr/Makefile b/diyspk/mtr/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = mtr
 SPK_VERS = 0.95
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/mtr
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = mtr \(My traceroute\) combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool.

diff --git a/diyspk/procs/Makefile b/diyspk/procs/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = procs
 SPK_VERS = 0.12.3
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/procs
 
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
 

diff --git a/diyspk/tdu/Makefile b/diyspk/tdu/Makefile
@@ -2,7 +2,7 @@ SPK_NAME = tdu
 SPK_VERS = 1.36
 SPK_REV = 1
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/tdu
 
 UNSUPPORTED_ARCHS = $(PPC_ARCHS)
 

diff --git a/diyspk/testdisk/Makefile b/diyspk/testdisk/Makefile
@@ -3,7 +3,7 @@ SPK_VERS = 7.1
 SPK_REV = 4
 SPK_ICON = src/testdisk.png
 
-DEPENDS  = cross/$(SPK_NAME)
+DEPENDS  = cross/testdisk
 
 MAINTAINER = hgy59
 DESCRIPTION = "TestDisk is powerful free data recovery software."