From 7b8631c5e79e07d25c40ee32a103de3c6827e95c Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 8 Jun 2011 08:53:36 +0200
Subject: upgrade packages: dbus fltk geos glib gnutls imagemagick lcms libass
 libevent libgsf pfstools x264 xvidcore xz

---
 src/dbus-1-fixes.patch |  2 +-
 src/dbus-2-win.patch   | 32 ++++++++++++++++++++++++++++++++
 src/dbus.mk            |  8 +++-----
 src/fltk.mk            |  4 ++--
 src/geos.mk            |  4 ++--
 src/glib.mk            |  4 ++--
 src/gnutls.mk          |  4 ++--
 src/imagemagick.mk     |  6 +++---
 src/lcms.mk            |  4 ++--
 src/libass.mk          |  6 +++---
 src/libevent.mk        |  4 ++--
 src/libgsf.mk          |  4 ++--
 src/pfstools.mk        |  4 ++--
 src/x264.mk            |  4 ++--
 src/xvidcore.mk        |  4 ++--
 src/xz.mk              |  4 ++--
 16 files changed, 64 insertions(+), 34 deletions(-)
 create mode 100644 src/dbus-2-win.patch

diff --git a/src/dbus-1-fixes.patch b/src/dbus-1-fixes.patch
index 41878d9..4f90611 100644
--- a/src/dbus-1-fixes.patch
+++ b/src/dbus-1-fixes.patch
@@ -11,7 +11,7 @@ diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
 index d1e40ec..3a32355 100644
 --- a/dbus/dbus-macros.h
 +++ b/dbus/dbus-macros.h
-@@ -158,6 +158,7 @@
+@@ -172,6 +172,7 @@
   */
  
  #if defined(_WIN32)
diff --git a/src/dbus-2-win.patch b/src/dbus-2-win.patch
new file mode 100644
index 0000000..1d90d4d
--- /dev/null
+++ b/src/dbus-2-win.patch
@@ -0,0 +1,32 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch taken from https://bugs.freedesktop.org/show_bug.cgi?id=37838
+
+From fb42ebba06d89c0fd9ca3b753b9f1d9837cf798f Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Wed, 1 Jun 2011 23:51:21 +0200
+Subject: [PATCH] don't try to build dbus-daemon-launch-helper for Windows
+
+Fixed regression in b0acded which breaks build for Windows.
+---
+ bus/Makefile.am |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/bus/Makefile.am b/bus/Makefile.am
+index dfb3bc3..73765f5 100644
+--- a/bus/Makefile.am
++++ b/bus/Makefile.am
+@@ -150,7 +150,9 @@ bus_test_launch_helper_CPPFLAGS= -DDBUS_STATIC_BUILD	\
+ ## even when not doing "make check"
+ noinst_PROGRAMS = $(TESTS)
+ dbus_daemon_exec_PROGRAMS = dbus-daemon
++if DBUS_UNIX
+ libexec_PROGRAMS = dbus-daemon-launch-helper
++endif DBUS_UNIX
+ 
+ ## note that TESTS has special meaning (stuff to use in make check)
+ ## so if adding tests not to be run in make check, don't add them to
+-- 
+1.7.4.2
+
diff --git a/src/dbus.mk b/src/dbus.mk
index 60d7324..2b1e297 100644
--- a/src/dbus.mk
+++ b/src/dbus.mk
@@ -4,8 +4,8 @@
 # dbus
 PKG             := dbus
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.5.0
-$(PKG)_CHECKSUM := 4f0c82af6de628d7359dcdbc0da402f8e369e367
+$(PKG)_VERSION  := 1.5.2
+$(PKG)_CHECKSUM := 26e78f6f0ea7d5151b60e905061e11979fb6098a
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://$(PKG).freedesktop.org/
@@ -20,7 +20,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    cd '$(1)' && automake && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-xml=expat \
@@ -29,8 +29,6 @@ define $(PKG)_BUILD
         --disable-asserts \
         --disable-shared \
         --enable-static \
-        --disable-tests \
-        --disable-standalone-tests \
         --disable-silent-rules
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef
diff --git a/src/fltk.mk b/src/fltk.mk
index 64720a3..eff8f11 100644
--- a/src/fltk.mk
+++ b/src/fltk.mk
@@ -4,8 +4,8 @@
 # FLTK
 PKG             := fltk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.x-r8659
