X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fhv-install-1;h=1059d6768b7d451a18f80f15806b289da0f1de7f;hb=45c5a2f834c42e914e684c784988f369118aa31b;hp=564e8f27a927dfcb765ce066d4edb26c1ede9ad4;hpb=f4db17a468c2141d7cd0afb3f59f198c88f16dfc;p=hvlinux.git

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 564e8f2..1059d67 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -3,11 +3,7 @@
 source ../functions/main
 source /etc/profile
 
-if [ "x${USER}" != "xroot" ]; then
-    echo "You must be the superuser to install hvlinux."
-    exit 1
-fi
-
+check_for_root_user
 init_log_file
 
 ipkg ${WHICH}
@@ -28,7 +24,8 @@ ipkg ${APR} "--with-installbuilddir=/usr/lib/apr-1/build"
 ipkg ${APR_UTIL} "--with-apr=/usr/bin/apr-1-config"
 ipkg ${NEON} "--with-ssl"
 ipkg -s tcl ${TCL}
-ipkg ${SQLITE}
+CFLAGS="${CFLAGS} -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY=1" \
+    ipkg ${SQLITE} "--enable-threadsafe --enable-readline --enable-dynamic-extensions"
 ipkg -j ${SUBVERSION} "--without-berkeley-db"
 ipkg ${SUDO}
 ipkg ${STRACE}
@@ -72,7 +69,6 @@ ipkg -m noac ${UNRAR}
 ipkg ${CPIO}
 
 ipkg ${PARTED} "--disable-device-mapper"
-ipkg ${ED}
 ipkg ${BC} "--with-readline"
 INIT_D_PATH=/etc/rc.d/init.d \
     ipkg -m acnb ${FUSE}
@@ -146,8 +142,47 @@ fi
 ipkg ${GNUPG} "--libexecdir=/usr/lib"
 ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl"
 
-ipkg ${ALSA_LIB}
-ipkg -m acnb ${ALSA_UTILS}
+# Audio
+if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+    if [ "x${SOUND_CARD}" = "xyes" ]; then
+        ipkg -m acnb ${NASM}
+
+        ipkg ${ALSA_LIB}
+        ipkg -m acnb ${ALSA_UTILS}
+
+        # Audio raw utilities
+        ipkg ${LIBSAMPLERATE}
+
+        # Audio file formats
+	ipkg ${LIBOGG}
+	ipkg ${LIBVORBIS}
+	ipkg -m acnb ${FLAC}
+	ipkg ${LAME}
+        CFLAGS="-fPIC ${CFLAGS}" ipkg ${LIBA52} "--enable-shared"
+
+	ipkg ${LIBID3TAG}
+	ipkg ${LIBMAD}
+
+        ipkg -m acnb ${LIBFAAC}
+        ipkg -m acnb ${LIBFAAD2}
+        ipkg ${LIBTHEORA}
+        ipkg ${XVIDCORE}
+
+        # Audio libraries
+	ipkg -m acnb ${AUDIOFILE}
+        ipkg ${PORTAUDIO}
+	ipkg ${LIBSNDFILE}
+
+        # Audio servers
+        ipkg ${SPEEX}
+	ipkg ${JACK} "--disable-portaudio --libdir=/usr/lib"
+
+	ipkg ${ALSA_PLUGINS} # Depends on pulseaudio
+	ipkg ${VORBIS_TOOLS}
+
+	ipkg ${MOC}
+    fi
+fi
 
 write_completed_stage
 display_stage_build_stats