mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 07:29:11 +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>
68 lines
3.0 KiB
Diff
68 lines
3.0 KiB
Diff
diff --git a/build-aux/post-install.bat b/build-aux/post-install.bat
|
|
index 6994d49e1..b4789dd62 100644
|
|
--- a/build-aux/post-install.bat
|
|
+++ b/build-aux/post-install.bat
|
|
@@ -7,8 +7,8 @@ set binary_version=%3
|
|
set libdir_windows=%libdir:/=\%
|
|
|
|
if not "%DESTDIR%" == "" goto warn_msg
|
|
-if not exist %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\ mkdir %libdir_windows%\gdk-pixbuf-2.0\%binary_version%
|
|
-%bindir%\gdk-pixbuf-query-loaders > %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache
|
|
+if not exist %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\ mkdir %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%
|
|
+%bindir%\gdk-pixbuf-query-loaders > %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\loaders.cache
|
|
|
|
goto end
|
|
|
|
@@ -18,7 +18,7 @@ echo *** Warning: loaders.cache not built
|
|
echo ***
|
|
echo *** You should generate this file manually on the host system
|
|
echo *** using:
|
|
-echo *** gdk-pixbuf-query-loaders ^> %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache
|
|
+echo *** gdk-pixbuf-query-loaders ^> %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\loaders.cache
|
|
echo ***
|
|
|
|
:end
|
|
diff --git a/build-aux/post-install.sh b/build-aux/post-install.sh
|
|
index 661bceeef..0b1a46527 100644
|
|
--- a/build-aux/post-install.sh
|
|
+++ b/build-aux/post-install.sh
|
|
@@ -5,14 +5,14 @@ libdir="$2"
|
|
binary_version="$3"
|
|
|
|
if [ -z "$DESTDIR" ]; then
|
|
- mkdir -p "$libdir/gdk-pixbuf-2.0/$binary_version"
|
|
- $bindir/gdk-pixbuf-query-loaders > "$libdir/gdk-pixbuf-2.0/$binary_version/loaders.cache"
|
|
+ mkdir -p "$libdir/../gdk-pixbuf-2.0/$binary_version"
|
|
+ $bindir/gdk-pixbuf-query-loaders > "$libdir/../gdk-pixbuf-2.0/$binary_version/loaders.cache"
|
|
else
|
|
echo "***"
|
|
echo "*** Warning: loaders.cache not built"
|
|
echo "***"
|
|
echo "*** You should generate this file manually on the host system"
|
|
echo "*** using:"
|
|
- echo "*** gdk-pixbuf-query-loaders > $libdir/gdk-pixbuf-2.0/$binary_version/loaders.cache"
|
|
+ echo "*** gdk-pixbuf-query-loaders > $libdir/../gdk-pixbuf-2.0/$binary_version/loaders.cache"
|
|
echo "***"
|
|
fi
|
|
diff --git a/meson.build b/meson.build
|
|
index c38607029..4b5df91ae 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -308,12 +310,12 @@ endif
|
|
# Don't check and build the jpeg loader if native_windows_loaders is true
|
|
if get_option('jpeg') and not native_windows_loaders
|
|
if cc.has_header('jpeglib.h')
|
|
- jpeg_dep = cc.find_library('jpeg', required: false)
|
|
- if cc.get_id() == 'msvc' and not jpeg_dep.found()
|
|
+ jpeg_dep = dependency('libjpeg', required: false)
|
|
+ #if cc.get_id() == 'msvc' and not jpeg_dep.found()
|
|
# The IJG JPEG library builds the .lib file as libjpeg.lib in its MSVC build system,
|
|
# so look for it as well when jpeg.lib cannot be found
|
|
- jpeg_dep = cc.find_library('libjpeg', required: false)
|
|
- endif
|
|
+ # jpeg_dep = cc.find_library('libjpeg', required: false)
|
|
+ #endif
|
|
if jpeg_dep.found() and cc.has_function('jpeg_destroy_decompress', dependencies: jpeg_dep)
|
|
enabled_loaders += 'jpeg'
|
|
loaders_deps += jpeg_dep
|