X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=4c3b61ab378bd848a0c8811ce30115251200c96b;hb=39a19cacbb9a44c5ceadd254463ea87c588a82a3;hp=d9cf9d006e4956ab29c3a534d5d271c0dda3f3b1;hpb=77031e8fcef84bf8d3980c9540ef5be53b636186;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index d9cf9d0..4c3b61a 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -8,9 +8,15 @@ init_log_file
 
 ipkg ${HELP2MAN}
 ipkg ${GSL}
+
 ipkg -m acnb ${CUPS}
+ipkg -m acnb ${GHOSTSCRIPT}
+ipkg ${LIBSPECTRE}
 ipkg -m noac ${CUPS_PDF}
 ipkg -m noac ${SPLIX}
+ipkg ${FOOMATIC_FILTERS}
+ipkg -m noac ${FOO2ZJS}
+
 ipkg ${GLIB_NETWORKING} "\
     --libexecdir=/usr/lib/glib-networking \
     --with-ca-certificates=/etc/ssl/ca-bundle.crt \
@@ -55,8 +61,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
 fi
 
 ipkg ${GPARTED} "--disable-doc"
-ipkg -m acnb ${GHOSTSCRIPT}
-ipkg ${LIBSPECTRE}
 
 if [ "x${INST_TYPE}" = "xworkstation" -o \
     "x${INST_TYPE}" = "xltsp-server" ]; then
@@ -77,7 +81,7 @@ fi
 ipkg -m noac ${CDRTOOLS}
 ipkg -m noac ${DVDRWTOOLS}
 ipkg ${LIBDVDCSS}
-ipkg ${LIBDVDREAD}
+ipkg -m acnb ${LIBDVDREAD}
 ipkg -m noac ${DVDFS}
 ipkg -m acnb ${VOBCOPY}
 
@@ -117,8 +121,15 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg -m acnb ${GRIP} "--disable-id3"
         ipkg -m acnb ${CDRDAO}
         ipkg -m acnb ${EASYTAG}
-        ipkg -m acnb ${FONTFORGE}
-        ipkg ${LILYPOND} "--disable-documentation --disable-debugging"
+        ipkg -m acnb ${FONTFORGE} "--enable-double"
+
+        # -Wno-error=unused-but-set-variable: Fix for newer GCC.
+        CFLAGS="${CFLAGS} -Wno-error=unused-but-set-variable" \
+            ipkg -s guile1 ${GUILE1}
+
+        # Lilypond 2.17 ne fonctionne pas encore avec guile2
+        PATH="/opt/guile1/bin/:$PATH" \
+            ipkg ${LILYPOND} "--disable-documentation --disable-debugging"
 
         # ChordPro utils
         ipkg -m noac ${CHORDPACK}
@@ -131,7 +142,8 @@ 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} "--with-ffmpeg-extra-configure=--disable-yasm"
+        ipkg -m acnb ${GST_FFMPEG}
+
         ipkg ${GNOME_MEDIA} # Pour gstreamer-properties et gnome-volume-control
 
         ipkg ${WXGTK} "--enable-unicode --disable-compat26"
@@ -141,18 +153,19 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
 
     ipkg ${SYLPHEED} "--enable-ssl --enable-ldap"
     ipkg ${LIBNOTIFY}
-    ipkg ${YASM}
     ipkg ${LIBVPX} "--enable-shared"
 
-    ipkg -m acnb -t -j ${WEBKIT} "\
-        --libexecdir=/usr/lib/WebKitGTK \
-        --with-gstreamer=0.10 \
-        --enable-introspection \
-        --with-gtk=2.0 \
-        --disable-geolocation \
-        --disable-gtk-doc"
-    ipkg ${VALA}
-    NOCOLOR=1 ipkg ${MIDORI}
+    if [ "x${USE_WEBKIT}" = "xyes" ]; then
+        ipkg -m acnb -t -j ${WEBKIT} "\
+            --libexecdir=/usr/lib/WebKitGTK \
+            --with-gstreamer=0.10 \
+            --enable-introspection \
+            --with-gtk=2.0 \
+            --disable-geolocation \
+            --disable-gtk-doc"
+        ipkg ${VALA}
+        NOCOLOR=1 ipkg ${MIDORI}
+    fi
 
     ipkg -m noac -l "${FIREFOX}-xulrunner" ${FIREFOX}
     ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX}
@@ -163,7 +176,9 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg -m acnb ${VLC}  "--enable-mozilla --enable-qt4 --enable-ncurses"
     ipkg ${SDL}
     ipkg -m noac ${AGG}
-    ipkg ${GNASH}
+    if [ "x${USE_GNASH}" = "xyes" ]; then
+        ipkg ${GNASH}
+    fi
 fi
 
 ipkg ${LIBGAMIN} "--libexecdir=/usr/sbin"
@@ -173,6 +188,14 @@ ipkg ${XARCHIVER}
 ipkg -m acnb ${LIBFM}
 ipkg ${PCMANFM}
 
+if [ "x${USE_HTTPD}" = "xyes" ]; then
+    ipkg -s apache ${HTTPD}
+fi
+if [ "x${USE_LIGHTTPD}" = "xyes" ]; then
+    ipkg ${LIGHTTPD}
+fi
+ipkg ${PHP}
+
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg -m noac ${PROCMAIL}
     ipkg -m noac ${LIBSPF2}
@@ -193,18 +216,12 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
 
     ipkg ${UW_IMAP}
 
-    ipkg ${HTTPD} # Apache
-    ipkg ${PHP}
-
     ipkg -m noac ${SQUIRRELMAIL}
     ipkg ${FETCHMAIL} "--with-ssl"
 
     # Subversion server (client was already installed in stage2)
     ipkg ${SUBVERSION}
-fi
 
-if [ "x${INST_TYPE}" = "xworkstation" -o \
-    "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${LIBGSF}
     ipkg -m acnb ${GOFFICE}
     ipkg ${GNUMERIC} "--localstatedir=/var/lib --disable-pdfdocs"
@@ -212,6 +229,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${ABIWORD} "--disable-spellcheck"
 fi
 
+ipkg -m noac ${MERCURIAL}
+
 ipkg ${INDENT}
 
 if [ "x${USE_SAMBA}" = "xyes" ]; then