X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fstage3-install;h=f5d1c4240bf3999957bb6e116ecdd8d5dc6e1ca5;hb=b2f91df3e7c1d1ca93ced97b5001e3134243666b;hp=0af34fbadf932bea7ff66aee026d0cefe0dae907;hpb=5d494ebc6690e09f6dd2b69bb29e9aa1dbee97df;p=hvlinux.git

diff --git a/stage3/stage3-install b/stage3/stage3-install
index 0af34fb..f5d1c42 100755
--- a/stage3/stage3-install
+++ b/stage3/stage3-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export LFS_PKG_DIR="$(dirname $(dirname $(pwd)))/packages/stage3"
+export LFS_PKG_DIR="$(dirname $(pwd))/packages/stage3"
 export LFS_LOG_DIR=/var/log/hvlinux-install/stage3
 export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
 export LFS_TMP=/tmp
@@ -42,6 +42,7 @@ fi
 
 ipkg       ${UNZIP} cis-unzip
 ipkg       ${ZIP}   cis-zip
+ipkg_ac    ${CPIO}
 
 # Installing only CVS client.
 ipkg_ac    ${CVS_PACKAGE} "--disable-server"
@@ -83,10 +84,9 @@ fi
 ipkg     ${TCL} cis-tcl
 ipkg     ${TK}  cis-tk
 
-# Python is required by libxml2
+ipkg_ac ${SQLITE}
 ipkg_ac ${PYTHON} "--enable-shared"
 
-# Needed by inkscape
 ipkg    ${LIBBOOST} cis-boost
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
@@ -140,8 +140,9 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg_ac    ${CAIRO} "--enable-glitz"
     ipkg_ac    ${PANGO}
     ipkg_ac    ${ATK}
-    ipkg_ac    ${GTK2}
+    ipkg_ac    ${GTK2} "--without-libjasper"
     ipkg_ac    ${GTK_ENGINES}
+    ipkg_ac    ${PYGOBJECT}
     ipkg_ac    ${PYGTK}
 
     ipkg_ac    ${LIBSIGCPP}
@@ -165,41 +166,32 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg_ac    ${LIBIDL}
 fi
 
-# Needed by inkscape SVN
-ipkg_ac ${INTLTOOL}
-
-ipkg_ac ${GSL}
-
+ipkg_ac  ${INTLTOOL}
+ipkg_ac  ${GSL}
 ipkg     ${CUPS}     cis-cups
 ipkg     ${ESPGS}    cis-espgs
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg       ${LIBUSB}  cis-libusb
     ipkg_ac    ${LIBGPHOTO2}
-
     ipkg_ac    ${IMAGE_MAGICK} "--with-modules"
-
     ipkg_ac    ${POPPLER} "--enable-xpdf-headers --enable-zlib"
-
     ipkg_ac    ${LIBRSVG} "--disable-gtk-doc --disable-mozilla-plugin"
+    ipkg_ac    ${BABL}
+    ipkg_ac    ${GEGL}
     ipkg_ac    ${GIMP} "--disable-print"
-
+    ipkg_ac_nb ${GUTENPRINT}
     ipkg_ac    ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\""
 fi
 
-ipkg     ${FOX} cis-fox
-ipkg     ${XFE} cis-xfe
-
 ipkg_ac  ${BC} "--with-readline"
 ipkg     ${CDRTOOLS} cis-cdrtools
 ipkg     ${DVDRWTOOLS} cis-dvd-rw-tools
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
-    # TeTeX needs ed.
     ipkg_ac  ${ED}
     ipkg     ${TETEX_SRC} cis-tetex
     ipkg     ${JADETEX}   cis-jadetex
-    ipkg_ac  ${PSTOEDIT}
 fi
 
 if [ "x${SANE_SUPPORT}" = "xyes" ]; then
@@ -212,7 +204,7 @@ ipkg_ac  ${TANGO_ICON_THEME}
 ipkg_ac  ${TANGO_ICON_THEME_EXTRAS}
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
-    # Sound
+    # Audio
     if [ "x${SOUND_CARD}" = "xyes" ]; then
         # Needed by some packages, mostly audio applications.
         ipkg_ac    ${LIBOIL}
