summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
Diffstat (limited to 'source/x')
-rw-r--r--source/x/x11/build/igt-gpu-tools2
-rw-r--r--source/x/x11/configure/igt-gpu-tools12
-rw-r--r--source/x/x11/make/igt-gpu-tools5
-rw-r--r--source/x/x11/make/xisxwayland1
-rw-r--r--source/x/x11/make/xorgproto5
5 files changed, 15 insertions, 10 deletions
diff --git a/source/x/x11/build/igt-gpu-tools b/source/x/x11/build/igt-gpu-tools
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/igt-gpu-tools
+++ b/source/x/x11/build/igt-gpu-tools
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/configure/igt-gpu-tools b/source/x/x11/configure/igt-gpu-tools
index b3e61fcbd..129951616 100644
--- a/source/x/x11/configure/igt-gpu-tools
+++ b/source/x/x11/configure/igt-gpu-tools
@@ -1,13 +1,15 @@
CFLAGS="$SLKCFLAGS -Wno-error=array-bounds" \
CXXFLAGS=$SLKCFLAGS \
-./autogen.sh \
+mkdir meson-build
+cd meson-build
+meson setup \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--infodir=/usr/info \
--mandir=/usr/man \
- --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
- --disable-static \
- --disable-tests \
- --build=$ARCH-slackware-linux
+ -Ddocs=disabled \
+ -Dtests=disabled \
+ -Drunner=disabled \
+ .. || exit 1
diff --git a/source/x/x11/make/igt-gpu-tools b/source/x/x11/make/igt-gpu-tools
new file mode 100644
index 000000000..635ee83dc
--- /dev/null
+++ b/source/x/x11/make/igt-gpu-tools
@@ -0,0 +1,5 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+ ninja || exit 1
+ DESTDIR=$PKG ninja install || exit 1
+cd ..
diff --git a/source/x/x11/make/xisxwayland b/source/x/x11/make/xisxwayland
index b22bc0de1..635ee83dc 100644
--- a/source/x/x11/make/xisxwayland
+++ b/source/x/x11/make/xisxwayland
@@ -1,6 +1,5 @@
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
-cd build
ninja || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/x/x11/make/xorgproto b/source/x/x11/make/xorgproto
index 47bfc8e6c..2903088d4 100644
--- a/source/x/x11/make/xorgproto
+++ b/source/x/x11/make/xorgproto
@@ -1,8 +1,7 @@
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
-cd build
- ninja || exit 1
- DESTDIR=$PKG ninja install || exit 1
+ninja || exit 1
+DESTDIR=$PKG ninja install || exit 1
cd ..
# meson doesn't seem to care about a docdir:
mkdir -p $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}