[proj4]Upgrade version to 6.1.1 and remove useless patches. #7917

JackBoosY · 2019-08-27T01:20:36Z

Upgrade proj4 to v6.1.1
Change the source to github.
Add a new version of the dependency port sqlite3[tool].
Remove useless patches.
According to the official response, change the generated library name to proj.lib.
Feature database need to install sqlite3:x86-windows/sqlite3:x64-windows on triplet arm/arm64/uwp.
Fix the default library name of proj4 used by gdal.

Related: #3258 #3408 #6180 #6949..

…kBoosY/vcpkg into dev/jack/upgrade_proj4_6.1.1

…jack/upgrade_proj4_6.1.1

…anges.

…jack/upgrade_proj4_6.1.1

JackBoosY · 2019-08-27T01:31:36Z

/azp run

azure-pipelines · 2019-08-27T01:31:44Z

Azure Pipelines successfully started running 1 pipeline(s).

JackBoosY · 2019-09-10T02:02:29Z

Only have OSX failure here:

FAILED: bin/Debug/liblas.2.4.0.dylib 
: && /Library/Developer/CommandLineTools/usr/bin/c++ -fPIC  -Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long -g  -dynamiclib -Wl,-headerpad_max_install_names -compatibility_version 3.0.0 -current_version 2.4.0 -o bin/Debug/liblas.2.4.0.dylib -install_name @rpath/liblas.3.dylib src/CMakeFiles/las.dir/detail/index/indexcell.cpp.o src/CMakeFiles/las.dir/detail/index/indexoutput.cpp.o src/CMakeFiles/las.dir/chipper.cpp.o src/CMakeFiles/las.dir/factory.cpp.o src/CMakeFiles/las.dir/classification.cpp.o src/CMakeFiles/las.dir/color.cpp.o src/CMakeFiles/las.dir/dimension.cpp.o src/CMakeFiles/las.dir/error.cpp.o src/CMakeFiles/las.dir/filter.cpp.o src/CMakeFiles/las.dir/header.cpp.o src/CMakeFiles/las.dir/index.cpp.o src/CMakeFiles/las.dir/point.cpp.o src/CMakeFiles/las.dir/reader.cpp.o src/CMakeFiles/las.dir/spatialreference.cpp.o src/CMakeFiles/las.dir/schema.cpp.o src/CMakeFiles/las.dir/transform.cpp.o src/CMakeFiles/las.dir/utility.cpp.o src/CMakeFiles/las.dir/variablerecord.cpp.o src/CMakeFiles/las.dir/writer.cpp.o src/CMakeFiles/las.dir/version.cpp.o src/CMakeFiles/las.dir/detail/utility.cpp.o src/CMakeFiles/las.dir/detail/sha1.cpp.o src/CMakeFiles/las.dir/detail/zippoint.cpp.o src/CMakeFiles/las.dir/detail/reader/header.cpp.o src/CMakeFiles/las.dir/detail/reader/reader.cpp.o src/CMakeFiles/las.dir/detail/reader/zipreader.cpp.o src/CMakeFiles/las.dir/detail/reader/cachedreader.cpp.o src/CMakeFiles/las.dir/detail/writer/header.cpp.o src/CMakeFiles/las.dir/detail/writer/point.cpp.o src/CMakeFiles/las.dir/detail/writer/zipwriter.cpp.o src/CMakeFiles/las.dir/detail/writer/writer.cpp.o -L/Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libtiffd.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/liblzmad.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libjpeg.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libz.a -lm /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libgeotiff.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libboost_program_options.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libboost_thread.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libboost_system.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libboost_iostreams.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libboost_filesystem.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libboost_chrono.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libboost_date_time.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libboost_atomic.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libboost_regex.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libtiffd.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/liblzmad.a -lproj /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libjpeg.a /Users/vagrant/azure_agent/_work/3/s/installed/x64-osx/debug/lib/libz.a -lm && :
Undefined symbols for architecture x86_64:
  "_sqlite3_bind_double", referenced from:
      osgeo::proj::io::DatabaseContext::Private::run(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::list<osgeo::proj::io::SQLValues, std::__1::allocator<osgeo::proj::io::SQLValues> > const&) in libproj.a(factory.cpp.o)
  "_sqlite3_bind_text", referenced from:
      osgeo::proj::io::DatabaseContext::Private::run(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::list<osgeo::proj::io::SQLValues, std::__1::allocator<osgeo::proj::io::SQLValues> > const&) in libproj.a(factory.cpp.o)
  "_sqlite3_close", referenced from:
      osgeo::proj::io::DatabaseContext::Private::closeDB() in libproj.a(factory.cpp.o)
  "_sqlite3_column_count", referenced from:
      osgeo::proj::io::DatabaseContext::Private::run(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::list<osgeo::proj::io::SQLValues, std::__1::allocator<osgeo::proj::io::SQLValues> > const&) in libproj.a(factory.cpp.o)
  "_sqlite3_column_text", referenced from:
      osgeo::proj::io::DatabaseContext::Private::run(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::list<osgeo::proj::io::SQLValues, std::__1::allocator<osgeo::proj::io::SQLValues> > const&) in libproj.a(factory.cpp.o)
  "_sqlite3_create_function", referenced from:
      osgeo::proj::io::DatabaseContext::Private::registerFunctions() in libproj.a(factory.cpp.o)
  "_sqlite3_errmsg", referenced from:
      osgeo::proj::io::DatabaseContext::Private::run(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::list<osgeo::proj::io::SQLValues, std::__1::allocator<osgeo::proj::io::SQLValues> > const&) in libproj.a(factory.cpp.o)
  "_sqlite3_finalize", referenced from:
      osgeo::proj::io::DatabaseContext::Private::closeDB() in libproj.a(factory.cpp.o)
  "_sqlite3_open_v2", referenced from:
      osgeo::proj::io::DatabaseContext::Private::open(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, projCtx_t*) in libproj.a(factory.cpp.o)
      osgeo::proj::io::DatabaseContext::Private::attachExtraDatabases(std::__1::vector<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, std::__1::allocator<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > > > const&) in libproj.a(factory.cpp.o)
  "_sqlite3_prepare_v2", referenced from:
      osgeo::proj::io::DatabaseContext::Private::run(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::list<osgeo::proj::io::SQLValues, std::__1::allocator<osgeo::proj::io::SQLValues> > const&) in libproj.a(factory.cpp.o)
  "_sqlite3_reset", referenced from:
      osgeo::proj::io::DatabaseContext::Private::run(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::list<osgeo::proj::io::SQLValues, std::__1::allocator<osgeo::proj::io::SQLValues> > const&) in libproj.a(factory.cpp.o)
  "_sqlite3_result_double", referenced from:
      osgeo::proj::io::PROJ_SQLITE_pseudo_area_from_swne(sqlite3_context*, int, sqlite3_value**) in libproj.a(factory.cpp.o)
  "_sqlite3_result_int", referenced from:
      osgeo::proj::io::PROJ_SQLITE_intersects_bbox(sqlite3_context*, int, sqlite3_value**) in libproj.a(factory.cpp.o)
  "_sqlite3_result_null", referenced from:
      osgeo::proj::io::PROJ_SQLITE_pseudo_area_from_swne(sqlite3_context*, int, sqlite3_value**) in libproj.a(factory.cpp.o)
      osgeo::proj::io::PROJ_SQLITE_intersects_bbox(sqlite3_context*, int, sqlite3_value**) in libproj.a(factory.cpp.o)
  "_sqlite3_snprintf", referenced from:
      osgeo::proj::internal::toString(int) in libproj.a(internal.cpp.o)
      osgeo::proj::internal::toString(double, int) in libproj.a(internal.cpp.o)
  "_sqlite3_step", referenced from:
      osgeo::proj::io::DatabaseContext::Private::run(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::list<osgeo::proj::io::SQLValues, std::__1::allocator<osgeo::proj::io::SQLValues> > const&) in libproj.a(factory.cpp.o)
  "_sqlite3_value_double", referenced from:
      osgeo::proj::io::PROJ_SQLITE_GetValAsDouble(sqlite3_value*, bool&) in libproj.a(factory.cpp.o)
  "_sqlite3_value_int64", referenced from:
      osgeo::proj::io::PROJ_SQLITE_GetValAsDouble(sqlite3_value*, bool&) in libproj.a(factory.cpp.o)
  "_sqlite3_value_type", referenced from:
      osgeo::proj::io::PROJ_SQLITE_GetValAsDouble(sqlite3_value*, bool&) in libproj.a(factory.cpp.o)
  "_sqlite3_vfs_find", referenced from:
      osgeo::proj::io::DatabaseContext::Private::createCustomVFS() in libproj.a(factory.cpp.o)
      osgeo::proj::io::VFSClose(sqlite3_file*) in libproj.a(factory.cpp.o)
  "_sqlite3_vfs_register", referenced from:
      osgeo::proj::io::DatabaseContext::Private::createCustomVFS() in libproj.a(factory.cpp.o)
  "_sqlite3_vfs_unregister", referenced from:
      osgeo::proj::io::DatabaseContext::Private::~Private() in libproj.a(factory.cpp.o)
