summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xsource/x/mesa/mesa-amber.build3
-rwxr-xr-xsource/x/mesa/mesa-demos.build9
2 files changed, 10 insertions, 2 deletions
diff --git a/source/x/mesa/mesa-amber.build b/source/x/mesa/mesa-amber.build
index 650dd8d8a..9a6d3d98e 100755
--- a/source/x/mesa/mesa-amber.build
+++ b/source/x/mesa/mesa-amber.build
@@ -47,7 +47,10 @@ export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
mkdir meson-build
cd meson-build
+# Architecture-specific settings can be configured in the mesa.SlackBuild
+# within the variable 'SLK_AMBER_CONF_OPTS'
meson setup \
+ $SLK_AMBER_CONF_OPTS \
--prefix=/usr \
--libdir=lib${LIBDIRSUFFIX} \
--libexecdir=/usr/libexec \
diff --git a/source/x/mesa/mesa-demos.build b/source/x/mesa/mesa-demos.build
index 67f460b3e..c9452d088 100755
--- a/source/x/mesa/mesa-demos.build
+++ b/source/x/mesa/mesa-demos.build
@@ -16,8 +16,11 @@ export CWD SLKCFLAGS NUMJOBS PKG
-exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+ # Architecture-specific settings can be configured in the mesa.SlackBuild
+ # within the variable 'SLK_MESADEMOS_CONF_OPTS'
CFLAGS="$SLKCFLAGS" \
./configure \
+ $SLK_MESADEMOS_CONF_OPTS \
--enable-autotools \
--prefix=/usr \
--build=$ARCH-slackware-linux || exit 1
@@ -27,8 +30,10 @@ export CWD SLKCFLAGS NUMJOBS PKG
make install DESTDIR=$PKG/cruft || exit 1
# Install gears and glinfo, as well as a few other demos:
mkdir -p $PKG/usr/bin
- for demo in eglinfo gears glinfo glthreads glxcontexts glxdemo glxgears \
- glxgears_fbconfig glxheads glxinfo glxpbdemo glxpixmap ; do
+ MESA_DEMO_BINS="${MESA_DEMO_BINS:=eglinfo gears glinfo glthreads glxcontexts glxdemo \
+ glxgears glxgears_fbconfig glxheads glxinfo glxpbdemo glxpixmap}"
+ # Install the demo:
+ for demo in $MESA_DEMO_BINS ; do
mv --verbose $PKG/cruft/usr/bin/$demo $PKG/usr/bin
done
# Remove cruft: