aboutsummaryrefslogtreecommitdiff
path: root/ports/gts
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2021-04-26 19:28:21 +0200
committerGitHub <noreply@github.com>2021-04-26 10:28:21 -0700
commit546813ae7b9e2873dd3d38e78b27ac5582feae10 (patch)
tree6acb3bf022bf9060c70c0665d3586bb33a60f4d9 /ports/gts
parenta9b27ed5dffbf70b135eddb0c4729f3ca87f106c (diff)
downloadvcpkg-546813ae7b9e2873dd3d38e78b27ac5582feae10.tar.gz
vcpkg-546813ae7b9e2873dd3d38e78b27ac5582feae10.zip
[glib up to gtk] update and make it work with meson (#13100)
* 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>
Diffstat (limited to 'ports/gts')
-rw-r--r--ports/gts/CONTROL5
-rw-r--r--ports/gts/glib2.patch54
-rw-r--r--ports/gts/portfile.cmake5
-rw-r--r--ports/gts/vcpkg.json10
4 files changed, 68 insertions, 6 deletions
diff --git a/ports/gts/CONTROL b/ports/gts/CONTROL
deleted file mode 100644
index 7d9db7391..000000000
--- a/ports/gts/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: gts
-Version: 0.7.6-3
-Homepage: https://github.com/finetjul/gts
-Description: A Library intended to provide a set of useful functions to deal with 3D surfaces meshed with interconnected triangles
-Build-Depends: glib
diff --git a/ports/gts/glib2.patch b/ports/gts/glib2.patch
new file mode 100644
index 000000000..60de77c70
--- /dev/null
+++ b/ports/gts/glib2.patch
@@ -0,0 +1,54 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 941e9b96b..ea031828d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -85,30 +85,35 @@ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/src
+ )
+
+-find_library(glib_LIBRARY NAMES glib libglib glib-2.0 libglib-2.0
+- HINTS ${glib_BINARY_DIR})
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(GLIB2 glib-2.0 IMPORTED_TARGET)
+
+-get_filename_component(glib_LIBRARY_DIR ${glib_LIBRARY} DIRECTORY)
+-get_filename_component(glib_LIBRARY_NAME ${glib_LIBRARY} NAME)
+-string(REGEX REPLACE "\\.[^.]*$" "" glib_LIBRARY_NAME ${glib_LIBRARY_NAME})
++# find_library(glib_LIBRARY NAMES glib libglib glib-2.0 libglib-2.0
++ # HINTS ${glib_BINARY_DIR})
+
+-find_path(glib_H NAMES glib.h
+- HINTS ${glib_LIBRARY_DIR}/../include)
+-get_filename_component(glib_INCLUDE_DIR ${glib_H} DIRECTORY)
++# get_filename_component(glib_LIBRARY_DIR ${glib_LIBRARY} DIRECTORY)
++# get_filename_component(glib_LIBRARY_NAME ${glib_LIBRARY} NAME)
++# string(REGEX REPLACE "\\.[^.]*$" "" glib_LIBRARY_NAME ${glib_LIBRARY_NAME})
+
+-set(glib_CONFIG_H)
+-find_path(glib_CONFIG_H NAMES glibconfig.h
+- HINTS ${glib_LIBRARY_DIR}/${glib_LIBRARY_NAME}/include)
++# find_path(glib_H NAMES glib.h
++ # HINTS ${glib_LIBRARY_DIR}/../include)
++# get_filename_component(glib_INCLUDE_DIR ${glib_H} DIRECTORY)
+
+-get_filename_component(glibconfig_INCLUDE_DIR ${glib_CONFIG_H} DIRECTORY)
+-include_directories(${glib_INCLUDE_DIR} ${glib_CONFIG_H})
++# set(glib_CONFIG_H)
++# find_path(glib_CONFIG_H NAMES glibconfig.h
++ # HINTS ${glib_LIBRARY_DIR}/${glib_LIBRARY_NAME}/include)
++
++# get_filename_component(glibconfig_INCLUDE_DIR ${glib_CONFIG_H} DIRECTORY)
++# include_directories(${glib_INCLUDE_DIR} ${glib_CONFIG_H})
++include_directories(${GLIB2_INCLUDE_DIRS})
+
+ if (NOT WIN32 AND BUILD_SHARED_LIBS)
+ add_definitions(/DGTS_COMPILATION)
+ endif()
+
+ add_library(${kit} SHARED ${srcs})
+-target_link_libraries(${kit} ${glib_LIBRARY})
++target_include_directories(${kit} PUBLIC ${GLIB2_INCLUDE_DIRS})
++target_link_libraries(${kit} PkgConfig::GLIB2)
+
+ if(MSVC)
+ SET_TARGET_PROPERTIES(${kit} PROPERTIES LINK_FLAGS "/DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/src/gts.def\"")
diff --git a/ports/gts/portfile.cmake b/ports/gts/portfile.cmake
index da7ed6183..98ea07a8f 100644
--- a/ports/gts/portfile.cmake
+++ b/ports/gts/portfile.cmake
@@ -10,10 +10,13 @@ vcpkg_from_github(
fix-M_PI-in-windows.patch
support-unix.patch
fix-pkgconfig.patch
+ glib2.patch
)
-
+vcpkg_find_acquire_program(PKGCONFIG)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
+ OPTIONS
+ -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}
)
vcpkg_install_cmake()
diff --git a/ports/gts/vcpkg.json b/ports/gts/vcpkg.json
new file mode 100644
index 000000000..45de1e6a4
--- /dev/null
+++ b/ports/gts/vcpkg.json
@@ -0,0 +1,10 @@
+{
+ "name": "gts",
+ "version": "0.7.6",
+ "port-version": 4,
+ "description": "A Library intended to provide a set of useful functions to deal with 3D surfaces meshed with interconnected triangles",
+ "homepage": "https://github.com/finetjul/gts",
+ "dependencies": [
+ "glib"
+ ]
+}