6 files changed, 13 insertions, 51 deletions
diff --git a/src/flac-1-win32.patch b/src/flac-1-win32.patch
deleted file mode 100644
index 92018d3..0000000
--- a/src/flac-1-win32.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-diff -ru flac-1.2.1.orig/include/share/alloc.h flac-1.2.1/include/share/alloc.h
---- flac-1.2.1.orig/include/share/alloc.h       2007-09-12 07:32:21.000000000 +0200
-+++ flac-1.2.1/include/share/alloc.h    2009-10-27 19:55:58.000000000 +0100
-@@ -35,7 +35,7 @@
- 
- #ifndef SIZE_MAX
- # ifndef SIZE_T_MAX
--#  ifdef _MSC_VER
-+#  if defined _MSC_VER || defined __MINGW32__
- #   define SIZE_T_MAX UINT_MAX
- #  else
- #   error
diff --git a/src/flac-2-lwsock32.patch b/src/flac-2-lwsock32.patch
deleted file mode 100644
index 16a2c1e..0000000
--- a/src/flac-2-lwsock32.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-diff -urN flac-1.2.1.orig/src/libFLAC/flac.pc.in flac-1.2.1/src/libFLAC/flac.pc.in
---- flac-1.2.1.orig/src/libFLAC/flac.pc.in	2007-02-07 12:07:32.000000000 +1100
-+++ flac-1.2.1/src/libFLAC/flac.pc.in	2010-10-07 14:57:17.000000000 +1100
-@@ -6,5 +6,5 @@
- Name: FLAC
- Description: Free Lossless Audio Codec Library
- Version: @VERSION@
--Libs: -L${libdir} -lFLAC -lm
-+Libs: -L${libdir} -lFLAC -lm -lwsock32
- Cflags: -I${includedir}/FLAC
-diff -urN flac-1.2.1.orig/src/libFLAC++/flac++.pc.in flac-1.2.1/src/libFLAC++/flac++.pc.in
---- flac-1.2.1.orig/src/libFLAC++/flac++.pc.in	2007-02-07 12:07:32.000000000 +1100
-+++ flac-1.2.1/src/libFLAC++/flac++.pc.in	2010-10-07 14:57:36.000000000 +1100
-@@ -7,5 +7,5 @@
- Description: Free Lossless Audio Codec Library (C++ API)
- Version: @VERSION@
- Requires: flac
--Libs: -L${libdir} -lFLAC++ -lm
-+Libs: -L${libdir} -lFLAC++ -lm -lwsock32
- Cflags: -I${includedir}/FLAC++
diff --git a/src/flac.mk b/src/flac.mk
index 8b47394..38cbff4 100644
--- a/src/flac.mk
+++ b/src/flac.mk
@@ -3,23 +3,23 @@
 
 PKG             := flac
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := bd54354900181b59db3089347cc84ad81e410b38
+$(PKG)_CHECKSUM := a136e5748f8fb1e6c524c75000a765fc63bb7b1b
 $(PKG)_SUBDIR   := flac-$($(PKG)_VERSION)
-$(PKG)_FILE     := flac-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/flac/flac-src/flac-$($(PKG)_VERSION)-src/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc libiconv ogg
+$(PKG)_FILE     := flac-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := http://downloads.xiph.org/releases/flac/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc ogg
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://flac.cvs.sourceforge.net/viewvc/flac/flac/' | \
-    grep '<option>FLAC_RELEASE_' | \
-    $(SED) -n 's,.*FLAC_RELEASE_\([0-9][0-9_]*\)__.*,\1,p' | \
-    $(SED) 's,_,.,g' | \
-    head -1
+    $(WGET) -q -O- 'http://downloads.xiph.org/releases/flac/' | \
+    $(SED) -n 's,.*<a href="flac-\([0-9][0-9.]*\)\.tar\.[gx]z">.*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --enable-static \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-doxygen-docs \
diff --git a/src/imagemagick.mk b/src/imagemagick.mk
index f1e951d..ad26c51 100644
--- a/src/imagemagick.mk
+++ b/src/imagemagick.mk
@@ -3,7 +3,7 @@
 
 PKG             := imagemagick
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := f393612e9797a6129f2cac7f83df337bb54ecf76
+$(PKG)_CHECKSUM := 4d961c8cf86611eb88ba8be616229101ceb3e7ff
 $(PKG)_SUBDIR   := ImageMagick-$($(PKG)_VERSION)
 $(PKG)_FILE     := ImageMagick-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://www.imagemagick.org/download/$($(PKG)_FILE)
@@ -12,7 +12,7 @@ $(PKG)_DEPS     := gcc bzip2 ffmpeg fftw freetype jasper jpeg lcms liblqr-1 libp
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.imagemagick.org/' | \
-    $(SED) -n 's,.*<p>The current release is ImageMagick \([0-9][^<]*\).</p>.*,\1,p' | \
+    $(SED) -n 's,.*<p>The current release is ImageMagick \([0-9][0-9.-]*\).*,\1,p' | \
     head -1
 endef
 
diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk
index c238ea6..bc0cd14 100644
--- a/src/openscenegraph.mk
+++ b/src/openscenegraph.mk
@@ -3,7 +3,7 @@
 
 PKG             := openscenegraph
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := f2d3707b033932cd7b916d425559572d0d3dfc69
+$(PKG)_CHECKSUM := 91a89891b761e97aa0bad9e76bf43dd66617e612
 $(PKG)_SUBDIR   := OpenSceneGraph-$($(PKG)_VERSION)
 $(PKG)_FILE     := OpenSceneGraph-$($(PKG)_VERSION).zip
 $(PKG)_URL      := http://www.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE)
diff --git a/src/x264.mk b/src/x264.mk
index 61352bd..42c2171 100644
--- a/src/x264.mk
+++ b/src/x264.mk
@@ -3,7 +3,7 @@
 
 PKG             := x264
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := f076166e7927562837383bbfb91430b2c7a3caf2
+$(PKG)_CHECKSUM := 768008db411c03afbd74ea808da5a1f57a77fed4
 $(PKG)_SUBDIR   := $(PKG)-snapshot-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://download.videolan.org/pub/videolan/$(PKG)/snapshots/$($(PKG)_FILE)