Mercurial > mxe-octave

changeset 1448:866560a7ee0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 28 Nov 2010 20:20:43 +0100
parents 3ace1d13163d (current diff) 8d43a215ea43 (diff)
children a28d4559075c 3f79849d1f32
files src/metis.mk
diffstat 24 files changed, 61 insertions(+), 125 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Nov 27 20:14:25 2010 +0100
+++ b/Makefile	Sun Nov 28 20:20:43 2010 +0100
@@ -60,9 +60,12 @@
 DOWNLOAD_PKG_ARCHIVE = \
     mkdir -p '$(PKG_DIR)' && \
     $(if $($(1)_URL_2), \
-        wget -T 30 -t 3 -c -O '$(PKG_DIR)/$($(1)_FILE)' '$($(1)_URL)' \
-        || wget -c -O '$(PKG_DIR)/$($(1)_FILE)' '$($(1)_URL_2)', \
-        wget -c -O '$(PKG_DIR)/$($(1)_FILE)' '$($(1)_URL)')
+        ( wget -T 30 -O- '$($(1)_URL)' || wget -O- '$($(1)_URL_2)' ), \
+        wget -O- '$($(1)_URL)') \
+    $(if $($(1)_FIX_GZIP), \
+        | gzip -d | gzip -9n, \
+        ) \
+    > '$(PKG_DIR)/$($(1)_FILE)'
 
 SOURCEFORGE_FILES = \
     wget -q -O- '$(1)' | \
--- a/doc/index.html	Sat Nov 27 20:14:25 2010 +0100
+++ b/doc/index.html	Sun Nov 28 20:20:43 2010 +0100
@@ -428,7 +428,8 @@
         </p>
 
         <p>
-        This release ...
+        This release provides some improvements to the build system
+        such as an automatic check for most of the requirements.
         </p>
 
         <p>
@@ -437,7 +438,8 @@
 
         <p>
         New packages are supported:
-        ...
+        bfd, blas, cblas, dcmtk, ftgl, lapack, lcms1,
+        mingw-utils, mxml, suitesparse and tinyxml.
         </p>
     </dd>
 
--- a/src/atkmm.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/atkmm.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # ATKmm
 PKG             := atkmm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.22.0
-$(PKG)_CHECKSUM := eec035b8312b38f3b835d6c1ec4a5813dbaee5f8
+$(PKG)_VERSION  := 2.22.1
+$(PKG)_CHECKSUM := d5e56afdbc53881a3cc7a6772e72eac16ae41fa6
 $(PKG)_SUBDIR   := atkmm-$($(PKG)_VERSION)
 $(PKG)_FILE     := atkmm-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtkmm.org/
--- a/src/cairo.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/cairo.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -13,9 +13,8 @@
 $(PKG)_DEPS     := gcc zlib libpng fontconfig freetype pixman
 
 define $(PKG)_UPDATE
-    wget -q -O- 'http://cairographics.org/releases/' | \
-    grep 'LATEST-cairo-' | \
-    $(SED) -n 's,.*"LATEST-cairo-\([0-9][^"]*\)".*,\1,p' | \
+    wget -q -O- 'http://cairographics.org/releases/?C=M;O=D' | \
+    $(SED) -n 's,.*"cairo-\([0-9][^"]*\)\.tar.*,\1,p' | \
     head -1
 endef
 
--- a/src/cairomm.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/cairomm.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -13,9 +13,9 @@
 $(PKG)_DEPS     := gcc cairo libsigc++
 
 define $(PKG)_UPDATE
-    wget -q -O- 'http://cairographics.org/releases/' | \
-    grep 'LATEST-cairomm-' | \
-    $(SED) -n 's,.*"LATEST-cairomm-\([0-9][^"]*\)".*,\1,p' | \
+    wget -q -O- 'http://cairographics.org/releases/?C=M;O=D' | \
+    $(SED) -n 's,.*"cairomm-\([0-9][^"]*\)\.tar.*,\1,p' | \
+    grep -v '^1\.8\.' | \
     head -1
 endef
 
