Skip to content

[qtinterfaceframework|opencv] fix python stuff #24041

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

Merged
strega-nil-ms merged 49 commits into from
Apr 14, 2022
Merged

[qtinterfaceframework|opencv] fix python stuff #24041

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
29ca9fb
add upstream patch
Apr 8, 2022
8ba7b6f
[skip actions] add the patch file
Apr 8, 2022
c87989c
fine tune
Apr 8, 2022
1cf8495
[opencv] update portfiles to use vcpkg-get-python-packages
cenit Apr 8, 2022
ca16dd2
fix references
cenit Apr 8, 2022
89ccf6e
try another fix
Neumann-A Apr 9, 2022
3d76b0d
add all deps
Neumann-A Apr 9, 2022
d695d7d
Merge remote-tracking branch 'upstream/master' into fix_qtinterfacefr…
Apr 11, 2022
6cfa4b1
add code from tensorflow about venv
Apr 11, 2022
c825038
retry
Apr 11, 2022
c2b722f
fix file path
Apr 11, 2022
52de5ad
new approach
Apr 11, 2022
f30fdec
unset pythonhome
Apr 11, 2022
323b467
next unset
Apr 11, 2022
7d8cfdf
try this instead.
Apr 11, 2022
d15be50
retry without the PYTHON_LIB_PATH stuff
Apr 11, 2022
503c2f8
try and error
Apr 11, 2022
43ba9c8
next try
Apr 11, 2022
9e2e675
retry
Apr 11, 2022
e7c5148
typo fix
Apr 11, 2022
ecb4f46
try updating
Apr 11, 2022
3f729fe
retry
Apr 11, 2022
5984bda
more try and error
Apr 11, 2022
aae4447
reorder
Apr 11, 2022
9cc9082
Merge remote-tracking branch 'cenit/dev/cenit/opencv_update' into fix…
Apr 11, 2022
4ee00e4
drop qface version
Apr 11, 2022
ccd856d
use qface 2.0.5
Apr 11, 2022
df1344e
bump watchdog
Apr 11, 2022
f0898f0
fix call on !windows
Apr 11, 2022
1fa7d35
fine tuning
Apr 11, 2022
8c4d02e
refactor function signature
Neumann-A Apr 11, 2022
b978f13
update version
Neumann-A Apr 11, 2022
aec68e8
fix formating
Neumann-A Apr 11, 2022
e62e55e
version stuff
Neumann-A Apr 11, 2022
17fce1f
create dir before usage
Neumann-A Apr 11, 2022
2fec24a
fine tuning
Neumann-A Apr 11, 2022
7d724fe
version stuff
Neumann-A Apr 11, 2022
1c199e9
Merge remote-tracking branch 'upstream/master' into fix_qtinterfacefr…
Apr 12, 2022
c08626e
update and patch libilbc
Apr 12, 2022
63cc904
formating stuff
Apr 12, 2022
d1ca808
fix version-string
Apr 12, 2022
ed07ade
version stuff
Apr 12, 2022
ddec1d2
add license
Apr 12, 2022
e8ff7b9
version update
Apr 12, 2022
7a24f35
Merge remote-tracking branch 'upstream/master' into fix_qtinterfacefr…
Neumann-A Apr 12, 2022
2acf836
bump version
Neumann-A Apr 12, 2022
f3dd26f
version stuff
Neumann-A Apr 12, 2022
531cea9
Merge remote-tracking branch 'upstream/master' into fix_qtinterfacefr…
Neumann-A Apr 13, 2022
040fefe
version stuff
Neumann-A Apr 13, 2022
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
4 changes: 3 additions & 1 deletion ports/qtinterfaceframework/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ function(vcpkg_get_python_package PYTHON_DIR ) # From mesa
endif()
endfunction()

set(${PORT}_PATCHES fix-taglib-search.patch) # Strictly this is only required if qt does not use pkg-config since it forces it to off.
set(${PORT}_PATCHES fix-taglib-search.patch # Strictly this is only required if qt does not use pkg-config since it forces it to off.
49b44d4.diff)
set(TOOL_NAMES
ifmedia-simulation-server
ifvehiclefunctions-simulation-server
Expand Down Expand Up @@ -84,6 +85,7 @@ set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
qt_cmake_configure(${_opt}
OPTIONS ${FEATURE_OPTIONS}
"-DPython3_EXECUTABLE=${PYTHON3}" # Otherwise a VS installation might be found.
"-DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE"
OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})

Expand Down
1 change: 1 addition & 0 deletions ports/qtinterfaceframework/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "qtinterfaceframework",
"version": "6.2.4",
"port-version": 1,
"description": "Qt Interface Framework",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
3 changes: 0 additions & 3 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,9 +1018,6 @@ qt5-base:arm64-windows=fail
# qtwebengine:x64-windows has an ICE in VS2022
qtwebengine:x64-windows=fail

# upstream bug, see https://github.com/microsoft/vcpkg/issues/23766
qtinterfaceframework:x64-windows=skip

# Skip deprecated Qt module
# (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly)
qt5-canvas3d:x64-linux=skip
Expand Down