12 files changed, 181 insertions, 60 deletions
diff --git a/source/l/babl/babl.SlackBuild b/source/l/babl/babl.SlackBuild
index e8902f38c..cfd97ce72 100755
--- a/source/l/babl/babl.SlackBuild
+++ b/source/l/babl/babl.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2018, 2019, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2008, 2009  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
@@ -96,6 +96,7 @@ meson setup \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --buildtype=release \
+  -Dgi-docgen=disabled \
   $XTRA_OPTIONS \
   .. || exit 1
   "${NINJA:=ninja}" $NUMJOBS || exit 1
diff --git a/source/l/glib-networking/glib-networking.SlackBuild b/source/l/glib-networking/glib-networking.SlackBuild
index aac7b0b80..682b2ccfe 100755
--- a/source/l/glib-networking/glib-networking.SlackBuild
+++ b/source/l/glib-networking/glib-networking.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=glib-networking
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/neon/neon.SlackBuild b/source/l/neon/neon.SlackBuild
index 10d9b2e1b..0d7becd37 100755
--- a/source/l/neon/neon.SlackBuild
+++ b/source/l/neon/neon.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=neon
 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:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/pipewire/doinst.sh b/source/l/pipewire/doinst.sh
index 2abb1b85d..e01b575b5 100644
--- a/source/l/pipewire/doinst.sh
+++ b/source/l/pipewire/doinst.sh
@@ -1,4 +1,4 @@
 # Toss redundant sample files:
-for file in pipewire.desktop wireplumber.desktop pipewire-pulse.desktop ; do
+for file in pipewire.desktop pipewire-pulse.desktop ; do
   cmp etc/xdg/autostart/${file} etc/xdg/autostart/${file}.sample 2> /dev/null && rm etc/xdg/autostart/${file}.sample
 done
diff --git a/source/l/pipewire/fetch-wireplumber.sh b/source/l/pipewire/fetch-wireplumber.sh
deleted file mode 100755
index 20d9572ad..000000000
--- a/source/l/pipewire/fetch-wireplumber.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# Copyright 2022, 2023, 2024  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.
-
-set -o errexit
-
-# If pipewire has to pull from git, it always pulls git HEAD.
-# But with 0.4.81, support for elogind seems broken, although it is
-# detected and linked to.
-# So we'll stick with this until a newer version can be tested and found
-# to work with bluetooth.
-CHECKOUT=${CHECKOUT:-0.4.17}
-
-# Clear download area:
-rm -rf wireplumber wireplumber.tar wireplumber.tar.lz
-
-# Clone repository:
-git clone https://gitlab.freedesktop.org/pipewire/wireplumber.git
-( cd wireplumber ; git checkout $CHECKOUT )
-
-# Cleanup.  We're not packing up the whole git repo.
-rm -rf wireplumber/.git*
-tar cf wireplumber.tar wireplumber
-plzip -9 -n 6 -f wireplumber.tar
-rm -rf wireplumber
-echo
-echo "wireplumber source repo packaged"
-echo
diff --git a/source/l/pipewire/pipewire.SlackBuild b/source/l/pipewire/pipewire.SlackBuild
index 6c5ff7147..e34798f85 100755
--- a/source/l/pipewire/pipewire.SlackBuild
+++ b/source/l/pipewire/pipewire.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2020  Eric Hameleers, Eindhoven, NL
-# Copyright 2020, 2021, 2022, 2023  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2020, 2021, 2022, 2023, 2024  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pipewire
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -86,12 +86,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# Add wireplumber:
-( cd subprojects ; tar xf $CWD/wireplumber.tar.lz )
-
-# Add lua (with pipewire patches):
-( cd subprojects ; tar xf $CWD/lua-5.4.4.tar.lz )
-
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
@@ -114,7 +108,7 @@ cd meson-build
   -Dvulkan=enabled \
   -Djack=disabled \
   -Dpipewire-jack=disabled \
-  -Dsession-managers=wireplumber \
+  -Dsession-managers=[] \
   .. || exit 1
   "${NINJA:=ninja}" $NUMJOBS || exit 1
   DESTDIR=$PKG $NINJA install || exit 1
