audio/guitarix: Updated for version 0.46.0.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 67 insertions, 21 deletions

diff --git a/audio/guitarix/git2tarxz.sh b/audio/guitarix/git2tarxz.sh
new file mode 100644
index 0000000000..e3c57c96ac
--- /dev/null
+++ b/audio/guitarix/git2tarxz.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# Create source tarball from rigel-engine git repo, including
+# submodules.  The auto-generated source tarballs from github don't
+# have the submodules, which is the only reason this exists...
+
+# Note that this script doesn't need to be run as root. It does need to
+# be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create a
+# tarball of. With no arg, HEAD is used.
+
+PRGNAM=guitarix
+CLONE_URL=https://github.com/brummer10/guitarix/
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+git submodule update --init --recursive
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERTAG=$( git tag -l | tail -1 )
+
+VERSION=${VERTAG}+${DATE}_${GIT_SHA}
+
+find . -name .git\* -print0 | xargs -0 rm -rf
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/audio/guitarix/guitarix.SlackBuild b/audio/guitarix/guitarix.SlackBuild
index f55fb75477..3861745771 100644
--- a/audio/guitarix/guitarix.SlackBuild
+++ b/audio/guitarix/guitarix.SlackBuild
@@ -6,8 +6,11 @@
 # Modified by B. Watson <urchlay@slackware.uk>. Modified version released
 # under the WTFPL, for details see http://www.wtfpl.net/txt/copying/
 
-# Note to self: git URL for guitarix is:
-# git://git.code.sf.net/p/guitarix/git/
+# 20250603 bkw: Updated for 0.46.0 (new homepage, too).
+# 0.46.0 tarball includes git submodules, created with git2tarxz.sh
+# and renamed so I don't have to include the commit hash in VERSION.
+# Upstream no longer builds LADSPA plugins though it looks like
+# other (non-guitarix) LADSPA plugins can still be used.
 
 # 20230723 bkw: Fix build following recent lilv update.
 # 20230108 bkw: Updated for 0.44.1.
@@ -24,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=guitarix
-VERSION=${VERSION:-0.44.1}
+VERSION=${VERSION:-0.46.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -61,21 +64,19 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Tarballs are now named "guitarix2-$VERSION", but the dir inside the
-# tarball is still "guitarix-$VERSION".
-TARNAME=${PRGNAM}2
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$TARNAME-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-V$VERSION+*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-V$VERSION+*
 chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+cd trunk
 
 # 20211205 bkw: why? *WHY?!*
 sed -i '/chmod/s,0o664,0o644,g' wscript
@@ -94,7 +95,6 @@ LIBDIR="/usr/lib${LIBDIRSUFFIX}"
 ./waf configure \
   --prefix=/usr \
   --cxxflags-release="$SLKCFLAGS -DNDEBUG -fpermissive" \
-  --ladspadir="$LIBDIR/ladspa/" \
   --lv2dir="$LIBDIR/lv2/" \
   --libdir="$LIBDIR" \
   --no-avahi \
@@ -103,17 +103,15 @@ LIBDIR="/usr/lib${LIBDIRSUFFIX}"
   --no-faust \
   --includeresampler \
   --includeconvolver \
-  --ladspa \
-  --new-ladspa \
   --mod-lv2 \
   --ldflags="-ldl" \
   $EXTRAOPT \
   $LV2OPT
-./waf build # -v # verbose, shows actual commands
+./waf build -v # verbose, shows actual commands
 ./waf install --destdir=$PKG
 
 # Dunno how to make waf strip stuff...
-strip $PKG/usr/bin/* $PKG/usr/lib*/{,ladspa/*,lv2/*/*}*.so \
+strip $PKG/usr/bin/* $PKG/usr/lib*/{,lv2/*/*}*.so \
 
 # --install-roboto-font does the wrong thing, we'll install it manually.
 mkdir -p $PKG/usr/share/fonts/TTF
diff --git a/audio/guitarix/guitarix.info b/audio/guitarix/guitarix.info
index 8618e9f5ae..e01698e143 100644
--- a/audio/guitarix/guitarix.info
+++ b/audio/guitarix/guitarix.info
@@ -1,8 +1,8 @@
 PRGNAM="guitarix"
-VERSION="0.44.1"
-HOMEPAGE="https://guitarix.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/guitarix/guitarix2-0.44.1.tar.xz"
-MD5SUM="d1757e08ddc54c4ec07defea6a30ac5b"
+VERSION="0.46.0"
+HOMEPAGE="https://guitarix.org/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/guitarix-0.46.0.tar.xz"
+MD5SUM="26c3dd8f9af458e9410f617a9bc9631f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack liblrdf lilv"