[Libreoffice-commits] .: 3 commits - gdk-pixbuf/gdk-pixbuf-2.23.0.patch gdk-pixbuf/makefile.mk gdk-pixbuf/prj
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Jun 2 03:42:32 PDT 2011
gdk-pixbuf/gdk-pixbuf-2.23.0.patch | 64 +++++++++++++++++++++++++++++++++++++
gdk-pixbuf/makefile.mk | 12 +++---
gdk-pixbuf/prj/d.lst | 1
3 files changed, 70 insertions(+), 7 deletions(-)
New commits:
commit e6c462f2700e8139b4c4e53f6415190403d5c697
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 2 13:41:26 2011 +0300
We don't need gdk-pixbuf-query-loaders
Especially not now with --disable-modules.
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
index 023b26d..1e89deb 100644
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@ -70,8 +70,6 @@ BUILD_DIR=$(CONFIGURE_DIR)
EXTRPATH=LOADER
OUT2LIB+=gdk-pixbuf/.libs/libgdk_pixbuf-2.0.0.dylib
-OUT2BIN+=gdk-pixbuf/.libs/gdk-pixbuf-query-loaders
-
OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h
OUT2INC+=gdk-pixbuf/gdk-pixbuf-features.h
OUT2INC+=gdk-pixbuf/gdk-pixbuf-marshal.h
diff --git a/gdk-pixbuf/prj/d.lst b/gdk-pixbuf/prj/d.lst
index ef7776a..54f62a1 100755
--- a/gdk-pixbuf/prj/d.lst
+++ b/gdk-pixbuf/prj/d.lst
@@ -16,6 +16,5 @@ mkdir: %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf
..\%__SRC%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib
symlink: %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.dylib
-..\%__SRC%\bin\gdk-pixbuf-query-loaders %_DEST%\bin%_EXT%\gdk-pixbuf-query-loaders
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
..\%__SRC%\lib\gdk_pixbuf-2.0.lib %_DEST%\lib%_EXT%\gdk_pixbuf-2.0.lib
commit c4c22b07f0377498d67a3d0ba2e4460092ba3315
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 2 13:38:25 2011 +0300
Make gdk-pixbuf build better
Pass the -I options needed in CPPFLAGS, not CFLAGS. Explicitly
disable dynamic loading of loaders. Pass an explicit list of loaders
to build in statically. Do include the jpeg loader.
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
index 9611844..023b26d 100644
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@ -55,12 +55,14 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \
BASE_DEPENDENCIES_LIBS=" " \
.$/configure \
+ CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/jpeg" \
+ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" \
+ LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \
--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
--disable-nls \
- CPPFLAGS="$(EXTRA_CDEFS)" \
- CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/libjpeg" \
- LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \
- --disable-glibtest --without-libtiff --without-libjpeg
+ --disable-modules \
+ --with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \
+ --disable-glibtest --without-libtiff --without-libjasper
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)
commit 5ee9679a76b2d27ca3ef82147243ebaa07c38195
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 2 13:32:03 2011 +0300
Make io-png.c actually compile with the libpng 1.5 we include
diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
index e86a70d..726ca89 100644
--- a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
+++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
@@ -54,3 +54,67 @@
+ return msgid;
+#endif
}
+From: Maarten Bosmans <mkbosmans at gmail.com>
+Date: Mon, 24 Jan 2011 10:39:22 +0000
+Subject: Use png_jmpbuf macro
+
+This makes the png loader compatible with libpng 1.5
+
+diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
+index 79c81fd..76f3304 100644
+--- misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c
++++ misc/build/gdk-pixbuf-2.23.0/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;
+ }
More information about the Libreoffice-commits
mailing list