Mercurial > mxe-octave
view src/gdk-pixbuf-1-fixes.patch @ 5541:d862fd40cc42
Use ccache for packages built with cmake.
* Makefile.in: New variable CMAKE_CCACHE_FLAGS.
* src/armadillo.mk, src/cgal.mk, src/cmake.mk, src/cminpack,
src/double-conversion.mk, src/eigen.mk, src/gdcm.mk, src/gl2ps.mk,
src/hdf5.mk, src/lapack.mk, src/libical.mk, src/libproxy, src/llvm.mk,
src/of-dicom.mk, src/openal.mk, src/opencv.mk, src/openexr.mk,
src/openscenegraph.mk, src/physfs.mk, src/qhull.mk, src/qjson.mk,
src/rapidjson.mk, src/suitesparse.mk, src/sundials-ida.mk, src/taglib.mk,
src/vigra.mk, src/vmime.mk, src/vtk.mk, src/wt.mk: Add new variable to cmake
flags. Harmonize indentation in files.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 20 Sep 2020 11:57:01 +0200 |
parents | e19ca43b6edd |
children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. Contains ad hoc patches for cross building. From 38f4e914e458de6963a3fddbb57dbf8cd0fb83b4 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 24 Sep 2010 23:31:24 +0200 Subject: [PATCH 1/3] s,DllMain,static _disabled_DllMain, diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 411ceb6..64db155 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -207,12 +207,16 @@ get_file_formats (void) #ifdef G_OS_WIN32 -/* DllMain function needed to tuck away the gdk-pixbuf DLL handle */ +/* static _disabled_DllMain function needed to tuck away the gdk-pixbuf DLL handle */ static HMODULE gdk_pixbuf_dll; BOOL WINAPI +#ifdef DLL_EXPORT DllMain (HINSTANCE hinstDLL, +#else +gdkpixbuf_DllMain (HINSTANCE hinstDLL, +#endif DWORD fdwReason, LPVOID lpvReserved) { -- 1.7.10.4 From 0903d316c228bf2a6ba9fe11188851a357cde43e Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 12 Oct 2012 12:24:51 +0200 Subject: [PATCH 2/3] add libtiff to required.private in .pc 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@ -- 1.7.10.4 From 1e76ff73dcd6f191584bb05c8ccc9b0a16394a0d Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 12 Oct 2012 12:25:27 +0200 Subject: [PATCH 3/3] allow static diff --git a/configure.ac b/configure.ac index a5224f8..a1fc2d0 100644 --- a/configure.ac +++ b/configure.ac @@ -131,16 +131,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]) -- 1.7.10.4