summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-09-21 18:51:07 +0000
committer Eric Hameleers <alien@slackware.com>2018-09-22 09:00:39 +0200
commit48e09f463d219d8975a3fb82f2d7d52a88472a9f (patch)
treeb664168d83cb02a14256d4ecce13202a59834b20 /source/x
parenta22d1843900f65ede3f87d55207ca0b8f2a38b98 (diff)
downloadcurrent-48e09f463d219d8975a3fb82f2d7d52a88472a9f.tar.gz
current-48e09f463d219d8975a3fb82f2d7d52a88472a9f.tar.xz
Fri Sep 21 18:51:07 UTC 201820180921185107
a/eudev-3.2.6-x86_64-1.txz: Upgraded. a/glibc-solibs-2.28-x86_64-2.txz: Upgraded. a/grub-2.02-x86_64-3.txz: Rebuilt. Patched to fix compatibility with recent xfsprogs. Thanks to Markus Wiesner. a/kernel-generic-4.14.71-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.71-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.71-x86_64-1.txz: Upgraded. ap/opus-tools-0.2-x86_64-1.txz: Upgraded. ap/sqlite-3.25.1-x86_64-1.txz: Upgraded. d/icecream-20180905_cdc6ff8-x86_64-1.txz: Upgraded. d/kernel-headers-4.14.71-x86-1.txz: Upgraded. d/llvm-7.0.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. k/kernel-source-4.14.71-noarch-1.txz: Upgraded. l/ffmpeg-3.4.4-x86_64-2.txz: Rebuilt. Don't try to link with Samba since the latest version is not compatible. l/glibc-2.28-x86_64-2.txz: Upgraded. All packages have been patched where needed for glibc-2.28 and compile tested here. Thanks to nobodino for the help. l/glibc-i18n-2.28-x86_64-2.txz: Upgraded. l/glibc-profile-2.28-x86_64-2.txz: Upgraded. l/gst-plugins-base-1.14.3-x86_64-1.txz: Upgraded. l/gst-plugins-good-1.14.3-x86_64-1.txz: Upgraded. l/gst-plugins-libav-1.14.3-x86_64-1.txz: Upgraded. l/gstreamer-1.14.3-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_11-x86_64-1.txz: Upgraded. l/libopusenc-0.2-x86_64-1.txz: Added. l/librsvg-2.44.3-x86_64-1.txz: Upgraded. l/opus-1.3_rc2-x86_64-1.txz: Upgraded. l/opusfile-0.11-x86_64-1.txz: Upgraded. l/soprano-2.9.4-x86_64-3.txz: Rebuilt. Recompiled to drop virtuoso dependency. l/virtuoso-ose-6.1.8-x86_64-9.txz: Removed. Even KDE4 has migrated away from actually using this for anything. The last thing in Slackware that was dependent on it was Soprano, which has been recompiled to no longer use it. n/postfix-3.3.1-x86_64-2.txz: Rebuilt. Recompiled so that it quits whining about OpenSSL. Thanks to shastah. x/mesa-18.2.1-x86_64-1.txz: Upgraded. Compiled against llvm-7.0.0. x/xf86-video-vmware-13.3.0-x86_64-2.txz: Rebuilt. Recompiled against llvm-7.0.0. x/xterm-336-x86_64-1.txz: Upgraded. extra/pure-alsa-system/ffmpeg-3.4.4-x86_64-2_alsa.txz: Rebuilt. Don't try to link with Samba since the latest version is not compatible. extra/pure-alsa-system/gst-plugins-good-1.14.3-x86_64-1_alsa.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/x')
-rwxr-xr-xsource/x/anthy/anthy.SlackBuild2
-rwxr-xr-xsource/x/fontconfig/fontconfig.SlackBuild2
-rwxr-xr-xsource/x/freeglut/freeglut.SlackBuild2
-rwxr-xr-xsource/x/glew/glew.SlackBuild2
-rwxr-xr-xsource/x/glu/glu.SlackBuild2
-rwxr-xr-xsource/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild2
-rwxr-xr-xsource/x/libXaw3dXft/libXaw3dXft.SlackBuild2
-rwxr-xr-xsource/x/libdrm/libdrm.SlackBuild2
-rwxr-xr-xsource/x/libepoxy/libepoxy.SlackBuild2
-rwxr-xr-xsource/x/libhangul/libhangul.SlackBuild2
-rwxr-xr-xsource/x/libmypaint/libmypaint.SlackBuild2
-rwxr-xr-xsource/x/libva-utils/libva-utils.SlackBuild2
-rwxr-xr-xsource/x/libva/libva.SlackBuild2
-rwxr-xr-xsource/x/libvdpau/libvdpau.SlackBuild2
-rwxr-xr-xsource/x/libwacom/libwacom.SlackBuild2
-rwxr-xr-xsource/x/m17n-lib/m17n-lib.SlackBuild2
-rwxr-xr-xsource/x/mesa/mesa.SlackBuild2
-rwxr-xr-xsource/x/motif/motif.SlackBuild2
-rwxr-xr-xsource/x/mypaint-brushes/mypaint-brushes.SlackBuild2
-rwxr-xr-xsource/x/scim-anthy/scim-anthy.SlackBuild2
-rwxr-xr-xsource/x/scim-hangul/scim-hangul.SlackBuild2
-rwxr-xr-xsource/x/scim-input-pad/scim-input-pad.SlackBuild2
-rwxr-xr-xsource/x/scim-m17n/scim-m17n.SlackBuild2
-rwxr-xr-xsource/x/scim-pinyin/scim-pinyin.SlackBuild2
-rwxr-xr-xsource/x/scim-tables/scim-tables.SlackBuild2
-rwxr-xr-xsource/x/scim/scim.SlackBuild2
-rwxr-xr-xsource/x/vulkan-sdk/vulkan-sdk.SlackBuild2
-rw-r--r--source/x/x11/build/xf86-video-vmware2
-rw-r--r--source/x/x11/patch/pixman.patch1
-rw-r--r--source/x/x11/patch/pixman/pixman.remove.glyph-test.that.fails.to.compile.diff83
-rwxr-xr-xsource/x/x11/x11.SlackBuild2
-rwxr-xr-xsource/x/xdg-utils/xdg-utils.SlackBuild2
-rwxr-xr-xsource/x/xterm/xterm.SlackBuild2
33 files changed, 115 insertions, 31 deletions
diff --git a/source/x/anthy/anthy.SlackBuild b/source/x/anthy/anthy.SlackBuild
index acacc7d04..d86617cbb 100755
--- a/source/x/anthy/anthy.SlackBuild
+++ b/source/x/anthy/anthy.SlackBuild
@@ -56,7 +56,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild
index 92ecc4f36..b58a3bf72 100755
--- a/source/x/fontconfig/fontconfig.SlackBuild
+++ b/source/x/fontconfig/fontconfig.SlackBuild
@@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-fontconfig
diff --git a/source/x/freeglut/freeglut.SlackBuild b/source/x/freeglut/freeglut.SlackBuild
index d60a0bdbb..935a71cec 100755
--- a/source/x/freeglut/freeglut.SlackBuild
+++ b/source/x/freeglut/freeglut.SlackBuild
@@ -29,7 +29,7 @@ PKGNAM=freeglut
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-2}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
diff --git a/source/x/glew/glew.SlackBuild b/source/x/glew/glew.SlackBuild
index cae1fd09e..0858569b5 100755
--- a/source/x/glew/glew.SlackBuild
+++ b/source/x/glew/glew.SlackBuild
@@ -46,7 +46,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:--j8}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
diff --git a/source/x/glu/glu.SlackBuild b/source/x/glu/glu.SlackBuild
index b77ebe7c3..3e95616e1 100755
--- a/source/x/glu/glu.SlackBuild
+++ b/source/x/glu/glu.SlackBuild
@@ -28,7 +28,7 @@ PKGNAM=glu
VERSION=${VERSION:-9.0.0}
BUILD=${BUILD:-2}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild b/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild
index 41b07015c..9f4978988 100755
--- a/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild
+++ b/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild
@@ -43,7 +43,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:--j6}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
diff --git a/source/x/libXaw3dXft/libXaw3dXft.SlackBuild b/source/x/libXaw3dXft/libXaw3dXft.SlackBuild
index ca493b807..59210d9a4 100755
--- a/source/x/libXaw3dXft/libXaw3dXft.SlackBuild
+++ b/source/x/libXaw3dXft/libXaw3dXft.SlackBuild
@@ -42,7 +42,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:--j6}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
diff --git a/source/x/libdrm/libdrm.SlackBuild b/source/x/libdrm/libdrm.SlackBuild
index 2686a6e9a..2b3c15445 100755
--- a/source/x/libdrm/libdrm.SlackBuild
+++ b/source/x/libdrm/libdrm.SlackBuild
@@ -43,7 +43,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-${PKGNAM}
diff --git a/source/x/libepoxy/libepoxy.SlackBuild b/source/x/libepoxy/libepoxy.SlackBuild
index a7380d0ce..41b061ca8 100755
--- a/source/x/libepoxy/libepoxy.SlackBuild
+++ b/source/x/libepoxy/libepoxy.SlackBuild
@@ -64,7 +64,7 @@ else
LIBDIRSUFFIX=""
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
rm -rf $PKG
mkdir -p $TMP $PKG
diff --git a/source/x/libhangul/libhangul.SlackBuild b/source/x/libhangul/libhangul.SlackBuild
index e60d7ab20..26a697989 100755
--- a/source/x/libhangul/libhangul.SlackBuild
+++ b/source/x/libhangul/libhangul.SlackBuild
@@ -40,7 +40,7 @@ PKGNAM=libhangul
VERSION=${VERSION:-0.1.0}
BUILD=${BUILD:-2}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
diff --git a/source/x/libmypaint/libmypaint.SlackBuild b/source/x/libmypaint/libmypaint.SlackBuild
index 7d5874793..34e4dbbbe 100755
--- a/source/x/libmypaint/libmypaint.SlackBuild
+++ b/source/x/libmypaint/libmypaint.SlackBuild
@@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
diff --git a/source/x/libva-utils/libva-utils.SlackBuild b/source/x/libva-utils/libva-utils.SlackBuild
index 570daafe9..db4004657 100755
--- a/source/x/libva-utils/libva-utils.SlackBuild
+++ b/source/x/libva-utils/libva-utils.SlackBuild
@@ -43,7 +43,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
diff --git a/source/x/libva/libva.SlackBuild b/source/x/libva/libva.SlackBuild
index fc75d1bd9..2d51be198 100755
--- a/source/x/libva/libva.SlackBuild
+++ b/source/x/libva/libva.SlackBuild
@@ -43,7 +43,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
diff --git a/source/x/libvdpau/libvdpau.SlackBuild b/source/x/libvdpau/libvdpau.SlackBuild
index f64f28b74..f7ba5d065 100755
--- a/source/x/libvdpau/libvdpau.SlackBuild
+++ b/source/x/libvdpau/libvdpau.SlackBuild
@@ -46,7 +46,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:--j6}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
diff --git a/source/x/libwacom/libwacom.SlackBuild b/source/x/libwacom/libwacom.SlackBuild
index f72ffd284..4e5b963b3 100755
--- a/source/x/libwacom/libwacom.SlackBuild
+++ b/source/x/libwacom/libwacom.SlackBuild
@@ -47,7 +47,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
diff --git a/source/x/m17n-lib/m17n-lib.SlackBuild b/source/x/m17n-lib/m17n-lib.SlackBuild
index 67d803b37..bf774091c 100755
--- a/source/x/m17n-lib/m17n-lib.SlackBuild
+++ b/source/x/m17n-lib/m17n-lib.SlackBuild
@@ -58,7 +58,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
DOCS="AUTHORS COPYING ChangeLog NEWS README TODO"
DOCS_DB="ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README"
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 99fc6399f..523f0860e 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -27,7 +27,7 @@ VERSION=${VERSION:-$(echo $PKGNAM-1*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d
DEMOVERS=${DEMOVERS:-8.4.0}
BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j7}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Be sure this list is up-to-date:
DRI_DRIVERS="i915,i965,nouveau,r200,radeon,swrast"
diff --git a/source/x/motif/motif.SlackBuild b/source/x/motif/motif.SlackBuild
index a714faa4f..a62d0a81f 100755
--- a/source/x/motif/motif.SlackBuild
+++ b/source/x/motif/motif.SlackBuild
@@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
diff --git a/source/x/mypaint-brushes/mypaint-brushes.SlackBuild b/source/x/mypaint-brushes/mypaint-brushes.SlackBuild
index 21f804f11..2a3749795 100755
--- a/source/x/mypaint-brushes/mypaint-brushes.SlackBuild
+++ b/source/x/mypaint-brushes/mypaint-brushes.SlackBuild
@@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
diff --git a/source/x/scim-anthy/scim-anthy.SlackBuild b/source/x/scim-anthy/scim-anthy.SlackBuild
index 9d87f4817..fbd652cd8 100755
--- a/source/x/scim-anthy/scim-anthy.SlackBuild
+++ b/source/x/scim-anthy/scim-anthy.SlackBuild
@@ -36,7 +36,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=scim-anthy
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
diff --git a/source/x/scim-hangul/scim-hangul.SlackBuild b/source/x/scim-hangul/scim-hangul.SlackBuild
index af54c219f..24b0e64d4 100755
--- a/source/x/scim-hangul/scim-hangul.SlackBuild
+++ b/source/x/scim-hangul/scim-hangul.SlackBuild
@@ -36,7 +36,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=scim-hangul
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
diff --git a/source/x/scim-input-pad/scim-input-pad.SlackBuild b/source/x/scim-input-pad/scim-input-pad.SlackBuild
index ee00b7ec4..63a063f2c 100755
--- a/source/x/scim-input-pad/scim-input-pad.SlackBuild
+++ b/source/x/scim-input-pad/scim-input-pad.SlackBuild
@@ -48,7 +48,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
diff --git a/source/x/scim-m17n/scim-m17n.SlackBuild b/source/x/scim-m17n/scim-m17n.SlackBuild
index 1d96977e4..397a47d83 100755
--- a/source/x/scim-m17n/scim-m17n.SlackBuild
+++ b/source/x/scim-m17n/scim-m17n.SlackBuild
@@ -57,7 +57,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
diff --git a/source/x/scim-pinyin/scim-pinyin.SlackBuild b/source/x/scim-pinyin/scim-pinyin.SlackBuild
index 00b461666..8987588e3 100755
--- a/source/x/scim-pinyin/scim-pinyin.SlackBuild
+++ b/source/x/scim-pinyin/scim-pinyin.SlackBuild
@@ -36,7 +36,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=scim-pinyin
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
diff --git a/source/x/scim-tables/scim-tables.SlackBuild b/source/x/scim-tables/scim-tables.SlackBuild
index fe46f3bf4..afb2c4bdd 100755
--- a/source/x/scim-tables/scim-tables.SlackBuild
+++ b/source/x/scim-tables/scim-tables.SlackBuild
@@ -57,7 +57,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild
index 8b5227f89..c1aa81fbd 100755
--- a/source/x/scim/scim.SlackBuild
+++ b/source/x/scim/scim.SlackBuild
@@ -74,7 +74,7 @@ elif [ "$ARCH" = "armel" ]; then
LIBDIRSUFFIX=""
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
index 056d1d7a0..a1d5e3380 100755
--- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
+++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
@@ -29,7 +29,7 @@ PKGNAM=vulkan-sdk
VERSION=${VERSION:-$(echo Vulkan-LoaderAndValidationLayers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j7}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
diff --git a/source/x/x11/build/xf86-video-vmware b/source/x/x11/build/xf86-video-vmware
index d00491fd7..0cfbf0888 100644
--- a/source/x/x11/build/xf86-video-vmware
+++ b/source/x/x11/build/xf86-video-vmware
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/patch/pixman.patch b/source/x/x11/patch/pixman.patch
new file mode 100644
index 000000000..89037dc3c
--- /dev/null
+++ b/source/x/x11/patch/pixman.patch
@@ -0,0 +1 @@
+zcat $CWD/patch/pixman/pixman.remove.glyph-test.that.fails.to.compile.diff.gz | patch -p1 || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/pixman/pixman.remove.glyph-test.that.fails.to.compile.diff b/source/x/x11/patch/pixman/pixman.remove.glyph-test.that.fails.to.compile.diff
new file mode 100644
index 000000000..a4042c52e
--- /dev/null
+++ b/source/x/x11/patch/pixman/pixman.remove.glyph-test.that.fails.to.compile.diff
@@ -0,0 +1,83 @@
+--- ./test/Makefile.in.orig 2016-01-31 08:31:06.000000000 -0600
++++ ./test/Makefile.in 2018-09-18 17:37:03.435015910 -0500
+@@ -122,7 +122,7 @@
+ rotate-test$(EXEEXT) alphamap$(EXEEXT) \
+ gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \
+ matrix-test$(EXEEXT) composite-traps-test$(EXEEXT) \
+- region-contains-test$(EXEEXT) glyph-test$(EXEEXT) \
++ region-contains-test$(EXEEXT) \
+ solid-test$(EXEEXT) stress-test$(EXEEXT) cover-test$(EXEEXT) \
+ blitters-test$(EXEEXT) affine-test$(EXEEXT) \
+ scaling-test$(EXEEXT) composite$(EXEEXT) \
+@@ -210,12 +210,6 @@
+ fetch_test_DEPENDENCIES = libutils.la \
+ $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+-glyph_test_SOURCES = glyph-test.c
+-glyph_test_OBJECTS = glyph-test.$(OBJEXT)
+-glyph_test_LDADD = $(LDADD)
+-glyph_test_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+ gradient_crash_test_SOURCES = gradient-crash-test.c
+ gradient_crash_test_OBJECTS = gradient-crash-test.$(OBJEXT)
+ gradient_crash_test_LDADD = $(LDADD)
+@@ -392,7 +386,7 @@
+ affine-test.c alpha-loop.c alphamap.c blitters-test.c \
+ check-formats.c combiner-test.c composite.c \
+ composite-traps-test.c cover-test.c fence-image-self-test.c \
+- fetch-test.c glyph-test.c gradient-crash-test.c \
++ fetch-test.c gradient-crash-test.c \
+ infinite-loop.c lowlevel-blt-bench.c matrix-test.c oob-test.c \
+ pdf-op-test.c pixel-test.c prng-test.c radial-invalid.c \
+ radial-perf-test.c region-contains-test.c region-test.c \
+@@ -404,7 +398,7 @@
+ affine-test.c alpha-loop.c alphamap.c blitters-test.c \
+ check-formats.c combiner-test.c composite.c \
+ composite-traps-test.c cover-test.c fence-image-self-test.c \
+- fetch-test.c glyph-test.c gradient-crash-test.c \
++ fetch-test.c gradient-crash-test.c \
+ infinite-loop.c lowlevel-blt-bench.c matrix-test.c oob-test.c \
+ pdf-op-test.c pixel-test.c prng-test.c radial-invalid.c \
+ radial-perf-test.c region-contains-test.c region-test.c \
+@@ -816,7 +810,6 @@
+ matrix-test \
+ composite-traps-test \
+ region-contains-test \
+- glyph-test \
+ solid-test \
+ stress-test \
+ cover-test \
+@@ -965,10 +958,6 @@
+ @rm -f fetch-test$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(fetch_test_OBJECTS) $(fetch_test_LDADD) $(LIBS)
+
+-glyph-test$(EXEEXT): $(glyph_test_OBJECTS) $(glyph_test_DEPENDENCIES) $(EXTRA_glyph_test_DEPENDENCIES)
+- @rm -f glyph-test$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(glyph_test_OBJECTS) $(glyph_test_LDADD) $(LIBS)
+-
+ gradient-crash-test$(EXEEXT): $(gradient_crash_test_OBJECTS) $(gradient_crash_test_DEPENDENCIES) $(EXTRA_gradient_crash_test_DEPENDENCIES)
+ @rm -f gradient-crash-test$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gradient_crash_test_OBJECTS) $(gradient_crash_test_LDADD) $(LIBS)
+@@ -1080,7 +1069,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cover-test.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fence-image-self-test.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fetch-test.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glyph-test.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infinite-loop.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@
+@@ -1487,13 +1475,6 @@
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
+-glyph-test.log: glyph-test$(EXEEXT)
+- @p='glyph-test$(EXEEXT)'; \
+- b='glyph-test'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+ solid-test.log: solid-test$(EXEEXT)
+ @p='solid-test$(EXEEXT)'; \
diff --git a/source/x/x11/x11.SlackBuild b/source/x/x11/x11.SlackBuild
index ffce8b0a0..780aaf528 100755
--- a/source/x/x11/x11.SlackBuild
+++ b/source/x/x11/x11.SlackBuild
@@ -82,7 +82,7 @@ fi
VERSION=${VERSION:-7.5}
BUILD=${BUILD:-1}
PKGARCH=$ARCH
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
if [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
diff --git a/source/x/xdg-utils/xdg-utils.SlackBuild b/source/x/xdg-utils/xdg-utils.SlackBuild
index 078026eb0..c15d398ec 100755
--- a/source/x/xdg-utils/xdg-utils.SlackBuild
+++ b/source/x/xdg-utils/xdg-utils.SlackBuild
@@ -40,7 +40,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index 4991aa4ed..9d065de9f 100755
--- a/source/x/xterm/xterm.SlackBuild
+++ b/source/x/xterm/xterm.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=xterm
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then