X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=68b77abec7a656d75ec1422f29eadd3dab5e30cf;hb=c891c3ca47bb7b71dbf57261d2a81911d832bf7b;hp=6b639d1ba1bdbb24583ecc77ce9a38feddc332bc;hpb=47b23eff793721903e93f18f2ca444ad52d1e305;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 6b639d1..68b77ab 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -50,7 +50,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${WMNOTIFY}
 
     ipkg ${DESKTOP_FILE_UTILS}
-    ipkg -m acnb ${SHARED_MIME_INFO}
+    ipkg -m acnb -j ${SHARED_MIME_INFO}
     ipkg ${STARTUP_NOTIFICATION}
     ipkg ${LIBWNCK}
     ipkg ${ISO_CODES}
@@ -139,7 +139,19 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg -m noac ${CHORDPACK}
         ipkg -m noac -s guitartex ${GUITARTEX}
 
-        ipkg ${FFMPEG}
+        ipkg ${FFMPEG} " \
+            --enable-shared \
+            --enable-pthreads \
+            --enable-gpl \
+            --enable-nonfree \
+            --disable-ffplay \
+            --enable-libfaac \
+            --enable-libmp3lame \
+            --enable-libtheora \
+            --enable-libvorbis \
+            --enable-libxvid \
+            --enable-libfreetype \
+            --enable-libx264"
 
         ipkg ${GSTREAMER} "--disable-tests"
         ipkg ${GST_PLUGINS_BASE}
@@ -231,8 +243,10 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg -m noac ${SQUIRRELMAIL}
     ipkg ${FETCHMAIL} "--with-ssl"
 
-    # Subversion server (client was already installed in stage2)
-    ipkg ${SUBVERSION}
+    if [ x"${SVN_SERVER}" == xyes ]; then
+        # Subversion server (client was already installed in stage3)
+        ipkg ${SUBVERSION}
+    fi
 fi
 
 ipkg ${LIBGSF}