projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to fontconfig-2.11.1 and freetype-2.5.4
[hvlinux.git]
/
stage5
/
hv-install-1
diff --git
a/stage5/hv-install-1
b/stage5/hv-install-1
index
6b639d1
..
68b77ab
100755
(executable)
--- a/
stage5/hv-install-1
+++ b/
stage5/hv-install-1
@@
-50,7
+50,7
@@
if [ "x${INST_TYPE}" = "xworkstation" -o \
ipkg ${WMNOTIFY}
ipkg ${DESKTOP_FILE_UTILS}
ipkg ${WMNOTIFY}
ipkg ${DESKTOP_FILE_UTILS}
- ipkg -m acnb ${SHARED_MIME_INFO}
+ ipkg -m acnb
-j
${SHARED_MIME_INFO}
ipkg ${STARTUP_NOTIFICATION}
ipkg ${LIBWNCK}
ipkg ${ISO_CODES}
ipkg ${STARTUP_NOTIFICATION}
ipkg ${LIBWNCK}
ipkg ${ISO_CODES}
@@
-139,7
+139,19
@@
if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
ipkg -m noac ${CHORDPACK}
ipkg -m noac -s guitartex ${GUITARTEX}
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}
ipkg ${GSTREAMER} "--disable-tests"
ipkg ${GST_PLUGINS_BASE}
@@
-231,8
+243,10
@@
if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
ipkg -m noac ${SQUIRRELMAIL}
ipkg ${FETCHMAIL} "--with-ssl"
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}
fi
ipkg ${LIBGSF}