-$(PKG)_CHECKSUM := 97d5002f1f3a32bf78634954e63c491483e727ac
+$(PKG)_VERSION  := 1.3.x-r8772
+$(PKG)_CHECKSUM := d8cbdaa2e61160ebf45444c0fd432fe0ffa03f17
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
 $(PKG)_WEBSITE  := http://www.fltk.org/
diff --git a/src/geos.mk b/src/geos.mk
index d53a0ad..f17579c 100644
--- a/src/geos.mk
+++ b/src/geos.mk
@@ -4,8 +4,8 @@
 # GEOS
 PKG             := geos
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.3.0rc1
-$(PKG)_CHECKSUM := 6a8f7153d887d7a5085dcee62251b6f9c82a2283
+$(PKG)_VERSION  := 3.3.0
+$(PKG)_CHECKSUM := f6c6e3398d5c7bf389a0610a0d06896d76ad4480
 $(PKG)_SUBDIR   := geos-$($(PKG)_VERSION)
 $(PKG)_FILE     := geos-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://trac.osgeo.org/geos/
diff --git a/src/glib.mk b/src/glib.mk
index cbfdd27..d336148 100644
--- a/src/glib.mk
+++ b/src/glib.mk
@@ -4,8 +4,8 @@
 # GLib
 PKG             := glib
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.28.6
-$(PKG)_CHECKSUM := 51996339c823cf36ba28c774c4afad933d5f5744
+$(PKG)_VERSION  := 2.28.8
+$(PKG)_CHECKSUM := 20cd63705a8805260da0320c65b979233f2e3c18
 $(PKG)_SUBDIR   := glib-$($(PKG)_VERSION)
 $(PKG)_FILE     := glib-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtk.org/
diff --git a/src/gnutls.mk b/src/gnutls.mk
index d3ae002..e72a2e9 100644
--- a/src/gnutls.mk
+++ b/src/gnutls.mk
@@ -3,8 +3,8 @@
 
 # GnuTLS
 PKG             := gnutls
-$(PKG)_VERSION  := 2.12.5
-$(PKG)_CHECKSUM := dd45d4fb7c365d18803b9eafef838b310c899d67
+$(PKG)_VERSION  := 2.12.6.1
+$(PKG)_CHECKSUM := c7cf31eac9c74ca2889775c7465b50346294736a
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gnu.org/software/gnutls/
diff --git a/src/imagemagick.mk b/src/imagemagick.mk
index 8f9bbb9..d560ba4 100644
--- a/src/imagemagick.mk
+++ b/src/imagemagick.mk
@@ -4,10 +4,10 @@
 # ImageMagick
 PKG             := imagemagick
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.6.9-9
-$(PKG)_CHECKSUM := 1d46f9d2b9294b11b9e9c03ee8da7e1df8d92fef
+$(PKG)_VERSION  := 6.7.0-5
+$(PKG)_CHECKSUM := 144b0c916f969db579eaf9358d864f726636a1a0
 $(PKG)_SUBDIR   := ImageMagick-$($(PKG)_VERSION)
-$(PKG)_FILE     := ImageMagick-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := ImageMagick-$($(PKG)_VERSION).tar.xz
 $(PKG)_WEBSITE  := http://www.imagemagick.org/
 $(PKG)_URL      := http://ftp.nluug.nl/ImageMagick/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc bzip2 ffmpeg fftw freetype jasper jpeg lcms libpng libtool openexr pthreads tiff zlib
diff --git a/src/lcms.mk b/src/lcms.mk
index 70524b4..7a396d0 100644
--- a/src/lcms.mk
+++ b/src/lcms.mk
@@ -4,8 +4,8 @@
 # lcms
 PKG             := lcms
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.1
-$(PKG)_CHECKSUM := 0ce856a004068ff6e22f9f2d7b94a11b9b469bf9
+$(PKG)_VERSION  := 2.2
+$(PKG)_CHECKSUM := b46f862690b37baa9e5be5a9355b8023df8bef6a
 $(PKG)_SUBDIR   := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION))
 $(PKG)_FILE     := $(PKG)$(word 1,$(subst ., ,$($(PKG)_VERSION)))-$(subst a,,$($(PKG)_VERSION)).tar.gz
 $(PKG)_WEBSITE  := http://www.littlecms.com/
