aboutsummaryrefslogtreecommitdiff
path: root/desktop/weston/weston.SlackBuild
diff options
context:
space:
mode:
authorLogan Rathbone <poprocks@gmail.com>2021-07-28 17:03:26 +0200
committerRobby Workman <rworkman@slackbuilds.org>2021-07-28 18:02:33 -0500
commitf5a99298d59998060118fc811aaad95fab6a5354 (patch)
tree98132dc6d201de420ea6a69797b8816916c45452 /desktop/weston/weston.SlackBuild
parent3f87bbd6f8aaf056f127d2c10fce28705ef240fd (diff)
desktop/weston: Cleanups to docs and SlackBuild.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'desktop/weston/weston.SlackBuild')
-rw-r--r--desktop/weston/weston.SlackBuild56
1 files changed, 22 insertions, 34 deletions
diff --git a/desktop/weston/weston.SlackBuild b/desktop/weston/weston.SlackBuild
index b67a823fd1..d1382dd8e5 100644
--- a/desktop/weston/weston.SlackBuild
+++ b/desktop/weston/weston.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for Weston
-# Copyright 2019-2020 Logan Rathbone <poprocks@gmail.com>
+# Copyright 2019-2021 Logan Rathbone <poprocks@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=weston
VERSION=${VERSION:-9.0.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -81,28 +81,26 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# "./configure"
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-meson build/ \
- --prefix=/usr \
- --mandir=man \
- --libdir=lib${LIBDIRSUFFIX} \
- -Dlauncher-logind=false \
- -Dbackend-rdp=false \
- -Dsystemd=false \
- -Dpipewire=false \
- -Dsimple-dmabuf-drm=auto \
- -Dcolor-management-colord=${USE_COLORD:-false}
-
-# "make"
-"${NINJA:=ninja}"
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-$NINJA -C build
-
-# "make install"
-DESTDIR=$PKG $NINJA -C build/ install
+# nb: pipewire is disabled for now as >= 0.3 not yet supported
+
+mkdir build
+cd build
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ meson .. \
+ --prefix=/usr \
+ --mandir=man \
+ --libdir=lib${LIBDIRSUFFIX} \
+ -Dlauncher-logind=false \
+ -Dbackend-rdp=false \
+ -Dsystemd=false \
+ -Dpipewire=false \
+ -Dsimple-dmabuf-drm=auto \
+ -Dcolor-management-colord=${USE_COLORD:-false}
+
+ ninja
+ DESTDIR=$PKG ninja install
+cd ..
# strip
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -172,16 +170,6 @@ EOF
# config-ify the profile.d stuff
-# FIXME - I tried many things to try to creatively preserve the perms
-# of weston-launch as well (ie, in case someone suid's it and wants to
-# keep it that way upon upgrade), but this is really difficult if not
-# impossible to implement with Slackware's packaging system without
-# allowing for stray binaries (which would have been setuid by the
-# user) lingering around, which I'd really rather avoid, for safety.
-#
-# At this juncture, users will simply have to manually setuid-root the
-# binary upon each upgrade.
-
cat << EOF >> $PKG/install/doinst.sh
preserve_perms etc/profile.d/${PRGNAM}.sh.new
preserve_perms etc/profile.d/${PRGNAM}.csh.new