summaryrefslogtreecommitdiffstats
path: root/source/x/x11
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/x11')
-rw-r--r--source/x/x11/arch.use.flags14
-rw-r--r--source/x/x11/build/igt-gpu-tools2
-rw-r--r--source/x/x11/build/xdm2
-rw-r--r--source/x/x11/build/xinput_calibrator1
-rw-r--r--source/x/x11/build/xorg-server2
-rw-r--r--source/x/x11/configure/xinput_calibrator18
-rw-r--r--source/x/x11/make/xinput_calibrator5
-rw-r--r--source/x/x11/modularize1
-rw-r--r--source/x/x11/patch/xdm.patch1
-rw-r--r--source/x/x11/patch/xdm/xdm-greeter.patch27
-rw-r--r--source/x/x11/patch/xorg-server.patch3
-rw-r--r--source/x/x11/patch/xorg-server/drmmode_display.c.1ULL.32-bit.fix.patch15
-rw-r--r--source/x/x11/post-install/xinput_calibrator.post-install5
-rw-r--r--source/x/x11/slack-desc/xinput_calibrator19
-rwxr-xr-xsource/x/x11/x11.SlackBuild2
15 files changed, 104 insertions, 13 deletions
diff --git a/source/x/x11/arch.use.flags b/source/x/x11/arch.use.flags
index 0e30c3eeb..79213ae62 100644
--- a/source/x/x11/arch.use.flags
+++ b/source/x/x11/arch.use.flags
@@ -1,11 +1,7 @@
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fcommon"
-elif [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon"
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fcommon"
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2 -fcommon"
+if [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=pentium4 -mtune=generic -mstackrealign -fcommon -Wno-error=incompatible-pointer-types"
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC -fcommon"
+ SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC -Wno-error=incompatible-pointer-types"
+else
+ SLKCFLAGS="-O2 -fPIC -fcommon -Wno-error=incompatible-pointer-types"
fi
diff --git a/source/x/x11/build/igt-gpu-tools b/source/x/x11/build/igt-gpu-tools
index 0cfbf0888..d00491fd7 100644
--- a/source/x/x11/build/igt-gpu-tools
+++ b/source/x/x11/build/igt-gpu-tools
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm
index d00491fd7..0cfbf0888 100644
--- a/source/x/x11/build/xdm
+++ b/source/x/x11/build/xdm
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/build/xinput_calibrator b/source/x/x11/build/xinput_calibrator
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/source/x/x11/build/xinput_calibrator
@@ -0,0 +1 @@
+1
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index d00491fd7..00750edc0 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-1
+3
diff --git a/source/x/x11/configure/xinput_calibrator b/source/x/x11/configure/xinput_calibrator
new file mode 100644
index 000000000..fa0206e0a
--- /dev/null
+++ b/source/x/x11/configure/xinput_calibrator
@@ -0,0 +1,18 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
+ --prefix=/usr \
+ --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 \
+ --buildtype=release \
+ -Dgui=x11 \
+ .. || exit 1
diff --git a/source/x/x11/make/xinput_calibrator b/source/x/x11/make/xinput_calibrator
new file mode 100644
index 000000000..635ee83dc
--- /dev/null
+++ b/source/x/x11/make/xinput_calibrator
@@ -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/modularize b/source/x/x11/modularize
index 00aaabf4c..c381ea8cd 100644
--- a/source/x/x11/modularize
+++ b/source/x/x11/modularize
@@ -234,6 +234,7 @@ xhost
xineramaproto
xinit
xinput
+xinput_calibrator
xisxwayland
xkbcomp
xkbevd
diff --git a/source/x/x11/patch/xdm.patch b/source/x/x11/patch/xdm.patch
new file mode 100644
index 000000000..2732c0a3d
--- /dev/null
+++ b/source/x/x11/patch/xdm.patch
@@ -0,0 +1 @@
+cat $CWD/patch/xdm/xdm-greeter.patch | patch -p1 || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xdm/xdm-greeter.patch b/source/x/x11/patch/xdm/xdm-greeter.patch
new file mode 100644
index 000000000..84db96a07
--- /dev/null
+++ b/source/x/x11/patch/xdm/xdm-greeter.patch
@@ -0,0 +1,27 @@
+# The existing calculation of Y_INC make no allowance for the size of the
+# inner frame of the input field. When the input field text height + the
+# inner frame size exceed the height of the prompt text this results in
+# misalignment and artefacts being left behind when erasing characters
+# with tails (such as 'j').
+#
+# The following resource settings can be used to reproduce the issue:
+# xlogin*face: Helvetica-30
+# xlogin*promptFace: Helvetica-16:bold
+# xlogin*innerFramesWidth: 8
+
+# This patch resolves both issues.
+#
+# Author: gary.langshaw@gmail.com
+
+diff -Nurp xdm-1.1.16.orig/greeter/Login.c xdm-1.1.16/greeter/Login.c
+--- xdm-1.1.16.orig/greeter/Login.c 2024-04-05 01:04:33.000000000 +0100
++++ xdm-1.1.16/greeter/Login.c 2024-06-11 15:39:20.596773706 +0100
+@@ -253,7 +253,7 @@ static XtResource resources[] = {
+ #define FAIL_X_INC(w) F_MAX_WIDTH(fail)
+ #define FAIL_Y_INC(w) (F_ASCENT(fail) + F_DESCENT(fail))
+
+-#define Y_INC(w) max (TEXT_Y_INC(w), PROMPT_Y_INC(w))
++#define Y_INC(w) max ((2 * (w)->login.inframeswidth) + TEXT_Y_INC(w), PROMPT_Y_INC(w))
+
+
+ #define PROMPT_TEXT(w,n) ((w)->login.prompts[n].promptText)
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index b75c4cf40..51c1dbb3b 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -21,3 +21,6 @@ zcat $CWD/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-Ge
# Only use Intel DDX with pre-gen4 hardware. Newer hardware will the the modesetting driver by default:
zcat $CWD/patch/xorg-server/06_use-intel-only-on-pre-gen4.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# Change a type from 1UL to 1ULL, which prevents a black screen on 32-bit Linux:
+zcat $CWD/patch/xorg-server/drmmode_display.c.1ULL.32-bit.fix.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/source/x/x11/patch/xorg-server/drmmode_display.c.1ULL.32-bit.fix.patch b/source/x/x11/patch/xorg-server/drmmode_display.c.1ULL.32-bit.fix.patch
new file mode 100644
index 000000000..28ff18825
--- /dev/null
+++ b/source/x/x11/patch/xorg-server/drmmode_display.c.1ULL.32-bit.fix.patch
@@ -0,0 +1,15 @@
+--- ./hw/xfree86/drivers/modesetting/drmmode_display.c.orig 2024-04-12 12:17:00.000000000 -0500
++++ ./hw/xfree86/drivers/modesetting/drmmode_display.c 2024-08-21 12:42:00.586800840 -0500
+@@ -63,9 +63,9 @@
+ void *pPixData);
+
+ static const struct drm_color_ctm ctm_identity = { {
+- 1UL << 32, 0, 0,
+- 0, 1UL << 32, 0,
+- 0, 0, 1UL << 32
++ 1ULL << 32, 0, 0,
++ 0, 1ULL << 32, 0,
++ 0, 0, 1ULL << 32
+ } };
+
+ static Bool ctm_is_identity(const struct drm_color_ctm *ctm)
diff --git a/source/x/x11/post-install/xinput_calibrator.post-install b/source/x/x11/post-install/xinput_calibrator.post-install
new file mode 100644
index 000000000..adb35ea55
--- /dev/null
+++ b/source/x/x11/post-install/xinput_calibrator.post-install
@@ -0,0 +1,5 @@
+# Add documentation:
+mkdir -p $PKG/usr/doc/xinput_calibrator-$MODULAR_PACKAGE_VERSION
+cp -a \
+ COPYING* README* NEWS* TODO* ChangeLog Changelog \
+ $PKG/usr/doc/xinput_calibrator-$MODULAR_PACKAGE_VERSION
diff --git a/source/x/x11/slack-desc/xinput_calibrator b/source/x/x11/slack-desc/xinput_calibrator
new file mode 100644
index 000000000..2e5e0cbd2
--- /dev/null
+++ b/source/x/x11/slack-desc/xinput_calibrator
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+xinput_calibrator: xinput_calibrator (touchscreen calibration program)
+xinput_calibrator:
+xinput_calibrator: Xinput_calibrator is based on a simple calibrator that was proposed on
+xinput_calibrator: the Xorg mailing list. The first release improved upon it by reading
+xinput_calibrator: axis valuators from Xinput, hence making it generic for all
+xinput_calibrator: touchscreen drivers.
+xinput_calibrator:
+xinput_calibrator: For more information about the X.Org Foundation (the providers of the
+xinput_calibrator: X.Org implementation of the X Window System), see their website:
+xinput_calibrator: http://www.x.org
+xinput_calibrator:
diff --git a/source/x/x11/x11.SlackBuild b/source/x/x11/x11.SlackBuild
index 8455b4a7d..226f4fd8d 100755
--- a/source/x/x11/x11.SlackBuild
+++ b/source/x/x11/x11.SlackBuild
@@ -71,7 +71,7 @@ mkdir -p $TMP $SLACK_X_BUILD_DIR
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i586 ;;
+ i?86) export ARCH=i686 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
generated by cgit v1.2.3-79-gdb01 (git 2.46.1) at 2024-09-24 00:30:21 +0000