@@ -126,7 +120,6 @@ mkdir -p $PKG/etc/pipewire
 # Add sample configuation files:
 mkdir -p $PKG/etc/xdg/autostart
 cp -a $CWD/pipewire.desktop.sample $PKG/etc/xdg/autostart
-cp -a $CWD/wireplumber.desktop.sample $PKG/etc/xdg/autostart
 cp -a $CWD/pipewire-pulse.desktop.sample $PKG/etc/xdg/autostart
 chown root:root $PKG/etc/xdg/autostart/*
 chmod 644 $PKG/etc/xdg/autostart/*
diff --git a/source/l/wireplumber/doinst.sh b/source/l/wireplumber/doinst.sh
new file mode 100644
index 000000000..b5e469913
--- /dev/null
+++ b/source/l/wireplumber/doinst.sh
@@ -0,0 +1,4 @@
+# Toss redundant sample files:
+for file in wireplumber.desktop ; do
+  cmp etc/xdg/autostart/${file} etc/xdg/autostart/${file}.sample 2> /dev/null && rm etc/xdg/autostart/${file}.sample
+done
diff --git a/source/l/pipewire/fetch-lua.sh b/source/l/wireplumber/fetch-lua.sh
index 5e621779e..5e621779e 100755
--- a/source/l/pipewire/fetch-lua.sh
+++ b/source/l/wireplumber/fetch-lua.sh
diff --git a/source/l/wireplumber/slack-desc b/source/l/wireplumber/slack-desc
new file mode 100644
index 000000000..f1a948f06
--- /dev/null
+++ b/source/l/wireplumber/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------------------------------------------------------|
+wireplumber: wireplumber (session and policy manager for pipewire)
+wireplumber:
+wireplumber: WirePlumber is a modular session / policy manager for PipeWire and a
+wireplumber: GObject-based high-level library that wraps PipeWire's API, providing
+wireplumber: convenience for writing the daemon's modules as well as external tools
+wireplumber: for managing PipeWire.
+wireplumber:
+wireplumber: Homepage: https://gitlab.freedesktop.org/pipewire/wireplumber
+wireplumber:
+wireplumber:
+wireplumber:
diff --git a/source/l/wireplumber/wireplumber.SlackBuild b/source/l/wireplumber/wireplumber.SlackBuild
new file mode 100755
index 000000000..d6b22c5cd
--- /dev/null
+++ b/source/l/wireplumber/wireplumber.SlackBuild
@@ -0,0 +1,149 @@
+#!/bin/bash
+
+# Copyright 2020  Eric Hameleers, Eindhoven, NL
+# Copyright 2020, 2021, 2022, 2023, 2024  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=wireplumber
+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 | grep -E -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 {} \+
+
+# Add lua (with pipewire patches):
+( cd subprojects ; tar xf $CWD/lua-5.4.4.tar.lz )
+
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+  unshare -n meson setup \
+  --prefix=/usr \
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/libexec \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --includedir=/usr/include \
+  --datadir=/usr/share \
+  --mandir=/usr/man \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --buildtype=release \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
+
+# Add sample configuation files:
+mkdir -p $PKG/etc/xdg/autostart
+cp -a $CWD/wireplumber.desktop.sample $PKG/etc/xdg/autostart
+chown root:root $PKG/etc/xdg/autostart/*
+chmod 644 $PKG/etc/xdg/autostart/*
+
+# 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 \
+  LICENSE* NEWS* README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+# If there's a NEWS.rst file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r NEWS.rst ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat NEWS.rst | head -n 1000 > $DOCSDIR/NEWS.rst
+  touch -r NEWS.rst $DOCSDIR/NEWS.rst
+fi
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+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/l/pipewire/wireplumber.desktop.sample b/source/l/wireplumber/wireplumber.desktop.sample
index b32e24f95..b32e24f95 100644
--- a/source/l/pipewire/wireplumber.desktop.sample
+++ b/source/l/wireplumber/wireplumber.desktop.sample
diff --git a/source/l/wireplumber/wireplumber.url b/source/l/wireplumber/wireplumber.url
new file mode 100644
index 000000000..69f04fa02
--- /dev/null
+++ b/source/l/wireplumber/wireplumber.url
@@ -0,0 +1 @@
+https://gitlab.freedesktop.org/pipewire/wireplumber