summaryrefslogtreecommitdiff
path: root/source/x/x11
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-04-23 19:13:09 +0000
committerEric Hameleers <alien@slackware.com>2021-04-24 08:59:55 +0200
commit6e50489feda778db0ff21b6f06adb801e8a5d003 (patch)
treee5747d4987977f0c4cea786e4f09c35d58c847a2 /source/x/x11
parent675ce365d7efe35f956695690cd263288b5cc9f1 (diff)
downloadcurrent-6e50489feda778db0ff21b6f06adb801e8a5d003.tar.gz
Fri Apr 23 19:13:09 UTC 202120210423191309
a/pkgtools-15.0-noarch-39.txz: Rebuilt. upgradepkg: revert change where $ROOT/sbin/installpkg is called instead of /sbin/installpkg. Conceptually, this seemed like a nice change (but would have also required removepkg to be called the same way), but it seems to break an established expectation that the pkgtools can be used without them actually being installed in $ROOT. Thanks to alienBOB. a/sysvinit-scripts-15.0-noarch-2.txz: Rebuilt. Use #!/bin/bash for these scripts so that bashisms don't cause script issues if /bin/sh is some other shell. Thanks to mumahendras3. rc.S: Use GazL's proposals for detecting/mounting /proc and /sys. d/parallel-20210422-noarch-1.txz: Upgraded. l/glib-networking-2.68.1-x86_64-1.txz: Upgraded. l/gtk+3-3.24.29-x86_64-1.txz: Upgraded. x/igt-gpu-tools-1.26-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. Rebuild with pkgtools-15.0-noarch-39. usb-and-pxe-installers/usbboot.img: Rebuilt. Rebuild with pkgtools-15.0-noarch-39.
Diffstat (limited to 'source/x/x11')
-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 00750edc..d00491fd 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 b3e61fcb..12995161 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 00000000..635ee83d
--- /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 b22bc0de..635ee83d 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 47bfc8e6..2903088d 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}