X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=stage3%2Fstage3-install;h=1bd119060ea7c9d6f908870f30a6177749126e3d;hb=34bf593fed308afb97457d5f94ae019977ba63c9;hp=7cc1279c4556388baee3f60fb18e4a9fcb18a431;hpb=b67ff7ac9b6cc59101a7dc0778daae5e8172660a;p=hvlinux.git

diff --git a/stage3/stage3-install b/stage3/stage3-install
index 7cc1279..1bd1190 100755
--- a/stage3/stage3-install
+++ b/stage3/stage3-install
@@ -169,6 +169,7 @@ fi
 ipkg_ac  ${INTLTOOL}
 ipkg_ac  ${GSL}
 ipkg     ${CUPS}     cis-cups
+ipkg     ${SPLIX}    cis-splix # Drivers Samsung pour CUPS
 ipkg     ${ESPGS}    cis-espgs
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
@@ -228,6 +229,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
 
         ipkg_ac_nb ${LIBFAAC}
         ipkg_ac_nb ${LIBFAAD2}
+        ipkg_ac    ${LIBTHEORA}
+        ipkg       ${XVIDCORE} cis-xvidcore
 
         # Audio libraries
 	ipkg_ac_nb ${AUDIOFILE}
@@ -247,17 +250,16 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         # Audio applications
 	ipkg_ac_nb ${GRIP} "--disable-id3"
         ipkg_ac_nb ${CDRDAO}
-        ######ipkg_ac    ${WXGTK} "--enable-unicode"
-        #####ipkg       ${AUDACITY} cis-audacity # Depends on portaudio and wxgtk
         ipkg_ac    ${SWEEP} "--enable-pulseaudio"
         ipkg_ac    ${EASYTAG}
+        ipkg_ac_nb ${LILYPOND}
+
+        ipkg_ac_nb ${FFMPEG} "--enable-shared --enable-pthreads --enable-gpl --enable-nonfree --disable-ffplay \
+                              --enable-libfaac --enable-libfaad --enable-libmp3lame --enable-libtheora \
+                              --enable-libvorbis --enable-libxvid"
     fi
 
     ipkg_ac    ${SYLPHEED} "--enable-ssl --enable-ldap"
-
-    ipkg       ${QT} cis-qt
-    ipkg       ${OPERA} cis-opera
-
     ipkg       ${NSS} cis-nss
     ipkg       ${FIREFOX} cis-firefox
 
@@ -265,11 +267,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg       ${JAVA} cis-java
     ipkg       ${AGG} cis-agg
     ipkg       ${GNASH} cis-gnash
-
-    ipkg_ac_nb ${FFMPEG} "--enable-shared --enable-pthreads --enable-swscaler --enable-liba52 \
-                          --enable-gpl --disable-ffplay --enable-libfaac --enable-libfaad \
-                          --enable-libmp3lame"
-    ipkg       ${XVIDCORE} cis-xvidcore
 fi
 
 ipkg    ${DBUS}      cis-dbus
@@ -313,6 +310,7 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
 
     # Subversion server (client was already installed in stage2) 
     ipkg     ${SUBVERSION} cis-subversion
+    ipkg_ac  ${INDENT}
 fi
 
     ipkg_ac_nb ${GIT}
@@ -343,6 +341,8 @@ ipkg_ac ${HELP2MAN}
 
 ipkg_ac ${LIBDVDCSS}
 ipkg_ac ${LIBDVDREAD} "--with-libdvdcss"
+INIT_D_PATH=/etc/rc.d/init.d ipkg_ac_nb ${FUSE}
+ipkg    ${DVDFS} cis-dvdfs
 
 ipkg    ${DOSFSTOOLS} cis-dosfstools