Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Mapnik] new port #14628

Closed
wants to merge 1,730 commits into from
Closed

[Mapnik] new port #14628

wants to merge 1,730 commits into from

Conversation

mathisloge
Copy link
Contributor

@mathisloge mathisloge commented Nov 18, 2020

Describe the pull request
adds mapnik without forking the mapnik repository. However, this PR needs the current master.

Adds the mapbox-geometry and mapbox-polyline ports. Mapnik is dependend on specific commits, therefore the REF commit.
I'll test with current releases after I've validated mapnik.

todo

@mathisloge mathisloge changed the title [Mapnik] [Mapnik] new port Nov 18, 2020
@mathisloge
Copy link
Contributor Author

mathisloge commented Nov 18, 2020

osx and linux fails due to boost-regex build...

@mathisloge
Copy link
Contributor Author

mathisloge commented Nov 18, 2020

added issue mapnik/mapnik#4187 to fix the applied patches csv and geojson

EDIT:
was fixed with mapnik/mapnik@3ae38bb
moving the REF up to remove the patches

@mathisloge mathisloge marked this pull request as ready for review November 18, 2020 13:44
@mathisloge
Copy link
Contributor Author

mathisloge commented Nov 18, 2020

Have tested with the viewer example. Ready for review

needs to install cmake targets

@mathisloge mathisloge marked this pull request as draft November 18, 2020 14:24
@mathisloge
Copy link
Contributor Author

mathisloge commented Nov 18, 2020

so, now it is ready to review. I've compiled a test program to validate that everything compiles

but i still need to fix the static version. somehow the defines got messed up and still i prefixes classes with dllimport..
Can someone help me with that?

EDIT:
accidentally used an old version for the diff and it is therefore not adjusted correctly.

@mathisloge mathisloge marked this pull request as ready for review November 18, 2020 18:10
@mathisloge mathisloge marked this pull request as draft November 18, 2020 19:10
@mathisloge
Copy link
Contributor Author

mathisloge commented Nov 18, 2020