ld: symbol(s) not found for architecture x86_64

I don't have osx machine, can anyone help me?

JackBoosY · 2019-09-11T02:48:21Z

/azp run

azure-pipelines · 2019-09-11T02:48:30Z

Azure Pipelines successfully started running 1 pipeline(s).

… failure in config.cmake. [proj4]Revert changes about namespace. [liblas]Remove FindPROJ4.cmake and FindGeoTIFF.cmake from the source.

…kBoosY/vcpkg into dev/jack/upgrade_proj4_6.1.1

JackBoosY · 2019-09-18T06:39:21Z

@dan-shaw I can't reproduce the qt5 component build failure on my machine. Can you test them?
If it is fake, this PR should be merged.

dan-shaw · 2019-10-15T20:51:53Z

Besides the ports/sqlite3/CONTROL merge conflict, LGTM.

JackBoosY · 2019-10-16T09:20:27Z

Already merged 9 times...OMG..

cbezault · 2019-10-17T19:27:16Z

/azp run

dan-shaw · 2019-10-17T23:48:21Z

/azp run

JackBoosY and others added 22 commits July 7, 2019 19:52

[proj4]Upgrade version to 6.1.1 and remove useless patches.

8f39623

[libgeotiff]Fix build errors using proj4 6.1.1.

