Mercurial > mxe-octave

changeset 3166:b52db21b9dcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] enable pixman compilation
author Michael Goffioul <michael.goffioul@gmail.com>
date Mon, 22 Jul 2013 12:16:41 -0400
parents e19ca43b6edd
children 6aaa1723e277
files dist-files.mk index.html src/msvc-pixman-1.patch src/pixman.mk
diffstat 4 files changed, 17 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Mon Jul 22 11:50:11 2013 -0400
+++ b/dist-files.mk	Mon Jul 22 12:16:41 2013 -0400
@@ -309,6 +309,7 @@
   msvc-netcdf-1.patch \
   msvc-nettle-1.patch \
   msvc-ncurses-1.patch \
+  msvc-pixman-1.patch \
   msvc-pstoedit-1.patch \
   msvc-qhull-1.patch \
   msvc-qt-1.patch \
--- a/index.html	Mon Jul 22 11:50:11 2013 -0400
+++ b/index.html	Mon Jul 22 12:16:41 2013 -0400
@@ -2045,7 +2045,7 @@
     </tr>
     <tr>
         <td id="pixman-package">pixman</td>
-        <td id="pixman-version">0.27.4</td>
+        <td id="pixman-version">0.30.0</td>
         <td id="pixman-website"><a href="http://cairographics.org/">pixman</a></td>
     </tr>
     <tr>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/msvc-pixman-1.patch	Mon Jul 22 12:16:41 2013 -0400
@@ -0,0 +1,12 @@
+diff -ur pixman-0.30.0-orig/pixman/Makefile.in pixman-0.30.0/pixman/Makefile.in
+--- pixman-0.30.0-orig/pixman/Makefile.in	2013-05-08 19:25:31 -0400
++++ pixman-0.30.0/pixman/Makefile.in	2013-07-22 12:07:31 -0400
+@@ -475,7 +475,7 @@
+ lib_LTLIBRARIES = libpixman-1.la
+ libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
+ 	-no-undefined @PTHREAD_LDFLAGS@ $(am__append_2) \
+-	$(am__append_7) $(am__append_18)
++	$(am__append_7) $(am__append_18) -export-symbols-regex "^pixman_.*"
+ libpixman_1_la_LIBADD = @PTHREAD_LIBS@ -lm $(am__append_3) \
+ 	$(am__append_5) $(am__append_8) $(am__append_10) \
+ 	$(am__append_12) $(am__append_14) $(am__append_16) \
--- a/src/pixman.mk	Mon Jul 22 11:50:11 2013 -0400
+++ b/src/pixman.mk	Mon Jul 22 12:16:41 2013 -0400
@@ -3,7 +3,7 @@
 
 PKG             := pixman
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 6bd2834e18f77b815047ec27ea8965fa26a36c2b
+$(PKG)_CHECKSUM := 9c25dd0efa2023216e82033b71fcfe1bae9ebaac
 $(PKG)_SUBDIR   := pixman-$($(PKG)_VERSION)
 $(PKG)_FILE     := pixman-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://cairographics.org/snapshots/$($(PKG)_FILE)
@@ -20,6 +20,7 @@
     cd '$(1)' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
-        --prefix='$(HOST_PREFIX)'
+        --prefix='$(HOST_PREFIX)' \
+        && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef