Changé ordre d'installation car LIBSAMPLERATE dépend de LIBSNDFILE.

diff --git a/config/dependencies b/config/dependencies
index 9f24395..0911496 100644 (file)
--- a/config/dependencies
+++ b/config/dependencies
@@ -12,7 +12,7 @@ ${RHYTHMBOX}: ${LIBID3TAG}
 # Easytag requiert id3lib pour les MP3
 ${EASYTAG}: id3lib OR ${LIBID3TAG}
 ${AUDACIOUS}: taglib, libmowgli, mcs
-${GRIP}: ${VTE} id3lib
+${GRIP}: ${VTE} id3lib ${CDPARANOIA} ${GTK}
 
 ${GOFFICE}: ${LIBGSF} ${PCRE} ${PANGO}
 ${GNUMERIC}: ${GOFFICE}
@@ -132,3 +132,14 @@ ${VLC}: ${QT} ${LUA} ${FIREFOX}
 ${PCMANFM}: ${MENU_CACHE} ${LIBFM}
 
 ${CUPS}: ${LIBJPEG} ${LIBPNG} ${LIBTIFF} ${OPENSSL}
+
+${LIBSNDFILE}: ${LIBOGG} ${LIBVORBIS} ${FLAC} ${SQLITE} ${ALSA_LIB}
+${LIBSAMPLERATE}: ${LIBSNDFILE}
+
+${ALSA_PLUGINS}: ${LIBSAMPLERATE}
+
+${JACK}: ${LIBSAMPLERATE} ${LIBSNDFILE}
+
+${MOC}: ${LIBSAMPLERATE} ${LIBSNDFILE}
+
+${CDPARANOIA}: # Aucune dépendence

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index a665941..22b030e 100755 (executable)
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -154,14 +154,15 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${ALSA_LIB}
         ipkg -m acnb ${ALSA_UTILS}
 
-        # Audio raw utilities
-        ipkg ${LIBSAMPLERATE}
         ipkg -m acnb ${CDPARANOIA}
 
         # Audio file formats
        ipkg ${LIBOGG}
        ipkg ${LIBVORBIS}
        ipkg -m acnb ${FLAC}
+
+       ipkg ${LIBSNDFILE}
+        ipkg ${LIBSAMPLERATE}
        ipkg ${LAME}
         CFLAGS="-fPIC ${CFLAGS}" ipkg ${LIBA52} "--enable-shared"
 
@@ -176,7 +177,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         # Audio libraries
        ipkg -m acnb ${AUDIOFILE}
         ipkg ${PORTAUDIO}
-       ipkg ${LIBSNDFILE}
 
         # Audio servers
         ipkg ${SPEEX}