aboutsummaryrefslogtreecommitdiff
path: root/ports/pdal
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2020-01-14 00:43:36 +0100
committerVictor Romero <romerosanchezv@gmail.com>2020-01-13 15:43:36 -0800
commitbdae0904c41a0ee2c5204d6449038d3b5d551726 (patch)
treeea710e1a326e02ed34a28afef72407d8855bb7bf /ports/pdal
parent5c0b7b55771fe4b40d3f4b7a8069b1c71022490e (diff)
downloadvcpkg-bdae0904c41a0ee2c5204d6449038d3b5d551726.tar.gz
vcpkg-bdae0904c41a0ee2c5204d6449038d3b5d551726.zip
[libpq, openssl, librtmp] libpq 12 and others with openssl 1.1.1d (#8566)
* [ports] Update openssl-unix to 1.1.1c * [ports] Update openssl-unix to 1.1.1d * [ports] openssl-unix platform 'AMD64' is called 'x86_64' on Linux * [ports] fix openssl platform * [ports] openssl-windows update openssl to 1.1.1d * [ports] Fix openssl post build * [ports] openssl add EnableUWPSupport.patch Reference: https://github.com/openssl/openssl/pull/8917 https://github.com/openssl/openssl/pull/9440 * [ports] openssl-uwp update openssl to 1.1.1d * Updated support for OpenSSL v1.1 With OpenSSL v1.1 we need an additional flag for ACE * update to 12.0 and change to vcpkg_configure_make * remove msys line * remove custom cmakelists * use --without-readline on linux * Update CONTROL Fix version * fix portfile * add all possible libpq features * create vcpkg_get_build_depends * create vcpkg_read_dependent_port_info * add vcpkg_write_port_info * fix a few bugs * libpq first succesful x86 build with core features. (files still must be moved) * always write the variable * Fix separate make and install execution error issue. * trigger CI system. * add openssl and win_bison win_flex patch * add configuration dependent patches * add bonjour as a dependency on macosx * apply patches and configure features * more patches to fix the windows build * more install fixes * remove unnecessary code * bit of code cleanup * remove unrelated files * remove unrelated function call. function was removed with last commit * removed hardcoded platform * fix patch * build only the interface libraries and nothing more * forgot to remove tool ecpg from install * seperate minimal install patch from normal install patch and introduce client feature * fix x86 Platform variable being x86 and not Win32 as required by the generated project * make linux build work * make more linux work * openssl return version number directly without calling openssl (should probably be done differently) * fix some more path and platform identification * comments to reduce install. currently libpq installs static and shared libraries and some tools on linux * patch arm * fix platform detection logic * make libpq osx buildable * Rename debug import library after build. (So that we don't affect external CMake users.) * revert debug naming and install a wrapper instead. * fix gdal regression due to name change * fix cutelyst regression due to qt5-base wrapper (why was it not using the target in the first place?) * correct wrapper install path * correct the arm patch. * trying to fix static gdal build * gdal still needs more work * update version of openssl in libpq openssl patch * nmap fix openssl * qt5 fix openssl * gdal fix openssl * librtmp migrate to openssl 1.1.1 * fail in patch since what is intended is not going to work in openssl 1.1.1 * fix static yara build * freedtds deactivate openssl feature until freetds decides to upgrade to 1.1 * fix libwebsockets cmakelists * fix the patch so that the generated targets also include crypt32 * xmlsec add threads dependency * bump control since I am unable to reproduce the regression * add pthread to openssl detection logic * fix freetds linkage missing crypt32 and fix the cmake checks. * fix the openssl wrapper to add the threads library * fix libmysql regression * add threads to openssl libraries. * upgrade libssh to 0.9 * fix nmap regression * fix mosquitto regression * fix openssl wrapper to make libarchive work * fix quickfix * changed patch a bit * improve freetds patch * fix case in librtmp * update control * bump control * fix case * make jasper a dependency of qt5-imageformats to fix flaky CI build. * add jasper libraries explicitly * jasper depends on freeglut so add it as a dependency. turbo_jpeg is also a dependency but that should already be handled in qt5-base * more glut names * bump control for macosx ci retry * fix slikenet regression * fix linebreak in qt5-base * update baseline * Update ci.baseline.txt those ports are not supported on UWP * [libevent] add dependency on libevent[threads] to openssl feature * [pdal,freerdp] Update CI baseline to fail * fix static pdal build * fix freerdp on linux * trying to revert some changes * revert changes in build make * revert x264 version bump Co-authored-by: Force Charlie <6904176+fcharlie@users.noreply.github.com> Co-authored-by: Johnny Willemsen <jwillemsen@remedy.nl> Co-authored-by: Lennart Trunk <lennart.trunk@outlook.de> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
Diffstat (limited to 'ports/pdal')
-rw-r--r--ports/pdal/CONTROL2
-rw-r--r--ports/pdal/libpq.patch33
-rw-r--r--ports/pdal/portfile.cmake1
3 files changed, 35 insertions, 1 deletions
diff --git a/ports/pdal/CONTROL b/ports/pdal/CONTROL
index d3e48fa42..d105decf5 100644
--- a/ports/pdal/CONTROL
+++ b/ports/pdal/CONTROL
@@ -1,4 +1,4 @@
Source: pdal
-Version: 1.7.1-7
+Version: 1.7.1-8
Description: PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.
Build-Depends: gdal, geos, jsoncpp, libgeotiff, laszip, boost-system, boost-filesystem
diff --git a/ports/pdal/libpq.patch b/ports/pdal/libpq.patch
new file mode 100644
index 000000000..3aac2188c
--- /dev/null
+++ b/ports/pdal/libpq.patch
@@ -0,0 +1,33 @@
+diff --git a/cmake/postgres.cmake b/cmake/postgres.cmake
+index 0dad71069..32fdae2f8 100644
+--- a/cmake/postgres.cmake
++++ b/cmake/postgres.cmake
+@@ -7,3 +7,27 @@ find_package(PostgreSQL REQUIRED)
+ mark_as_advanced(CLEAR POSTGRESQL_INCLUDE_DIR)
+ mark_as_advanced(CLEAR POSTGRESQL_LIBRARIES)
+ include_directories(${POSTGRESQL_INCLUDE_DIR})
++
++include(SelectLibraryConfigurations)
++
++find_library(PostgreSQLCommon_LIBRARY_DEBUG
++NAMES libpgcommond pgcommond pgcommon libpgcommon
++NAMES_PER_DIR
++)
++find_library(PostgreSQLCommon_LIBRARY_RELEASE
++NAMES pgcommon libpgcommon
++NAMES_PER_DIR
++)
++select_library_configurations(PostgreSQLCommon)
++
++find_library(PostgreSQLPort_LIBRARY_DEBUG
++NAMES pgportd libpgportd pgport libpgport
++NAMES_PER_DIR
++)
++find_library(PostgreSQLPort_LIBRARY_RELEASE
++NAMES pgport libpgport
++NAMES_PER_DIR
++)
++select_library_configurations(PostgreSQLPort)
++
++list(APPEND POSTGRESQL_LIBRARIES ${PostgreSQLPort_LIBRARIES} ${PostgreSQLCommon_LIBRARIES})
+\ No newline at end of file
diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake
index d9b8a0a69..ef792f3a0 100644
--- a/ports/pdal/portfile.cmake
+++ b/ports/pdal/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_extract_source_archive_ex(
0003-fix-copy-vendor.patch
PDALConfig.patch
fix-dependency.patch
+ libpq.patch
)
file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp")