Mercurial > mxe-octave
changeset 3171:4a05b335972b
[MSVC] enable harfbuzz compilation (and bump version to 0.9.19)
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Tue, 23 Jul 2013 22:29:33 -0400 |
| parents | 5ee3638d5411 |
| children | 8d294e37ce65 |
| files | dist-files.mk index.html src/harfbuzz.mk src/msvc-harfbuzz-1.patch |
| diffstat | 4 files changed, 47 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Tue Jul 23 22:29:33 2013 -0400 +++ b/dist-files.mk Tue Jul 23 22:29:33 2013 -0400 @@ -294,6 +294,7 @@ msvc-glib-1.patch \ msvc-gnutls-1.patch \ msvc-graphicsmagick-1.patch \ + msvc-harfbuzz-1.patch \ msvc-hdf5-1.patch \ msvc-itsol-1.patch \ msvc-libffi-1.patch \
--- a/index.html Tue Jul 23 22:29:33 2013 -0400 +++ b/index.html Tue Jul 23 22:29:33 2013 -0400 @@ -1360,7 +1360,7 @@ </tr> <tr> <td id="harfbuzz-package">harfbuzz</td> - <td id="harfbuzz-version">0.9.6</td> + <td id="harfbuzz-version">0.9.19</td> <td id="harfbuzz-website"><a href="http://harfbuzz.sourceforge.net/">HarfBuzz</a></td> </tr> <tr>
--- a/src/harfbuzz.mk Tue Jul 23 22:29:33 2013 -0400 +++ b/src/harfbuzz.mk Tue Jul 23 22:29:33 2013 -0400 @@ -3,7 +3,7 @@ PKG := harfbuzz $(PKG)_IGNORE := -$(PKG)_CHECKSUM := c99ed7881bbeadbb9fbeb544b28d2174ddac5910 +$(PKG)_CHECKSUM := 5603e084fbf8be1b93722c8e2694643361c489e4 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE) @@ -20,6 +20,10 @@ cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ - $(ENABLE_SHARED_OR_STATIC) - $(MAKE) -C '$(1)' -j '$(JOBS)' install + $(ENABLE_SHARED_OR_STATIC) \ + PKG_CONFIG='$(MXE_PKG_CONFIG)' \ + PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \ + && $(CONFIGURE_POST_HOOK) + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/msvc-harfbuzz-1.patch Tue Jul 23 22:29:33 2013 -0400 @@ -0,0 +1,38 @@ +diff -ur harfbuzz-0.9.19-orig/src/Makefile.in harfbuzz-0.9.19/src/Makefile.in +--- harfbuzz-0.9.19-orig/src/Makefile.in 2013-07-16 16:04:27 -0400 ++++ harfbuzz-0.9.19/src/Makefile.in 2013-07-22 21:31:44 -0400 +@@ -1749,9 +1749,9 @@ + %.pc: %.pc.in $(top_builddir)/config.status + $(AM_V_GEN) \ + $(SED) -e 's@%prefix%@$(prefix)@g' \ +- -e 's@%exec_prefix%@$(exec_prefix)@g' \ +- -e 's@%libdir%@$(libdir)@g' \ +- -e 's@%includedir%@$(includedir)@g' \ ++ -e 's@%exec_prefix%@$${prefix}@g' \ ++ -e 's@%libdir%@$${exec_prefix}/lib@g' \ ++ -e 's@%includedir%@$${prefix}/include@g' \ + -e 's@%VERSION%@$(VERSION)@g' \ + "$<" \ + > "$@.tmp" && mv "$@.tmp" "$@" || ( $(RM) "$@.tmp"; false ) +@@ -1761,7 +1761,6 @@ + $(EGREP) '^hb_.* \(' | \ + sed -e 's/ (.*//' | \ + LANG=C sort; \ +- echo LIBRARY libharfbuzz-$(HB_VERSION_MAJOR).dll; \ + ) >"$@.tmp" + @ ! grep -q hb_ERROR "$@.tmp" && mv "$@.tmp" "$@" || ($(RM) "$@"; false) + +diff -ur harfbuzz-0.9.19-orig/util/helper-cairo.cc harfbuzz-0.9.19/util/helper-cairo.cc +--- harfbuzz-0.9.19-orig/util/helper-cairo.cc 2013-04-04 21:15:59 -0400 ++++ harfbuzz-0.9.19/util/helper-cairo.cc 2013-07-22 21:30:28 -0400 +@@ -60,6 +60,10 @@ + # endif + #endif + ++#if defined (_MSC_VER) && ! defined (strcasecmp) ++# define strcasecmp stricmp ++#endif ++ + cairo_scaled_font_t * + helper_cairo_create_scaled_font (const font_options_t *font_opts, + double font_size)