Update X.org packages (fixes bug with intel driver)

[hvlinux.git] / stage4 / hv-install-1

diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index 4be71f0..cdfdc50 100755 (executable)
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -6,60 +6,48 @@ source /etc/profile
 check_for_root_user
 init_log_file
 
-LFS_PKG_DIR_ORIG=${LFS_PKG_DIR}
+VERSIONS_DIR="${SCRDIR}/versions"
 
 export XORG_CONFIG="\
     --mandir=/usr/share/man \
     --localstatedir=/var"
 
 # Arg #1: module name and version
-# Arg #2: subdirectory
-# Arg #3: optional configure arguments
+# Arg #2: optional configure arguments
 ipkg_xorg()
 {
     local MODULE=${1}
-    local SUBDIR=${2}
-    shift 2
-    local CONFIGURE_OPTS=${*}
+    shift
+    local MY_CONFIGURE_OPTS=${*}
 
-    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${SUBDIR}
-    ipkg ${MODULE} ${XORG_CONFIG} ${CONFIGURE_OPTS}
-    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}
+    ipkg ${MODULE} ${XORG_CONFIG} ${MY_CONFIGURE_OPTS}
 }
 
 # Install all submodules in a module
 #
-# Arg #1: module name and version
-# Arg #2: optional configure arguments
+# Arg #1: module name
 install_xorg_modules()
 {
     local MODULE=${1}
-    shift
-    local CONFIGURE_OPTS=${*}
 
-    local MODULE_NAME=$(get_pkg_name ${MODULE})
-
-    local MY_XORG_CONFIG
-
-    for package in $(grep -v '^#' ${LFS_PKG_DIR}/${MODULE_NAME}/${MODULE}.wget); do
-        SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')"
-
-        ipkg_xorg ${SUBMOD} ${MODULE_NAME} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
+    for package in $(grep -v '^#' ${VERSIONS_DIR}/${MODULE}.md5 | \
+        awk '{print $2}' | sed 's!\.tar\.bz2$!!'); do
+        ipkg_xorg ${package}
     done
 }
 
-ipkg_xorg ${XORG_UTIL_MACROS} "util"
-install_xorg_modules ${XORG_PROTO}
-ipkg_xorg ${XORG_MAKEDEPEND} "util"
-ipkg_xorg ${LIBXAU} "lib"
-ipkg_xorg ${LIBXDMCP} "lib"
+ipkg_xorg ${XORG_UTIL_MACROS}
+install_xorg_modules proto
+ipkg_xorg ${LIBXAU}
+ipkg_xorg ${LIBXDMCP}
 ipkg ${LIBPTHREAD_STUBS} ${XORG_CONFIG}
 ipkg ${XCB_PROTO} ${XORG_CONFIG}
 ipkg ${LIBXCB} ${XORG_CONFIG}
-install_xorg_modules ${XORG_LIB}
+install_xorg_modules lib
 ipkg ${XCB_UTIL} ${XORG_CONFIG}
-ipkg -m acnb ${LESSTIF}
-ipkg_xorg ${XBITMAPS} "data"
+ipkg ${XCB_UTIL_KSYMS} ${XORG_CONFIG}
+ipkg_xorg ${XBITMAPS}
+ipkg -m acnb -j ${MOTIF}
 ipkg ${LIBDRM} "\
     --enable-udev \
     --enable-nouveau-experimental-api"
@@ -74,40 +62,42 @@ ipkg -m acnb ${LLVM} "\
     --enable-optimized"
 
 ipkg -m acnb ${MESALIB}
-install_xorg_modules ${XORG_APP}
-ipkg_xorg ${XCURSOR_THEMES} "data"
-install_xorg_modules ${XORG_FONT}
+ipkg ${GLU}
+ipkg ${FREEGLUT}
+install_xorg_modules app
+ipkg_xorg ${XCURSOR_THEMES}
+install_xorg_modules font
 ipkg ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
-ipkg_xorg ${LUIT} "app"
 ipkg ${PIXMAN}
 ipkg ${DBUS}
-ipkg ${GLIB}
+ipkg ${GLIB} "--with-pcre=system"
 ipkg ${GOBJECT_INSTROSPECTION} "--disable-tests"
 ipkg -m acnb ${DBUS_GLIB} \
     --disable-tests \
     --libexecdir=/usr/lib/dbus-1.0/dbus-1
 
-ipkg_xorg ${XORG_SERVER} "xserver" "\
-    --with-module-dir=/usr/lib/X11/modules \
+ipkg -m acnb -j ${LIBEPOXY}
+ipkg_xorg ${XORG_SERVER} "\
     --with-xkb-output=/var/lib/xkb \
+    --enable-dmx \
+    --enable-glamor \
     --enable-install-setuid \
-    --disable-config-hal"
+    --enable-suid-wrapper"
 
 ipkg -m acnb ${MTDEV} "--disable-static"
 
-install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=/usr/lib/X11/modules
-
-if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then
-    ipkg ${XORG_VIDEO_NOUVEAU} ${XORG_CONFIG} --with-xorg-module-dir=/usr/lib/X11/modules
-fi
+ipkg ${LIBEVDEV} ${XORG_CONFIG}
+install_xorg_modules driver
 
-ipkg_xorg ${XDM} "app"
+ipkg_xorg ${XDM} "--with-xdmlibdir=/usr/lib/xorg/xdm"
 
 rscr once "Configuring X.org" configure-xorg
 
 ipkg ${XTERM}
 ipkg -m acnb ${T1LIB}
-ipkg -s tk ${TK}
+ipkg -s tk -d unix ${TK} "\
+        --enable-threads \
+        --mandir=/usr/share/man"
 
 # Re-installing python now that tk is present???
 ipkg ${PYTHON} "--enable-shared"