Enleve les librairies audio du stage 5 maintenant que leur installation se fait avec...

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 6434fe7..7d0f5bd 100755 (executable)
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -146,12 +146,9 @@ fi
 ipkg ${GNUPG} "--libexecdir=/usr/lib"
 ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl"
 
+# Audio
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
-    # Audio
     if [ "x${SOUND_CARD}" = "xyes" ]; then
-        # Needed by some packages, mostly audio applications.
-        #ipkg ${LIBOIL}
-
         ipkg -m acnb ${NASM}
 
         ipkg ${ALSA_LIB}

diff --git a/stage3/packages-update b/stage3/packages-update
index f3bd5de..4701dbd 100755 (executable)
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -134,16 +134,14 @@ fi
 fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt"
 fpkg -m sf ${MUTT}
 
-
+# Audio
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
-    # Audio
     if [ "x${SOUND_CARD}" = "xyes" ]; then
 
         fpkg ${NASM} "http://www.nasm.us/pub/nasm/releasebuilds/$(get_pkg_ver \
           ${NASM})"
         fpkg ${ALSA_LIB}   "ftp://ftp.alsa-project.org/pub/lib"
         fpkg ${ALSA_UTILS} "ftp://ftp.alsa-project.org/pub/utils"
-        ##fpkg -e "tar.gz" ${LIBOIL} "http://liboil.freedesktop.org/download"
 
         fpkg -e "tar.gz" ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
 

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index fafef67..233b8ff 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -109,39 +109,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         # Needed by some packages, mostly audio applications.
         ipkg ${LIBOIL}
 
-       #ipkg ${ALSA_OSS}
-
-        # Audio raw utilities
-        ipkg ${LIBSAMPLERATE}
-
-        # Audio file formats
-       ipkg ${LIBOGG}
-       ipkg ${LIBVORBIS}
-       ipkg -m acnb ${FLAC}
-       ipkg ${LAME}
-        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 ${ESOUND} # Necessary????
-        ipkg ${SPEEX}
-        ##ipkg ${PULSEAUDIO}
-       ipkg ${JACK} "--disable-portaudio"
-
-       ipkg ${ALSA_PLUGINS} # Depends on pulseaudio
-       ipkg ${VORBIS_TOOLS}
-
         # Audio applications
        ipkg -m acnb ${GRIP} "--disable-id3"
         ipkg -m acnb ${CDRDAO}
@@ -189,7 +156,7 @@ 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) 
+    # Subversion server (client was already installed in stage2)
     ipkg ${SUBVERSION}
 fi
 

diff --git a/stage5/packages-update b/stage5/packages-update
index 5689758..a939103 100755 (executable)
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -89,38 +89,6 @@ fpkg -e "tar.gz" ${TANGO_ICON_THEME_EXTRAS} \
     "http://tango.freedesktop.org/releases"
 
 fpkg -e "tar.gz" ${LIBOIL} "http://liboil.freedesktop.org/download"
-
-fpkg ${ALSA_LIB}   "ftp://ftp.alsa-project.org/pub/lib"
-fpkg ${ALSA_UTILS} "ftp://ftp.alsa-project.org/pub/utils"
-fpkg ${ALSA_OSS}   "ftp://ftp.alsa-project.org/pub/oss-lib"
-
-fpkg -e "tar.gz" ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
-
-fpkg -e "tar.gz" ${LIBOGG} "http://downloads.xiph.org/releases/ogg"
-fpkg ${LIBVORBIS} "http://downloads.xiph.org/releases/vorbis"
-fpkg -m sf ${FLAC}
-fpkg -m sf ${LAME}
-fpkg -m hv ${LIBA52}
-fpkg -m hv ${LIBID3TAG}
-fpkg -e "tar.gz" ${LIBMAD} "ftp://ftp.mars.org/pub/mpeg"
-
-fpkg -m sf ${LIBFAAC}
-fpkg ${LIBFAAD2} "http://downloads.sourceforge.net/faac"
-fpkg ${LIBTHEORA} "http://downloads.xiph.org/releases/theora"
-fpkg ${XVIDCORE} "http://downloads.xvid.org/downloads"
-
-fpkg -e "tar.gz" ${AUDIOFILE} "http://www.68k.org/~michael/audiofile"
-fpkg -e "tar.gz" -f "pa_stable_v19_20071207" ${PORTAUDIO} \
-    "http://www.portaudio.com/archives"
-fpkg -e "tar.gz" ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile/files"
-
-fpkg -e "tar.gz" ${SPEEX} "http://downloads.xiph.org/releases/speex"
-#fpkg -m gnome ${ESOUND}
-###fpkg ${PULSEAUDIO} "http://0pointer.de/lennart/projects/pulseaudio"
-fpkg -e "tar.gz" ${JACK} "http://jackaudio.org/downloads"
-fpkg ${ALSA_PLUGINS} "ftp://ftp.alsa-project.org/pub/plugins"
-fpkg -e "tar.gz" ${VORBIS_TOOLS} "http://downloads.xiph.org/releases/vorbis"
-
 fpkg -m sf ${GRIP}
 fpkg -m sf -e "tar.bz2" ${CDRDAO}
 fpkg -m sf -e "tar.bz2" ${EASYTAG}