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/compiz1
-rw-r--r--source/x/x11/configure/configure1
-rw-r--r--source/x/x11/configure/font-bh-ttf13
-rw-r--r--source/x/x11/configure/gccmakedep14
-rw-r--r--source/x/x11/configure/libX112
-rw-r--r--source/x/x11/configure/libXp14
-rw-r--r--source/x/x11/configure/xf86-video-ati2
-rw-r--r--source/x/x11/configure/xf86-video-nouveau11
-rw-r--r--source/x/x11/configure/xf86-video-nv21
-rw-r--r--source/x/x11/configure/xorg-docs1
-rw-r--r--source/x/x11/configure/xorg-server10
11 files changed, 63 insertions, 27 deletions
diff --git a/source/x/x11/configure/compiz b/source/x/x11/configure/compiz
index 21d8270d..aebd49a2 100644
--- a/source/x/x11/configure/compiz
+++ b/source/x/x11/configure/compiz
@@ -1,3 +1,4 @@
+# Use ./autogen.sh for git, or ./configure for releases:
CFLAGS=$SLKCFLAGS \
CXXFLAGS=$SLKCFLAGS \
./configure \
diff --git a/source/x/x11/configure/configure b/source/x/x11/configure/configure
index eb3fd59c..0f3bccf2 100644
--- a/source/x/x11/configure/configure
+++ b/source/x/x11/configure/configure
@@ -7,5 +7,6 @@ CXXFLAGS=$SLKCFLAGS \
--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/font-bh-ttf b/source/x/x11/configure/font-bh-ttf
new file mode 100644
index 00000000..9e498859
--- /dev/null
+++ b/source/x/x11/configure/font-bh-ttf
@@ -0,0 +1,13 @@
+FC_CONFDIR=/etc/fonts \
+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/gccmakedep b/source/x/x11/configure/gccmakedep
new file mode 100644
index 00000000..181ae81e
--- /dev/null
+++ b/source/x/x11/configure/gccmakedep
@@ -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 \
+ --disable-static \
+ --build=$ARCH-slackware-linux
+#
+# --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+#
diff --git a/source/x/x11/configure/libX11 b/source/x/x11/configure/libX11
index 093c6044..cf85e58d 100644
--- a/source/x/x11/configure/libX11
+++ b/source/x/x11/configure/libX11
@@ -3,10 +3,10 @@ CXXFLAGS=$SLKCFLAGS \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--sysconfdir=/etc \
--localstatedir=/var \
--infodir=/usr/info \
--mandir=/usr/man \
--disable-static \
- --with-xcb=yes \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/libXp b/source/x/x11/configure/libXp
new file mode 100644
index 00000000..181ae81e
--- /dev/null
+++ b/source/x/x11/configure/libXp
@@ -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 \
+ --disable-static \
+ --build=$ARCH-slackware-linux
+#
+# --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+#
diff --git a/source/x/x11/configure/xf86-video-ati b/source/x/x11/configure/xf86-video-ati
index ae245884..0eacb0c3 100644
--- a/source/x/x11/configure/xf86-video-ati
+++ b/source/x/x11/configure/xf86-video-ati
@@ -1,4 +1,4 @@
-xserver_source="/tmp/x11-build/xorg-server-1.7.5"
+xserver_source="/tmp/x11-build/xorg-server-1.9.3"
# Let these just fail to build. In any case, an "exit 1"
# here is just plain wrong.
diff --git a/source/x/x11/configure/xf86-video-nouveau b/source/x/x11/configure/xf86-video-nouveau
new file mode 100644
index 00000000..e050771b
--- /dev/null
+++ b/source/x/x11/configure/xf86-video-nouveau
@@ -0,0 +1,11 @@
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./autogen.sh \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --disable-static \
+ --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-nv b/source/x/x11/configure/xf86-video-nv
deleted file mode 100644
index ae245884..00000000
--- a/source/x/x11/configure/xf86-video-nv
+++ /dev/null
@@ -1,21 +0,0 @@
-xserver_source="/tmp/x11-build/xorg-server-1.7.5"
-
-# Let these just fail to build. In any case, an "exit 1"
-# here is just plain wrong.
-#if [ ! -d "$xserver_source" ]; then
-# echo "$xserver_source does not exist, and you need it."
-# exit 1
-#fi
-
-CFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \
-CXXFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --infodir=/usr/info \
- --mandir=/usr/man \
- --disable-static \
- --with-xserver-source=${xserver_source} \
- --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xorg-docs b/source/x/x11/configure/xorg-docs
index 77bb98d8..ff88ae97 100644
--- a/source/x/x11/configure/xorg-docs
+++ b/source/x/x11/configure/xorg-docs
@@ -7,6 +7,7 @@ CXXFLAGS=$SLKCFLAGS \
--localstatedir=/var \
--infodir=/usr/info \
--mandir=/usr/man \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--disable-static \
--enable-pdf=no \
--enable-ps=no \
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index 943797bf..cf9bd843 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -1,13 +1,15 @@
# Servers to build:
BUILD_SERVERS="--enable-xorg \
+ --enable-dmx \
--enable-xvfb \
--enable-xnest \
--enable-kdrive \
--enable-xephyr \
- --enable-xsdl \
- --enable-xfbdev"
+ --enable-xfbdev \
+ --enable-config-udev \
+ --disable-config-hal"
-MESA_VERSION=${MESA_VERSION:-7.5} # unused in 1.7.x
+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"
@@ -26,7 +28,7 @@ CFLAGS="$SLKCFLAGS" \
--with-default-font-path="${DEF_FONTPATH}" \
--with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
--with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
- --with-os-name="Slackware 13.1" \
+ --with-os-name="Slackware 13.37" \
--with-os-vendor="Slackware Linux Project" \
--with-xkb-path=/etc/X11/xkb \
--with-xkb-output=/var/lib/xkb \