summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/libxkbcommon/README6
-rw-r--r--libraries/libxkbcommon/libxkbcommon.SlackBuild23
-rw-r--r--libraries/libxkbcommon/libxkbcommon.info8
3 files changed, 20 insertions, 17 deletions
diff --git a/libraries/libxkbcommon/README b/libraries/libxkbcommon/README
index 4099b0a642..6a31b3a410 100644
--- a/libraries/libxkbcommon/README
+++ b/libraries/libxkbcommon/README
@@ -3,3 +3,9 @@ loading them from disk, parsing them and handling their state.
It's mainly meant for client toolkits, window systems, and other
system applications; currently that includes Wayland, kmscon,
GTK+, Clutter, and more.
+
+This Slackbuild disables Wayland support by default. In enabling
+Wayland support (which requires wayland-protocols), run the script
+with the following command:
+
+WAYLAND=yes ./libxkbcommon.SlackBuild
diff --git a/libraries/libxkbcommon/libxkbcommon.SlackBuild b/libraries/libxkbcommon/libxkbcommon.SlackBuild
index 937a45dd60..fb22069506 100644
--- a/libraries/libxkbcommon/libxkbcommon.SlackBuild
+++ b/libraries/libxkbcommon/libxkbcommon.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=libxkbcommon
-VERSION=${VERSION:-0.8.4}
+VERSION=${VERSION:-0.9.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -70,23 +70,20 @@ 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 {} \;
+if [ ${WAYLAND:-no} = yes ]; then
+ ENABLE_WAYLAND=true
+else
+ ENABLE_WAYLAND=false
+fi
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux \
- --disable-static
+meson --prefix /usr --mandir /usr/man --libdir lib${LIBDIRSUFFIX} -Denable-wayland=$ENABLE_WAYLAND build
-make
-make install-strip DESTDIR=$PKG
+DESTDIR=$PKG ninja -C build all install
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.md NEWS PACKAGING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md NEWS PACKAGING doc/* $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/libraries/libxkbcommon/libxkbcommon.info b/libraries/libxkbcommon/libxkbcommon.info
index 2d00d3d848..0d7c18be17 100644
--- a/libraries/libxkbcommon/libxkbcommon.info
+++ b/libraries/libxkbcommon/libxkbcommon.info
@@ -1,10 +1,10 @@
PRGNAM="libxkbcommon"
-VERSION="0.8.4"
+VERSION="0.9.1"
HOMEPAGE="https://xkbcommon.org/"
-DOWNLOAD="https://xkbcommon.org/download/libxkbcommon-0.8.4.tar.xz"
-MD5SUM="3c4409058dfd203f641a563358e0187d"
+DOWNLOAD="https://xkbcommon.org/download/libxkbcommon-0.9.1.tar.xz"
+MD5SUM="4662756fd73ab0ac9e32efdad8f807f6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="meson"
MAINTAINER="Isaac Yu"
EMAIL="isaacyu1@isaacyu1.com"