diff --git a/src/libass.mk b/src/libass.mk
index 36f6480..cdc717f 100644
--- a/src/libass.mk
+++ b/src/libass.mk
@@ -4,10 +4,10 @@
 # libass
 PKG             := libass
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.9.11
-$(PKG)_CHECKSUM := 6f69f6c4474c649de4fd7913b050bfd4cf8110cb
+$(PKG)_VERSION  := 0.9.12
+$(PKG)_CHECKSUM := 7ce9689a6a3f822477880f3d11203a7f65444396
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.bz2
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.xz
 $(PKG)_WEBSITE  := http://code.google.com/p/libass/
 $(PKG)_URL      := http://libass.googlecode.com/files/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc freetype fontconfig
diff --git a/src/libevent.mk b/src/libevent.mk
index 2f3cd7a..ac45e08 100644
--- a/src/libevent.mk
+++ b/src/libevent.mk
@@ -4,8 +4,8 @@
 # libevent
 PKG             := libevent
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.0.11
-$(PKG)_CHECKSUM := 843b5d395054b9d4d5586220c004c29cdcc37fcf
+$(PKG)_VERSION  := 2.0.12
+$(PKG)_CHECKSUM := fa2e1643101a8f8eba8e6fcffdce97cb9309c1d2
 $(PKG)_SUBDIR   := libevent-$($(PKG)_VERSION)-stable
 $(PKG)_FILE     := libevent-$($(PKG)_VERSION)-stable.tar.gz
 $(PKG)_WEBSITE  := http://monkey.org/~provos/libevent/
diff --git a/src/libgsf.mk b/src/libgsf.mk
index 577d8a8..7d103a5 100644
--- a/src/libgsf.mk
+++ b/src/libgsf.mk
@@ -4,8 +4,8 @@
 # libgsf
 PKG             := libgsf
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.14.20
-$(PKG)_CHECKSUM := d172b454c1b98f9c111df11e000b1ced050bdac9
+$(PKG)_VERSION  := 1.14.21
+$(PKG)_CHECKSUM := 17981f238f1f8dddb7af01c161bd6a1c4d5e85d2
 $(PKG)_SUBDIR   := libgsf-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgsf-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://ftp.gnome.org/pub/gnome/sources/libgsf/
diff --git a/src/pfstools.mk b/src/pfstools.mk
index 2dc4b2c..dcd322d 100644
--- a/src/pfstools.mk
+++ b/src/pfstools.mk
@@ -4,8 +4,8 @@
 # pfstools
 PKG             := pfstools
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.8.3
-$(PKG)_CHECKSUM := b13d1863944afc4a88eb6ec92954677995399ab7
+$(PKG)_VERSION  := 1.8.4
+$(PKG)_CHECKSUM := 7090fcf05850ad3186d36f750cab6810fac4a753
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://$(PKG).sourceforge.net/
diff --git a/src/x264.mk b/src/x264.mk
index 8aa6687..74846a0 100644
--- a/src/x264.mk
+++ b/src/x264.mk
@@ -4,8 +4,8 @@
 # x264
 PKG             := x264
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 20110517-2245
-$(PKG)_CHECKSUM := 51aa8e7ac683ef1bfeec638d0e44e2bd94a25a92
+$(PKG)_VERSION  := 20110607-2245
+$(PKG)_CHECKSUM := a75660dc7c485ef4cef7cc3f8cd05cf8602e1004
 $(PKG)_SUBDIR   := $(PKG)-snapshot-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.videolan.org/developers/x264.html
diff --git a/src/xvidcore.mk b/src/xvidcore.mk
index 06f3bdf..952a0f3 100644
--- a/src/xvidcore.mk
+++ b/src/xvidcore.mk
@@ -4,8 +4,8 @@
 # xvidcore
 PKG             := xvidcore
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.1
-$(PKG)_CHECKSUM := 68c73b9a00dfb830083f619335eb876b0f845bec
+$(PKG)_VERSION  := 1.3.2
+$(PKG)_CHECKSUM := 56e065d331545ade04c63c91153b9624b51d6e1b
 $(PKG)_SUBDIR   := xvidcore/build/generic
 $(PKG)_FILE     := xvidcore-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.xvid.org/
diff --git a/src/xz.mk b/src/xz.mk
index 6a3381c..8a9348e 100644
--- a/src/xz.mk
+++ b/src/xz.mk
@@ -4,8 +4,8 @@
 # XZ
 PKG             := xz
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.0.2
-$(PKG)_CHECKSUM := 2f64e90df16a4cc143bf7ba5788953fac593f4f6
+$(PKG)_VERSION  := 5.0.3
+$(PKG)_CHECKSUM := 50ce842bea6519537457d9ad90d110a127656786
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://tukaani.org/xz/
-- 
cgit v0.12