@@ -224,7 +216,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
 
         # Audio raw utilities
         ipkg_ac    ${LIBSAMPLERATE}
-	ipkg_ac    ${TAGLIB}
 
         # Audio file formats
 	ipkg_ac    ${LIBOGG}
@@ -245,6 +236,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
 
         # Audio servers
 	ipkg_ac  ${ESOUND}
+        ipkg     ${GDBM} cis-gdbm
+        ipkg_ac  ${SPEEX}
         ipkg     ${PULSEAUDIO} cis-pulseaudio
 	ipkg_ac  ${JACK} "--disable-portaudio"
 
@@ -252,14 +245,12 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
 	ipkg_ac  ${VORBIS_TOOLS}
         
         # Audio applications
-	ipkg_ac_nb ${LIBMCS}
-        ipkg_ac_nb ${LIBMOWGLI}
-	ipkg_ac_nb ${AUDACIOUS} # Depends on mcs and libmowgli
-	ipkg_ac_nb ${AUDACIOUS_PLUGINS} "--disable-hotkey"
-	ipkg_ac_nb ${GRIP}
+	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    ${WXGTK} "--enable-unicode"
+        #####ipkg       ${AUDACITY} cis-audacity # Depends on portaudio and wxgtk
+        ipkg_ac    ${SWEEP} "--enable-pulseaudio"
+        ipkg_ac    ${EASYTAG}
     fi
 
     ipkg_ac    ${SYLPHEED} "--enable-ssl --enable-ldap"
@@ -268,29 +259,25 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg       ${OPERA} cis-opera
 
     ipkg       ${NSS} cis-nss
-
     ipkg       ${FIREFOX} cis-firefox
 
     # Plugins for Opera and Firefox
     ipkg       ${JAVA} cis-java
-    ipkg       ${FLASH_PLUGIN} cis-flashplugin
+    ######ipkg       ${FLASH_PLUGIN} cis-flashplugin
 
     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
-    ipkg_ac    ${XINELIB}
-    ipkg_ac_nb ${GXINE}
-    ipkg       ${MPLAYER_CODECS} cis-mplayer-codecs
-    ipkg       ${MPLAYER} cis-mplayer
 fi
 
-ipkg_ac  ${MINICOM}
-
 ipkg    ${DBUS}      cis-dbus
 ipkg_ac ${DBUS_GLIB} "--disable-tests --disable-dependency-tracking --disable-xml-docs --disable-doxygen-docs"
 ipkg    ${HAL}       cis-hal
 
+ipkg_ac   ${LIBGAMIN} "--libexecdir=/usr/sbin"
+ipkg_ac   ${PCMANFM}
+
 # Mail
 ipkg     ${SASL2}     cis-sasl2
 ipkg     ${OPENLDAP}  cis-openldap
@@ -315,12 +302,10 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
 
     # Apache
     ipkg     ${HTTPD} cis-apache
-    # CURL is needed by PHP
     ipkg_ac  ${CURL}
     ipkg     ${PHP}   cis-php
 
     ipkg     ${SQUIRRELMAIL} cis-squirrelmail
-
     ipkg     ${MAILMAN} cis-mailman
 
     # Subversion server (client was already installed in stage2) 
@@ -343,10 +328,20 @@ ipkg_ac_nb ${KVM}
 ipkg_ac_nb ${BRIDGE_UTILS}
 ipkg       ${UML_UTILITIES} cis-uml-utilities
 
-# Pour lilypond
-ipkg_ac   ${GMP} "--enable-cxx --enable-mpbsd ABI=32"
-ipkg      ${GUILE} cis-guile
-#ipkg mftrace
+ipkg       ${GUILE} cis-guile
+
+ipkg       ${CKERMIT} cis-ckermit
+
+# BitTorrent client
+ipkg_ac    ${TRANSMISSION} "--disable-daemon"
+
+# For bitbake
+ipkg_ac ${HELP2MAN}
+
+ipkg_ac ${LIBDVDCSS}
+ipkg_ac ${LIBDVDREAD} "--with-libdvdcss"
+
+ipkg    ${DOSFSTOOLS} cis-dosfstools
 
 ./cis-postinstall