Might be good to switch to scons with vcpkg_find_acquire_program/vcpkg_execute_required_process
EDIT:
tried it a bit (https://github.com/mathisloge/vcpkg/tree/mapnik_scons) but i don't really know how this should build since the variables are not correctly taken.

@NancyLi1013 NancyLi1013 self-assigned this Nov 19, 2020
@NancyLi1013 NancyLi1013 added the category:new-port The issue is requesting a new library to be added; consider making a PR! label Nov 19, 2020
ports/mapnik/vcpkg.json Outdated Show resolved Hide resolved
ports/mapbox-geometry/portfile.cmake Outdated Show resolved Hide resolved
ports/mapbox-geometry/portfile.cmake Outdated Show resolved Hide resolved
ports/mapbox-polylabel/portfile.cmake Outdated Show resolved Hide resolved
ports/mapbox-polylabel/portfile.cmake Outdated Show resolved Hide resolved
ports/mapnik/cmake/plugins/input/geobuf/CMakeLists.txt Outdated Show resolved Hide resolved
ports/mapnik/cmake/utils/mapnik-render/CMakeLists.txt Outdated Show resolved Hide resolved
ports/mapnik/portfile.cmake Outdated Show resolved Hide resolved
ports/mapnik/portfile.cmake Outdated Show resolved Hide resolved
ports/mapnik/portfile.cmake Show resolved Hide resolved
@mathisloge mathisloge marked this pull request as ready for review November 19, 2020 10:40
@mathisloge
Copy link
Contributor Author

mhm linux fails due to qt5-location error. but mapnik was build successfully.

@NancyLi1013
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013
Copy link
Contributor

@mathisloge

Would you like to add these CMakeLists.txt for mapnik to upstream? I noticed that there are several files in this PR.

@mathisloge
Copy link
Contributor Author

mathisloge commented Nov 20, 2020

@NancyLi1013 to upstream vcpkg master yes.
Normally mapnik uses scons as a build system but I don't get it to work with vcpkg since all the dependencies would not be correctly noticed by the build system.
I've set the include dirs manually .

Because of that I would like to use cmake as the build system. (URL of scons port https://github.com/mathisloge/vcpkg/tree/mapnik_scons ) note: it is quite messed up because I've tried a few different things

@NancyLi1013
Copy link
Contributor

@NancyLi1013 to upstream vcpkg master yes.

I mean upstream is https://github.com/mapnik/mapnik.

@mathisloge
Copy link
Contributor Author

mathisloge commented Nov 20, 2020

@NancyLi1013 i don't think that they want to add cmake to their build system. But I will ask them.

@mathisloge
Copy link
Contributor Author

@NancyLi1013 Well, I guess I was wrong. :D
I will create a PR in mapnik to add CMake support. I will convert this PR into a draft.

@mathisloge mathisloge marked this pull request as draft November 20, 2020 17:05
@mathisloge
Copy link
Contributor Author

PR located at mapnik/mapnik#4191

@NancyLi1013 NancyLi1013 added the depends:upstream-changes Waiting on a change to the upstream project label Nov 23, 2020
@mathisloge mathisloge mentioned this pull request Nov 25, 2020
15 tasks
@NancyLi1013
Copy link
Contributor

/azp run

julianxhokaxhiu and others added 23 commits July 6, 2021 13:37
Add a missing, but required task for Azure DevOps Pipelines, to automatically authenticate against the Artifacts registry.
This should help any vcpkg newcomer to integrate easily.
* [sdl2-mixer] Add fluidsynth feature

* [sdl2-mixer] Add fluidsynth feature

* [sdl2-mixer] Add fluidsynth feature

* Updated versions & fixed style

* Fixed version hash
* [paho-mqtt] update to 1.3.9

* update version

* revert patch format

* update version
* update qt to 6.1.2

* version stuff
* [ffmpeg] do not pull in postproc for LGPL build

* [ffmpeg] disable avisynthplus on static builds (as it is not functional)

* [ffmpeg] bump port version

* [ffmpeg] x-add-version
* [exiv2] update to 0.27.4

* update version
Signed-off-by: Luca Schlecker <[email protected]>
* Fix Irrlicht compilation on OSX

* Update port description

* Update portfile instructions

* Update version

* Fix patch files

* Add missing cmake dependencies

* Remove obsolete comment

* Update version

* Remove OBJCXX language from project definition to prevent Windows builds from failing

* Update versions

* Code review tweaks

* Update version

* Update versions/i-/irrlicht.json

Co-authored-by: NancyLi1013 <[email protected]>

* Fix qt5-3d build failure on OSX

* Update qt5-3d version

* Update port-version for qt5-3d

* Update version for qt5-3d

* [qt5-3d] Revert modification to previous version entry

Co-authored-by: NancyLi1013 <[email protected]>
Co-authored-by: Robert Schumacher <[email protected]>
* add wagyu

* add versions

* update hash

* update versions
* [ftxui] Add new port (fix #16327)

* [ftxui] x-add-version ftxui

* [ftxui] Drop UWP support

* [ftxui] Update to 2021-06-16

* [ftxui] Overwrite version

* [ftxui] Try to fix linux and macOS build

* [ftxui] Overwrite version

* [ftxui] Fail fast on UWP

* [ftxui] Clean version file

* [ftxui] Overwrite version

* [ftxui] Update to 2021-06-17

* [ftxui] Overwrite version

* [ftxui] Remove debug/share

* [ftxui] Overwrite version

* [ftxui] Quote paths

* [ftxui] Overwrite version
* add port: xlsxio

* vcpkg x-add-version xlsxio

* fix deps

* add vcpkg_fixup_pkgconfig()

* Apply suggestions from code review

To be consistent, `OUT_FEATURE_OPTIONS FEATURE_OPTIONS` in a new line, as in `vcpkg_from_git`.

Co-authored-by: Jack·Boos·Yu <[email protected]>

* Update ports/xlsxio/portfile.cmake

Co-authored-by: Jack·Boos·Yu <[email protected]>

* format

* use date as version string

* vcpkg format-manifest

* Update ports/xlsxio/portfile.cmake

Co-authored-by: Jack·Boos·Yu <[email protected]>

* patch for dependency

* fix typo

* vcpkg x-add-version

* remove feature wide

* Update ports/xlsxio/vcpkg.json

deprecate libzip that's an alternative and imperfect

Co-authored-by: Robert Schumacher <[email protected]>

* Update ports/xlsxio/vcpkg.json

Co-authored-by: Robert Schumacher <[email protected]>

* Update versions/x-/xlsxio.json

Co-authored-by: Jack·Boos·Yu <[email protected]>

* Remove x64-windows-cpp17 community triplet

Co-authored-by: abc <[email protected]>
Co-authored-by: Jack·Boos·Yu <[email protected]>
Co-authored-by: Robert Schumacher <[email protected]>
…ing used (#18529)

* Fix boost build toolchain options not being used

The issue was due to the options only being set for the gcc toolchain,
and then only for a specific version. On platforms defaulting to a
different toolchain (e.g. macOS) this didn't work at all.

Additionally, some missing flags were not propagated, in particular the
CMAKE_OSX_DEPLOYMENT_TARGET, CMAKE_OSX_SYSROOT and CMAKE_OSX_ARCHITECTURES

* [boost-modular-build-helper] Apply CR comments

Co-authored-by: Martijn Otto <[email protected]>
Co-authored-by: Robert Schumacher <[email protected]>
@mathisloge
Copy link
Contributor Author

@NancyLi1013 i think i have screwed this PR up. Don't know what has happend here to the git history. :D

Should i open a new fresh PR?

@mathisloge mathisloge mentioned this pull request Jul 7, 2021
2 tasks
@mathisloge mathisloge closed this Jul 7, 2021
@mathisloge
Copy link
Contributor Author

closed in favor of #18849

@NancyLi1013
Copy link
Contributor

Thanks for your information. Seems your branch is based on upstream master. These changes should be in vcpkg master branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:new-port The issue is requesting a new library to be added; consider making a PR! depends:upstream-changes Waiting on a change to the upstream project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[New Port Request] <Mapnik>