mirror of https://git.wownero.com/dsc/mxe.git
update package gdk-pixbuf
This commit is contained in:
Hans Petter Jansson
Mark Brand
parent
4669cde481
commit
6d39c73bad
|
|
@ -1140,7 +1140,7 @@ USE_OSGPLUGIN(<plugin2>)
|
|||
</tr>
|
||||
<tr>
|
||||
<td id="gdk-pixbuf-package">gdk-pixbuf</td>
|
||||
<td id="gdk-pixbuf-version">2.22.1</td>
|
||||
<td id="gdk-pixbuf-version">2.26.1</td>
|
||||
<td id="gdk-pixbuf-website"><a href="http://www.gdk-pixbuf.org/">GDK-pixbuf</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -35,99 +35,3 @@ index 6a5dbce..e5e1c2d 100644
|
|||
1.7.8
|
||||
|
||||
|
||||
From 076713fb334bd200d41b056001f7e44fcae695fb Mon Sep 17 00:00:00 2001
|
||||
From: Maarten Bosmans <mkbosmans@gmail.com>
|
||||
Date: Mon, 24 Jan 2011 10:39:22 +0000
|
||||
Subject: [PATCH 2/3] Use png_jmpbuf macro
|
||||
|
||||
This makes the png loader compatible with libpng 1.5
|
||||
---
|
||||
gdk-pixbuf/io-png.c | 12 ++++++------
|
||||
1 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
|
||||
index 79c81fd..76f3304 100644
|
||||
--- a/gdk-pixbuf/io-png.c
|
||||
+++ b/gdk-pixbuf/io-png.c
|
||||
@@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr,
|
||||
error_msg);
|
||||
}
|
||||
|
||||
- longjmp (png_save_ptr->jmpbuf, 1);
|
||||
+ longjmp (png_jmpbuf(png_save_ptr), 1);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- if (setjmp (png_ptr->jmpbuf)) {
|
||||
+ if (setjmp (png_jmpbuf(png_ptr))) {
|
||||
g_free (rows);
|
||||
|
||||
if (pixbuf)
|
||||
@@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- if (setjmp (lc->png_read_ptr->jmpbuf)) {
|
||||
+ if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
|
||||
if (lc->png_info_ptr)
|
||||
png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
|
||||
g_free(lc);
|
||||
@@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context,
|
||||
lc->error = error;
|
||||
|
||||
/* Invokes our callbacks as needed */
|
||||
- if (setjmp (lc->png_read_ptr->jmpbuf)) {
|
||||
+ if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
|
||||
lc->error = NULL;
|
||||
return FALSE;
|
||||
} else {
|
||||
@@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr,
|
||||
error_msg);
|
||||
}
|
||||
|
||||
- longjmp (png_read_ptr->jmpbuf, 1);
|
||||
+ longjmp (png_jmpbuf(png_read_ptr), 1);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf *pixbuf,
|
||||
success = FALSE;
|
||||
goto cleanup;
|
||||
}
|
||||
- if (setjmp (png_ptr->jmpbuf)) {
|
||||
+ if (setjmp (png_jmpbuf(png_ptr))) {
|
||||
success = FALSE;
|
||||
goto cleanup;
|
||||
}
|
||||
--
|
||||
1.7.8
|
||||
|
||||
|
||||
From 98b7ca46c998a497a1bc6cd563e0201d0cd65de0 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri, 23 Dec 2011 18:54:01 +0100
|
||||
Subject: [PATCH 3/3] add libtiff-4 to Requires.private
|
||||
|
||||
---
|
||||
gdk-pixbuf-2.0.pc.in | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in
|
||||
index 7e61775..bc33627 100644
|
||||
--- a/gdk-pixbuf-2.0.pc.in
|
||||
+++ b/gdk-pixbuf-2.0.pc.in
|
||||
@@ -12,6 +12,7 @@ Name: GdkPixbuf
|
||||
Description: Image loading and scaling
|
||||
Version: @VERSION@
|
||||
Requires: gobject-2.0 gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
|
||||
+Requires.private: libtiff-4
|
||||
Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
|
||||
Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
|
||||
|
||||
--
|
||||
1.7.8
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in
|
||||
index 7addefc..a07a46f 100644
|
||||
--- a/gdk-pixbuf-2.0.pc.in
|
||||
+++ b/gdk-pixbuf-2.0.pc.in
|
||||
@@ -12,7 +12,7 @@ Name: GdkPixbuf
|
||||
Description: Image loading and scaling
|
||||
Version: @VERSION@
|
||||
Requires: gobject-2.0
|
||||
-Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
|
||||
+Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@ libtiff-4
|
||||
Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@
|
||||
Libs.private: @GDK_PIXBUF_EXTRA_LIBS@
|
||||
Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
diff --git a/configure.ac b/configure.ac
|
||||
index d929c84..20f8121 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -126,16 +126,16 @@ case $host in
|
||||
;;
|
||||
esac
|
||||
|
||||
-if test "$os_win32" = "yes"; then
|
||||
- if test x$enable_static = xyes -o x$enable_static = x; then
|
||||
- AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
|
||||
- enable_static=no
|
||||
- fi
|
||||
- if test x$enable_shared = xno; then
|
||||
- AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
|
||||
- fi
|
||||
- enable_shared=yes
|
||||
-fi
|
||||
+dnl if test "$os_win32" = "yes"; then
|
||||
+dnl if test x$enable_static = xyes -o x$enable_static = x; then
|
||||
+dnl AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
|
||||
+dnl enable_static=no
|
||||
+dnl fi
|
||||
+dnl if test x$enable_shared = xno; then
|
||||
+dnl AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
|
||||
+dnl fi
|
||||
+dnl enable_shared=yes
|
||||
+dnl fi
|
||||
|
||||
dnl Initialize libtool
|
||||
LT_PREREQ([2.2.6])
|
||||
|
|
@ -3,9 +3,9 @@
|
|||
|
||||
PKG := gdk-pixbuf
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_CHECKSUM := b452208963ddd84f7280865695b50255fcafaa2e
|
||||
$(PKG)_CHECKSUM := 43e4fe5bd8d19bc7d7b853f71c85c193392cb2f7
|
||||
$(PKG)_SUBDIR := gdk-pixbuf-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := gdk-pixbuf-$($(PKG)_VERSION).tar.bz2
|
||||
$(PKG)_FILE := gdk-pixbuf-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc glib libpng jpeg tiff jasper libiconv
|
||||
|
||||
|
|
@ -18,13 +18,15 @@ define $(PKG)_UPDATE
|
|||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
cd '$(1)' && ./configure \
|
||||
cd '$(1)' && autoreconf && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--build="`config.guess`" \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-modules \
|
||||
--with-included-loaders \
|
||||
--without-gdiplus \
|
||||
LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`"
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' install
|
||||
endef
|
||||
|
|
|
|||
Loading…
Reference in New Issue