Update samba for new ipkg() -d option

[hvlinux.git] / stage5 / hv-install-1

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index bdc8822..e236cf1 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -12,10 +12,10 @@ ipkg ${GSL}
 ipkg -m acnb ${CUPS}
 ipkg -m acnb ${GHOSTSCRIPT}
 ipkg ${LIBSPECTRE}
-ipkg -m noac ${CUPS_PDF}
-ipkg -m noac ${SPLIX}
-ipkg ${FOOMATIC_FILTERS}
-ipkg -m noac ${FOO2ZJS}
+ipkg ${IJS} " \
+    --mandir=/usr/share/man \
+    --enable-shared \
+    --disable-static"
 
 ipkg ${ITSTOOL}
 
@@ -32,13 +32,21 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg -m acnb ${GLIBMM}
     ipkg ${CAIRO} "--enable-tee"
     ipkg ${CAIROMM}
+    ipkg ${HARFBUZZ}
+
+    # Freetype was installed in stage3, but needs to be reinstalled after harfbuzz
+    ipkg ${FREETYPE} "--disable-static"
+
     ipkg -m acnb ${PANGO}
     ipkg ${PANGOMM}
-    ipkg ${ATK}
     ipkg ${GDK_PIXBUF} "--with-x11"
-    ipkg ${GTK} "--disable-gtk-doc"
+    ipkg ${LIBCROCO} "--disable-static"
+    ipkg ${LIBRSVG} "--disable-gtk-doc --disable-static --disable-mozilla-plugin"
+    ipkg ${ATK}
     ipkg ${ATKMM}
+    ipkg ${GTK} "--disable-gtk-doc"
     ipkg ${GTKMM} "--disable-documentation"
+    ipkg ${ADWAITA_ICON_THEME}
     ipkg ${GTK_ENGINES}
     ipkg -m acnb ${PYCAIRO}
     ipkg ${PYGOBJECT} "--disable-introspection"
@@ -56,8 +64,13 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${ISO_CODES}
     ipkg ${LIBXKLAVIER}
     ipkg ${LIBGLADE}
-    ipkg -m acnb ${GCONF}
-    ipkg ${GNOME_KEYRING}
+    ipkg -m acnb ${GCONF} "\
+        --disable-orbit \
+        --disable-static"
+    ipkg -c -m noac ${CERTDATA}
+    ipkg ${P11KIT}
+    ipkg ${GCR} "--without-gtk" # Needs Gtk3
+    ipkg ${GNOME_KEYRING} "--with-pam-dir=/lib/security --disable-debug"
     ipkg ${LIBSOUP} "--disable-static --without-gnome"
 
     ipkg ${XSCREENSAVER} "--libexecdir=/usr/lib"
@@ -67,12 +80,11 @@ ipkg ${GPARTED} "--disable-doc"
 
 if [ "x${INST_TYPE}" = "xworkstation" -o \
     "x${INST_TYPE}" = "xltsp-server" ]; then
+    ipkg -m acnb ${EVIV2}
     ipkg ${IMAGE_MAGICK} "--with-modules --with-gslib=/usr/lib"
     ipkg ${VIEWNIOR}
     # xpdf headers are needed by inkscape
     ipkg ${POPPLER} "--enable-xpdf-headers --enable-zlib"
-    ipkg ${LIBCROCO} "--disable-static"
-    ipkg ${LIBRSVG} "--disable-gtk-doc --disable-static --disable-mozilla-plugin"
     ipkg ${BABL}
     ipkg ${GEGL}
     ipkg ${GIMP}
@@ -81,6 +93,18 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\""
 fi
 
+ipkg -m acnb ${QPDF}
+ipkg ${CUPS_FILTERS} " \
+    --localstatedir=/var \
+    --without-rcdir \
+    --with-gs-path=/usr/bin/gs \
+    --with-pdftops-path=/usr/bin/gs \
+    --disable-static"
+ipkg -m noac ${CUPS_PDF}
+ipkg -m noac ${SPLIX}
+ipkg ${FOOMATIC_FILTERS}
+ipkg -m noac ${FOO2ZJS}
+
 ipkg -m noac ${CDRTOOLS}
 ipkg -m noac ${DVDRWTOOLS}
 ipkg ${LIBDVDCSS}
