diff options
Diffstat (limited to 'source')
15 files changed, 47 insertions, 34 deletions
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild index a5b8f33a1..052eabba2 100755 --- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild +++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_elflibs VERSION=${VERSION:-15.0} -BUILD=${BUILD:-28} +BUILD=${BUILD:-29} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs index 6f1d3ab07..414e3373a 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs @@ -89,3 +89,4 @@ /usr/lib/libusb-1.0.so.0 /usr/lib/libvga.so.1 /usr/lib/libvgagl.so.1 +/usr/lib/libzstd.so.1 diff --git a/source/a/kmod/kmod.SlackBuild b/source/a/kmod/kmod.SlackBuild index 90eb3432c..fab2b6f7d 100755 --- a/source/a/kmod/kmod.SlackBuild +++ b/source/a/kmod/kmod.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=kmod -VERSION=${VERSION:-27} +VERSION=${VERSION:-28} BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then @@ -94,6 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \ --with-openssl \ --with-xz \ --with-zlib \ + --with-zstd \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 @@ -132,6 +133,7 @@ sed -i "s,/usr/lib,/lib,g" man/* # --with-openssl \ # --with-xz \ # --with-zlib \ +# --with-zstd \ # --build=$ARCH-slackware-linux || exit 1 # #make \ diff --git a/source/buildlist-from-changelog.sh b/source/buildlist-from-changelog.sh index 56719c286..d4cb6670c 100755 --- a/source/buildlist-from-changelog.sh +++ b/source/buildlist-from-changelog.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -222,20 +222,6 @@ cat $TMPDIR/header $TMPDIR/kernel $TMPDIR/sobumps $TMPDIR/perl $TMPDIR/packages fi SERIES=$(dirname $line) PACKAGE=$(pkgname $line) - # Handle special case of KDE package: - if [ "$SERIES" = "kde" ]; then - if [ -x $SLACKSRC/kde/kde.SlackBuild ]; then - KDESB=kde/kde.SlackBuild - elif [ -x $SLACKSRC/kde/kde/kde.SlackBuild ]; then - KDESB=kde/kde/kde.SlackBuild - else - echo "# UNHANDLED: $line" >> $TMPDIR/output - continue - fi - BUILDOPT="$(grep "^${PACKAGE}$" $(dirname $SLACKSRC/$KDESB)/modules/* | rev | cut -f 1 -d / | rev)" - echo "$KDESB $BUILDOPT" >> $TMPDIR/output - continue - fi # Search SlackBuilds that start with that name: SEARCHFOUND=false for searchdir in $SLACKSRC/*/$(echo $PACKAGE | cut -f 1 -d -)* ; do @@ -263,6 +249,20 @@ cat $TMPDIR/header $TMPDIR/kernel $TMPDIR/sobumps $TMPDIR/perl $TMPDIR/packages if [ "$SEARCHFOUND" = "true" ]; then continue fi + # Handle special case of KDE package: + if [ "$SERIES" = "kde" ]; then + if [ -x $SLACKSRC/kde/kde.SlackBuild ]; then + KDESB=kde/kde.SlackBuild + elif [ -x $SLACKSRC/kde/kde/kde.SlackBuild ]; then + KDESB=kde/kde/kde.SlackBuild + else + echo "# UNHANDLED: $line" >> $TMPDIR/output + continue + fi + BUILDOPT="$(grep "^${PACKAGE}$" $(dirname $SLACKSRC/$KDESB)/modules/* | rev | cut -f 1 -d / | rev)" + echo "$KDESB $BUILDOPT" >> $TMPDIR/output + continue + fi # Handle special case of aspell-en: if [ "$PACKAGE" = "aspell-en" ]; then echo "# To rebuild aspell-en, see:" >> $TMPDIR/output diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index c7c0992a7..e28b9d61a 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,6 @@ +Sat Jan 9 19:43:33 UTC 2021 + Add libzstd.so.1, needed by kmod. ++--------------------------+ Thu Dec 31 20:35:53 UTC 2020 Add libelogind.so.0, needed by libprocps.so.8. +--------------------------+ diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index bc8c978e9..5cc3b3534 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -930,6 +930,7 @@ l/pcre \ l/popt \ l/readline \ l/zlib \ +l/zstd \ n/dhcpcd \ n/dnsmasq \ n/iproute2 \ @@ -1271,6 +1272,7 @@ cp -fa${VERBOSE1} \ libstdc++*.so* \ libunistring*.so* \ libusb-1.0*.so* \ + libzstd.so* \ $PKG/$ARCH-installer-filesystem/usr/lib${LIBDIRSUFFIX}/ # Stuff needed for os-prober: diff --git a/source/k/kernel-configs/config-generic-5.10.5 b/source/k/kernel-configs/config-generic-5.10.6 index fed467e74..a3ad07b06 100644 --- a/source/k/kernel-configs/config-generic-5.10.5 +++ b/source/k/kernel-configs/config-generic-5.10.6 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.5 Kernel Configuration +# Linux/x86 5.10.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -6486,7 +6486,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/source/k/kernel-configs/config-generic-5.10.5.x64 b/source/k/kernel-configs/config-generic-5.10.6.x64 index 4cbb9c9c4..016ccc705 100644 --- a/source/k/kernel-configs/config-generic-5.10.5.x64 +++ b/source/k/kernel-configs/config-generic-5.10.6.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.5 Kernel Configuration +# Linux/x86 5.10.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -6418,7 +6418,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m @@ -9510,7 +9510,6 @@ CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y -CONFIG_DMA_VIRT_OPS=y CONFIG_SWIOTLB=y CONFIG_DMA_COHERENT_POOL=y CONFIG_DMA_CMA=y diff --git a/source/k/kernel-configs/config-generic-smp-5.10.5-smp b/source/k/kernel-configs/config-generic-smp-5.10.6-smp index 502ba1247..ebf6d321a 100644 --- a/source/k/kernel-configs/config-generic-smp-5.10.5-smp +++ b/source/k/kernel-configs/config-generic-smp-5.10.6-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.5 Kernel Configuration +# Linux/x86 5.10.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -6532,7 +6532,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/source/k/kernel-configs/config-huge-5.10.5 b/source/k/kernel-configs/config-huge-5.10.6 index 88fed9b90..d94ce837d 100644 --- a/source/k/kernel-configs/config-huge-5.10.5 +++ b/source/k/kernel-configs/config-huge-5.10.6 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.5 Kernel Configuration +# Linux/x86 5.10.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -6486,7 +6486,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/source/k/kernel-configs/config-huge-5.10.5.x64 b/source/k/kernel-configs/config-huge-5.10.6.x64 index 5d6730f69..cbc619589 100644 --- a/source/k/kernel-configs/config-huge-5.10.5.x64 +++ b/source/k/kernel-configs/config-huge-5.10.6.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.5 Kernel Configuration +# Linux/x86 5.10.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -6418,7 +6418,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m @@ -9510,7 +9510,6 @@ CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y -CONFIG_DMA_VIRT_OPS=y CONFIG_SWIOTLB=y CONFIG_DMA_COHERENT_POOL=y CONFIG_DMA_CMA=y diff --git a/source/k/kernel-configs/config-huge-smp-5.10.5-smp b/source/k/kernel-configs/config-huge-smp-5.10.6-smp index 6e9171787..d25f4d68b 100644 --- a/source/k/kernel-configs/config-huge-smp-5.10.5-smp +++ b/source/k/kernel-configs/config-huge-smp-5.10.6-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.5 Kernel Configuration +# Linux/x86 5.10.6 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -6532,7 +6532,7 @@ CONFIG_SND_HDA_CODEC_CMEDIA=m CONFIG_SND_HDA_CODEC_SI3054=m CONFIG_SND_HDA_GENERIC=m CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -# CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set +CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio CONFIG_SND_HDA_CORE=m diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -2 +1 diff --git a/source/l/gvfs/gvfs.SlackBuild b/source/l/gvfs/gvfs.SlackBuild index 7cd928045..199ebdbfc 100755 --- a/source/l/gvfs/gvfs.SlackBuild +++ b/source/l/gvfs/gvfs.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gvfs VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/system-config-printer/system-config-printer.SlackBuild b/source/l/system-config-printer/system-config-printer.SlackBuild index 4b8b6ef3c..09d7bf635 100755 --- a/source/l/system-config-printer/system-config-printer.SlackBuild +++ b/source/l/system-config-printer/system-config-printer.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL -# Copyright 2010, 2011, 2012, 2013, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2011, 2012, 2013, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -90,6 +90,13 @@ find . \ -exec chmod 644 {} \+ # Configure: +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ |