From ccde14dbaf08463bb8ca62c98302c0da1a6f2b51 Mon Sep 17 00:00:00 2001 From: gobo72 Date: Tue, 7 Aug 2012 00:10:38 +0000 Subject: [PATCH] Tentative pour nouveau x.org, ne marche pas encore. --- config/dependencies | 2 +- config/packages-list | 100 +++++++++--------- functions/fpkg | 4 + stage4/hv-install-1 | 23 ++-- stage4/packages-update | 15 +-- stage4/pkg/MesaLib | 10 +- stage4/pkg/libdrm-git | 3 +- stage4/pkg/llvm | 35 ++++++ stage4/pkg/xf86-video-nouveau-git | 1 - stage5/hv-install-1 | 14 +-- stage5/packages-update | 9 +- .../pkg/libdvdread | 4 +- stage5/pkg/xsane | 5 + 13 files changed, 138 insertions(+), 87 deletions(-) create mode 100644 stage4/pkg/llvm copy stage4/pkg/xf86-video-nouveau-git => stage5/pkg/libdvdread (54%) diff --git a/config/dependencies b/config/dependencies index 8049464..7f0e8d7 100644 --- a/config/dependencies +++ b/config/dependencies @@ -103,7 +103,7 @@ ${GNUTLS}: ${LIBGCRYPT} ${LIBTASN1} ${GUILE} ${LIBIDL}: ${GLIB} ${ORBIT2}: ${LIBIDL} ${OPENSSL} -${GCONF}: ${ORBIT2} ${POLKIT} ${GTK} +${GCONF}: ${ORBIT2} ${POLKIT} ${GTK} ${DBUS_GLIB} ${LIBPROXY}: ${GCONF} ${GNOME_KEYRING}: ${GCONF} ${LIBTASN1} ${LIBGCRYPT} ${LIBSOUP}: ${GNUTLS} ${GNOME_KEYRING} ${LIBPROXY} ${SQLITE} ${LIBXML2} diff --git a/config/packages-list b/config/packages-list index 0bb7b98..9659746 100644 --- a/config/packages-list +++ b/config/packages-list @@ -14,13 +14,13 @@ APR="apr-1.4.5" APR_UTIL="apr-util-1.4.1" AVR_GDB="gdb-6.4" AVRDUDE="avrdude-5.1" -ATK="atk-1.32.0" -ATKMM="atkmm-2.22.5" +ATK="atk-2.4.0" +ATKMM="atkmm-2.22.6" AUDIOFILE="audiofile-0.3.2" AUTOCONF="autoconf-2.68" AUTOMAKE="automake-1.11.1" -BABL="babl-0.1.2" +BABL="babl-0.1.6" BASH="bash-4.2" BC="bc-1.06" BDWGC="bdwgc-7_2alpha5-20110107" @@ -32,7 +32,7 @@ AVR_BINUTILS=${BINUTILS} BRIDGE_UTILS="bridge-utils-1.4" BZIP2="bzip2-1.0.6" -CAIRO="cairo-1.10.2" +CAIRO="cairo-1.12.2" CAIROMM="cairomm-1.10.0" CDPARANOIA="cdparanoia-III-10.2" CDRTOOLS="cdrtools-2.01" @@ -42,7 +42,7 @@ CHORDPACK="chordpack-0.8.2" CLAMAV="clamav-0.93.3" CLOOG_PPL="cloog-ppl-0.15.11" COLORDIFF="colordiff-1.0.9" -CONSOLEKIT="ConsoleKit-0.4.1" +CONSOLEKIT="ConsoleKit-0.4.5" COREUTILS="coreutils-8.14" CPIO="cpio-2.11" CUPS="cups-1.4.8" @@ -50,9 +50,8 @@ CUPS_PDF="cups-pdf-2.5.1" CURL="curl-7.23.1" CVS="cvs-1.11.23" -DBUS="dbus-1.2.24" -# dbus-glib-0.92 has some compilation problems -DBUS_GLIB="dbus-glib-0.88" +DBUS="dbus-1.4.16" +DBUS_GLIB="dbus-glib-0.98" DDCLIENT="ddclient-3.6.7" DEJAGNU="dejagnu-1.4.4" DESKTOP_FILE_UTILS="desktop-file-utils-0.17" @@ -72,7 +71,7 @@ DVDRWTOOLS="dvd+rw-tools-7.1" E2FSPROGS="e2fsprogs-1.41.14" EASYTAG="easytag-2.1.6" -EGGDBUS="eggdbus-0.6" +#########EGGDBUS="eggdbus-0.6" EGLIBC="eglibc-2.13-r13356" EGLIBC_PORTS="eglibc-ports-2.13-r13356" UCLIBC="uClibc-0.9.30.1" @@ -83,9 +82,9 @@ EXPAT="expat-2.0.1" FCRON="fcron-3.0.6" FETCHMAIL="fetchmail-6.3.12" -FFMPEG="ffmpeg-0.8.2" +FFMPEG="ffmpeg-0.10.2" FFTW="fftw-3.3" -FIREFOX="firefox-9.0.1" +FIREFOX="firefox-12.0" FILE_PKG="file-5.09" FINDUTILS="findutils-4.4.2" FIRMWARE_B43_LPPHY="broadcom-wl-4.178.10.4" @@ -106,24 +105,24 @@ GCC="gcc-4.6.2" GCONF="GConf-2.32.3" GDB="gdb-6.4" GDBM="gdbm-1.10" -GDK_PIXBUF="gdk-pixbuf-2.22.1" +GDK_PIXBUF="gdk-pixbuf-2.26.1" GEDA_SYMBOLS="geda-symbols-1.2.0" GEDA_GSCHEM="geda-gschem-1.2.0" GEDA_GNETLIST="geda-gnetlist-1.2.0" GEDA_SYMCHECK="geda-gsymcheck-1.2.0" GEDA_GATTRIB="geda-gattrib-1.2.0" -GEGL="gegl-0.1.2" +GEGL="gegl-0.1.8" GETDATE="getdate_rfc868-1.2" GETTEXT="gettext-0.18.1.1" GHOSTSCRIPT="ghostscript-9.04" GHOSTSCRIPT_FONTS_STD="ghostscript-fonts-std-8.11" GHOSTSCRIPT_FONTS_OTHER="ghostscript-fonts-other-6.0" GIFLIB="giflib-4.1.6" -GIMP="gimp-2.6.11" +GIMP="gimp-2.6.12" GIT="git-1.7.8.3" GIT_MANPAGES="git-manpages-1.6.6.1" -GLIB="glib-2.28.7" -GLIBMM="glibmm-2.28.1" +GLIB="glib-2.32.1" +GLIBMM="glibmm-2.32.0" GLITZ="glitz-0.5.6" GMP="gmp-5.0.2" GNASH=" gnash-0.8.9" @@ -133,7 +132,7 @@ GNOME_MEDIA="gnome-media-2.32.0" GNUMERIC="gnumeric-1.10.17" GNUPG="gnupg-1.4.11" GNUTLS="gnutls-3.0.7" -GOBJECT_INSTROSPECTION="gobject-introspection-0.10.2" +GOBJECT_INSTROSPECTION="gobject-introspection-1.32.1" GOFFICE="goffice-0.8.17" GPERF="gperf-3.0.4" GREP="grep-2.10" @@ -141,16 +140,16 @@ GRIP="grip-3.4.0" GROFF="groff-1.21" GRUB="grub-1.99" GSL="gsl-1.15" -GSTREAMER="gstreamer-0.10.35" -GST_PLUGINS_BASE="gst-plugins-base-0.10.35" -GST_PLUGINS_GOOD="gst-plugins-good-0.10.30" -GST_PLUGINS_BAD="gst-plugins-bad-0.10.22" -GST_PLUGINS_UGLY="gst-plugins-ugly-0.10.18" -GST_FFMPEG="gst-ffmpeg-0.10.12" -GTK="gtk+-2.24.4" +GSTREAMER="gstreamer-0.10.36" +GST_PLUGINS_BASE="gst-plugins-base-0.10.36" +GST_PLUGINS_GOOD="gst-plugins-good-0.10.31" +GST_PLUGINS_BAD="gst-plugins-bad-0.10.23" +GST_PLUGINS_UGLY="gst-plugins-ugly-0.10.19" +GST_FFMPEG="gst-ffmpeg-0.10.13" +GTK="gtk+-2.24.10" GTK_ENGINES="gtk-engines-2.20.2" -GTKMM="gtkmm-2.24.0" -GUILE="guile-2.0.3" +GTKMM="gtkmm-2.24.2" +GUILE="guile-2.0.5" GUITARTEX="guitartex-hv-r119" GUTENPRINT="gutenprint-5.2.5" GVFS="gvfs-1.8.2" @@ -169,7 +168,7 @@ IMAGE_MAGICK="ImageMagick-6.6.8-1" IMLIB2="imlib-1.4.2" INDENT="indent-2.2.10" INETUTILS="inetutils-1.8" -INKSCAPE="inkscape-0.48.1" +INKSCAPE="inkscape-0.48.2" INTLTOOL="intltool-0.50.0" IPROUTE2="iproute2-3.1.0" IPTABLES="iptables-1.4.12" @@ -181,7 +180,7 @@ JASPER="jasper-1.900.1" KBD="kbd-1.15.2" KERBEROS5="krb5-1.10" KERNEL="linux-3.1.6" -NOUVEAU_NVIDIA_KERNEL="linux-2.6.38-rc7-g3d3d123-nouveau-git" +NOUVEAU_NVIDIA_KERNEL="linux-3.3.0-rc7-nouveau-git-20120314" KVM="kvm-84" LADSPA="ladspa_sdk" @@ -194,8 +193,8 @@ LIBA52="a52dec-0.7.4" LIBART="libart_lgpl-2.3.21" BOOST="boost_1_45_0" LIBCROCO="libcroco-0.6.2" -LIBDVDCSS="libdvdcss-1.2.10" -LIBDVDREAD="libdvdread-0.9.7" +LIBDVDCSS="libdvdcss-1.2.11" +LIBDVDREAD="libdvdread-4.2.0" LIBEXIF="libexif-0.6.19" LIBEVENT="libevent-2.0.12-stable" LIBFAAD2="faad2-2.7" @@ -222,9 +221,9 @@ LIBPNG="libpng-1.5.5" LIBPTHREAD_STUBS="libpthread-stubs-0.3" LIBRSVG="librsvg-2.32.1" LIBSAMPLERATE="libsamplerate-0.1.8" -LIBSIGCPP="libsigc++-2.2.8" +LIBSIGCPP="libsigc++-2.2.10" LIBSNDFILE="libsndfile-1.0.25" -LIBSOUP="libsoup-2.32.2" +LIBSOUP="libsoup-2.38.1" LIBSPF2="libspf2-1.2.5" LIBSPECTRE="libspectre-0.2.6" LIBTASN1="libtasn1-2.10" @@ -232,7 +231,7 @@ LIBTHEORA="libtheora-1.1.1" LIBTOOL="libtool-2.4.2" LIBVORBIS="libvorbis-1.3.2" VORBIS_TOOLS="vorbis-tools-1.2.0" -LIBVPX="libvpx-v0.9.7" +LIBVPX="libvpx-v1.0.0" LIBUNISTRING="libunistring-0.9.3" LIBUSB="libusb-1.0.8" LIBUSB_COMPAT="libusb-compat-0.1.3" @@ -241,6 +240,7 @@ LIBXKLAVIER="libxklavier-5.0" LIBXML2="libxml2-2.7.8" LIBXSLT="libxslt-1.1.26" LILYPOND="lilypond-2.14.2" +LLVM="llvm-3.0" LTSP_UTILS="ltsp-utils-0.25-0" LUA="lua-5.1.4" LYNX="lynx2.8.7rel.2" @@ -276,8 +276,8 @@ OPENSSL_ROOT_CERTS="BLFS-ca-bundle-3.12.8.0" ORBIT2="ORBit2-2.14.19" PAM="Linux-PAM-1.1.5" -PANGO="pango-1.28.4" -PANGOMM="pangomm-2.28.2" +PANGO="pango-1.30.0" +PANGOMM="pangomm-2.28.4" PARTED="parted-3.0" PATCH_PACKAGE="patch-2.6.1" PCIUTILS="pciutils-3.1.8" @@ -299,10 +299,10 @@ PERL_MOD_LWP="libwww-perl-6.01" PERL_MOD_URI="URI-1.58" PERL_MOD_NET_DNS="Net-DNS-0.66" PHP="php-5.3.3" -PIXMAN="pixman-0.22.0" -POLKIT="polkit-0.99" +PIXMAN="pixman-0.24.4" +######POLKIT="polkit-0.99" POLICYKIT="PolicyKit-0.9" -POPPLER="poppler-0.16.5" +POPPLER="poppler-0.18.4" PKG_CONFIG="pkg-config-0.26" POPT="popt-1.16" PORTAUDIO="pa_stable_v19_20111121" @@ -312,7 +312,7 @@ PROCMAIL="procmail-3.22" PROCPS="procps-3.2.8" PSMISC="psmisc-22.13" PYCAIRO="py2cairo-1.10.0" -PYGOBJECT="pygobject-2.28.4" +PYGOBJECT="pygobject-2.28.6" PYGTK="pygtk-2.24.0" PYTHON="Python-2.7.2" @@ -344,19 +344,19 @@ SPAMASSASSIN="Mail-SpamAssassin-3.3.1" SPEEX="speex-1.2rc1" SPLINT="splint-3.1.1" SPLIX="splix-2.0.0" -SQLITE="sqlite-autoconf-3070800" +SQLITE="sqlite-autoconf-3071100" SQUIRRELMAIL="squirrelmail-1.5.1" SSMTP="ssmtp-2.64" STARTUP_NOTIFICATION="startup-notification-0.9" STRACE="strace-4.6" SUBVERSION="subversion-1.7.2" -SYLPHEED="sylpheed-3.1.1" +SYLPHEED="sylpheed-3.1.4" SUDO="sudo-1.8.2" SYSKLOGD="sysklogd-1.5" SYSVINIT="sysvinit-2.88dsf" T1LIB="t1lib-5.1.2" -TALLOC="talloc-2.0.1" +TALLOC="talloc-2.0.7" TANGO_ICON_THEME="tango-icon-theme-0.8.90" TANGO_ICON_THEME_EXTRAS="tango-icon-theme-extras-0.1.0" TAR_PACKAGE="tar-1.26" @@ -394,10 +394,10 @@ WMNOTIFY="wmnotify-1.0.0" WPA_SUPPLICANT="wpa_supplicant-0.7.3" WV="wv-1.2.9" -XORG_VER="7.6-1" +XORG_VER="7.6-2" XORG_APP=app-${XORG_VER} XORG_DRIVER=driver-${XORG_VER} -XORG_VIDEO_NOUVEAU="xf86-video-nouveau-git-20110306" +XORG_VIDEO_NOUVEAU="xf86-video-nouveau-git-20120313" XORG_FONT=font-${XORG_VER} XORG_LIB=lib-${XORG_VER} XORG_PROTO=proto-${XORG_VER} @@ -406,22 +406,22 @@ XORG_MAKEDEPEND="makedepend-1.0.3" LIBXAU="libXau-1.0.6" LIBXDMCP="libXdmcp-1.1.0" XBITMAPS="xbitmaps-1.1.1" -LIBDRM="libdrm-git-20110306" -MESALIB="MesaLib-7.10.1" +LIBDRM="libdrm-git-20120313" +MESALIB="MesaLib-7.11.2" XCURSOR_THEMES="xcursor-themes-1.0.3" XKEYBOARD_CONFIG="xkeyboard-config-2.0" LUIT="luit-1.1.0" -XORG_SERVER="xorg-server-1.9.3" -XDM="xdm-1.1.10" +XORG_SERVER="xorg-server-1.11.2" +XDM="xdm-1.1.11" XCB_PROTO="xcb-proto-1.6" -XCB_UTIL="xcb-util-0.3.6" +XCB_UTIL="xcb-util-0.3.8" LIBXCB="libxcb-1.7" XARCHIVER="xarchiver-0.5.2" XINETD="xinetd-2.3.14" XMLTO="xmlto-0.0.23" XMLTOMAN="xmltoman-0.4" -XTERM="xterm-267" +XTERM="xterm-276" XVIDCORE="xvidcore-1.2.2" XZ_UTILS="xz-5.0.3" diff --git a/functions/fpkg b/functions/fpkg index 6a8bf4b..0729e78 100644 --- a/functions/fpkg +++ b/functions/fpkg @@ -486,6 +486,10 @@ fpkg() SRC_DIR=$(get_pkg_name ${PACK}) fi SRC_DIR="${SRC_DIR}/$(get_pkg_ver2 ${PACK})" + if [ -z "${FILE_EXT}" ]; then + # Default file extension is xz + FILE_EXT="tar.xz" + fi ;; sf) URL=${SOURCEFORGE_URL} diff --git a/stage4/hv-install-1 b/stage4/hv-install-1 index b6940ea..5d698d7 100755 --- a/stage4/hv-install-1 +++ b/stage4/hv-install-1 @@ -61,9 +61,12 @@ ipkg ${GPERF} ipkg ${XCB_UTIL} ${XORG_CONFIG} ipkg -m acnb ${LESSTIF} ipkg_xorg ${XBITMAPS} "data" -ipkg ${LIBDRM} "--enable-udev" +ipkg -s libdrm-git ${LIBDRM} "\ + --enable-udev \ + --enable-nouveau-experimental-api" ipkg -m acnb ${TALLOC} +ipkg -m acnb ${LLVM} ipkg -m acnb ${MESALIB} install_xorg_modules ${XORG_APP} ipkg_xorg ${XCURSOR_THEMES} "data" @@ -77,15 +80,15 @@ ipkg ${GOBJECT_INSTROSPECTION} "--disable-tests" ipkg -m acnb ${DBUS_GLIB} \ --disable-tests \ --libexecdir=/usr/lib/dbus-1.0/dbus-1 -ipkg ${EGGDBUS} -ipkg -m acnb ${POLKIT} -ipkg -m acnb ${CONSOLEKIT} \ - --libexecdir=/usr/lib/ConsoleKit \ - --localstatedir=/var \ - --enable-pam-module -ipkg ${POLICYKIT} -ipkg ${HAL} -ipkg ${HAL_INFO} +###ipkg ${EGGDBUS} +###ipkg -m acnb ${POLKIT} +##ipkg -m acnb ${CONSOLEKIT} \ +## --libexecdir=/usr/lib/ConsoleKit \ +## --localstatedir=/var \ +## --enable-pam-module +##ipkg ${POLICYKIT} +##ipkg ${HAL} +##ipkg ${HAL_INFO} ipkg_xorg ${XORG_SERVER} "xserver" "\ --with-module-dir=/usr/lib/X11/modules \ diff --git a/stage4/packages-update b/stage4/packages-update index 6f924f6..af243c1 100755 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -75,8 +75,9 @@ fpkg -m fd -o "xcb" -s "dist" ${LIBXCB} fpkg -m fd -o "xcb" -s "dist" ${XCB_UTIL} fpkg -m gnu ${GPERF} -fpkg -m hv ${LIBDRM} +fpkg ${LIBDRM} "http://dri.freedesktop.org/libdrm" fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc" +fpkg -e "tar.gz" ${LLVM} "http://llvm.org/releases/3.0" fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} \ ftp://ftp.freedesktop.org/pub/mesa fpkg -m xorg -s data ${XCURSOR_THEMES} @@ -88,12 +89,12 @@ fpkg -e "tar.gz" ${PIXMAN} ${CAIRO_URL} fpkg -m fd -s "releases/dbus" ${DBUS} fpkg -m gnome ${GOBJECT_INSTROSPECTION} fpkg -m fd -o "dbus" -s "releases/dbus-glib" ${DBUS_GLIB} -fpkg -m fd -o "hal" ${EGGDBUS} -fpkg -m fd -o "hal" ${POLKIT} -fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist" -fpkg -m fd -o "hal" ${POLICYKIT} -fpkg -m fd ${HAL} -fpkg -m fd -o "hal" ${HAL_INFO} +######fpkg -m fd -o "hal" ${EGGDBUS} +#######fpkg -m fd -o "hal" ${POLKIT} +#fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist" +###fpkg -m fd -o "hal" ${POLICYKIT} +#####fpkg -m fd ${HAL} +#####fpkg -m fd -o "hal" ${HAL_INFO} if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then fpkg -m hv ${XORG_VIDEO_NOUVEAU} diff --git a/stage4/pkg/MesaLib b/stage4/pkg/MesaLib index 45e210b..a7068bd 100644 --- a/stage4/pkg/MesaLib +++ b/stage4/pkg/MesaLib @@ -2,15 +2,18 @@ hvconfig_pre() { - local DRVPTS="" + local DRVPTS="--with-dri-drivers=no" + local GALPTS="--with-gallium-drivers=" if [ -n "${XORG_VIDEO_DRIVER}" ]; then case "${XORG_VIDEO_DRIVER}" in nouveau) - DRVPTS="--with-dri-drivers=nouveau --enable-gallium-nouveau" + DRVPTS="--with-dri-drivers=nouveau" + GALPTS="--enable-gallium-nouveau" ;; intel) - DRVPTS="--with-dri-drivers=i915,i965 --enable-gallium-i915 --enable-gallium-i965" + DRVPTS="--with-dri-drivers=i915,i965" + GALPTS="--enable-gallium-i915 --enable-gallium-i965" ;; esac fi @@ -20,6 +23,7 @@ hvconfig_pre() --enable-motif \ --enable-xcb \ ${DRVPTS} \ + ${GALPTS} \ ${XORG_CONFIG}" # Mesa builds with debugging symbols. Remove the -g switch from both CFLAGS diff --git a/stage4/pkg/libdrm-git b/stage4/pkg/libdrm-git index f61874f..31de355 100644 --- a/stage4/pkg/libdrm-git +++ b/stage4/pkg/libdrm-git @@ -3,11 +3,10 @@ hvconfig_pre() { cd ${LFS_TMP}/${PACKAGE} - ./autogen.sh + NOCONFIGURE=1 ./autogen.sh CONFIGURE_OPTS="\ ${CONFIGURE_OPTS} \ - --enable-nouveau-experimental-api \ ${XORG_CONFIG}" } diff --git a/stage4/pkg/llvm b/stage4/pkg/llvm new file mode 100644 index 0000000..649c332 --- /dev/null +++ b/stage4/pkg/llvm @@ -0,0 +1,35 @@ +#!/bin/bash + +hvconfig_pre() +{ + cd ${LFS_TMP}/${PACKAGE} + touch tools/edis/EnhancedDisassembly.exports + + CONFIGURE_OPTS="\ + --prefix=/opt/llvm \ + --sysconfdir=/etc" +} + +hvconfig_post() +{ + find -name Makefile -exec \ + sed -i -r -e '/^LIBRARYNAME/a SHARED_LIBRARY = 1' \ + -e 's#BUILD_ARCHIVE :*= 1#NO_&#' \ + -e '/^USEDLIBS/s# ([A-Za-z]*).a# -l\1#g' \ + -e 's#^USEDLIBS#LDFLAGS#' {} \; + sed -i 's#BUILD_ARCHIVE = 1#NO_&#' Makefile.rules + sed -i 's#x)/docs#x)/share/doc#' Makefile.config +} + +hvbuild_post() +{ + echo "/opt/llvm/lib" >> /etc/ld.so.conf + ldconfig + ###echo "pathappend /usr/share/man MANPATH" >> /etc/profile.d/extrapaths.sh + ###echo "pathappend /opt/llvm/share/man MANPATH" >> /etc/profile.d/extrapaths.sh + ###echo "pathappend /opt/llvm/bin" >> /etc/profile.d/extrapaths.sh + ln -svf /opt/llvm/share/doc /usr/share/doc/${PACKAGE} + + var_add_path "PKG_CONFIG_PATH" /etc/profile "/opt/llvm/lib/pkgconfig" + var_export "PKG_CONFIG_PATH" /etc/profile +} diff --git a/stage4/pkg/xf86-video-nouveau-git b/stage4/pkg/xf86-video-nouveau-git index ba3dbef..306a4e2 100644 --- a/stage4/pkg/xf86-video-nouveau-git +++ b/stage4/pkg/xf86-video-nouveau-git @@ -5,4 +5,3 @@ hvconfig_pre() cd ${LFS_TMP}/${PACKAGE} ./autogen.sh } - diff --git a/stage5/hv-install-1 b/stage5/hv-install-1 index c247237..b363309 100755 --- a/stage5/hv-install-1 +++ b/stage5/hv-install-1 @@ -29,7 +29,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \ ipkg ${GTKMM} "--disable-documentation" ipkg ${GTK_ENGINES} ipkg -m acnb ${PYCAIRO} - ipkg ${PYGOBJECT} + ipkg ${PYGOBJECT} "--disable-introspection" ipkg ${PYGTK} ipkg ${GC} @@ -49,7 +49,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \ ipkg ${ORBIT2} ipkg -m acnb ${GCONF} ipkg ${GNOME_KEYRING} - ipkg ${LIBSOUP} "--without-gnome" +########### ipkg ${LIBSOUP} "--without-gnome" fi ipkg -m acnb ${GHOSTSCRIPT} @@ -64,16 +64,16 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \ ipkg ${LIBRSVG} "--disable-gtk-doc --disable-mozilla-plugin" ipkg ${BABL} ipkg ${GEGL} - ipkg ${GIMP} "--disable-print" + ipkg ${GIMP} ipkg -m acnb ${GUTENPRINT} ipkg -s boost -m noac ${BOOST} - ipkg ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\"" + #################ipkg ${INKSCAPE} "CFLAGS=\"-DPOPPLER_NEW_GFXFONT\"" fi ipkg -m noac ${CDRTOOLS} ipkg -m noac ${DVDRWTOOLS} ipkg ${LIBDVDCSS} -ipkg ${LIBDVDREAD} "--with-libdvdcss" +ipkg ${LIBDVDREAD} ipkg -m noac ${DVDFS} if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then @@ -113,7 +113,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg -m acnb ${CDRDAO} ipkg -m acnb ${EASYTAG} ipkg -m acnb ${FONTFORGE} - ipkg ${LILYPOND} "--disable-documentation --disable-debugging" + #######################ipkg ${LILYPOND} "--disable-documentation --disable-debugging" # ChordPro utils ipkg -m noac ${CHORDPACK} @@ -130,7 +130,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg ${GNOME_MEDIA} # Pour gstreamer-properties et gnome-volume-control fi - ipkg ${SYLPHEED} "--enable-ssl --enable-ldap" + ###########################ipkg ${SYLPHEED} "--enable-ssl --enable-ldap" ipkg ${LIBNOTIFY} ipkg ${YASM} ipkg ${LIBVPX} "--enable-shared" diff --git a/stage5/packages-update b/stage5/packages-update index 0b64774..9d07d23 100755 --- a/stage5/packages-update +++ b/stage5/packages-update @@ -73,7 +73,7 @@ fpkg -e "tar.gz" ${DVDRWTOOLS} \ "http://fy.chalmers.se/~appro/linux/DVD+RW/tools" fpkg -s "$(get_pkg_ver ${LIBDVDCSS})" ${LIBDVDCSS} \ "http://www.videolan.org/pub/libdvdcss" -fpkg -e "tar.gz" ${LIBDVDREAD} "http://www.dtek.chalmers.se/groups/dvd/dist" +fpkg -e "tar.bz2" ${LIBDVDREAD} "http://dvdnav.mplayerhq.hu/releases" fpkg -e "tar.gz" ${DVDFS} "http://jspenguin.org:81/dvdfs" fpkg -e "tar.xz" ${TEXLIVE} "ftp://tug.org/texlive/historic/2010" @@ -112,11 +112,12 @@ 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 ${SYLPHEED} \ - "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver2 ${SYLPHEED})" +fpkg -m sf ${SYLPHEED} +#fpkg ${SYLPHEED} \ +# "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver2 ${SYLPHEED})" fpkg ${LIBNOTIFY} \ "http://www.galago-project.org/files/releases/source/libnotify" -fpkg ${YASM} "http://www.tortall.net/projects/yasm/releases" +fpkg ${YASM} "http://www.tortall.net/projects/yasm/releases" fpkg ${LIBVPX} "http://webm.googlecode.com/files" diff --git a/stage4/pkg/xf86-video-nouveau-git b/stage5/pkg/libdvdread similarity index 54% copy from stage4/pkg/xf86-video-nouveau-git copy to stage5/pkg/libdvdread index ba3dbef..d0a62ed 100644 --- a/stage4/pkg/xf86-video-nouveau-git +++ b/stage5/pkg/libdvdread @@ -3,6 +3,6 @@ hvconfig_pre() { cd ${LFS_TMP}/${PACKAGE} - ./autogen.sh + sh autogen.sh --prefix=/usr + make distclean } - diff --git a/stage5/pkg/xsane b/stage5/pkg/xsane index d10b16a..4e1db05 100644 --- a/stage5/pkg/xsane +++ b/stage5/pkg/xsane @@ -1,5 +1,10 @@ #!/bin/bash +hvconfig_pre() +{ + sed -i -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' ${LFS_TMP}/${PACKAGE}/src/xsane-save.c +} + hvbuild_post() { # Adding link for GIMP plugin (Base GIMP version hardcoded for now) -- 2.20.1