--- a/src/gdal.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/gdal.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # GDAL
 PKG             := gdal
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.7.2
-$(PKG)_CHECKSUM := a03127530708e3924aec7b505cc2ca4f8153f13c
+$(PKG)_VERSION  := 1.7.3
+$(PKG)_CHECKSUM := 58d4355fe792ad618bb74605dc1a084a0aeb7cb1
 $(PKG)_SUBDIR   := gdal-$($(PKG)_VERSION)
 $(PKG)_FILE     := gdal-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.gdal.org/
--- a/src/gdk-pixbuf.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/gdk-pixbuf.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # GDK-pixbuf
 PKG             := gdk-pixbuf
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.22.0
-$(PKG)_CHECKSUM := 80c25eaa08b22ebab24b98e88883ff615240d7cf
+$(PKG)_VERSION  := 2.22.1
+$(PKG)_CHECKSUM := b452208963ddd84f7280865695b50255fcafaa2e
 $(PKG)_SUBDIR   := gdk-pixbuf-$($(PKG)_VERSION)
 $(PKG)_FILE     := gdk-pixbuf-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gdk-pixbuf.org/
--- a/src/glew.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/glew.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # GLEW
 PKG             := glew
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.5.6
-$(PKG)_CHECKSUM := 053355a41c5eacf9492d157d7eda4d14656f8c96
+$(PKG)_VERSION  := 1.5.7
+$(PKG)_CHECKSUM := 4adc816afbfb65a4969484d10343a88c117ca989
 $(PKG)_SUBDIR   := glew-$($(PKG)_VERSION)
 $(PKG)_FILE     := glew-$($(PKG)_VERSION).tgz
 $(PKG)_WEBSITE  := http://glew.sourceforge.net/
--- a/src/glib.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/glib.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # GLib
 PKG             := glib
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.26.0
-$(PKG)_CHECKSUM := 9d7e9dce2add3fadc35079ad291a94f45ebcf706
+$(PKG)_VERSION  := 2.26.1
+$(PKG)_CHECKSUM := 8d35d5cf41d681dd6480a16be39f7d3cffbd29f0
 $(PKG)_SUBDIR   := glib-$($(PKG)_VERSION)
 $(PKG)_FILE     := glib-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtk.org/
--- a/src/gtk.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/gtk.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # GTK+
 PKG             := gtk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.22.0
-$(PKG)_CHECKSUM := 3af12d8eb3520516b25fa82873f87473dfb42cc0
+$(PKG)_VERSION  := 2.22.1
+$(PKG)_CHECKSUM := c88d8be4aebd6e59d6ca44d57f6acd18e2be1c08
 $(PKG)_SUBDIR   := gtk+-$($(PKG)_VERSION)
 $(PKG)_FILE     := gtk+-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtk.org/
--- a/src/gtksourceview.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/gtksourceview.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -16,7 +16,7 @@
     wget -q -O- 'http://git.gnome.org/browse/gtksourceview/refs/tags' | \
     $(SED) -n 's,.*>GTKSOURCEVIEW_\([0-9]\+_[0-9]*[02468]_[^<]*\)<.*,\1,p' | \
     $(SED) 's,_,.,g' | \
-    grep -v '^2\.9' | \
+    grep -v '^2\.9[0-9]\.' | \
     head -1
 endef
 
--- a/src/gtksourceviewmm.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/gtksourceviewmm.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -8,7 +8,7 @@
 $(PKG)_CHECKSUM := 7f6fb046427054d85c791a4b1fc0f742a3313c8a
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://projects.gnome.org/gtksourceview/
+$(PKG)_WEBSITE  := http://projects.gnome.org/gtksourceviewmm/
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/gtksourceviewmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc gtkmm gtksourceview
 
@@ -16,6 +16,7 @@
     wget -q -O- 'http://git.gnome.org/cgit/gtksourceviewmm/refs/tags' | \
     grep '<a href=' | \
     $(SED) -n "s,.*<a href='[^']*/tag/?id=gtksourceviewmm-\\([0-9][^']*\\)'.*,\\1,p" | \
