Mercurial > mxe-octave

changeset 3138:4cc36e7d6ff5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add libgd (and MSVC-specific patch)
author Michael Goffioul <michael.goffioul@gmail.com>
date Sun, 14 Jul 2013 16:18:54 -0400
parents 98d994cfc408
children 1d9bbaa43239
files dist-files.mk index.html src/libgd.mk src/msvc-libgd-1.patch
diffstat 4 files changed, 54 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sat Jul 13 23:52:36 2013 -0400
+++ b/dist-files.mk	Sun Jul 14 16:18:54 2013 -0400
@@ -183,6 +183,7 @@
   libgcrypt-1-fixes.patch \
   libgcrypt-test.c \
   libgcrypt.mk \
+  libgd.mk \
   libgda.mk \
   libgdamm.mk \
   libgee.mk \
@@ -286,6 +287,7 @@
   msvc-hdf5-1.patch \
   msvc-itsol-1.patch \
   msvc-libffi-1.patch \
+  msvc-libgd-1.patch \
   msvc-libgcrypt-1.patch \
   msvc-libgpg_error-1.patch \
   msvc-libgsf-1.patch \
--- a/index.html	Sat Jul 13 23:52:36 2013 -0400
+++ b/index.html	Sun Jul 14 16:18:54 2013 -0400
@@ -1469,6 +1469,11 @@
         <td id="libgcrypt-website"><a href="ftp://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</a></td>
     </tr>
     <tr>
+        <td id="libgd-package">libgd</td>
+        <td id="libgd-version">2.1.0</td>
+        <td id="libgd-website"><a href="http://www.libgd.org/">libgd</a></td>
+    </tr>
+    <tr>
         <td id="libgda-package">libgda</td>
         <td id="libgda-version">4.2.13</td>
         <td id="libgda-website"><a href="http://www.gnome-db.org/">libgda</a></td>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgd.mk	Sun Jul 14 16:18:54 2013 -0400
@@ -0,0 +1,35 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := libgd
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 66c56fc07246b66ba649c83e996fd2085ea2f9e2
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := https://bitbucket.org/libgd/gd-libgd/downloads/$(PKG)-$($(PKG)_VERSION).tar.xz
+$(PKG)_DEPS     := fontconfig freetype libpng jpeg tiff zlib
+
+ifneq ($(MXE_SYSTEM),msvc)
+    $(PKG)_DEPS += pthreads
+endif
+
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package libgd.' >&2;
+    echo $(gd_VERSION)
+endef
+
+define $(PKG)_BUILD
+    if [ $(MXE_SYSTEM) = msvc ]; then \
+        cd '$(1)' && libtoolize && autoreconf -i; \
+    fi
+
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --prefix='$(HOST_PREFIX)' \
+	PKG_CONFIG='$(MXE_PKG_CONFIG)' \
+	PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \
+        && $(CONFIGURE_POST_HOOK)
+
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/msvc-libgd-1.patch	Sun Jul 14 16:18:54 2013 -0400
@@ -0,0 +1,12 @@
+diff -ur libgd-2.1.0-orig/src/Makefile.am libgd-2.1.0/src/Makefile.am
+--- libgd-2.1.0-orig/src/Makefile.am	2013-06-25 05:58:23 -0400
++++ libgd-2.1.0/src/Makefile.am	2013-07-14 16:16:20 -0400
+@@ -50,7 +50,7 @@
+                    gd_tga.c gd_tga.h gd_bmp.c bmp.h gd_color.h gd_nnquant.h gd_tga.h gd_intern.h gd_io_stream.h gd_xbm.c \
+ 		   gd_color_match.c
+ 
+-libgd_la_LDFLAGS = -version-info $(GDLIB_CURRENT):$(GDLIB_REVISION):$(GDLIB_AGE) -no-undefined
++libgd_la_LDFLAGS = -version-info $(GDLIB_CURRENT):$(GDLIB_REVISION):$(GDLIB_AGE) -no-undefined -export-symbols-regex "xXx"
+ 
+ libgd_la_LIBADD = $(LTLIBICONV)
+