d965783

[libspatialite]Fix build errors using proj4 6.1.1.

6e6441a

[gdal]Fix build errors using proj4 6.1.1.

c673b44

[spatialite-tools]Fix build errors using proj4 6.1.1.

d960deb

[spatialite-tools]Fix build errors using proj4 6.1.1.

591d699

[libgeotiff]Re-fix build errors using proj4 6.1.1.

717c4c8

[vtk]Fix build errors using proj4 6.1.1.

e2671b3

[proj4]Fix find sqlite binary failure.

c879a94

[proj4]Disable build tools when building proj4 in arm/uwp.

95c7551

[sqlite3/libgeotiff]Fix libdl library linkage. Re-fix use proj issue.

3965d2c

Merge branch 'master' into dev/jack/upgrade_proj4_6.1.1

f0e5449

add back dl libs

7f4c30e

Merge branch 'master' into dev/jack/upgrade_proj4_6.1.1

28d3dfe

[gdal]Fix dependent port proj library name.

1d3c9c4

Merge branch 'dev/jack/upgrade_proj4_6.1.1' of https://github.com/Jac…

01552d1

…kBoosY/vcpkg into dev/jack/upgrade_proj4_6.1.1

Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…

06bca1f

…jack/upgrade_proj4_6.1.1

[proj4]Set Windows library name to "proj" and revert fix-proj-name ch…

46bd75f

…anges.

[liblas]Fix build errors using proj4 6.1.1.

7b63dc1

[liblas]Fix build errors using proj4 6.1.1.

c89b1e6

[liblas]Fix build errors using proj4 6.1.1.

2ed03db

[proj4]Fix feature database on triplet arm/uwp.

6485d26

