Mercurial > mxe-octave

changeset 4803:e2349691d6ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix fontconfig dependencies Only include fontconfig as a dependency if USE_SYSTEM_FONTCONFIG is no.
author John W. Eaton <jwe@octave.org>
date Fri, 17 Aug 2018 14:09:31 -0400
parents 9d58f6f5eaf3
children b44c4c322953
files src/cairo.mk src/libass.mk src/libgd.mk src/pango.mk src/qt.mk src/qtbase.mk src/xft.mk src/xine-lib.mk
diffstat 8 files changed, 28 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/cairo.mk	Fri Aug 17 13:46:22 2018 -0400
+++ b/src/cairo.mk	Fri Aug 17 14:09:31 2018 -0400
@@ -8,7 +8,10 @@
 $(PKG)_SUBDIR   := cairo-$($(PKG)_VERSION)
 $(PKG)_FILE     := cairo-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://cairographics.org/releases/$($(PKG)_FILE)
-$(PKG)_DEPS     := zlib libpng fontconfig freetype pixman glib
+ifeq ($(USE_SYSTEM_FONTCONFIG),no)
+  $(PKG)_FONTCONFIG := fontconfig
+endif
+$(PKG)_DEPS     := zlib libpng $($(PKG)_FONTCONFIG) freetype pixman glib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://cairographics.org/releases/?C=M;O=D' | \
--- a/src/libass.mk	Fri Aug 17 13:46:22 2018 -0400
+++ b/src/libass.mk	Fri Aug 17 14:09:31 2018 -0400
@@ -8,7 +8,10 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.xz
 $(PKG)_URL      := http://libass.googlecode.com/files/$($(PKG)_FILE)
-$(PKG)_DEPS     := freetype fontconfig fribidi
+ifeq ($(USE_SYSTEM_FONTCONFIG),no)
+  $(PKG)_FONTCONFIG := fontconfig
+endif
+$(PKG)_DEPS     := freetype $($(PKG)_FONTCONFIG) fribidi
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://github.com/libass/libass/tags' | \
--- a/src/libgd.mk	Fri Aug 17 13:46:22 2018 -0400
+++ b/src/libgd.mk	Fri Aug 17 14:09:31 2018 -0400
@@ -8,7 +8,10 @@
 $(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
+ifeq ($(USE_SYSTEM_FONTCONFIG),no)
+  $(PKG)_FONTCONFIG := fontconfig
+endif
+$(PKG)_DEPS     := $($(PKG)_FONTCONFIG) freetype libpng jpeg tiff zlib
 
 ifneq ($(MXE_SYSTEM),msvc)
     $(PKG)_DEPS += pthreads
--- a/src/pango.mk	Fri Aug 17 13:46:22 2018 -0400
+++ b/src/pango.mk	Fri Aug 17 14:09:31 2018 -0400
@@ -8,7 +8,10 @@
 $(PKG)_SUBDIR   := pango-$($(PKG)_VERSION)
 $(PKG)_FILE     := pango-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/pango/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
-$(PKG)_DEPS     := fontconfig freetype cairo glib
+ifeq ($(USE_SYSTEM_FONTCONFIG),no)
+  $(PKG)_FONTCONFIG := fontconfig
+endif
+$(PKG)_DEPS     := $($(PKG)_FONTCONFIG) freetype cairo glib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- https://github.com/GNOME/pango/tags | \
--- a/src/qt.mk	Fri Aug 17 13:46:22 2018 -0400
+++ b/src/qt.mk	Fri Aug 17 14:09:31 2018 -0400
@@ -9,9 +9,6 @@
 $(PKG)_FILE     := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://download.qt.io/official_releases/qt/4.8/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := postgresql freetds zlib libpng jpeg libmng tiff sqlite dbus
-ifeq ($(USE_SYSTEM_FONTCONFIG),no)
-  $(PKG)_FONTCONFIG := fontconfig
-endif
 ifeq ($(MXE_WINDOWS_BUILD),no)
   ifeq ($(USE_SYSTEM_X11_LIBS),no)
     $(PKG)_DEPS += xdamage xdmcp xext xfixes xi xrender xt xxf86vm x11 xcb xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm
--- a/src/qtbase.mk	Fri Aug 17 13:46:22 2018 -0400
+++ b/src/qtbase.mk	Fri Aug 17 14:09:31 2018 -0400
@@ -8,7 +8,10 @@
 $(PKG)_SUBDIR   := $(PKG)-everywhere-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
-$(PKG)_DEPS     := dbus double-conversion freetds freetype fontconfig jpeg libjbig libpng libproxy pcre2 postgresql sqlite zlib
+ifeq ($(USE_SYSTEM_FONTCONFIG),no)
+  $(PKG)_FONTCONFIG := fontconfig
+endif
+$(PKG)_DEPS     := dbus double-conversion freetds freetype $($(PKG)_FONTCONFIG) jpeg libjbig libpng libproxy pcre2 postgresql sqlite zlib
 
 $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION :=
 $(PKG)_CONFIGURE_DATABASE_OPTION :=
@@ -18,9 +21,6 @@
 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
 $(PKG)_CONFIGURE_OPTS :=
 
-ifeq ($(USE_SYSTEM_FONTCONFIG),no)
-  $(PKG)_FONTCONFIG := fontconfig
-endif
 ifeq ($(USE_SYSTEM_OPENGL),no)
   $(PKG)_DEPS += mesa
 endif
--- a/src/xft.mk	Fri Aug 17 13:46:22 2018 -0400
+++ b/src/xft.mk	Fri Aug 17 14:09:31 2018 -0400
@@ -8,7 +8,10 @@
 $(PKG)_SUBDIR   := libXft-$($(PKG)_VERSION)
 $(PKG)_FILE     := libXft-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://www.x.org/archive/individual/lib/$($(PKG)_FILE)
-$(PKG)_DEPS     := kbproto xrender fontconfig freetype
+ifeq ($(USE_SYSTEM_FONTCONFIG),no)
+  $(PKG)_FONTCONFIG := fontconfig
+endif
+$(PKG)_DEPS     := kbproto xrender $($(PKG)_FONTCONFIG) freetype
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   define $(PKG)_BUILD
--- a/src/xine-lib.mk	Fri Aug 17 13:46:22 2018 -0400
+++ b/src/xine-lib.mk	Fri Aug 17 14:09:31 2018 -0400
@@ -8,7 +8,10 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/xine/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := faad2 ffmpeg flac fontconfig freetype graphicsmagick libiconv libmng pthreads sdl speex theora vorbis wavpack zlib libmpcdec libcdio vcdimager mman-win32 libmad a52dec libmodplug
+ifeq ($(USE_SYSTEM_FONTCONFIG),no)
+  $(PKG)_FONTCONFIG := fontconfig
+endif
+$(PKG)_DEPS     := faad2 ffmpeg flac $($(PKG)_FONTCONFIG) freetype graphicsmagick libiconv libmng pthreads sdl speex theora vorbis wavpack zlib libmpcdec libcdio vcdimager mman-win32 libmad a52dec libmodplug
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://hg.debian.org/hg/xine-lib/xine-lib/tags' | \