+    grep -v '^2\.9[0-9]\.' | \
     head -1
 endef
 
--- a/src/imagemagick.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/imagemagick.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # ImageMagick
 PKG             := imagemagick
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.6.5-4
-$(PKG)_CHECKSUM := 233f6cb7b92431923e15c9757467e40d168cbbc0
+$(PKG)_VERSION  := 6.6.6-0
+$(PKG)_CHECKSUM := 4120f4766d79d53ca2615332651bd1be86144d3b
 $(PKG)_SUBDIR   := ImageMagick-$($(PKG)_VERSION)
 $(PKG)_FILE     := ImageMagick-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.imagemagick.org/
--- a/src/lapack.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/lapack.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # lapack
 PKG             := lapack
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.2.2
-$(PKG)_CHECKSUM := a434c45932f6affb654b3abde21dd669f5751633
+$(PKG)_VERSION  := 3.3.0
+$(PKG)_CHECKSUM := 4f0b103da52110e7f60d1d7676727103aca9785e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tgz
 $(PKG)_WEBSITE  := http://www.netlib.org/$(PKG)/
--- a/src/librsvg-1-fixes.patch	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/librsvg-1-fixes.patch	Sun Nov 28 20:20:43 2010 +0100
@@ -1,7 +1,7 @@
 This file is part of mingw-cross-env.
 See doc/index.html for further information.
 
-Contains ad hoc patches for cross building.
+Contains an ad hoc patch for cross building.
 
 From 1ff5a73bee660f1d61f9cdd7c8d7aff29e959c4c Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
@@ -24,28 +24,3 @@
  Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@
 -- 
 1.7.1
