Add libepoxy

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

diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index 4be71f0..8c93bd8 100755 (executable)
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -6,25 +6,21 @@ 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
+    shift
     local CONFIGURE_OPTS=${*}
 
-    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${SUBDIR}
     ipkg ${MODULE} ${XORG_CONFIG} ${CONFIGURE_OPTS}
-    LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}
 }
 
 # Install all submodules in a module
@@ -37,29 +33,26 @@ install_xorg_modules()
     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
+    for package in $(grep -v '^#' ${VERSIONS_DIR}/${MODULE}.wget); do
         SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')"
-
-        ipkg_xorg ${SUBMOD} ${MODULE_NAME} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
+        ipkg_xorg ${SUBMOD} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
     done
 }
 
-ipkg_xorg ${XORG_UTIL_MACROS} "util"
+ipkg_xorg ${XORG_UTIL_MACROS}
 install_xorg_modules ${XORG_PROTO}
-ipkg_xorg ${XORG_MAKEDEPEND} "util"
-ipkg_xorg ${LIBXAU} "lib"
-ipkg_xorg ${LIBXDMCP} "lib"
+ipkg_xorg ${XORG_MAKEDEPEND}
+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}
 ipkg ${XCB_UTIL} ${XORG_CONFIG}
 ipkg -m acnb ${LESSTIF}
-ipkg_xorg ${XBITMAPS} "data"
+ipkg_xorg ${XBITMAPS}
 ipkg ${LIBDRM} "\
     --enable-udev \
     --enable-nouveau-experimental-api"
@@ -75,10 +68,10 @@ ipkg -m acnb ${LLVM} "\
 
 ipkg -m acnb ${MESALIB}
 install_xorg_modules ${XORG_APP}
-ipkg_xorg ${XCURSOR_THEMES} "data"
+ipkg_xorg ${XCURSOR_THEMES}
 install_xorg_modules ${XORG_FONT}
 ipkg ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
-ipkg_xorg ${LUIT} "app"
+ipkg_xorg ${LUIT}
 ipkg ${PIXMAN}
 ipkg ${DBUS}
 ipkg ${GLIB}
@@ -87,7 +80,8 @@ ipkg -m acnb ${DBUS_GLIB} \
     --disable-tests \
     --libexecdir=/usr/lib/dbus-1.0/dbus-1
 
-ipkg_xorg ${XORG_SERVER} "xserver" "\
+ipkg -m acnb -j ${LIBEPOXY}
+ipkg_xorg ${XORG_SERVER} "\
     --with-module-dir=/usr/lib/X11/modules \
     --with-xkb-output=/var/lib/xkb \
     --enable-install-setuid \
@@ -97,11 +91,7 @@ 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_xorg ${XDM} "app"
+ipkg_xorg ${XDM}
 
 rscr once "Configuring X.org" configure-xorg