summaryrefslogtreecommitdiff
path: root/source/x
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-12-25 19:00:02 +0000
committerEric Hameleers <alien@slackware.com>2019-12-26 08:59:50 +0100
commitbe35adbd1160550e441ead585a97faba68a83f27 (patch)
treea5d719110cc081d7af9c610f8251aa6118fdd64d /source/x
parent4f356a745d1cfec7850c8c2c4a779184f8b418dc (diff)
downloadcurrent-be35adbd1160550e441ead585a97faba68a83f27.tar.gz
Wed Dec 25 19:00:02 UTC 201920191225190002
d/ruby-2.7.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. d/subversion-1.13.0-x86_64-2.txz: Rebuilt. Recompiled against ruby-2.7.0. kde/korundum-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against ruby-2.7.0. kde/qtruby-4.14.3-x86_64-11.txz: Rebuilt. Recompiled against ruby-2.7.0. n/epic5-2.1.1-x86_64-3.txz: Rebuilt. Ruby support won't build, so we'll skip it for now. x/libva-2.6.0-x86_64-1.txz: Upgraded. x/libva-utils-2.6.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x')
-rwxr-xr-xsource/x/libva-utils/libva-utils.SlackBuild38
-rwxr-xr-xsource/x/libva/libva.SlackBuild38
2 files changed, 36 insertions, 40 deletions
diff --git a/source/x/libva-utils/libva-utils.SlackBuild b/source/x/libva-utils/libva-utils.SlackBuild
index 9eaaae53..d07c0bea 100755
--- a/source/x/libva-utils/libva-utils.SlackBuild
+++ b/source/x/libva-utils/libva-utils.SlackBuild
@@ -75,29 +75,27 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# These fix a mandatory check for wayland-scanner:
-mkdir -p m4
-autoreconf -fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --enable-shared \
- --disable-static \
- --enable-dummy-driver \
- --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+ --buildtype=release \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
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
diff --git a/source/x/libva/libva.SlackBuild b/source/x/libva/libva.SlackBuild
index 876c20f0..1f27702f 100755
--- a/source/x/libva/libva.SlackBuild
+++ b/source/x/libva/libva.SlackBuild
@@ -75,29 +75,27 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# These fix a mandatory check for wayland-scanner:
-mkdir -p m4
-autoreconf -fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --enable-shared \
- --disable-static \
- --enable-dummy-driver \
- --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+ --buildtype=release \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
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