-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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
[aravis] add new port (+add to OpenCV 4 as optional feature) #42351
base: master
Are you sure you want to change the base?
Changes from all commits
d983757
bb39fe6
f626ae4
476ea22
9779103
9524783
d636c66
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
vcpkg_from_github( | ||
OUT_SOURCE_PATH SOURCE_PATH | ||
REPO AravisProject/aravis | ||
REF "${VERSION}" | ||
SHA512 05f08ceb9b96b27be4cb6e66b39a59524efc6bc2ae4058fb69bba1e0ecb3eeec0f9754f25c356be8cda70d2c4d481b74b1b981d54f124e9656bebb35951d318f | ||
HEAD_REF main | ||
) | ||
|
||
list(APPEND OPTIONS -Dviewer=disabled) | ||
list(APPEND OPTIONS -Dgst-plugin=disabled) | ||
if("usb" IN_LIST FEATURES) | ||
list(APPEND OPTIONS -Dusb=enabled) | ||
else() | ||
list(APPEND OPTIONS -Dusb=disabled) | ||
endif() | ||
if("packet-socket" IN_LIST FEATURES) | ||
list(APPEND OPTIONS -Dpacket-socket=enabled) | ||
else() | ||
list(APPEND OPTIONS -Dpacket-socket=disabled) | ||
endif() | ||
if("fast-heartbeat" IN_LIST FEATURES) | ||
list(APPEND OPTIONS -Dfast-heartbeat=true) | ||
else() | ||
list(APPEND OPTIONS -Dfast-heartbeat=false) | ||
endif() | ||
if("introspection" IN_LIST FEATURES) | ||
list(APPEND OPTIONS -Dintrospection=enabled) | ||
endif() | ||
|
||
set(GLIB_TOOLS_DIR "${CURRENT_HOST_INSTALLED_DIR}/tools/glib") | ||
|
||
vcpkg_configure_meson( | ||
SOURCE_PATH | ||
"${SOURCE_PATH}" | ||
OPTIONS | ||
${OPTIONS} | ||
ADDITIONAL_BINARIES | ||
glib-mkenums='${GLIB_TOOLS_DIR}/glib-mkenums' | ||
glib-compile-resources='${GLIB_TOOLS_DIR}/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' | ||
) | ||
vcpkg_install_meson() | ||
|
||
vcpkg_copy_pdbs() | ||
|
||
vcpkg_fixup_pkgconfig() | ||
|
||
vcpkg_copy_tools( | ||
AUTO_CLEAN | ||
TOOL_NAMES | ||
arv-camera-test-0.8 | ||
arv-fake-gv-camera-0.8 | ||
arv-test-0.8 | ||
arv-tool-0.8 | ||
) | ||
|
||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
{ | ||
"name": "aravis", | ||
"version": "0.8.33", | ||
"description": " A vision library for genicam based cameras.", | ||
"homepage": "https://github.com/AravisProject/aravis", | ||
"license": "LGPL-2.1-only", | ||
"dependencies": [ | ||
"glib", | ||
{ | ||
"name": "glib", | ||
"host": true | ||
}, | ||
"libxml2", | ||
{ | ||
"name": "vcpkg-tool-meson", | ||
"host": true | ||
}, | ||
"zlib" | ||
], | ||
"features": { | ||
"fast-heartbeat": { | ||
"description": "Enable faster heartbeat rate" | ||
}, | ||
"introspection": { | ||
"description": "Build introspection data", | ||
"dependencies": [ | ||
"gobject-introspection" | ||
] | ||
}, | ||
"packet-socket": { | ||
"description": "Enable packet socket support" | ||
}, | ||
"usb": { | ||
"description": "Enable USB support", | ||
"dependencies": [ | ||
"libusb" | ||
] | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -1,7 +1,7 @@ | ||||||||||||
{ | ||||||||||||
"name": "opencv4", | ||||||||||||
"version": "4.10.0", | ||||||||||||
"port-version": 1, | ||||||||||||
"port-version": 2, | ||||||||||||
"description": "computer vision library", | ||||||||||||
"homepage": "https://github.com/opencv/opencv", | ||||||||||||
"license": "Apache-2.0", | ||||||||||||
|
@@ -30,6 +30,12 @@ | |||||||||||
"ade" | ||||||||||||
] | ||||||||||||
}, | ||||||||||||
"aravis": { | ||||||||||||
"description": "aravis", | ||||||||||||
"dependencies": [ | ||||||||||||
"aravis" | ||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Enable opt-out from usb.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. then it might be better to leave There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. vcpkg will install aravis' default feature by default. This change enables the user to explicitly request installation of aravis without default features. |
||||||||||||
] | ||||||||||||
}, | ||||||||||||
"calib3d": { | ||||||||||||
"description": "calib3d module" | ||||||||||||
}, | ||||||||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
{ | ||
"versions": [ | ||
{ | ||
"git-tree": "c4152870b29fc3a69a03516358dd68d7319febf7", | ||
"version": "0.8.33", | ||
"port-version": 0 | ||
} | ||
] | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that this may also change behavior for other find modules, in unexpected/untested ways. (Mostly on Windows.)
And in most other CMake ports, we pass it as
PKG_CONFIG_EXECUTABLE
cmake option. (Nitpick.)