summaryrefslogtreecommitdiffstats
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/font-util12
-rw-r--r--source/x/x11/configure/xf86-input-vmmouse15
-rw-r--r--source/x/x11/configure/xf86-video-ati12
-rw-r--r--source/x/x11/configure/xf86-video-nv12
-rw-r--r--source/x/x11/configure/xorg-server5
5 files changed, 43 insertions, 13 deletions
diff --git a/source/x/x11/configure/font-util b/source/x/x11/configure/font-util
new file mode 100644
index 000000000..698241b33
--- /dev/null
+++ b/source/x/x11/configure/font-util
@@ -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 \
+ --with-fontrootdir=/usr/share/fonts \
+ --disable-static \
+ --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-input-vmmouse b/source/x/x11/configure/xf86-input-vmmouse
new file mode 100644
index 000000000..1b99250b6
--- /dev/null
+++ b/source/x/x11/configure/xf86-input-vmmouse
@@ -0,0 +1,15 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --disable-static \
+ --with-hal-bin-dir=/usr/bin \
+ --with-hal-callouts-dir=/usr/libexec \
+ --with-hal-fdi-dir=/usr/share/hal/fdi/policy/10osvendor \
+ --with-udev-rules-dir=none \
+ --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-ati b/source/x/x11/configure/xf86-video-ati
index 6e41b488e..ae2458849 100644
--- a/source/x/x11/configure/xf86-video-ati
+++ b/source/x/x11/configure/xf86-video-ati
@@ -1,9 +1,11 @@
-xserver_source="/tmp/x11-build/xorg-server-1.6.2"
+xserver_source="/tmp/x11-build/xorg-server-1.7.5"
-if [ ! -d "$xserver_source" ]; then
- echo "$xserver_source does not exist, and you need it."
- exit 1
-fi
+# 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" \
diff --git a/source/x/x11/configure/xf86-video-nv b/source/x/x11/configure/xf86-video-nv
index 6e41b488e..ae2458849 100644
--- a/source/x/x11/configure/xf86-video-nv
+++ b/source/x/x11/configure/xf86-video-nv
@@ -1,9 +1,11 @@
-xserver_source="/tmp/x11-build/xorg-server-1.6.2"
+xserver_source="/tmp/x11-build/xorg-server-1.7.5"
-if [ ! -d "$xserver_source" ]; then
- echo "$xserver_source does not exist, and you need it."
- exit 1
-fi
+# 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" \
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index b66600258..943797bfd 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -7,7 +7,7 @@ BUILD_SERVERS="--enable-xorg \
--enable-xsdl \
--enable-xfbdev"
-MESA_VERSION=${MESA_VERSION:-7.5}
+MESA_VERSION=${MESA_VERSION:-7.5} # unused in 1.7.x
# 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,9 +26,8 @@ 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.0" \
+ --with-os-name="Slackware 13.1" \
--with-os-vendor="Slackware Linux Project" \
- --with-mesa-source=/tmp/Mesa-${MESA_VERSION} \
--with-xkb-path=/etc/X11/xkb \
--with-xkb-output=/var/lib/xkb \
$BUILD_SERVERS \