-
-
-From 9a7e7ebee9aab83659b9aced51fb53de5427138d Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Mon, 27 Sep 2010 12:02:45 +0200
-Subject: [PATCH 2/2] fix stray comma
-
-Taken from https://bugzilla.gnome.org/show_bug.cgi?id=630714
-
-diff --git a/rsvg.h b/rsvg.h
-index 37e7930..41c4127 100644
---- a/rsvg.h
-+++ b/rsvg.h
-@@ -139,7 +139,7 @@ gboolean rsvg_handle_has_sub (RsvgHandle * handle, const char *id);
- /* GIO APIs */
- 
- typedef enum {
--    RSVG_HANDLE_FLAGS_NONE        = 0,
-+    RSVG_HANDLE_FLAGS_NONE        = 0
- } RsvgHandleFlags;
- 
- void        rsvg_handle_set_base_gfile (RsvgHandle *handle,
--- 
-1.7.1
-
--- a/src/librsvg.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/librsvg.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # librsvg
 PKG             := librsvg
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.32.0
-$(PKG)_CHECKSUM := 252727b948a29b36dae0022e0c620538bcb158f8
+$(PKG)_VERSION  := 2.32.1
+$(PKG)_CHECKSUM := 2762cfa3a4e9c9ee845c7f23a824dbd13583ebf0
 $(PKG)_SUBDIR   := librsvg-$($(PKG)_VERSION)
 $(PKG)_FILE     := librsvg-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://librsvg.sourceforge.net/
--- a/src/libvpx.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/libvpx.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,10 +4,10 @@
 # vpx
 PKG             := libvpx
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.9.2
-$(PKG)_CHECKSUM := d3b386773aa11e2385829c078d52b3a3982d1122
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-v$($(PKG)_VERSION).tar.bz2
+$(PKG)_VERSION  := 0.9.5
+$(PKG)_CHECKSUM := 223965ff16737251afb3377c0800d1f8b5f84379
+$(PKG)_SUBDIR   := $(PKG)-v$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
 $(PKG)_WEBSITE  := http://code.google.com/p/webm/
 $(PKG)_URL      := http://webm.googlecode.com/files/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
--- a/src/libxml2.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/libxml2.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # libxml2
 PKG             := libxml2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.7.7
-$(PKG)_CHECKSUM := 8592824a2788574a172cbddcdc72f734ff87abe3
+$(PKG)_VERSION  := 2.7.8
+$(PKG)_CHECKSUM := 859dd535edbb851cc15b64740ee06551a7a17d40
 $(PKG)_SUBDIR   := libxml2-$($(PKG)_VERSION)
 $(PKG)_FILE     := libxml2-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.xmlsoft.org/
--- a/src/metis.mk	Sat Nov 27 20:14:25 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html for further information.
-
-# METIS
-PKG             := metis
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.0
-$(PKG)_CHECKSUM := 580568308e1fa40e5a7a77cacbf27f865d6c01af
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
-$(PKG)_WEBSITE  := http://glaros.dtc.umn.edu/gkhome/metis/metis/overview
-$(PKG)_URL      := http://glaros.dtc.umn.edu/gkhome/fetch/sw/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc
-
-define $(PKG)_UPDATE
-    wget -q -O- 'http://glaros.dtc.umn.edu/gkhome/metis/metis/download' | \
-    $(SED) -n 's,.*metis-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    head -1
-endef
-
-define $(PKG)_BUILD
-    $(SED) -i 's,cc,$(TARGET)-gcc,'        '$(1)/Makefile.in'
-    $(SED) -i 's,ar ,$(TARGET)-ar ,'       '$(1)/Makefile.in'
-    $(SED) -i 's,ranlib,$(TARGET)-ranlib,' '$(1)/Makefile.in'
-    $(MAKE) -C '$(1)/Lib' -j '$(JOBS)'
-    $(INSTALL) -d                        '$(PREFIX)/$(TARGET)/lib'
-    $(INSTALL) -m644 '$(1)/libmetis.a'   '$(PREFIX)/$(TARGET)/lib/libmetis.a'
-    $(INSTALL) -d                        '$(PREFIX)/$(TARGET)/include/metis/Lib'
-    $(INSTALL) -m644 '$(1)/Lib/metis.h'  '$(PREFIX)/$(TARGET)/include/metis/Lib/metis.h'
-    $(INSTALL) -m644 '$(1)/Lib/defs.h'   '$(PREFIX)/$(TARGET)/include/metis/Lib/defs.h'
-    $(INSTALL) -m644 '$(1)/Lib/struct.h' '$(PREFIX)/$(TARGET)/include/metis/Lib/struct.h'
-    $(INSTALL) -m644 '$(1)/Lib/macros.h' '$(PREFIX)/$(TARGET)/include/metis/Lib/macros.h'
-    $(INSTALL) -m644 '$(1)/Lib/rename.h' '$(PREFIX)/$(TARGET)/include/metis/Lib/rename.h'
-    $(INSTALL) -m644 '$(1)/Lib/proto.h'  '$(PREFIX)/$(TARGET)/include/metis/Lib/proto.h'
-endef
--- a/src/ogg.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/ogg.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # OGG
 PKG             := ogg
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.0
-$(PKG)_CHECKSUM := 135fb812282e08833295c91e005bd0258fff9098
+$(PKG)_VERSION  := 1.2.1
+$(PKG)_CHECKSUM := 7d8b49e6546f29e6ade7b5dd5d85c869e35b428a
 $(PKG)_SUBDIR   := libogg-$($(PKG)_VERSION)
 $(PKG)_FILE     := libogg-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.xiph.org/ogg/
--- a/src/pixman.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/pixman.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # pixman
 PKG             := pixman
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.19.6
-$(PKG)_CHECKSUM := 1ecd608c4464ec099830d0c088bf4ec5d318b86e
+$(PKG)_VERSION  := 0.21.2
+$(PKG)_CHECKSUM := c0ff07d7e4877dd4d0d369ca09e50ca956e3386e
 $(PKG)_SUBDIR   := pixman-$($(PKG)_VERSION)
 $(PKG)_FILE     := pixman-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://cairographics.org/
@@ -14,9 +14,7 @@
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://cairographics.org/releases/?C=M;O=D' | \
-    grep '<a href="pixman-' | \
-    $(SED) -n 's,.*<a href="pixman-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    grep -v '^0\.16\.' | \
+    $(SED) -n 's,.*"pixman-\([0-9][^"]*\)\.tar.*,\1,p' | \
     head -1
 endef
 
