diff options
| -rw-r--r-- | src/librsvg-1-fixes.patch | 34 | ||||
| -rw-r--r-- | src/librsvg.mk | 4 | ||||
| -rw-r--r-- | src/libusb1.mk | 4 | ||||
| -rw-r--r-- | src/m4.mk | 4 | ||||
| -rw-r--r-- | src/openscenegraph-1-disable-broken-plugins.patch | 19 | ||||
| -rw-r--r-- | src/openscenegraph.mk | 4 |
6 files changed, 41 insertions, 28 deletions
diff --git a/src/librsvg-1-fixes.patch b/src/librsvg-1-fixes.patch index dbaf5de..8e25e66 100644 --- a/src/librsvg-1-fixes.patch +++ b/src/librsvg-1-fixes.patch @@ -6,7 +6,7 @@ Contains an ad hoc patch for cross building. From 1ff5a73bee660f1d61f9cdd7c8d7aff29e959c4c Mon Sep 17 00:00:00 2001 From: MXE Date: Mon, 27 Sep 2010 12:00:52 +0200 -Subject: [PATCH] fix .pc requirements +Subject: [PATCH 1/2] fix .pc requirements diff --git a/librsvg.pc.in b/librsvg.pc.in @@ -24,3 +24,35 @@ index 372f199..b6ee7a9 100644 Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@ -- 1.7.1 + + +[PATCH 2/2] Work around use of canonicalize_file_name() + + +diff -ur librsvg-2.40.0.orig/rsvg-base.c librsvg-2.40.0/rsvg-base.c +--- librsvg-2.40.0.orig/rsvg-base.c 2013-05-11 11:19:07.000000000 +0200 ++++ librsvg-2.40.0/rsvg-base.c 2013-11-09 15:24:47.865999754 +0100 +@@ -2191,7 +2191,11 @@ + g_object_unref (base); + + /* FIXME portability */ ++#ifndef __MINGW32__ + cdir = canonicalize_file_name (dir); ++#else ++ cdir = dir; ++#endif + g_free (dir); + if (cdir == NULL) + goto deny; +@@ -2201,7 +2205,11 @@ + goto deny; + + /* FIXME portability */ ++#ifndef __MINGW32__ + cpath = canonicalize_file_name (path); ++#else ++ cpath = path; ++#endif + g_free (path); + + if (cpath == NULL) diff --git a/src/librsvg.mk b/src/librsvg.mk index a540e3a..8d75a38 100644 --- a/src/librsvg.mk +++ b/src/librsvg.mk @@ -3,8 +3,8 @@ PKG := librsvg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.37.0 -$(PKG)_CHECKSUM := 92ac16f1210e2324011039284407e17d3fda6e88 +$(PKG)_VERSION := 2.40.0 +$(PKG)_CHECKSUM := eb915c9d963326e74be2e92fba4c4e9fbb06eefe $(PKG)_SUBDIR := librsvg-$($(PKG)_VERSION) $(PKG)_FILE := librsvg-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) diff --git a/src/libusb1.mk b/src/libusb1.mk index c36c114..151a8cc 100644 --- a/src/libusb1.mk +++ b/src/libusb1.mk @@ -3,8 +3,8 @@ PKG := libusb1 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.16 -$(PKG)_CHECKSUM := ec164f02e6732c373e5a24be6b33a59142435615 +$(PKG)_VERSION := 1.0.17 +$(PKG)_CHECKSUM := a491054e7f4f3f52b12bd567335180586a54ae16 $(PKG)_SUBDIR := libusbx-$($(PKG)_VERSION) $(PKG)_FILE := libusbx-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/libusbx/releases/$($(PKG)_VERSION)/source/$($(PKG)_FILE) @@ -3,8 +3,8 @@ PKG := m4 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.16 -$(PKG)_CHECKSUM := d8688d1d84e058366134301e018e57bbbdc33463 +$(PKG)_VERSION := 1.4.17 +$(PKG)_CHECKSUM := 74ad71fa100ec8c13bc715082757eb9ab1e4bbb0 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/m4/$($(PKG)_FILE) diff --git a/src/openscenegraph-1-disable-broken-plugins.patch b/src/openscenegraph-1-disable-broken-plugins.patch deleted file mode 100644 index 4810e12..0000000 --- a/src/openscenegraph-1-disable-broken-plugins.patch +++ /dev/null @@ -1,19 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: - -http://lists.nongnu.org/archive/html/mingw-cross-env-list/2012-11/msg00009.html - -diff -uNr a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2011-07-31 09:50:34.000000000 +0200 -+++ b/CMakeLists.txt 2012-11-26 09:41:12.199384455 +0100 -@@ -530,7 +530,7 @@ - # can use Quicktime. - IF(NOT ANDROID) - IF(NOT APPLE) -- FIND_PACKAGE(GIFLIB) -+ #FIND_PACKAGE(GIFLIB) - FIND_PACKAGE(JPEG) - FIND_PACKAGE(PNG) - FIND_PACKAGE(TIFF) diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index 3845352..da12cbd 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -3,8 +3,8 @@ PKG := openscenegraph $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.0-rc4 -$(PKG)_CHECKSUM := 43f3c8fb3f2964cf632174d0c6af1ac97b733992 +$(PKG)_VERSION := 3.2.0 +$(PKG)_CHECKSUM := c20891862b5876983d180fc4a3d3cfb2b4a3375c $(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION) $(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip $(PKG)_URL := http://www.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE) |