summaryrefslogtreecommitdiffstats
path: root/audio/gvolwheel
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2022-02-18 14:58:02 -0500
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-19 12:09:30 +0700
commit8b4d576f26c85d3a26332ef1630268149a7c93f5 (patch)
treee84aef14c89ea9f92dd3fa782759f2e0e9278dc1 /audio/gvolwheel
parent51422af73f9679c26a901ae4d8ee08fc2fcefb03 (diff)
downloadslackbuilds-8b4d576f26c85d3a26332ef1630268149a7c93f5.tar.gz
slackbuilds-8b4d576f26c85d3a26332ef1630268149a7c93f5.tar.xz
audio/gvolwheel: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'audio/gvolwheel')
-rw-r--r--audio/gvolwheel/gvolwheel.SlackBuild29
1 files changed, 16 insertions, 13 deletions
diff --git a/audio/gvolwheel/gvolwheel.SlackBuild b/audio/gvolwheel/gvolwheel.SlackBuild
index bebb9e08eb..df4e5a9cda 100644
--- a/audio/gvolwheel/gvolwheel.SlackBuild
+++ b/audio/gvolwheel/gvolwheel.SlackBuild
@@ -22,25 +22,26 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220218 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix build for Slackware 15.0.
+# - remove useless/redundant files from doc dir.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=gvolwheel
VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -50,8 +51,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -80,9 +81,11 @@ cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
+
+SLKCFLAGS+=" -fcommon"
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -96,14 +99,14 @@ CXXFLAGS="$SLKCFLAGS" \
--build=$ARCH-slackware-linux
make
-make install DESTDIR=$PKG
-
-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
+make install-strip DESTDIR=$PKG
# Configure will ignore passed --docdir option, so correct docdir manually.
mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+# INSTALL is useless, NEWS is 0 bytes.
+rm -f $PKG/usr/doc/$PRGNAM-$VERSION/{INSTALL,NEWS}
+
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install