X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=33108edeca13e56f23892080c076339beba1facf;hb=cf85ac0edf080d2b0a0747e9d0411b2831a11b5e;hp=44cbfa3066791eab097d57bb35025e8524a5fc3e;hpb=9b10776d29224587f739f7ac3698284b49696664;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 44cbfa3..33108ed 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -42,7 +42,6 @@ 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
@@ -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}
@@ -114,6 +113,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         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}
@@ -121,21 +124,24 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         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
 
     ipkg ${SYLPHEED} "--enable-ssl --enable-ldap"
     ipkg ${LIBNOTIFY}
     ipkg ${YASM}
-    ipkg -m noac ${FIREFOX}
+
+    ipkg -m noac -l "${FIREFOX}-xulrunner" ${FIREFOX}
+    ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX}
 
     ipkg -s qt ${QT}
+    source /etc/profile
     ipkg -m noac ${LUA}
-    ##ipkg ${VLC} "--enable-mozilla"
-    ipkg -m acnb ${VLC} "--disable-mozilla"
-
-    ####ipkg ${GNASH}
-    # GtkGLExt gstreamer SDL xulrunner
+    ipkg -m acnb ${VLC}  "--enable-mozilla"
+    ipkg ${SDL}
+    ipkg -m noac ${AGG}
+    ipkg ${GNASH}
 fi
 
 ipkg ${LIBGAMIN} "--libexecdir=/usr/sbin"