diff options
Diffstat (limited to 'audio/guitarix')
-rw-r--r-- | audio/guitarix/ChangeLog.old | 32 | ||||
-rw-r--r-- | audio/guitarix/README | 12 | ||||
-rw-r--r-- | audio/guitarix/guitarix.SlackBuild | 96 | ||||
-rw-r--r-- | audio/guitarix/guitarix.info | 10 | ||||
-rw-r--r-- | audio/guitarix/patches/always_inline.patch | 22 | ||||
-rw-r--r-- | audio/guitarix/patches/gcc-13.patch | 12 |
6 files changed, 131 insertions, 53 deletions
diff --git a/audio/guitarix/ChangeLog.old b/audio/guitarix/ChangeLog.old index ac4d9f096f..7b48c9c3d0 100644 --- a/audio/guitarix/ChangeLog.old +++ b/audio/guitarix/ChangeLog.old @@ -1,6 +1,38 @@ # This stuff used to be in the script, but it was getting annoyingly # long. Probably only of interest to me, and maybe future archaeologists. +# 20180619 bkw: +# - Updated for 0.37.1. +# - Force building with bundled zita-convolver and resampler libs. +# Previously, system libs would be linked if they were installed, +# otherwise bundled libs were used... caused a problem if the +# system zita-convolver was updated to an incompatible version. +# - Add config options to re-enable ladspa and lv2 mod-gui stuff that +# used to be enabled by default in 0.36.1. +# - Add patches from upstream git, to fix segfaults when online +# button gets clicked. Also if dbus isn't running, guitarix will now +# actually say so, in its error message. +# - Move old changelog entries to ChangeLog.old. + +# 20171223 bkw: Updated for 0.36.1. +# 20170825 bkw: Updated for 0.35.6. Install the bundled roboto font. +# 20170725 bkw: Updated for 0.35.5 + +# 20170710 bkw: +# - Updated for 0.35.4 +# - Remove README stuff about webkitgtk, since upstream dropped it. +# - Add README.online with troubleshooting info. I had trouble +# getting the new Online Presets stuff to work, so hopefully this +# might help the next guy. + +# 20170404 bkw: +# - Updated for 0.35.3 +# - Use + rather than ; in find/chmod. Noticeably faster. + +# 20170306 bkw: +# - Flip changelog comments right-side up +# - Stop writing outside of $TMP. + # 20161016 bkw: Updated for 0.35.2 # 20160806 bkw: diff --git a/audio/guitarix/README b/audio/guitarix/README index 365e6deeed..692e677c31 100644 --- a/audio/guitarix/README +++ b/audio/guitarix/README @@ -1,8 +1,10 @@ -guitarix offers the range of sounds you would expect from a full-featured -universal guitar-amp. You can get crisp clean-sounds, nice overdrive, fat -distortion and a diversity of crazy sounds never heard before. Guitarix -can be used as a standalone application, as LADSPA plugins, or as LV2 -plugins. +guitarix (virtual guitar amplifier for jack) + +guitarix offers the range of sounds you would expect from a +full-featured universal guitar-amp. You can get crisp clean-sounds, +nice overdrive, fat distortion and a diversity of crazy sounds never +heard before. Guitarix can be used as a standalone application, as +LADSPA plugins, or as LV2 plugins. For 32-bit x86, a CPU with SSE instructions is required. For other architectures, SSE will be used if available. diff --git a/audio/guitarix/guitarix.SlackBuild b/audio/guitarix/guitarix.SlackBuild index 60245ea738..eadb51e8cd 100644 --- a/audio/guitarix/guitarix.SlackBuild +++ b/audio/guitarix/guitarix.SlackBuild @@ -1,53 +1,33 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for guitarix # Originally written by Michales Michaloudes (email removed) -# Modified by B. Watson <yalhcru@gmail.com>. Modified version released +# 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/ +# 20230723 bkw: Fix build following recent lilv update. +# 20230108 bkw: Updated for 0.44.1. +# 20211205 bkw: BUILD=2 +# - new-style icons. +# - correct install permissions in /usr/share/gx_head +# - who the heck is kb6? +# 20200408 kb6: Updated for 0.42.1. Add -fpermissive compiler flag. +# 20201105 bkw: Add no-upgrade note to README. +# 20200307 bkw: Updated for 3.39.0. # 20191211 bkw: Updated for 0.38.1. # 20180828 bkw: Updated for 0.37.3. -# 20180619 bkw: -# - Updated for 0.37.1. -# - Force building with bundled zita-convolver and resampler libs. -# Previously, system libs would be linked if they were installed, -# otherwise bundled libs were used... caused a problem if the -# system zita-convolver was updated to an incompatible version. -# - Add config options to re-enable ladspa and lv2 mod-gui stuff that -# used to be enabled by default in 0.36.1. -# - Add patches from upstream git, to fix segfaults when online -# button gets clicked. Also if dbus isn't running, guitarix will now -# actually say so, in its error message. -# - Move old changelog entries to ChangeLog.old. - -# 20171223 bkw: Updated for 0.36.1. -# 20170825 bkw: Updated for 0.35.6. Install the bundled roboto font. -# 20170725 bkw: Updated for 0.35.5 - -# 20170710 bkw: -# - Updated for 0.35.4 -# - Remove README stuff about webkitgtk, since upstream dropped it. -# - Add README.online with troubleshooting info. I had trouble -# getting the new Online Presets stuff to work, so hopefully this -# might help the next guy. - -# 20170404 bkw: -# - Updated for 0.35.3 -# - Use + rather than ; in find/chmod. Noticeably faster. - -# 20170306 bkw: -# - Flip changelog comments right-side up -# - Stop writing outside of $TMP. +cd $(dirname $0) ; CWD=$(pwd) PRGNAM=guitarix -VERSION=${VERSION:-0.38.1} +VERSION=${VERSION:-0.44.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -57,16 +37,21 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +# 20220322 bkw: 32-bit builds need -mfxsr now. if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686 -msse" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -msse -mfxsr" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686 -msse" + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -msse -mfxsr" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" @@ -92,6 +77,9 @@ 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 {} \+ +# 20211205 bkw: why? *WHY?!* +sed -i '/chmod/s,0o664,0o644,g' wscript + # guitarix wants to install the roboto font in the wrong place for # slackware. sed -i '/fonts/s,\<truetype\>,TTF,' wscript tools/undiag @@ -101,34 +89,38 @@ if [ "${LV2:-yes}" = "no" ]; then LV2OPT=--no-lv2 fi +for i in $CWD/patches/*; do patch -p2 < $i ; done + # grrr, -DNDEBUG doesn't get added to the flags automatically... LIBDIR="/usr/lib${LIBDIRSUFFIX}" ./waf configure \ --prefix=/usr \ - --cxxflags-release="$SLKCFLAGS -DNDEBUG" \ + --cxxflags-release="$SLKCFLAGS -DNDEBUG -fpermissive" \ --ladspadir="$LIBDIR/ladspa/" \ --lv2dir="$LIBDIR/lv2/" \ --libdir="$LIBDIR" \ --no-avahi \ --no-ldconfig \ --no-desktop-update \ + --no-faust \ --includeresampler \ --includeconvolver \ --ladspa \ --new-ladspa \ --mod-lv2 \ + --ldflags="-ldl" \ $EXTRAOPT \ $LV2OPT ./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 \ + # --install-roboto-font does the wrong thing, we'll install it manually. mkdir -p $PKG/usr/share/fonts/TTF install -m0644 fonts/* $PKG/usr/share/fonts/TTF -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - # Shared libraries are supposed to be +x. chmod 755 $PKG/$LIBDIR/libgx*.so.?.? @@ -136,10 +128,28 @@ chmod 755 $PKG/$LIBDIR/libgx*.so.?.? mkdir -p $PKG/usr/man/man1 gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz +# for the 128x128 icon, center upstream's 100x100 icon in a 128x128 png. +dir=$PKG/usr/share/icons/hicolor/128x128/apps +mkdir -p $dir +convert -background none -extent 128x128 -gravity center \ + pixmaps/gx_head.png \ + $dir/$PRGNAM.png + +# for the rest, resize as usual. +for px in 16 32 48 64; do + size=${px}x${px} + dir=$PKG/usr/share/icons/hicolor/$size/apps + mkdir -p $dir + convert -resize $size \ + pixmaps/gx_head.png \ + $dir/$PRGNAM.png +done + +ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING changelog README* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -find $PKG/usr/doc -type f -exec chmod 0644 {} \; mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc @@ -154,4 +164,4 @@ if [ "${SETCAP:-yes}" = "yes" ]; then fi cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/audio/guitarix/guitarix.info b/audio/guitarix/guitarix.info index 22726782c1..8618e9f5ae 100644 --- a/audio/guitarix/guitarix.info +++ b/audio/guitarix/guitarix.info @@ -1,10 +1,10 @@ PRGNAM="guitarix" -VERSION="0.38.1" -HOMEPAGE="http://guitarix.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/guitarix/guitarix2-0.38.1.tar.xz" -MD5SUM="d9aec810bf164cbf040b298cb9c45d50" +VERSION="0.44.1" +HOMEPAGE="https://guitarix.sourceforge.net/" +DOWNLOAD="https://downloads.sourceforge.net/guitarix/guitarix2-0.44.1.tar.xz" +MD5SUM="d1757e08ddc54c4ec07defea6a30ac5b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jack liblrdf lilv" MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" +EMAIL="urchlay@slackware.uk" diff --git a/audio/guitarix/patches/always_inline.patch b/audio/guitarix/patches/always_inline.patch new file mode 100644 index 0000000000..940649f11c --- /dev/null +++ b/audio/guitarix/patches/always_inline.patch @@ -0,0 +1,22 @@ +diff --git a/trunk/src/ladspa/ladspa_guitarix.cpp b/trunk/src/ladspa/ladspa_guitarix.cpp +index 1fccffb3..85c3a766 100644 +--- a/trunk/src/ladspa/ladspa_guitarix.cpp ++++ b/trunk/src/ladspa/ladspa_guitarix.cpp +@@ -16,8 +16,6 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#define always_inline inline __attribute__((always_inline)) +- + #include <stdlib.h> + #include <string.h> + #include <ladspa.h> +@@ -34,6 +32,8 @@ + #include "gx_faust_plugins.h" + #include "../plugins/pluginlib.h" + ++#define always_inline inline __attribute__((always_inline)) ++ + #include "faust/gx_ampout_ladspa.cc" + #include "faust/gx_outputlevel_ladspa.cc" + diff --git a/audio/guitarix/patches/gcc-13.patch b/audio/guitarix/patches/gcc-13.patch new file mode 100644 index 0000000000..90681810b1 --- /dev/null +++ b/audio/guitarix/patches/gcc-13.patch @@ -0,0 +1,12 @@ +diff --git a/trunk/src/LV2/DSP/gx_common.h b/trunk/src/LV2/DSP/gx_common.h +index 71108442..ea230e34 100644 +--- a/trunk/src/LV2/DSP/gx_common.h ++++ b/trunk/src/LV2/DSP/gx_common.h +@@ -28,6 +28,7 @@ + #include <iostream> + #include <cstring> + #include <unistd.h> ++#include <cstdint> + + ///////////////////////// DENORMAL PROTECTION WITH SSE ///////////////// + |