JackBoosY added the info:internal This PR or Issue was filed by the vcpkg team. label Aug 27, 2019

JackBoosY requested a review from Rastaban August 27, 2019 01:20

JackBoosY mentioned this pull request Aug 27, 2019

[proj4]Upgrade version to 6.1.1 and remove useless patches. #7192

Closed

Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…

d357dfc

…jack/upgrade_proj4_6.1.1

microsoft deleted a comment from azure-pipelines bot Aug 27, 2019

JackBoosY added the wip label Sep 9, 2019

JackBoosY and others added 9 commits September 12, 2019 07:29

Merge branch 'master' into dev/jack/upgrade_proj4_6.1.1

c33c39a

[libspatialite]Fix linux build.

3806381

[libspatialite]Fix linux command.

6265a1f

[libspatialite]Fix configure error.

927b522

[proj4]fix static cmake tools path.

348cfc5

Merge branch 'master' into dev/jack/upgrade_proj4_6.1.1

49015db

[libgeotiff]Set configure options to 1/0 to avoid the "if" comparison…

b929a29

… failure in config.cmake. [proj4]Revert changes about namespace. [liblas]Remove FindPROJ4.cmake and FindGeoTIFF.cmake from the source.

Merge branch 'dev/jack/upgrade_proj4_6.1.1' of https://github.com/Jac…

b949d7a

…kBoosY/vcpkg into dev/jack/upgrade_proj4_6.1.1

[vtk]Fix using latest proj4 issue.

2589ab9

JackBoosY removed the wip label Sep 18, 2019

Merge branch 'master' into dev/jack/upgrade_proj4_6.1.1

6ae887a

JackBoosY mentioned this pull request Sep 26, 2019

Update proj4 to 6.1.1 #5138

Closed

JackBoosY and others added 2 commits October 8, 2019 10:38

Merge branch 'master' into dev/jack/upgrade_proj4_6.1.1

30198f1

[proj4]Delete missing patch.

21ef18b

dan-shaw requested a review from vicroms October 15, 2019 20:51

JackBoosY added 2 commits October 16, 2019 10:27

Merge branch 'master' into dev/jack/upgrade_proj4_6.1.1

5c6ab85

Merge branch 'master' into dev/jack/upgrade_proj4_6.1.1

9921dbc

JackBoosY mentioned this pull request Oct 16, 2019

[proj4] Update to version 6.2.0 #8621

Merged

dan-shaw merged commit 75dd38c into microsoft:master Oct 18, 2019

JackBoosY deleted the dev/jack/upgrade_proj4_6.1.1 branch October 18, 2019 00:24

JackBoosY mentioned this pull request Oct 22, 2019

How do I link GDAL to library compile #8664

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[proj4]Upgrade version to 6.1.1 and remove useless patches. #7917

[proj4]Upgrade version to 6.1.1 and remove useless patches. #7917

JackBoosY commented Aug 27, 2019 •

edited

Loading

JackBoosY commented Aug 27, 2019

azure-pipelines bot commented Aug 27, 2019

JackBoosY commented Sep 10, 2019

JackBoosY commented Sep 11, 2019

azure-pipelines bot commented Sep 11, 2019

JackBoosY commented Sep 18, 2019

dan-shaw commented Oct 15, 2019

JackBoosY commented Oct 16, 2019

cbezault commented Oct 17, 2019

dan-shaw commented Oct 17, 2019

[proj4]Upgrade version to 6.1.1 and remove useless patches. #7917

[proj4]Upgrade version to 6.1.1 and remove useless patches. #7917

Conversation

JackBoosY commented Aug 27, 2019 • edited Loading

JackBoosY commented Aug 27, 2019

azure-pipelines bot commented Aug 27, 2019

JackBoosY commented Sep 10, 2019

JackBoosY commented Sep 11, 2019

azure-pipelines bot commented Sep 11, 2019

JackBoosY commented Sep 18, 2019

dan-shaw commented Oct 15, 2019

JackBoosY commented Oct 16, 2019

cbezault commented Oct 17, 2019

dan-shaw commented Oct 17, 2019

JackBoosY commented Aug 27, 2019 •

edited

Loading