@@ -106,14 +130,18 @@ ipkg ${TANGO_ICON_THEME_EXTRAS}
 ipkg ${GNOME_ICON_THEME}
 
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+    ipkg ${GSETTINGS_DESKTOP_SCHEMAS}
     ipkg ${EVINCE} "\
         --without-keyring \
         --disable-nautilus \
         --disable-help \
+        --enable-introspection \
         --enable-pixbuf \
         --enable-dvi \
         --enable-t1lib"
 
+    ipkg ${VALA}
+
     # Audio
     if [ "x${SOUND_CARD}" = "xyes" ]; then
         # Needed by some packages, mostly audio applications.
@@ -139,7 +167,19 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg -m noac ${CHORDPACK}
         ipkg -m noac -s guitartex ${GUITARTEX}
 
-        ipkg ${FFMPEG}
+        ipkg ${FFMPEG} " \
+            --enable-shared \
+            --enable-pthreads \
+            --enable-gpl \
+            --enable-nonfree \
+            --disable-ffplay \
+            --enable-libfaac \
+            --enable-libmp3lame \
+            --enable-libtheora \
+            --enable-libvorbis \
+            --enable-libxvid \
+            --enable-libfreetype \
+            --enable-libx264"
 
         ipkg ${GSTREAMER} "--disable-tests"
         ipkg ${GST_PLUGINS_BASE}
@@ -167,16 +207,14 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
             --with-gtk=2.0 \
             --disable-geolocation \
             --disable-gtk-doc"
-        ipkg ${VALA}
         NOCOLOR=1 ipkg ${MIDORI}
     fi
 
     ipkg ${LIBEVENT}
-    ipkg -m noac ${NSPR} "--with-mozilla --with-pthreads \
+    ipkg -d "nspr" ${NSPR} "--with-mozilla --with-pthreads \
         $([ $(uname -m) = x86_64 ] && echo --enable-64bit)"
     ipkg -m noac ${NSS}
-    ipkg -m noac -l "${FIREFOX}-xulrunner" ${FIREFOX}
-    ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX}
+    ipkg -m noac ${FIREFOX}
 
     ipkg -m noac ${KEYUTILS}
     ipkg -s ecryptfs-utils ${ECRYPTFS_UTILS}
@@ -186,7 +224,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg -m noac ${LUA}
     ipkg -m acnb ${VLC}  "--enable-mozilla --enable-qt4 --enable-ncurses"
     ipkg ${SDL}
-    ipkg -m noac ${AGG}
+    ipkg ${AGG} " \
+        --disable-static \
+        --enable-ctrl \
+        --enable-gpc"
     if [ "x${USE_GNASH}" = "xyes" ]; then
         ipkg ${GNASH}
     fi
@@ -195,7 +236,7 @@ fi
 ipkg ${LIBGAMIN} "--libexecdir=/usr/sbin"
 ipkg ${MENU_CACHE}
 ipkg ${GVFS}
-ipkg ${XARCHIVER}
+ipkg -m acnb ${XARCHIVER}
 ipkg ${GNOME_MENUS}
 ipkg -m acnb ${LIBFM}
 ipkg ${PCMANFM}
@@ -231,8 +272,10 @@ 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)
-    ipkg ${SUBVERSION}
+    if [ x"${SVN_SERVER}" == xyes ]; then
+        # Subversion server (client was already installed in stage3)
+        ipkg ${SUBVERSION}
+    fi
 fi
 
 ipkg ${LIBGSF}
@@ -246,7 +289,11 @@ ipkg -m noac ${MERCURIAL}
 ipkg ${INDENT}
 
 if [ "x${USE_SAMBA}" = "xyes" ]; then
-    ipkg ${SAMBA}
+    ipkg -d source ${SAMBA} "\
+        --localstatedir=/var \
+        --with-piddir=/var/run \
+        --with-fhs \
+        --with-smbmount"
 fi
 
 if [ "x${INST_TYPE}" = "xltsp-server" ]; then