--- a/src/suitesparse.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/suitesparse.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -10,7 +10,7 @@
 $(PKG)_FILE     := SuiteSparse-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.cise.ufl.edu/research/sparse/SuiteSparse/
 $(PKG)_URL      := http://www.cise.ufl.edu/research/sparse/SuiteSparse/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc metis blas lapack
+$(PKG)_DEPS     := gcc blas lapack
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://www.cise.ufl.edu/research/sparse/SuiteSparse/' | \
@@ -19,26 +19,19 @@
 endef
 
 define $(PKG)_BUILD
-    # set path to metis
-    $(SED) -i 's,METIS_PATH =.*,METIS_PATH = $(PREFIX)/$(TARGET)/include/metis,' '$(1)/UFconfig/UFconfig.mk'
-    $(SED) -i 's,METIS =.*,METIS = $(PREFIX)/$(TARGET)/lib/libmetis.a,'          '$(1)/UFconfig/UFconfig.mk'
-
-    # use cross tools
-    $(SED) -i 's,cc,$(TARGET)-gcc,'        '$(1)/UFconfig/UFconfig.mk'
-    $(SED) -i 's,g++,$(TARGET)-g++,'       '$(1)/UFconfig/UFconfig.mk'
-    $(SED) -i 's,f77,$(TARGET)-gfortran,'  '$(1)/UFconfig/UFconfig.mk'
-    $(SED) -i 's,ar ,$(TARGET)-ar ,'       '$(1)/UFconfig/UFconfig.mk'
-    $(SED) -i 's,ranlib,$(TARGET)-ranlib,' '$(1)/UFconfig/UFconfig.mk'
-
-    # gfortran does not need libg2c
-    $(SED) -i 's,-lg2c,,' '$(1)/UFconfig/UFconfig.mk'
-
     # exclude demos
     find '$(1)' -name 'Makefile' \
         -exec $(SED) -i 's,( cd Demo,#( cd Demo,' {} \;
 
     # build all
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' \
+        CC='$(TARGET)-gcc' \
+        CPLUSPLUS='$(TARGET)-g++' \
+        F77='$(TARGET)-gfortran' \
+        AR='$(TARGET)-ar cr' \
+        RANLIB='$(TARGET)-ranlib' \
+        BLAS='-lblas -lgfortran -lgfortranbegin' \
+        CHOLMOD_CONFIG='-DNPARTITION'
 
     # install library files
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
--- a/src/vorbis.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/vorbis.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # Vorbis
 PKG             := vorbis
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.1
-$(PKG)_CHECKSUM := 0874dd08699240b868b22979da4c95ae6325006b
+$(PKG)_VERSION  := 1.3.2
+$(PKG)_CHECKSUM := 4b089ace4c8420c479b2fde9c5b01588cf86c959
 $(PKG)_SUBDIR   := libvorbis-$($(PKG)_VERSION)
 $(PKG)_FILE     := libvorbis-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.vorbis.com/
--- a/src/x264.mk	Sat Nov 27 20:14:25 2010 +0100
+++ b/src/x264.mk	Sun Nov 28 20:20:43 2010 +0100
@@ -4,8 +4,8 @@
 # x264
 PKG             := x264
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 20101026-2245
-$(PKG)_CHECKSUM := f7fd7533084535d84807be6537e1792cce9ddbe1
+$(PKG)_VERSION  := 20101127-2245
+$(PKG)_CHECKSUM := 22e03cb6bb7d521c4086fdf130331c35e4e7ff1e
 $(PKG)_SUBDIR   := $(PKG)-snapshot-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.videolan.org/developers/x264.html