mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 09:29:16 +08:00
546813ae7b
* update glib to meson * update ci baseline * update glib to 2.66.3 remove cmakelists * fix some minor meson issue but meson is still a mess * add_bin_to_path to vcpkg_install_meson * regen docs * try fixing/touching all glib dependent ports * fix libsigcpp-3 version * fix glibmm * fix gmime * fix libcroco * update libnice * fix atk build * update harfbuzz * fix few builds * update libxmlpp * fix gdk-pixbuf * fix gts * gts add patch * remove old libsigcpp * add missing comma * fix supports logic * fix name mismatch * restore original ci baseline. * fix a lot of small details. increment controls. * fix harfbuzz & glib * bump port version * update port_versions * fix version field * update versions * fix glib in harfbuzz * update port versions * silly uppercase type * update port-versions * fix cairo build * update version * fix atk * update atk port-verisons * fix gts public includes * update versions * fix cairomm * fix pango * fix ignition * update versions. * fix gtk * fix librsvg * update versions * fix atk linux * fix libgpod * update versions * fix lcm * fix librsvg * update pango and pangomm * update pango to meson * more updates * update pixman * fix cairo * fix cairo * some fixes * reorder meson a bit * add none.txt for meson * fix x86_x64 to x86 "cross" builds * add tiff pkgconfig * update gdk-pixbuf * fix tiff and jpeg * add graphene * fix gdk-pixbuf * add sassc * update gtk * fix cairo complete build * add harfbuzz inlcude in pango since meson does not add it into pkgconfig. * fix gtk build. Remaining issue fix install script. * fix gtk build * fix io2d * add supports field * fix cartographer? * fix librsvg build * fix gtk build * fix cartographer * fix sassc on linux * fix tiff and libjpeg pc files * fix pixman x86 * _isnanf is undefined on arm- * merge fix for make on arm64 * fix gdk-pixbuf on arm64-windows * pixman remove test/demos. should fix it on osx. * [vcpkg_install_meson] add bin to path to run code generators * [vcpkg_configure_meson] deactivate native compiler in cross builds make x86 on x86_x64 a native instead of a cross build (as long as we are not building for UWP) * pixman reenable UWP support. * pixman reenable arm support * add pixman:arm-uwp=fail to baseline * update gtkmm * remove double whitespaces * gtk baseline gtk dependency on cairo x11 remove double spaces in flags * fix linux build * native none again * cairo fix cairo-script.pc * comment out patch since the cairo changes should have fixed it. * disable wayland backend in GTK since CI is missing system packages * silly typo in cairo pc file correction install lzo pc on windows * remove double spaces in _FLAGS remove unnecessary comments * actually disabling wayland backend * fix glib codegen issue having the wrong path * try to fix paths in glib codegen * integrate changes form #12860 * add the uwp patch back in * deactivate extra harfbuzz shapers. * vcpkg x-add-version --all --overwrite-version * remove patches in tesseract. * fix version * rerun add-version * add libgpod:x64-linux=fail to baseline due to missing system tools/libraries * change regex to take double - into account. * run x-add-version * run format-manifest * add missing removal of multiple spaces back into the regex * remove ws diff change * fix gtkmm the upstream way * remove ws to reduce diff * make glib build on osx * format manifest * run x-add-version * add pthread dependency * update baseline due to glib compiling on osx now. * add meson as a dep to glib * - add glib host dependencies - switch to manifest of touched ports * switch to manifest. * [libxml2] add gnuinstalldirs * [libxml2] add missing include of GNUInstallDirs * add version info * add include dir to pc files .... * update version * add UWP as crosscompiling target * Apply suggestions from code review * trying to fix cairo pthread detection on osx. * fix libmicrohttpd by adding the required system frameworks on osx * fix poppler by not removing the CXX standard * fix missing coretext header from harfbuzz in pano * fix formating issues * fix librsvg on osx * revert version changes * bump version * version stuff. * fix graphene version stuff * fix version stuff * removing ports from ci baseline to cause me pain * move cairomm:x64-linux=fail to gtkmm:x64-linx=fail remove pangomm:x64-osx=fail * fix typo * revert ws changes to vcpkg_install_meson * update port version after merge * version stuff * fix fluidsynth by adding vcpkg_check_features * move cairo to ci baseline on osx * version stuff * fluidsynth corrections * more version stuff * apply code review changes * clean version stuff. * update version stuff * code review cleanup * version stuff * formating * update version stuff again * remove gdi again * version stuff * version stuff * version baseline * Apply strega-nil suggestions from code review * run x-add-version * reset versions to upstream/master * v8 CONTROL -> json * reset fluidsynth to upstream/master * first batch of version-string -> version conversion * second and last batch of version-string -> version conversions * update version stuff * disable gdi feature in harfbuzz (missing user32 linkage in qt5-base) * version stuff * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * more CR stuff * update versions * back out provision changes so that pr can be merged. Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
110 lines
4.3 KiB
Diff
110 lines
4.3 KiB
Diff
diff --git a/build/Makefile.win32.common b/build/Makefile.win32.common
|
|
index 7d7e9735f..f39ea1991 100644
|
|
--- a/build/Makefile.win32.common
|
|
+++ b/build/Makefile.win32.common
|
|
@@ -44,13 +44,13 @@ else
|
|
ifeq ($(ZLIB_PATH),)
|
|
ZLIB_PATH := $(top_builddir)/../zlib
|
|
endif
|
|
-ZLIB_CFLAGS += -I$(ZLIB_PATH)/
|
|
-CAIRO_LIBS += $(ZLIB_PATH)/zdll.lib
|
|
+# ZLIB_CFLAGS += -I$(ZLIB_PATH)/
|
|
+# CAIRO_LIBS += $(ZLIB_PATH)/zdll.lib
|
|
endif
|
|
|
|
DEFAULT_CFLAGS = -nologo $(CFG_CFLAGS)
|
|
DEFAULT_CFLAGS += -I. -I$(top_srcdir) -I$(top_srcdir)/src
|
|
-DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
|
|
+DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS)
|
|
|
|
CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 5e33c96ea..c9e9cfaa9 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -43,7 +43,7 @@ AC_CACHE_SAVE
|
|
|
|
dnl ===========================================================================
|
|
|
|
-AC_CHECK_LIB(z, compress,
|
|
+AC_SEARCH_LIBS(compress, z zlib zlibd,
|
|
[AC_CHECK_HEADER(zlib.h, [
|
|
have_libz=yes
|
|
AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if you have zlib available])
|
|
@@ -481,7 +481,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(script, script, yes, [
|
|
any2ppm_cs=yes
|
|
# The script backend requires zlib.
|
|
use_script=$have_libz
|
|
- script_NONPKGCONFIG_LIBS=-lz
|
|
+ script_NONPKGCONFIG_LIBS=$ac_cv_search_compress
|
|
])
|
|
|
|
dnl ===========================================================================
|
|
@@ -582,7 +582,7 @@ dnl ===========================================================================
|
|
CAIRO_ENABLE_SURFACE_BACKEND(ps, PostScript, yes, [
|
|
# The ps backend requires zlib.
|
|
use_ps=$have_libz
|
|
- ps_NONPKGCONFIG_LIBS=-lz
|
|
+ ps_NONPKGCONFIG_LIBS=$ac_cv_search_compress
|
|
])
|
|
|
|
dnl ===========================================================================
|
|
@@ -619,7 +619,7 @@ dnl ===========================================================================
|
|
CAIRO_ENABLE_SURFACE_BACKEND(pdf, PDF, yes, [
|
|
# The pdf backend requires zlib.
|
|
use_pdf=$have_libz
|
|
- pdf_NONPKGCONFIG_LIBS=-lz
|
|
+ pdf_NONPKGCONFIG_LIBS=$ac_cv_search_compress
|
|
])
|
|
|
|
dnl ===========================================================================
|
|
@@ -706,7 +706,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(observer, observer, always)
|
|
CAIRO_ENABLE_SURFACE_BACKEND(tee, tee, no)
|
|
CAIRO_ENABLE_SURFACE_BACKEND(xml, xml, no, [
|
|
use_xml=$have_libz
|
|
- xml_NONPKGCONFIG_LIBS=-lz
|
|
+ xml_NONPKGCONFIG_LIBS=$ac_cv_search_compress
|
|
])
|
|
|
|
dnl ===========================================================================
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index acf0a8281..fe339a3cf 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -68,7 +68,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
|
|
@(echo EXPORTS; \
|
|
(cd $(srcdir); cat $(enabled_cairo_headers) || echo 'cairo_ERROR ()' ) | \
|
|
$(EGREP) -v '^# *include' | \
|
|
- ( cat cairo-features.h - | $(CPP) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \
|
|
+ ( cat cairo-features.h - | $(CPP) $(CPP_FLAGS) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \
|
|
$(EGREP) '^cairo_.* \(' | \
|
|
sed -e 's/[ ].*//' | \
|
|
sort; \
|
|
diff --git a/util/cairo-script/Makefile.am b/util/cairo-script/Makefile.am
|
|
index d5c2998ac..e6e23b2ed 100644
|
|
--- a/util/cairo-script/Makefile.am
|
|
+++ b/util/cairo-script/Makefile.am
|
|
@@ -15,7 +15,7 @@ libcairo_script_interpreter_la_SOURCES = \
|
|
$(NULL)
|
|
libcairo_script_interpreter_la_CFLAGS = $(CAIRO_CFLAGS)
|
|
libcairo_script_interpreter_la_LDFLAGS = -version-info $(CAIRO_LIBTOOL_VERSION_INFO) -no-undefined $(export_symbols)
|
|
-libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(lzo_LIBS) -lz
|
|
+libcairo_script_interpreter_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LIBS) $(lzo_LIBS)
|
|
|
|
csi_replay_SOURCES = csi-replay.c
|
|
csi_replay_CFLAGS = $(CAIRO_CFLAGS)
|
|
diff --git a/util/cairo-trace/Makefile.am b/util/cairo-trace/Makefile.am
|
|
index a0091f882..64d86184f 100644
|
|
--- a/util/cairo-trace/Makefile.am
|
|
+++ b/util/cairo-trace/Makefile.am
|
|
@@ -13,7 +13,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$(cairooutdir)\"" \
|
|
libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
|
|
libcairo_trace_la_LDFLAGS = -module -no-undefined -avoid-version
|
|
|
|
-libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz
|
|
+libcairo_trace_la_LIBADD = $(real_pthread_LIBS)
|
|
if CAIRO_HAS_DL
|
|
libcairo_trace_la_LIBADD += -ldl
|
|
endif
|