diff options
Diffstat (limited to 'source')
12 files changed, 168 insertions, 28 deletions
diff --git a/source/k/kernel-configs/config-generic-5.4.2 b/source/k/kernel-configs/config-generic-5.4.3 index eb1b30402..32ec45eb8 100644 --- a/source/k/kernel-configs/config-generic-5.4.2 +++ b/source/k/kernel-configs/config-generic-5.4.3 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.2 Kernel Configuration +# Linux/x86 5.4.3 Kernel Configuration # # @@ -639,7 +639,7 @@ CONFIG_EFI_CAPSULE_LOADER=m # CONFIG_EFI_TEST is not set CONFIG_APPLE_PROPERTIES=y # CONFIG_RESET_ATTACK_MITIGATION is not set -CONFIG_EFI_RCI2_TABLE=y +# CONFIG_EFI_RCI2_TABLE is not set # end of EFI (Extensible Firmware Interface) Support CONFIG_UEFI_CPER=y diff --git a/source/k/kernel-configs/config-generic-5.4.2.x64 b/source/k/kernel-configs/config-generic-5.4.3.x64 index 46a8d360e..b83ea0664 100644 --- a/source/k/kernel-configs/config-generic-5.4.2.x64 +++ b/source/k/kernel-configs/config-generic-5.4.3.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.2 Kernel Configuration +# Linux/x86 5.4.3 Kernel Configuration # # @@ -667,7 +667,7 @@ CONFIG_EFI_CAPSULE_LOADER=m # CONFIG_EFI_TEST is not set CONFIG_APPLE_PROPERTIES=y CONFIG_RESET_ATTACK_MITIGATION=y -CONFIG_EFI_RCI2_TABLE=y +# CONFIG_EFI_RCI2_TABLE is not set # end of EFI (Extensible Firmware Interface) Support CONFIG_UEFI_CPER=y diff --git a/source/k/kernel-configs/config-generic-smp-5.4.2-smp b/source/k/kernel-configs/config-generic-smp-5.4.3-smp index 93ab8f47d..967cd1576 100644 --- a/source/k/kernel-configs/config-generic-smp-5.4.2-smp +++ b/source/k/kernel-configs/config-generic-smp-5.4.3-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.2 Kernel Configuration +# Linux/x86 5.4.3 Kernel Configuration # # @@ -677,7 +677,7 @@ CONFIG_EFI_CAPSULE_LOADER=m # CONFIG_EFI_TEST is not set CONFIG_APPLE_PROPERTIES=y # CONFIG_RESET_ATTACK_MITIGATION is not set -CONFIG_EFI_RCI2_TABLE=y +# CONFIG_EFI_RCI2_TABLE is not set # end of EFI (Extensible Firmware Interface) Support CONFIG_UEFI_CPER=y diff --git a/source/k/kernel-configs/config-huge-5.4.2 b/source/k/kernel-configs/config-huge-5.4.3 index 7c913f714..679f3bbb1 100644 --- a/source/k/kernel-configs/config-huge-5.4.2 +++ b/source/k/kernel-configs/config-huge-5.4.3 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.2 Kernel Configuration +# Linux/x86 5.4.3 Kernel Configuration # # @@ -639,7 +639,7 @@ CONFIG_EFI_CAPSULE_LOADER=m # CONFIG_EFI_TEST is not set CONFIG_APPLE_PROPERTIES=y # CONFIG_RESET_ATTACK_MITIGATION is not set -CONFIG_EFI_RCI2_TABLE=y +# CONFIG_EFI_RCI2_TABLE is not set # end of EFI (Extensible Firmware Interface) Support CONFIG_UEFI_CPER=y diff --git a/source/k/kernel-configs/config-huge-5.4.2.x64 b/source/k/kernel-configs/config-huge-5.4.3.x64 index bd72eb38d..b6cdf7965 100644 --- a/source/k/kernel-configs/config-huge-5.4.2.x64 +++ b/source/k/kernel-configs/config-huge-5.4.3.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.2 Kernel Configuration +# Linux/x86 5.4.3 Kernel Configuration # # @@ -667,7 +667,7 @@ CONFIG_EFI_CAPSULE_LOADER=m # CONFIG_EFI_TEST is not set CONFIG_APPLE_PROPERTIES=y CONFIG_RESET_ATTACK_MITIGATION=y -CONFIG_EFI_RCI2_TABLE=y +# CONFIG_EFI_RCI2_TABLE is not set # end of EFI (Extensible Firmware Interface) Support CONFIG_UEFI_CPER=y diff --git a/source/k/kernel-configs/config-huge-smp-5.4.2-smp b/source/k/kernel-configs/config-huge-smp-5.4.3-smp index 199765cb2..47fa6209e 100644 --- a/source/k/kernel-configs/config-huge-smp-5.4.2-smp +++ b/source/k/kernel-configs/config-huge-smp-5.4.3-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.2 Kernel Configuration +# Linux/x86 5.4.3 Kernel Configuration # # @@ -677,7 +677,7 @@ CONFIG_EFI_CAPSULE_LOADER=m # CONFIG_EFI_TEST is not set CONFIG_APPLE_PROPERTIES=y # CONFIG_RESET_ATTACK_MITIGATION is not set -CONFIG_EFI_RCI2_TABLE=y +# CONFIG_EFI_RCI2_TABLE is not set # end of EFI (Extensible Firmware Interface) Support CONFIG_UEFI_CPER=y diff --git a/source/x/x11/build/libXpm b/source/x/x11/build/libXpm index 0cfbf0888..d00491fd7 100644 --- a/source/x/x11/build/libXpm +++ b/source/x/x11/build/libXpm @@ -1 +1 @@ -2 +1 diff --git a/source/xap/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild b/source/xap/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild new file mode 100755 index 000000000..6bed2b3bc --- /dev/null +++ b/source/xap/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Copyright 2007-2009 Frank Caraballo <fecaraballo{at}gmail{dot}com> +# Copyright 2012-2017 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=ffmpegthumbnailer +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Configure, build, and install: +mkdir cmake-build +cd cmake-build + cmake \ + -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ + -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_INSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \ + -DCMAKE_INSTALL_MANDIR="man" \ + -DENABLE_GIO="yes" \ + -DENABLE_THUMBNAILER="yes" \ + .. + + make VERBOSE=1 + make install DESTDIR=$PKG +cd .. + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS* ChangeLog COPYING* INSTALL* NEWS* README* TODO* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xap/ffmpegthumbnailer/slack-desc b/source/xap/ffmpegthumbnailer/slack-desc new file mode 100644 index 000000000..3ff7f2e6c --- /dev/null +++ b/source/xap/ffmpegthumbnailer/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +ffmpegthumbnailer: ffmpegthumbnailer (Lightweight Video Thumbnailer) +ffmpegthumbnailer: +ffmpegthumbnailer: FFmpegthumbnailer is a lightweight video thumbnailer that can be +ffmpegthumbnailer: used by file managers to create thumbnails for your video files. +ffmpegthumbnailer: The thumbnailer uses ffmpeg to decode frames from the video files, +ffmpegthumbnailer: so supported videoformats depend on the configuration flags of +ffmpegthumbnailer: ffmpeg. +ffmpegthumbnailer: +ffmpegthumbnailer: Homepage: https://github.com/dirkvdb/ffmpegthumbnailer +ffmpegthumbnailer: +ffmpegthumbnailer: diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild index e92b19dc7..6e884cf6b 100755 --- a/source/xap/xlockmore/xlockmore.SlackBuild +++ b/source/xap/xlockmore/xlockmore.SlackBuild @@ -76,9 +76,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Fix a trivial coding bug in 5.60: -zcat $CWD/xlockmore.gltrackball_init.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - zcat $CWD/xlockmore.bitmap.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 mkdir -p $PKG/usr/include/X11/bitmaps cp $CWD/l-bob.xbm $PKG/usr/include/X11/bitmaps diff --git a/source/xap/xlockmore/xlockmore.gltrackball_init.diff b/source/xap/xlockmore/xlockmore.gltrackball_init.diff deleted file mode 100644 index 8aed3ae6e..000000000 --- a/source/xap/xlockmore/xlockmore.gltrackball_init.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./modes/glx/juggler3d.c.orig 2019-09-11 00:06:52.000000000 -0500 -+++ ./modes/glx/juggler3d.c 2019-12-06 15:03:43.465002755 -0600 -@@ -2729,7 +2729,7 @@ - double spin_accel = 0.05; - sp->rot = make_rotator (0, spin_speed, 0, - spin_accel, wander_speed, False); -- sp->trackball = gltrackball_init (); -+ sp->trackball = gltrackball_init ( 0 ); - } - - if (only && *only && strcmp(only, " ")) { diff --git a/source/xfce/tumbler/tumbler.SlackBuild b/source/xfce/tumbler/tumbler.SlackBuild index e717911e7..20c1e563c 100755 --- a/source/xfce/tumbler/tumbler.SlackBuild +++ b/source/xfce/tumbler/tumbler.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tumbler VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) |