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.

Sign up for GitHub

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

[morphologica] new port #43752

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

[morphologica] new port #43752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6af8d81
[morphologica] new port
rremilian Feb 10, 2025
84437c6
[morphologica] add fix_nlohmann_include.patch
rremilian Feb 11, 2025
40a1855
[morphologica] Windows builds have not been tested since 2021
rremilian Feb 11, 2025
fdc46aa
[morphologica] add freeglut
rremilian Feb 11, 2025
bc466fe
[morphologica] add prevent examples patch
rremilian Feb 11, 2025
3e96bff
[morphologica] remove egl_fix.patch (only needed for Windows)
rremilian Feb 11, 2025
ae41875
[morphologica] prevent tests and examples
rremilian Feb 11, 2025
8c9716e
[morpholica] add back egl_fix.patch for Windows
rremilian Feb 11, 2025
b993129
[morphologica] remove support for Windows
rremilian Feb 11, 2025
25e6c06
[morphologica] use freeglut only on Linux
rremilian Feb 11, 2025
31c20af
[morphologica] minor changes
rremilian Feb 12, 2025
e8d9423
[morphologica] fonts are required
rremilian Feb 12, 2025
22e3767
[morphologica] update to v3.3
rremilian Feb 13, 2025
8254dae
[morphologica] update to 3.3.1
rremilian Feb 13, 2025
5088a6a
[morphologica] add fix_egl.patch
rremilian Feb 13, 2025
02baac3
[morphologica] use patch from upstream
rremilian Feb 13, 2025
aeb9a78
[morphologica] bump to version 3.4
rremilian Feb 14, 2025
57d3994
[morphologica] update to 3.4.1
rremilian Feb 16, 2025
0d41d28
[morphologica] update to v3.4.3
rremilian Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions ports/morphologica/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
set(VCPKG_BUILD_TYPE release)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ABRG-Models/morphologica
REF "v${VERSION}"
SHA512 0c92fd191b8eae57fae389517433d83ab3498bec3806cc658499d1ab1a294ed8b861dba38b5592c0ffec9c45fa9a8a453df660b35878f360b8395b948a958e52
)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_EXAMPLES=OFF
)
vcpkg_cmake_install()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/ABRG-Models/morphologica?tab=readme-ov-file#what-is-morphologica claims 'header-only', could this be replaced with adding set(VCPKG_BUILD_TYPE release) to the top of the file?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right that these headers should not be bundled in morphologica. I've now removed all bundled GL headers such as these:

morphologica:x64-windows:/include/morph/GL3/gl3.h
morphologica:x64-windows:/include/morph/GL3/gl3w.h

These are all a legitimate part of morphologica and not third party code:

morphologica:x64-windows:/include/morph/gl/compute_manager.h
morphologica:x64-windows:/include/morph/gl/compute_manager_cli.h
morphologica:x64-windows:/include/morph/gl/compute_shaderprog.h
morphologica:x64-windows:/include/morph/gl/shaders.h
morphologica:x64-windows:/include/morph/gl/ssbo.h
morphologica:x64-windows:/include/morph/gl/texture.h
morphologica:x64-windows:/include/morph/gl/util.h
morphologica:x64-windows:/include/morph/gl/version.h

Yes, rapidxml needs to be handled differently and ideally not bundled. I've fixed these upstream:

morphologica:x64-windows:/include/morph/rapidxml.hpp
morphologica:x64-windows:/include/morph/rapidxml_iterators.hpp
morphologica:x64-windows:/include/morph/rapidxml_print.hpp
morphologica:x64-windows:/include/morph/rapidxml_utils.hpp

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BillyONeal I have bumped the version to 3.4 and included rapidxml and egl.
I've also changed the manifest to build only the Release version.

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
32 changes: 32 additions & 0 deletions ports/morphologica/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"name": "morphologica",
"version": "3.4.3",
"description": "C++ header-only graphing and data visualization with Modern OpenGL",
"homepage": "https://github.com/ABRG-Models/morphologica",
"license": "Apache-2.0",
"dependencies": [
"armadillo",
{
"name": "egl",
"platform": "linux"
},
{
"name": "freeglut",
"platform": "linux"
},
"freetype",
"glfw3",
"hdf5",
"nlohmann-json",
"opengl",
"rapidxml",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
4 changes: 4 additions & 0 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6076,6 +6076,10 @@
"baseline": "10.0.1",
"port-version": 5
},
"morphologica": {
"baseline": "3.4.3",
"port-version": 0
},
"morton-nd": {
"baseline": "4.0.0",
"port-version": 3
Expand Down
9 changes: 9 additions & 0 deletions versions/m-/morphologica.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "5466b5703932a35e1d51b0b5392da26fe3f0abcb",
"version": "3.4.3",
"port-version": 0
}
]
}