X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=918d1483351156e54afe80603cd6e68381ef5a46;hb=081a04339d8454848014909c0b4a430c70b7fff1;hp=686f56316e2f3ff56bcdf8f775c4f925227de75d;hpb=6fb59c47344b8dec7f46dde511032a1ecb9b6658;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 686f563..918d148 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -6,6 +6,11 @@ source /etc/profile
 check_for_root_user
 init_log_file
 
+ipkg ${HELP2MAN}
+ipkg -m acnb ${CUPS}
+ipkg -m noac ${CUPS_PDF}
+ipkg -m noac ${SPLIX}
+
 if [ "x${INST_TYPE}" = "xworkstation" -o \
     "x${INST_TYPE}" = "xltsp-server" ]; then
     # Gtk
@@ -42,16 +47,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${LIBIDL} # Dépendence de quoi??
     ipkg ${ORBIT2}
     ipkg -m acnb ${GCONF}
-    ipkg ${LIBPROXY} "--with-gnome"
     ipkg ${GNOME_KEYRING}
     ipkg ${LIBSOUP} "--without-gnome"
 fi
 
-ipkg ${HELP2MAN}
-ipkg ${GSL}
-ipkg -m acnb ${CUPS}
-ipkg -m noac ${CUPS_PDF}
-ipkg -m noac ${SPLIX}
 ipkg -m acnb ${GHOSTSCRIPT}
 ipkg ${LIBSPECTRE}
 
@@ -83,7 +82,7 @@ fi
 
 if [ "x${SANE_SUPPORT}" = "xyes" ]; then
     ipkg -m acnb ${SANE_BACKENDS}
-    ipkg ${XSANE}
+    ipkg -m acnb ${XSANE}
 fi
 
 ipkg -m pm ${PERL_MOD_XML_SIMPLE}
@@ -108,20 +107,25 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${LIBOIL}
 
         # Audio applications
-	###ipkg -m acnb ${GRIP} "--disable-id3"
+        ipkg ${VTE} "--libexecdir=/usr/lib/vte --disable-gtk-doc"
+        ipkg -m acnb ${GRIP} "--disable-id3"
         ipkg -m acnb ${CDRDAO}
         ipkg -m acnb ${EASYTAG}
         ipkg -m acnb ${FONTFORGE}
         ipkg ${LILYPOND} "--disable-documentation --disable-debugging"
 
+        # ChordPro utils
+        ipkg -m noac ${CHORDPACK}
+        ipkg -m noac -s guitartex ${GUITARTEX}
+
         ipkg ${FFMPEG}
 
-        ipkg ${GSTREAMER}
+        ipkg ${GSTREAMER} "--disable-tests"
         ipkg ${GST_PLUGINS_BASE}
         ipkg ${GST_PLUGINS_GOOD}
         ipkg ${GST_PLUGINS_BAD}
         ipkg ${GST_PLUGINS_UGLY}
-        ipkg -m acnb ${GST_FFMPEG}
+        ipkg -m acnb ${GST_FFMPEG} "--with-ffmpeg-extra-configure=--disable-yasm"
         ipkg ${GNOME_MEDIA} # Pour gstreamer-properties et gnome-volume-control
     fi
 
@@ -133,6 +137,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX}
 
     ipkg -s qt ${QT}
+    source /etc/profile
     ipkg -m noac ${LUA}
     ipkg -m acnb ${VLC}  "--enable-mozilla"
     ipkg ${SDL}