From d9702c4a5c6fbf2c738ffbf9c3563daf552c91d8 Mon Sep 17 00:00:00 2001 From: gobo72 Date: Wed, 24 Oct 2012 00:52:28 +0000 Subject: [PATCH] -Added dejavu fonts. -Added Midori browser. -Added vobcopy. -Added option to not disable dependency tracking for broken packages. -Added audacity --- config/amd64/config-linux-3.4.7 | 15 ++++++++------- config/dependencies | 19 ++++++++++++++++-- config/packages-list | 28 ++++++++++++++++++--------- functions/ipkg | 12 +++++++----- functions/main | 11 +++++++++-- stage4/hv-install-1 | 2 ++ stage4/packages-update | 2 ++ stage4/pkg/dejavu-fonts-ttf | 6 ++++++ stage5/hv-install-1 | 34 +++++++++++++++++++++++++++------ stage5/packages-update | 15 ++++++++++++++- stage5/pkg/agg | 9 ++++----- stage5/pkg/bridge-utils | 7 +++++++ stage5/pkg/icu | 8 ++++++++ stage5/pkg/lua | 3 +++ stage5/pkg/sane-backends | 7 +++++-- stage5/pkg/texlive | 6 +++++- stage5/pkg/vobcopy | 7 +++++++ 17 files changed, 151 insertions(+), 40 deletions(-) create mode 100644 stage4/pkg/dejavu-fonts-ttf create mode 100644 stage5/pkg/bridge-utils create mode 100644 stage5/pkg/icu create mode 100644 stage5/pkg/vobcopy diff --git a/config/amd64/config-linux-3.4.7 b/config/amd64/config-linux-3.4.7 index a9ef983..975cdc1 100644 --- a/config/amd64/config-linux-3.4.7 +++ b/config/amd64/config-linux-3.4.7 @@ -382,7 +382,7 @@ CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="" CONFIG_PM_SLEEP=y -# CONFIG_PM_RUNTIME is not set +CONFIG_PM_RUNTIME=y CONFIG_PM=y # CONFIG_PM_DEBUG is not set CONFIG_ACPI=y @@ -395,7 +395,7 @@ CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_BATTERY is not set CONFIG_ACPI_BUTTON=m CONFIG_ACPI_FAN=m -CONFIG_ACPI_DOCK=y +# CONFIG_ACPI_DOCK is not set CONFIG_ACPI_PROCESSOR=m # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set CONFIG_ACPI_THERMAL=m @@ -418,15 +418,15 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=y # CONFIG_CPU_FREQ_STAT_DETAILS is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_POWERSAVE=m # CONFIG_CPU_FREQ_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # x86 CPU frequency scaling drivers @@ -1932,6 +1932,7 @@ CONFIG_USB=y CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set CONFIG_USB_MON=y # CONFIG_USB_WUSB_CBAF is not set diff --git a/config/dependencies b/config/dependencies index fc00573..3cceb7e 100644 --- a/config/dependencies +++ b/config/dependencies @@ -6,7 +6,7 @@ ${INKSCAPE}: ${POPPLER} ${BOOST} ${INTLTOOL} ${GTKMM} ${GSL} ${PHP}: ${CURL} # Audio utilities -${AUDACITY}: ${LIBID3TAG} wxgtk +${AUDACITY}: ${LIBID3TAG} ${WXGTK} # Easytag requiert id3lib pour les MP3 ${EASYTAG}: id3lib OR ${LIBID3TAG} ${AUDACIOUS}: taglib, libmowgli, mcs @@ -31,7 +31,8 @@ ${JASPER}: ${LIBJPEG} ${XORG} ${MESALIB} ${GHOSTSCRIPT}: ${LIBJPEG} ${LIBPNG} ${JASPER} ${GTK} ${XORG} ${POPPLER}: ${FONTCONFIG} ${LIBJPEG} ${CAIRO} ${GLIB} ${LIBOPENJPEG} -${EVINCE}: ${POPPLER} ${GNOME_ICON_THEME} ${TEXLIVE} ${GHOSTSCRIPT} ${T1LIB} ${LIBSPECTRE} +${EVINCE}: ${POPPLER} ${GNOME_ICON_THEME} ${TEXLIVE} ${GHOSTSCRIPT} ${T1LIB} \ + ${LIBSPECTRE} ${GNOME_KEYRING} ${DBUS}: ${EXPAT} ${LIBXML2} ${XORG_LIBS} ${GLIB}: ${LIBFFI} ${PYTHON} ${PCRE} @@ -65,6 +66,8 @@ ${CAIROMM}: ${CAIRO} ${LIBDVDREAD}: ${LIBDVDCSS} ${DVDFS}: ${FUSE} ${LIBDVDREAD} +${VOBCOPY}: ${LIBDVDREAD} + ${DVDRWTOOLS}: ${CDRTOOLS} ${T1LIB}: ${XORG} @@ -151,3 +154,15 @@ ${RUBBERBAND}: ${LIBSNDFILE} ${FFTW} ${VAMP} ${RALENTI}: ${RUBBERBAND} ${LIBSNDFILE} ${MAN_DB}: ${LIBPIPELINE} + +${GLIB_NETWORKING}: ${GNUTLS} + +${LIBSOUP}: ${GLIB_NETWORKING} ${LIBXML2} ${GNOME_KEYRING} ${SQLITE} \ + ${GOBJECT_INSTROSPECTION} + +${WEBKIT}: ${GPERF} ${GSTREAMER} ${ICU} ${LIBXSLT} ${LIBSOUP} ${MESALIB} \ + ${GTK} + +${VALA}: ${GLIB} + +${MIDORI}: ${WEBKIT} ${VALA} ${LIBNOTIFY} ${LIBRSVG} diff --git a/config/packages-list b/config/packages-list index 345abff..0aa2d22 100644 --- a/config/packages-list +++ b/config/packages-list @@ -16,6 +16,7 @@ AVR_GDB="gdb-6.4" AVRDUDE="avrdude-5.1" ATK="atk-2.4.0" ATKMM="atkmm-2.22.6" +AUDACITY="audacity-minsrc-2.0.2" AUDIOFILE="audiofile-0.3.4" AUTOCONF="autoconf-2.69" AUTOMAKE="automake-1.12.2" @@ -32,7 +33,7 @@ AVR_BINUTILS=${BINUTILS} BRIDGE_UTILS="bridge-utils-1.5" BZIP2="bzip2-1.0.6" -CAIRO="cairo-1.12.2" +CAIRO="cairo-1.12.4" CAIROMM="cairomm-1.10.0" CDPARANOIA="cdparanoia-III-10.2" CDRTOOLS="cdrtools-3.00" @@ -53,6 +54,7 @@ DBUS="dbus-1.4.16" DBUS_GLIB="dbus-glib-0.98" DDCLIENT="ddclient-3.6.7" DEJAGNU="dejagnu-1.4.4" +DEJAVUFONTS="dejavu-fonts-ttf-2.33" DESKTOP_FILE_UTILS="desktop-file-utils-0.20" DHCP="dhcp-4.2.3-P2" DIFFUTILS="diffutils-3.2" @@ -89,7 +91,7 @@ FIRMWARE_B43_LPPHY="broadcom-wl-5.100.138" FLAC="flac-1.2.1" FLEX="flex-2.5.35" FONTCONFIG="fontconfig-2.10.1" -FONTFORGE="fontforge_full-20120731" +FONTFORGE="fontforge_full-20120731-b" FREETYPE="freetype-2.4.10" FRIBIDI="fribidi-0.19.2" FUSE="fuse-2.9.1" @@ -118,10 +120,11 @@ GIFLIB="giflib-4.1.6" GIMP="gimp-2.8.2" GIT="git-1.7.12" GLIB="glib-2.32.1" +GLIB_NETWORKING="glib-networking-2.32.3" GLIBMM="glibmm-2.32.1" GLITZ="glitz-0.5.6" GMP="gmp-5.0.5" -###GNASH=" gnash-0.8.9" +GNASH=" gnash-0.8.10" GNOME_KEYRING="gnome-keyring-2.32.1" GNOME_ICON_THEME="gnome-icon-theme-3.4.0" GNOME_MEDIA="gnome-media-2.32.0" @@ -158,6 +161,7 @@ HVCLOCK="hvclock-1.0.2" IANA="iana-etc-2.30" ICON_NAMING_UTILS="icon-naming-utils-0.8.90" +ICU="icu4c-49_1_2-src" IMAGE_MAGICK="ImageMagick-6.7.9-6" IMLIB2="imlib-1.4.2" INDENT="indent-2.2.10" @@ -186,7 +190,7 @@ LFS_BOOTSCRIPTS="lfs-bootscripts-20070813" LIBA52="a52dec-0.7.4" LIBART="libart_lgpl-2.3.21" BOOST="boost_1_51_0" -LIBCROCO="libcroco-0.6.2" +LIBCROCO="libcroco-0.6.6" LIBDVDCSS="libdvdcss-1.2.12" LIBDVDREAD="libdvdread-4.2.0" LIBEXIF="libexif-0.6.21" @@ -204,7 +208,7 @@ LIBID3TAG="libid3tag-0.15.1b" LIBJPEG="libjpeg-8d" LIBMAD="libmad-0.15.1b" LIBMNG="libmng-1.0.10" -LIBNOTIFY="libnotify-0.7.5" +LIBNOTIFY="libnotify-0.5.2" LIBOGG="libogg-1.3.0" LIBOIL="liboil-0.3.17" LIBOPENJPEG="openjpeg-1.5.0" @@ -216,6 +220,7 @@ LIBRSVG="librsvg-2.36.3" LIBSAMPLERATE="libsamplerate-0.1.8" LIBSIGCPP="libsigc++-2.2.10" LIBSNDFILE="libsndfile-1.0.25" +LIBSOUP="libsoup-2.38.1" LIBSPF2="libspf2-1.2.9" LIBSPECTRE="libspectre-0.2.7" LIBTASN1="libtasn1-2.13" @@ -236,13 +241,14 @@ LIBXSLT="libxslt-1.1.26" LILYPOND="lilypond-2.16.0" LLVM="llvm-3.1" LTSP_UTILS="ltsp-utils-0.25-0" -LUA="lua-5.2.1" +LUA="lua-5.1.4" LYNX="lynx2.8.8dev.10" MAKE_PACKAGE="make-3.82" MAN_DB="man-db-2.6.2" MANPAGES="man-pages-3.41" MFOUR="m4-1.4.16" +MIDORI="midori-0.4.6" MILTER_GREYLIST="milter-greylist-4.0" MILTER_SPF="smf-spf-2.0.2" MOC="moc-2.4.4" @@ -277,11 +283,11 @@ PATCH_PACKAGE="patch-2.6.1" PCIUTILS="pciutils-3.1.10" MENU_CACHE="menu-cache-0.3.3" LIBFM="libfm-1.0" -PCMANFM="pcmanfm-1.0" +PCMANFM="pcmanfm-1.0.1" PCRE="pcre-8.31" PERL="perl-5.14.2" PERL_MOD_PDL="PDL-2.4.9" -PERL_MOD_PARSE_REDESCENT="Parse-RecDescent-1.967009" +PERL_MOD_PARSE_REDESCENT="Parse-RecDescent-1.965001" PERL_MOD_XML_WRITER="XML-Writer-0.614" PERL_MOD_XML_PARSER="XML-Parser-2.40" PERL_MOD_XML_SIMPLE="XML-Simple-2.18" @@ -373,11 +379,14 @@ USBUTILS="usbutils-006" UTIL_LINUX="util-linux-2.20.1" UW_IMAP="imap-2007e" +VALA="vala-0.17.4" VAMP="vamp-plugin-sdk-2.3" VIEWNIOR="viewnior-1.3" VLC="vlc-2.0.3" -VTE="vte-0.32.2" +VOBCOPY="vobcopy-1.2.0" +VTE="vte-0.28.2" +WEBKIT="webkit-1.8.3" WGET="wget-1.14" WHICH="which-2.20" WINDOWMAKER="WindowMaker-0.95.3" @@ -386,6 +395,7 @@ WIRELESS_TOOLS="wireless_tools.29" WMNOTIFY="wmnotify-1.0.0" WPA_SUPPLICANT="wpa_supplicant-1.0" WV="wv-1.2.9" +WXGTK="wxGTK-2.8.12" XORG_VER="7.7-1" XORG_APP=app-${XORG_VER} diff --git a/functions/ipkg b/functions/ipkg index 22f1803..b3cba7c 100644 --- a/functions/ipkg +++ b/functions/ipkg @@ -172,12 +172,14 @@ ipkg_script() fi if [ -x ${LFS_TMP}/${PACKAGE}/configure ]; then - # Add option --disable-dependency-tracking if supported - if cat ${LFS_TMP}/${PACKAGE}/configure | \ - grep -q "disable-dependency-tracking"; then - CONFIGURE_OPTS="\ + if [ "x${ENABLE_DEPENDENCY_TRACKING}" = "x0" ]; then + # Add option --disable-dependency-tracking if supported + if cat ${LFS_TMP}/${PACKAGE}/configure | \ + grep -q "disable-dependency-tracking"; then + CONFIGURE_OPTS="\ ${CONFIGURE_OPTS} \ - --disable-dependency-tracking" + --disable-dependency-tracking" + fi fi # Remove option --sysconfdir=... if not supported diff --git a/functions/main b/functions/main index 14f39a9..d888168 100644 --- a/functions/main +++ b/functions/main @@ -654,9 +654,10 @@ static_decompressed_dirname() # and extract base directory name with awk. # tar 1.23 reports an error when using pipes, so # remove error message with "2> /dev/null" + # (we extract the last line from tar output) DIRNAME=$(tar ${TAR_OPTS} -tf \ ${LFS_PKG_DIR}/${PACKAGE}.${arch_ext} 2> /dev/null | \ - head -n1 | sed 's!^\./!!' | awk -F \/ '{print $1}') + tail -n 1 | sed 's!^\./!!' | awk -F \/ '{print $1}') ;; zip) DIRNAME=$(unzip -l \ @@ -817,6 +818,7 @@ indicate_pkg_build_complete() # gnome # xorg # pm +# -t Enable dependency tracking # -s Name of script to source (default is from name of package) ipkg() { @@ -827,10 +829,11 @@ ipkg() export DECOMPRESS="1" export IPKG_MODE="ac" # Default mode if not specified export HVLABEL="" # Global variable + export ENABLE_DEPENDENCY_TRACKING="0" local HVMAKE_ORIG=${HVMAKE} - while getopts "cjl:m:s:" flag ;do + while getopts "cjl:m:s:t" flag ;do case ${flag} in c) # Do not decompress package @@ -860,6 +863,10 @@ ipkg() # Alternate script name ALT_SCRIPT_NAME=${OPTARG} ;; + t) + # Do not disable dependency tracking + ENABLE_DEPENDENCY_TRACKING="1" + ;; ?) echo "${FUNCNAME}(): Invalid option: ${OPTARG}." return 1 diff --git a/stage4/hv-install-1 b/stage4/hv-install-1 index 2910382..a721581 100755 --- a/stage4/hv-install-1 +++ b/stage4/hv-install-1 @@ -111,6 +111,8 @@ ipkg -s tk ${TK} # Re-installing python now that tk is present??? ipkg ${PYTHON} "--enable-shared" +ipkg -m noac ${DEJAVUFONTS} + ipkg -m acnb ${WINDOWMAKER} "--with-gnustepdir=/usr/share/GNUstep" ipkg ${WINDOWMAKER_EXTRA} diff --git a/stage4/packages-update b/stage4/packages-update index 2950c5e..a3e3976 100755 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -101,6 +101,8 @@ fpkg -m xorg -s app ${XDM} fpkg -e "tgz" ${XTERM} "ftp://invisible-island.net/xterm" fpkg -e "tar.gz" ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics" +fpkg -m sf -e "tar.bz2" -s "dejavu" ${DEJAVUFONTS} + fpkg -m sf -s "tcl" ${TK} fpkg -e "tar.gz" ${WINDOWMAKER} ${WMAKER_URL} fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL} diff --git a/stage4/pkg/dejavu-fonts-ttf b/stage4/pkg/dejavu-fonts-ttf new file mode 100644 index 0000000..fd93340 --- /dev/null +++ b/stage4/pkg/dejavu-fonts-ttf @@ -0,0 +1,6 @@ +#!/bin/bash + +hvbuild() +{ + decompress_package ${PACKAGE} /usr/share/fonts +} diff --git a/stage5/hv-install-1 b/stage5/hv-install-1 index c4709cb..27d8666 100755 --- a/stage5/hv-install-1 +++ b/stage5/hv-install-1 @@ -11,6 +11,11 @@ ipkg ${GSL} ipkg -m acnb ${CUPS} ipkg -m noac ${CUPS_PDF} ipkg -m noac ${SPLIX} +ipkg ${GLIB_NETWORKING} "\ + --libexecdir=/usr/lib/glib-networking \ + --with-ca-certificates=/etc/ssl/ca-bundle.crt \ + --disable-static" +ipkg -s "icu" ${ICU} if [ "x${INST_TYPE}" = "xworkstation" -o \ "x${INST_TYPE}" = "xltsp-server" ]; then @@ -24,7 +29,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \ ipkg ${PANGOMM} ipkg ${ATK} ipkg ${GDK_PIXBUF} - ipkg ${GTK} "--disable-gtk-doc-html" + ipkg ${GTK} "--disable-gtk-doc" ipkg ${ATKMM} ipkg ${GTKMM} "--disable-documentation" ipkg ${GTK_ENGINES} @@ -36,7 +41,6 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \ ipkg ${HVCLOCK} ipkg ${WMNOTIFY} - # Needed by Gnome ipkg ${DESKTOP_FILE_UTILS} ipkg -m acnb ${SHARED_MIME_INFO} ipkg ${STARTUP_NOTIFICATION} @@ -46,6 +50,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \ ipkg ${LIBGLADE} ipkg -m acnb ${GCONF} ipkg ${GNOME_KEYRING} + ipkg ${LIBSOUP} "--disable-static --without-gnome" fi ipkg -m acnb ${GHOSTSCRIPT} @@ -57,7 +62,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \ ipkg ${VIEWNIOR} # xpdf headers are needed by inkscape ipkg ${POPPLER} "--enable-xpdf-headers --enable-zlib" - ipkg ${LIBRSVG} "--disable-gtk-doc --disable-mozilla-plugin" + ipkg ${LIBCROCO} "--disable-static" + ipkg ${LIBRSVG} "--disable-gtk-doc --disable-static --disable-mozilla-plugin" ipkg ${BABL} ipkg ${GEGL} ipkg ${GIMP} @@ -71,10 +77,11 @@ ipkg -m noac ${DVDRWTOOLS} ipkg ${LIBDVDCSS} ipkg ${LIBDVDREAD} ipkg -m noac ${DVDFS} +ipkg -m acnb ${VOBCOPY} if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then rscr once "Installing TexLive texmf" install-texlive-texmf - ipkg -s texlive ${TEXLIVE} + ipkg -s texlive -m acnb ${TEXLIVE} fi if [ "x${SANE_SUPPORT}" = "xyes" ]; then @@ -124,12 +131,27 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg ${GST_PLUGINS_UGLY} ipkg -m acnb ${GST_FFMPEG} "--with-ffmpeg-extra-configure=--disable-yasm" ipkg ${GNOME_MEDIA} # Pour gstreamer-properties et gnome-volume-control + + ipkg ${WXGTK} "--enable-unicode --disable-compat26" + # Bug with system-installed portaudio and ffmpeg + ipkg -m acnb ${AUDACITY} "--with-libsamplerate --with-portaudio=local --with-ffmpeg=local" fi ipkg ${SYLPHEED} "--enable-ssl --enable-ldap" ipkg ${LIBNOTIFY} ipkg ${YASM} ipkg ${LIBVPX} "--enable-shared" + + ipkg -m acnb -t -j ${WEBKIT} "\ + --libexecdir=/usr/lib/WebKitGTK \ + --with-gstreamer=0.10 \ + --enable-introspection \ + --with-gtk=2.0 \ + --disable-geolocation \ + --disable-gtk-doc" + ipkg ${VALA} + NOCOLOR=1 ipkg ${MIDORI} + ipkg -m noac -l "${FIREFOX}-xulrunner" ${FIREFOX} ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX} @@ -139,7 +161,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg -m acnb ${VLC} "--enable-mozilla --enable-qt4 --enable-ncurses" ipkg ${SDL} ipkg -m noac ${AGG} -# ipkg ${GNASH} # Problème de compilation, désactivé + ipkg ${GNASH} fi ipkg ${LIBGAMIN} "--libexecdir=/usr/sbin" @@ -201,7 +223,7 @@ fi ipkg -m acnb ${KVM} ipkg -m acnb ${BRIDGE_UTILS} -ipkg ${TUNCTL} +ipkg -m noac ${TUNCTL} ipkg ${LIBEVENT} ipkg ${TRANSMISSION} "--disable-daemon" diff --git a/stage5/packages-update b/stage5/packages-update index 45b071b..2d3fde5 100755 --- a/stage5/packages-update +++ b/stage5/packages-update @@ -18,6 +18,8 @@ fpkg -s "$(get_pkg_ver ${CUPS})" -f "${CUPS}-source" ${CUPS} \ fpkg -e "tar.gz" -f "$(get_pkg_name ${CUPS_PDF})_$(get_pkg_ver ${CUPS_PDF})" \ ${CUPS_PDF} "http://www.cups-pdf.de/src" fpkg -m sf -e "tar.bz2" ${SPLIX} +fpkg -m gnome ${GLIB_NETWORKING} +fpkg -e "tgz" ${ICU} "http://download.icu-project.org/files/icu4c/49.1.2" fpkg -m gnome ${LIBSIGCPP} fpkg -e zip ${JASPER} "http://www.ece.uvic.ca/~mdadams/jasper/software" @@ -50,6 +52,7 @@ fpkg -m gnome ${LIBXKLAVIER} fpkg -m gnome ${LIBGLADE} fpkg -m gnome ${GCONF} fpkg -m gnome ${GNOME_KEYRING} +fpkg -m gnome ${LIBSOUP} fpkg -m sf ${GHOSTSCRIPT} fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_STD} @@ -58,6 +61,7 @@ fpkg -e "tar.gz" ${LIBSPECTRE} "http://libspectre.freedesktop.org/releases" fpkg -e "tar.xz" ${IMAGE_MAGICK} "ftp://ftp.imagemagick.org/pub/ImageMagick" fpkg -e "tar.gz" ${VIEWNIOR} "http://cloud.github.com/downloads/xsisqox/Viewnior" fpkg -m fd -s "none" ${POPPLER} +fpkg -m gnome ${LIBCROCO} fpkg -m gnome ${LIBRSVG} fpkg ${BABL} "ftp://ftp.gtk.org/pub/babl/$(get_pkg_ver2 ${BABL})" fpkg ${GEGL} "ftp://ftp.gimp.org/pub/gegl/$(get_pkg_ver2 ${GEGL})" @@ -73,6 +77,7 @@ fpkg -s "$(get_pkg_ver ${LIBDVDCSS})" ${LIBDVDCSS} \ "http://www.videolan.org/pub/libdvdcss" fpkg -e "tar.bz2" ${LIBDVDREAD} "http://dvdnav.mplayerhq.hu/releases" fpkg -e "tar.gz" ${DVDFS} "http://jspenguin.org:81/dvdfs" +fpkg -e "tar.bz2" ${VOBCOPY} "http://vobcopy.org/download" fpkg -e "tar.xz" ${TEXLIVE} "ftp://tug.org/texlive/historic/2012" fpkg -e "tar.xz" ${TEXLIVE_TEXMF} "ftp://tug.org/texlive/historic/2012" @@ -89,6 +94,7 @@ fpkg -m gnome ${GNOME_ICON_THEME} fpkg -m gnome ${EVINCE} +fpkg -e "tar.gz" ${LIBOIL} "http://liboil.freedesktop.org/download" fpkg -m gnome ${VTE} fpkg -m sf ${GRIP} fpkg -m sf -e "tar.bz2" ${CDRDAO} @@ -109,6 +115,9 @@ fpkg -m fd -o "gstreamer" -s "src/gst-plugins-ugly" ${GST_PLUGINS_UGLY} fpkg -m fd -o "gstreamer" -s "src/gst-ffmpeg" ${GST_FFMPEG} fpkg -m gnome ${GNOME_MEDIA} +fpkg -m sf -s "wxwindows" ${WXGTK} +fpkg ${AUDACITY} "http://audacity.googlecode.com/files" + fpkg ${SYLPHEED} \ "http://sylpheed.sraoss.jp/sylpheed/v$(get_pkg_ver2 ${SYLPHEED})" @@ -118,6 +127,10 @@ fpkg -e "tar.gz" ${YASM} "http://www.tortall.net/projects/yasm/releases" fpkg ${LIBVPX} "http://webm.googlecode.com/files" +fpkg -e "tar.xz" ${WEBKIT} "http://webkitgtk.org/releases" +fpkg -m gnome ${VALA} +fpkg ${MIDORI} "http://archive.xfce.org/src/apps/midori/$(get_pkg_ver2 ${MIDORI})" + fpkg -f "${FIREFOX}.source" ${FIREFOX} \ "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source" @@ -126,7 +139,7 @@ fpkg -e "tar.gz" ${LUA} "http://www.lua.org/ftp" fpkg -e "tar.xz" -m sf ${VLC} fpkg -e "tar.gz" ${SDL} "http://www.libsdl.org/release" fpkg -e "tar.gz" ${AGG} "http://www.antigrain.com" -##fpkg ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash/$(get_pkg_ver ${GNASH})" +fpkg ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash/$(get_pkg_ver ${GNASH})" fpkg -e "tar.gz" ${LIBSPF2} "http://libspf2.org/spf" fpkg -e "tgz" ${MILTER_GREYLIST} "ftp://ftp.espci.fr/pub/milter-greylist" diff --git a/stage5/pkg/agg b/stage5/pkg/agg index 1fb83b1..7ed2522 100644 --- a/stage5/pkg/agg +++ b/stage5/pkg/agg @@ -3,11 +3,10 @@ hvconfig_pre() { cd ${LFS_TMP}/${PACKAGE} - sh autogen.sh - - CONFIGURE_OPTS=" \ - ${CONFIGURE_OPTS} \ + sed -i 's: -L@x_libraries@::' src/platform/X11/Makefile.am + sed -i '/^AM_C_PROTOTYPES/d' configure.in + bash autogen.sh --prefix=/usr \ --disable-static \ --enable-ctrl \ - --enable-gpc" + --enable-gpc } diff --git a/stage5/pkg/bridge-utils b/stage5/pkg/bridge-utils new file mode 100644 index 0000000..fb85105 --- /dev/null +++ b/stage5/pkg/bridge-utils @@ -0,0 +1,7 @@ +#!/bin/bash + +hvconfig_pre() +{ + cd ${LFS_TMP}/${PACKAGE} + autoreconf -vi +} diff --git a/stage5/pkg/icu b/stage5/pkg/icu new file mode 100644 index 0000000..de2fa60 --- /dev/null +++ b/stage5/pkg/icu @@ -0,0 +1,8 @@ +#!/bin/bash + +hvconfig() +{ + cd ${LFS_TMP}/${PACKAGE}/source + + ./configure ${CONFIGURE_OPTS} +} diff --git a/stage5/pkg/lua b/stage5/pkg/lua index ab76ab1..f84210e 100644 --- a/stage5/pkg/lua +++ b/stage5/pkg/lua @@ -5,6 +5,9 @@ hvbuild() cd ${LFS_TMP}/${PACKAGE} make CPPFLAGS="-fPIC" linux make INSTALL_TOP=/usr install + +# Pour lua plus récent (éliminer hvbuild_post): +# make INSTALL_TOP=/usr pc > /usr/lib/pkgconfig/lua.pc } hvbuild_post() diff --git a/stage5/pkg/sane-backends b/stage5/pkg/sane-backends index 02a9200..260dc6b 100644 --- a/stage5/pkg/sane-backends +++ b/stage5/pkg/sane-backends @@ -10,6 +10,9 @@ hvconfig_pre() USE_X_OPTION="no" fi + # Add group for UDEV rules + hv_groupadd scanner + hv_groupadd saned hv_useradd -c saned -d /dev/null -g saned -s /bin/false saned @@ -36,13 +39,13 @@ hvbuild_post() if [ -z "${SANE_SERVER}" ]; then # If 'SANE_SERVER' is not defined, then we automatically configure for # the SANE Network Daemon. - + # Adding entry to '/etc/sane.d/dll.conf' #######echo "${SANE_DRIVER}" >> /etc/sane.d/dll.conf # Creating '/etc/sane.d/saned.conf' echo "${LAN_NETWORK_MASK}" > /etc/sane.d/saned.conf - + # Addition to xinetd cat > /etc/xinetd.d/saned << "EOF" service sane diff --git a/stage5/pkg/texlive b/stage5/pkg/texlive index 1d81ba9..8c4eda8 100644 --- a/stage5/pkg/texlive +++ b/stage5/pkg/texlive @@ -20,8 +20,9 @@ hvconfig_pre() CONFIGURE_OPTS="\ ${CONFIGURE_OPTS} \ --disable-native-texlive-build \ - --enable-shared \ + --enable-build-in-source-tree \ --without-luatex \ + --enable-shared \ --enable-mktextex-default" # This TexLive version overwrites /usr/bin/man. Save Man-DB version @@ -33,6 +34,9 @@ hvconfig_pre() hvbuild_post() { + cp -a ${LFS_TMP}/${PACKAGE}/utils/biber/TeXLive /usr/lib/perl5/site_perl/${PERL} + ###cp -a ${LFS_TMP}/${PACKAGE}/utils/biber/TeXLive /usr/lib/perl5/site_perl/${PERL}/x86_64-linux-thread-multi + rm -v /usr/texmf{,-dist} install -v -m1777 -d /var/lib/livetex/fonts install -v -m755 -d /usr/share/texmf-{config,var,local} diff --git a/stage5/pkg/vobcopy b/stage5/pkg/vobcopy new file mode 100644 index 0000000..e6269aa --- /dev/null +++ b/stage5/pkg/vobcopy @@ -0,0 +1,7 @@ +#!/bin/bash + +hvconfig_pre() +{ + cd ${LFS_TMP}/${PACKAGE} + mv configure.sh configure +} -- 2.20.1