summaryrefslogtreecommitdiff
path: root/source/x/x11/configure
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/x/x11/configure
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x/x11/configure')
-rw-r--r--source/x/x11/configure/intel-gpu-tools4
-rw-r--r--source/x/x11/configure/xcb-proto35
-rw-r--r--source/x/x11/configure/xf86-video-intel11
-rw-r--r--source/x/x11/configure/xorg-server6
-rw-r--r--source/x/x11/configure/xorgproto18
5 files changed, 65 insertions, 9 deletions
diff --git a/source/x/x11/configure/intel-gpu-tools b/source/x/x11/configure/intel-gpu-tools
index d996de5c..a5e0db8a 100644
--- a/source/x/x11/configure/intel-gpu-tools
+++ b/source/x/x11/configure/intel-gpu-tools
@@ -1,6 +1,6 @@
CFLAGS=$SLKCFLAGS \
CXXFLAGS=$SLKCFLAGS \
-./configure \
+./autogen.sh \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
@@ -9,5 +9,5 @@ CXXFLAGS=$SLKCFLAGS \
--mandir=/usr/man \
--docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--disable-static \
- --disable-dumper \
+ --disable-tests \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xcb-proto b/source/x/x11/configure/xcb-proto
new file mode 100644
index 00000000..2df1aaf7
--- /dev/null
+++ b/source/x/x11/configure/xcb-proto
@@ -0,0 +1,35 @@
+mkdir python2 python3
+
+cd python2
+ CFLAGS=$SLKCFLAGS \
+ CXXFLAGS=$SLKCFLAGS \
+ PYTHON=python3 \
+ ../configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
+ --with-udev-rules-dir=/lib/udev/rules.d \
+ --disable-static \
+ --build=$ARCH-slackware-linux
+cd -
+
+cd python3
+ CFLAGS=$SLKCFLAGS \
+ CXXFLAGS=$SLKCFLAGS \
+ PYTHON=python \
+ ../configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
+ --with-udev-rules-dir=/lib/udev/rules.d \
+ --disable-static \
+ --build=$ARCH-slackware-linux
+cd -
diff --git a/source/x/x11/configure/xf86-video-intel b/source/x/x11/configure/xf86-video-intel
index d744b329..88581a1e 100644
--- a/source/x/x11/configure/xf86-video-intel
+++ b/source/x/x11/configure/xf86-video-intel
@@ -1,5 +1,11 @@
-CFLAGS=$SLKCFLAGS \
-CXXFLAGS=$SLKCFLAGS \
+# xf86-video-intel requires SSE2 instructions on 32-bit x86:
+ALTCFLAGS="$SLKCFLAGS"
+case "$( uname -m )" in
+ i?86) ALTCFLAGS="-O2 -march=i686 -mtune=i686 -msse2" ; PKGARCH=i686 ;;
+esac
+
+CFLAGS="$ALTCFLAGS" \
+CXXFLAGS="$ALTCFLAGS" \
./autogen.sh \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -11,4 +17,5 @@ CXXFLAGS=$SLKCFLAGS \
--disable-static \
--enable-kms-only \
--enable-uxa \
+ --with-default-dri=3 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index 755b565d..1ebd6346 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -6,11 +6,7 @@ BUILD_SERVERS="--enable-xorg \
--enable-glamor \
--enable-kdrive \
--enable-xephyr \
- --enable-xfbdev \
--enable-config-udev \
- --enable-kdrive-evdev \
- --enable-kdrive-kbd \
- --enable-kdrive-mouse \
--disable-config-hal \
--disable-systemd-logind"
@@ -36,7 +32,7 @@ CFLAGS="$SLKCFLAGS" \
--with-int10=x86emu \
--with-default-font-path="${DEF_FONTPATH}" \
--with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
- --with-os-name="Slackware 14.2" \
+ --with-os-name="Slackware 15.0" \
--with-os-vendor="Slackware Linux Project" \
--with-xkb-path=/etc/X11/xkb \
--with-xkb-output=/var/lib/xkb \
diff --git a/source/x/x11/configure/xorgproto b/source/x/x11/configure/xorgproto
new file mode 100644
index 00000000..f95c810b
--- /dev/null
+++ b/source/x/x11/configure/xorgproto
@@ -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 \
+ -Dlegacy=true \
+ .. || exit 1