From e6f45d8772363d0730cdf030d307bdbb23a1876c Mon Sep 17 00:00:00 2001 From: Woodpecker CI Date: Thu, 21 Aug 2025 22:47:55 +0000 Subject: Woodpecker CI 843dc9355d70385c9345f1d42ba286275e3e433e [SKIP CI] --- lz4/.checksum | 1 + lz4/.files | 25 +++++ lz4/abuild | 10 ++ mesa/.checksum | 2 +- mesa/.files | 2 +- mesa/abuild | 2 +- meson/.checksum | 2 +- meson/.files | 14 +-- meson/abuild | 2 +- squashfs-tools/.checksum | 3 +- ...-generate-manpages-Workaround-busybox-sed.patch | 105 +++++++++++++++++++++ squashfs-tools/abuild | 5 +- squashfs-tools/depends | 1 + 13 files changed, 159 insertions(+), 15 deletions(-) create mode 100644 lz4/.checksum create mode 100644 lz4/.files create mode 100644 lz4/abuild create mode 100644 squashfs-tools/0002-generate-manpages-Workaround-busybox-sed.patch diff --git a/lz4/.checksum b/lz4/.checksum new file mode 100644 index 00000000..e19c4393 --- /dev/null +++ b/lz4/.checksum @@ -0,0 +1 @@ +3e69fd475e7852e17594985528b5232afeba7d3d56cfebe2e89071768b2ab36a lz4-1.10.0.tar.gz diff --git a/lz4/.files b/lz4/.files new file mode 100644 index 00000000..7f2869ac --- /dev/null +++ b/lz4/.files @@ -0,0 +1,25 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/lz4 +lrwxrwxrwx root/root usr/bin/lz4c -> lz4 +lrwxrwxrwx root/root usr/bin/lz4cat -> lz4 +lrwxrwxrwx root/root usr/bin/unlz4 -> lz4 +drwxr-xr-x root/root usr/include/ +-rw-r--r-- root/root usr/include/lz4.h +-rw-r--r-- root/root usr/include/lz4file.h +-rw-r--r-- root/root usr/include/lz4frame.h +-rw-r--r-- root/root usr/include/lz4frame_static.h +-rw-r--r-- root/root usr/include/lz4hc.h +drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/liblz4.so -> liblz4.so.1.10.0 +lrwxrwxrwx root/root usr/lib/liblz4.so.1 -> liblz4.so.1.10.0 +-rwxr-xr-x root/root usr/lib/liblz4.so.1.10.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/liblz4.pc +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/lz4.1.gz +lrwxrwxrwx root/root usr/share/man/man1/lz4c.1.gz -> lz4.1.gz +lrwxrwxrwx root/root usr/share/man/man1/lz4cat.1.gz -> lz4.1.gz +lrwxrwxrwx root/root usr/share/man/man1/unlz4.1.gz -> lz4.1.gz diff --git a/lz4/abuild b/lz4/abuild new file mode 100644 index 00000000..6f8cb5e0 --- /dev/null +++ b/lz4/abuild @@ -0,0 +1,10 @@ +name=lz4 +version=1.10.0 +release=1 +source="https://github.com/${name}/${name}/releases/download/v${version}/${name}-${version}.tar.gz" + +build() { + make -C lib PREFIX=/usr + make -C programs PREFIX=/usr lz4 lz4c + make install PREFIX=/usr DESTDIR=$PKG +} diff --git a/mesa/.checksum b/mesa/.checksum index cd5b12ed..d0be4608 100644 --- a/mesa/.checksum +++ b/mesa/.checksum @@ -1 +1 @@ -8b43c6391743688c25fcfa0647e8e37ee43375b053deb6f70b1bd6d37c13beff mesa-25.1.8.tar.xz +3038096ae6d897877c9e1b740da25b97e27b192c1adef9f009e94a4210fe1328 mesa-25.2.1.tar.xz diff --git a/mesa/.files b/mesa/.files index d2909863..602bb203 100644 --- a/mesa/.files +++ b/mesa/.files @@ -14,7 +14,7 @@ drwxr-xr-x root/root usr/lib/gbm/ lrwxrwxrwx root/root usr/lib/libEGL_mesa.so -> libEGL_mesa.so.0 lrwxrwxrwx root/root usr/lib/libEGL_mesa.so.0 -> libEGL_mesa.so.0.0.0 -rwxr-xr-x root/root usr/lib/libEGL_mesa.so.0.0.0 --rwxr-xr-x root/root usr/lib/libgallium-25.1.8.so +-rwxr-xr-x root/root usr/lib/libgallium-25.2.1.so lrwxrwxrwx root/root usr/lib/libgbm.so -> libgbm.so.1 lrwxrwxrwx root/root usr/lib/libgbm.so.1 -> libgbm.so.1.0.0 -rwxr-xr-x root/root usr/lib/libgbm.so.1.0.0 diff --git a/mesa/abuild b/mesa/abuild index 973ba87d..b15ff9cf 100644 --- a/mesa/abuild +++ b/mesa/abuild @@ -1,5 +1,5 @@ name=mesa -version=25.1.8 +version=25.2.1 release=1 source="https://archive.mesa3d.org/$name-$version.tar.xz" diff --git a/meson/.checksum b/meson/.checksum index f41e523b..7537a6b3 100644 --- a/meson/.checksum +++ b/meson/.checksum @@ -1 +1 @@ -a68f3209fcdaf2f1125eebf90c28d4ed6fc9f6b0dfe13049e23aaee6391a31b5 meson-1.8.3.tar.gz +9d80297c834e68dbbca086468a25d09385ffa0e0864d19cc4ddd91baf0af6e9c meson-1.8.4.tar.gz diff --git a/meson/.files b/meson/.files index 49c40a86..095a0263 100644 --- a/meson/.files +++ b/meson/.files @@ -4,13 +4,13 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.13/ drwxr-xr-x root/root usr/lib/python3.13/site-packages/ -drwxr-xr-x root/root usr/lib/python3.13/site-packages/meson-1.8.3-py3.13.egg-info/ --rw-r--r-- root/root usr/lib/python3.13/site-packages/meson-1.8.3-py3.13.egg-info/PKG-INFO --rw-rw-r-- root/root usr/lib/python3.13/site-packages/meson-1.8.3-py3.13.egg-info/SOURCES.txt --rw-rw-r-- root/root usr/lib/python3.13/site-packages/meson-1.8.3-py3.13.egg-info/dependency_links.txt --rw-rw-r-- root/root usr/lib/python3.13/site-packages/meson-1.8.3-py3.13.egg-info/entry_points.txt --rw-rw-r-- root/root usr/lib/python3.13/site-packages/meson-1.8.3-py3.13.egg-info/requires.txt --rw-rw-r-- root/root usr/lib/python3.13/site-packages/meson-1.8.3-py3.13.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.13/site-packages/meson-1.8.4-py3.13.egg-info/ +-rw-r--r-- root/root usr/lib/python3.13/site-packages/meson-1.8.4-py3.13.egg-info/PKG-INFO +-rw-rw-r-- root/root usr/lib/python3.13/site-packages/meson-1.8.4-py3.13.egg-info/SOURCES.txt +-rw-rw-r-- root/root usr/lib/python3.13/site-packages/meson-1.8.4-py3.13.egg-info/dependency_links.txt +-rw-rw-r-- root/root usr/lib/python3.13/site-packages/meson-1.8.4-py3.13.egg-info/entry_points.txt +-rw-rw-r-- root/root usr/lib/python3.13/site-packages/meson-1.8.4-py3.13.egg-info/requires.txt +-rw-rw-r-- root/root usr/lib/python3.13/site-packages/meson-1.8.4-py3.13.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.13/site-packages/mesonbuild/ -rw-r--r-- root/root usr/lib/python3.13/site-packages/mesonbuild/__init__.py drwxr-xr-x root/root usr/lib/python3.13/site-packages/mesonbuild/__pycache__/ diff --git a/meson/abuild b/meson/abuild index dbf20840..683edcb9 100644 --- a/meson/abuild +++ b/meson/abuild @@ -1,4 +1,4 @@ name=meson -version=1.8.3 +version=1.8.4 release=1 source="https://github.com/mesonbuild/$name/releases/download/$version/$name-$version.tar.gz" diff --git a/squashfs-tools/.checksum b/squashfs-tools/.checksum index cabfc4ad..3ca60ba5 100644 --- a/squashfs-tools/.checksum +++ b/squashfs-tools/.checksum @@ -1 +1,2 @@ -c0da71730793c5d8b6bbcbb170a75c804191f90048254203007da06bf9f0c53c squashfs-tools-4.6.1.tar.gz +528027175c87c86cf8432405313a3219dcc89c22ea32cbada17fd3646594a5fa 0002-generate-manpages-Workaround-busybox-sed.patch +388f328ead5b6f0a8401adeeb16f71fdcff21304b860d2f627c610ad42cbbd6e squashfs-tools-4.7.2.tar.gz diff --git a/squashfs-tools/0002-generate-manpages-Workaround-busybox-sed.patch b/squashfs-tools/0002-generate-manpages-Workaround-busybox-sed.patch new file mode 100644 index 00000000..a2ce7f04 --- /dev/null +++ b/squashfs-tools/0002-generate-manpages-Workaround-busybox-sed.patch @@ -0,0 +1,105 @@ +From 7e7a26b1f975396c36351ea661efc8b06777cb42 Mon Sep 17 00:00:00 2001 +From: Yao Zi +Date: Mon, 9 Jun 2025 11:56:45 +0000 +Subject: [PATCH] generate-manpages: Workaround busybox sed + +Busybox SED doesn't support \U in replacement pattern, which is used to +turning option arugments into uppercase in manpage-generation scripts. + +Let's remove the sed-compatibility check and simply don't do the +case-conversion. A less well-formatted documentation is better than +nothing. + +Signed-off-by: Yao Zi +--- + squashfs-tools/generate-manpages/functions.sh | 26 +------------------ + .../generate-manpages/mksquashfs-manpage.sh | 5 ---- + .../generate-manpages/sqfscat-manpage.sh | 5 ---- + .../generate-manpages/unsquashfs-manpage.sh | 5 ---- + 4 files changed, 1 insertion(+), 40 deletions(-) + +diff --git a/squashfs-tools/generate-manpages/functions.sh b/squashfs-tools/generate-manpages/functions.sh +index 5e31d9cdc32c..efbc00000b85 100755 +--- a/squashfs-tools/generate-manpages/functions.sh ++++ b/squashfs-tools/generate-manpages/functions.sh +@@ -53,28 +53,4 @@ if ! which echo > /dev/null 2>&1; then + fi + + ECHO=$(which echo) +- +-# The manpage generation scripts rely on sed being GNU sed. Check whether +-# 'sed' looks like GNU sed, and if not try gsed which is often what GNU sed is +-# named on BSD systems. +-# +-# If SED has been already defined on the command line then use that, but, +-# check that it looks like GNU sed too. +-if [ -n "${SED}" ]; then +- if ! check_sed "${SED}"; then +- error "$0: SED set to ${SED}, but this doesn't seem to be GNU sed!" +- error "$0: Fix variable or install GNU sed before running this script!" +- exit 1 +- fi +-elif check_sed sed; then +- SED=sed; +-elif check_sed gsed; then +- SED=gsed +-else +- error "$0: You don't seem to have GNU sed installed, either as sed or gsed." +- error "$0: Fix PATH or install GNU sed before running this script!" +- error "$0: If GNU sed is not named sed or gsed on your system" +- error "$0: use SED=xxx on command line" +- +- exit 1 +-fi ++SED=sed +diff --git a/squashfs-tools/generate-manpages/mksquashfs-manpage.sh b/squashfs-tools/generate-manpages/mksquashfs-manpage.sh +index fbbbf9610fef..4ba36b8d3239 100755 +--- a/squashfs-tools/generate-manpages/mksquashfs-manpage.sh ++++ b/squashfs-tools/generate-manpages/mksquashfs-manpage.sh +@@ -120,11 +120,6 @@ ${SED} -i -e "s/expr> as/expr> as/" -e "s/exp> as/exp> as/" \ + + ${SED} -i -e "s/act@/action@/g" -e "s/expr>/expression>/g" -e "s/exp>/expression>/" -e "s///g" $tmp/mksquashfs.help + +-# Uppercase the options operands (between < and > ) to make it conform +-# more to man page standards +- +-${SED} -i "s/<[^>]*>/\U&/g" $tmp/mksquashfs.help +- + # Undo the above for the -pd option, where the case actually matters! Also + # expand the truncated uid and gid in help text due to lack of space. + # Also put quotes around the above pseudo definitions +diff --git a/squashfs-tools/generate-manpages/sqfscat-manpage.sh b/squashfs-tools/generate-manpages/sqfscat-manpage.sh +index 76940fb2239a..71eab52a7c6a 100755 +--- a/squashfs-tools/generate-manpages/sqfscat-manpage.sh ++++ b/squashfs-tools/generate-manpages/sqfscat-manpage.sh +@@ -115,11 +115,6 @@ ${SED} -i "s/\([^ ][^ \[]*\)\[\([a-z-]*\)\]/\1, \1\2/" $tmp/sqfscat.help + + ${SED} -i "s/\t/ /g" $tmp/sqfscat.help + +-# Uppercase the options operands (between < and > ) to make it conform +-# more to man page standards +- +-${SED} -i "s/<[^>]*>/\U&/g" $tmp/sqfscat.help +- + # Remove the "<" and ">" around options operands to make it conform + # more to man page standards + +diff --git a/squashfs-tools/generate-manpages/unsquashfs-manpage.sh b/squashfs-tools/generate-manpages/unsquashfs-manpage.sh +index e2c25bd88e0d..55e0abbd948a 100755 +--- a/squashfs-tools/generate-manpages/unsquashfs-manpage.sh ++++ b/squashfs-tools/generate-manpages/unsquashfs-manpage.sh +@@ -115,11 +115,6 @@ ${SED} -i "s/\([^ ][^ \[]*\)\[\([a-z-]*\)\]/\1, \1\2/" $tmp/unsquashfs.help + + ${SED} -i "s/\t/ /g" $tmp/unsquashfs.help + +-# Uppercase the options operands (between < and > ) to make it conform +-# more to man page standards +- +-${SED} -i "s/<[^>]*>/\U&/g" $tmp/unsquashfs.help +- + # Remove the "<" and ">" around options operands to make it conform + # more to man page standards + +-- +2.49.0 + diff --git a/squashfs-tools/abuild b/squashfs-tools/abuild index c8d371fd..0aa2e8cb 100644 --- a/squashfs-tools/abuild +++ b/squashfs-tools/abuild @@ -1,7 +1,8 @@ name=squashfs-tools -version=4.6.1 +version=4.7.2 release=1 -source="https://github.com/plougher/$name/archive/$version/$name-$version.tar.gz" +source="https://github.com/plougher/$name/archive/$version/$name-$version.tar.gz + 0002-generate-manpages-Workaround-busybox-sed.patch" build() { make ZSTD_SUPPORT=1 GZIP_SUPPORT=1 LZO_SUPPORT=1 XZ_SUPPORT=1 EXTRA_CFLAGS="-fcommon" -C $name diff --git a/squashfs-tools/depends b/squashfs-tools/depends index ddde88fa..ae589085 100644 --- a/squashfs-tools/depends +++ b/squashfs-tools/depends @@ -1,2 +1,3 @@ lzo zstd +lz4 -- cgit v1.2.3