Upgrade to viewnior-1.4 and add eviv2

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

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 735d242..2b08db9 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -34,9 +34,11 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${CAIROMM}
     ipkg -m acnb ${PANGO}
     ipkg ${PANGOMM}
+    ipkg ${GDK_PIXBUF} "--with-x11"
+    ipkg ${LIBCROCO} "--disable-static"
+    ipkg ${LIBRSVG} "--disable-gtk-doc --disable-static --disable-mozilla-plugin"
     ipkg ${ATK}
     ipkg ${ATKMM}
-    ipkg ${GDK_PIXBUF} "--with-x11"
     ipkg ${GTK} "--disable-gtk-doc"
     ipkg ${GTKMM} "--disable-documentation"
     ipkg ${GTK_ENGINES}
@@ -67,12 +69,11 @@ ipkg ${GPARTED} "--disable-doc"
 
 if [ "x${INST_TYPE}" = "xworkstation" -o \
     "x${INST_TYPE}" = "xltsp-server" ]; then
+    ipkg -m acnb ${EVIV2}
     ipkg ${IMAGE_MAGICK} "--with-modules --with-gslib=/usr/lib"
     ipkg ${VIEWNIOR}
     # xpdf headers are needed by inkscape
     ipkg ${POPPLER} "--enable-xpdf-headers --enable-zlib"
-    ipkg ${LIBCROCO} "--disable-static"
-    ipkg ${LIBRSVG} "--disable-gtk-doc --disable-static --disable-mozilla-plugin"
     ipkg ${BABL}
     ipkg ${GEGL}
     ipkg ${GIMP}