Mercurial > mxe-octave
changeset 1885:36d9d04b0510
update packages: dbus fltk imagemagick x264
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Sat, 11 Jun 2011 19:05:29 +0200 |
| parents | abf6f1b6b915 |
| children | 675fd93501d8 |
| files | src/dbus-2-win.patch src/dbus.mk src/fltk.mk src/imagemagick.mk src/x264.mk |
| diffstat | 5 files changed, 9 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dbus-2-win.patch Fri Jun 10 20:51:59 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -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 -
--- a/src/dbus.mk Fri Jun 10 20:51:59 2011 +0200 +++ b/src/dbus.mk Sat Jun 11 19:05:29 2011 +0200 @@ -4,8 +4,8 @@ # dbus PKG := dbus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.5.2 -$(PKG)_CHECKSUM := 26e78f6f0ea7d5151b60e905061e11979fb6098a +$(PKG)_VERSION := 1.5.4 +$(PKG)_CHECKSUM := 11bd5828ac56a3e8f125a487b5743f09914ecea6 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://$(PKG).freedesktop.org/ @@ -15,7 +15,7 @@ define $(PKG)_UPDATE wget -q -O- 'http://cgit.freedesktop.org/dbus/dbus/refs/tags' | \ $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \ - grep -v '^1\.[0123]\.' | \ + grep -v '^1\.[01234]\.' | \ head -1 endef
--- a/src/fltk.mk Fri Jun 10 20:51:59 2011 +0200 +++ b/src/fltk.mk Sat Jun 11 19:05:29 2011 +0200 @@ -4,8 +4,8 @@ # FLTK PKG := fltk $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.x-r8772 -$(PKG)_CHECKSUM := d8cbdaa2e61160ebf45444c0fd432fe0ffa03f17 +$(PKG)_VERSION := 1.3.x-r8800 +$(PKG)_CHECKSUM := f901184e30fa8a43c12aab30a9cb6fa2510cdf29 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 $(PKG)_WEBSITE := http://www.fltk.org/
--- a/src/imagemagick.mk Fri Jun 10 20:51:59 2011 +0200 +++ b/src/imagemagick.mk Sat Jun 11 19:05:29 2011 +0200 @@ -4,8 +4,8 @@ # ImageMagick PKG := imagemagick $(PKG)_IGNORE := -$(PKG)_VERSION := 6.7.0-5 -$(PKG)_CHECKSUM := 144b0c916f969db579eaf9358d864f726636a1a0 +$(PKG)_VERSION := 6.7.0-6 +$(PKG)_CHECKSUM := 423ddda3d3430339d7dcb34a7515b6fe5784557c $(PKG)_SUBDIR := ImageMagick-$($(PKG)_VERSION) $(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.xz $(PKG)_WEBSITE := http://www.imagemagick.org/
--- a/src/x264.mk Fri Jun 10 20:51:59 2011 +0200 +++ b/src/x264.mk Sat Jun 11 19:05:29 2011 +0200 @@ -4,8 +4,8 @@ # x264 PKG := x264 $(PKG)_IGNORE := -$(PKG)_VERSION := 20110607-2245 -$(PKG)_CHECKSUM := a75660dc7c485ef4cef7cc3f8cd05cf8602e1004 +$(PKG)_VERSION := 20110610-2245 +$(PKG)_CHECKSUM := fa6fccbec932a608d343ff882532bcc86929919d $(PKG)_SUBDIR := $(PKG)-snapshot-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.videolan.org/developers/x264.html