Lecture de /etc/profile après l'installation de Qt

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

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 6691ecc..536af9c 100755 (executable)
--- 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
@@ -58,6 +57,7 @@ ipkg ${LIBSPECTRE}
 if [ "x${INST_TYPE}" = "xworkstation" -o \
     "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${IMAGE_MAGICK} "--with-modules --with-gslib=/usr/lib"
+    ipkg ${VIEWNIOR}
     # xpdf headers needed by inkscape
     ipkg ${POPPLER} "--enable-xpdf-headers --enable-zlib"
     ipkg ${LIBRSVG} "--disable-gtk-doc --disable-mozilla-plugin"
@@ -113,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}
@@ -120,24 +124,29 @@ 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"
+ipkg ${MENU_CACHE}
+ipkg -m acnb ${LIBFM}
 ipkg ${PCMANFM}
 
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then