summaryrefslogtreecommitdiff
path: root/source/x/x11/configure
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/x11/configure')
-rw-r--r--source/x/x11/configure/autogen13
-rw-r--r--source/x/x11/configure/configure1
-rw-r--r--source/x/x11/configure/intel-gpu-tools (renamed from source/x/x11/configure/xf86-input-vmmouse)5
-rw-r--r--source/x/x11/configure/libxcb14
-rw-r--r--source/x/x11/configure/libxshmfence15
-rw-r--r--source/x/x11/configure/xf86-video-intel14
-rw-r--r--source/x/x11/configure/xf86-video-nouveau12
-rw-r--r--source/x/x11/configure/xorg-server15
8 files changed, 83 insertions, 6 deletions
diff --git a/source/x/x11/configure/autogen b/source/x/x11/configure/autogen
new file mode 100644
index 00000000..291eb9b9
--- /dev/null
+++ b/source/x/x11/configure/autogen
@@ -0,0 +1,13 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./autogen.sh \
+ --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
diff --git a/source/x/x11/configure/configure b/source/x/x11/configure/configure
index 0f3bccf2..dcb1109b 100644
--- a/source/x/x11/configure/configure
+++ b/source/x/x11/configure/configure
@@ -8,5 +8,6 @@ CXXFLAGS=$SLKCFLAGS \
--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
diff --git a/source/x/x11/configure/xf86-input-vmmouse b/source/x/x11/configure/intel-gpu-tools
index 1ac86351..d996de5c 100644
--- a/source/x/x11/configure/xf86-input-vmmouse
+++ b/source/x/x11/configure/intel-gpu-tools
@@ -7,8 +7,7 @@ CXXFLAGS=$SLKCFLAGS \
--localstatedir=/var \
--infodir=/usr/info \
--mandir=/usr/man \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--disable-static \
- --with-hal-bin-dir=none \
- --with-hal-callouts-dir=none \
- --with-hal-fdi-dir=none \
+ --disable-dumper \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/libxcb b/source/x/x11/configure/libxcb
new file mode 100644
index 00000000..0c8a4a8c
--- /dev/null
+++ b/source/x/x11/configure/libxcb
@@ -0,0 +1,14 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+ --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 \
+ --enable-xinput \
+ --enable-xkb \
+ --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/libxshmfence b/source/x/x11/configure/libxshmfence
new file mode 100644
index 00000000..ec0521d8
--- /dev/null
+++ b/source/x/x11/configure/libxshmfence
@@ -0,0 +1,15 @@
+# Of course, the libtool stuff included in the tarball is broken :/
+autoreconf -v -i -f
+
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+ --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 \
+ --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-intel b/source/x/x11/configure/xf86-video-intel
new file mode 100644
index 00000000..d744b329
--- /dev/null
+++ b/source/x/x11/configure/xf86-video-intel
@@ -0,0 +1,14 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./autogen.sh \
+ --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 \
+ --enable-kms-only \
+ --enable-uxa \
+ --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-nouveau b/source/x/x11/configure/xf86-video-nouveau
new file mode 100644
index 00000000..0f3bccf2
--- /dev/null
+++ b/source/x/x11/configure/xf86-video-nouveau
@@ -0,0 +1,12 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+ --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 \
+ --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index b62befba..755b565d 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -3,17 +3,25 @@ BUILD_SERVERS="--enable-xorg \
--enable-dmx \
--enable-xvfb \
--enable-xnest \
+ --enable-glamor \
--enable-kdrive \
--enable-xephyr \
--enable-xfbdev \
--enable-config-udev \
- --disable-config-hal"
+ --enable-kdrive-evdev \
+ --enable-kdrive-kbd \
+ --enable-kdrive-mouse \
+ --disable-config-hal \
+ --disable-systemd-logind"
-MESA_VERSION=${MESA_VERSION:-7.5} # unused in 1.7+
+#MESA_VERSION=${MESA_VERSION:-7.5} # unused in 1.7+
# Default font paths to be used by the X server
DEF_FONTPATH="/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/misc,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic"
+# Reconf (don't remove this plz):
+autoreconf -vif
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
@@ -24,10 +32,11 @@ CFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--disable-static \
--with-pic \
+ --enable-suid-wrapper \
--with-int10=x86emu \
--with-default-font-path="${DEF_FONTPATH}" \
--with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
- --with-os-name="Slackware 14.1" \
+ --with-os-name="Slackware 14.2" \
--with-os-vendor="Slackware Linux Project" \
--with-xkb-path=/etc/X11/xkb \
--with-xkb-output=/var/lib/xkb \