-
Notifications
You must be signed in to change notification settings - Fork 7.5k
[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.
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
microsoft:master
from
Neumann-A:fix_qtinterfaceframework
Apr 14, 2022
Merged
Changes from all commits
Commits
Show all changes
49 commits
Select commit
Hold shift + click to select a range
29ca9fb
add upstream patch
8ba7b6f
[skip actions] add the patch file
c87989c
fine tune
1cf8495
[opencv] update portfiles to use vcpkg-get-python-packages
cenit ca16dd2
fix references
cenit 89ccf6e
try another fix
Neumann-A 3d76b0d
add all deps
Neumann-A d695d7d
Merge remote-tracking branch 'upstream/master' into fix_qtinterfacefr…
6cfa4b1
add code from tensorflow about venv
c825038
retry
c2b722f
fix file path
52de5ad
new approach
f30fdec
unset pythonhome
323b467
next unset
7d8cfdf
try this instead.
d15be50
retry without the PYTHON_LIB_PATH stuff
503c2f8
try and error
43ba9c8
next try
9e2e675
retry
e7c5148
typo fix
ecb4f46
try updating
3f729fe
retry
5984bda
more try and error
aae4447
reorder
9cc9082
Merge remote-tracking branch 'cenit/dev/cenit/opencv_update' into fix…
4ee00e4
drop qface version
ccd856d
use qface 2.0.5
df1344e
bump watchdog
f0898f0
fix call on !windows
1fa7d35
fine tuning
8c4d02e
refactor function signature
Neumann-A b978f13
update version
Neumann-A aec68e8
fix formating
Neumann-A e62e55e
version stuff
Neumann-A 17fce1f
create dir before usage
Neumann-A 2fec24a
fine tuning
Neumann-A 7d724fe
version stuff
Neumann-A 1c199e9
Merge remote-tracking branch 'upstream/master' into fix_qtinterfacefr…
c08626e
update and patch libilbc
63cc904
formating stuff
d1ca808
fix version-string
ed07ade
version stuff
ddec1d2
add license
e8ff7b9
version update
7a24f35
Merge remote-tracking branch 'upstream/master' into fix_qtinterfacefr…
Neumann-A 2acf836
bump version
Neumann-A f3dd26f
version stuff
Neumann-A 531cea9
Merge remote-tracking branch 'upstream/master' into fix_qtinterfacefr…
Neumann-A 040fefe
version stuff
Neumann-A File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 016b46d37..4caa88fce 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -50,14 +50,12 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) | ||
|
|
||
| set(CMAKE_CXX_STANDARD 14) | ||
|
|
||
| -if((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR | ||
| - (CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")) | ||
| +if(0) | ||
| set(CMAKE_C_FLAGS "-Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -fno-strict-aliasing") | ||
| set(CMAKE_C_FLAGS_DEBUG "-g") | ||
| set(CMAKE_C_FLAGS_RELEASE "-O2") | ||
| endif() | ||
| -if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR | ||
| - (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")) | ||
| +if(0) | ||
| set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing") | ||
| set(CMAKE_CXX_FLAGS_DEBUG "-g") | ||
| set(CMAKE_CXX_FLAGS_RELEASE "-O2") | ||
| @@ -146,7 +144,8 @@ endif() | ||
| ## Configure input files | ||
| ############################################################################# | ||
|
|
||
| -include_directories(. abseil-cpp ${CMAKE_CURRENT_BINARY_DIR}) | ||
| +find_package(absl REQUIRED) | ||
| +include_directories(. ${CMAKE_CURRENT_BINARY_DIR}) | ||
|
|
||
| set(ilbc_source_files | ||
| modules/audio_coding/codecs/ilbc/abs_quant.c | ||
| @@ -310,6 +310,7 @@ add_library(ilbc ${ilbc_source_files}) | ||
| generate_export_header(ilbc) | ||
| set_target_properties(ilbc PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 3) | ||
| set_target_properties(ilbc PROPERTIES CLEAN_DIRECT_OUTPUT 1) | ||
| +target_link_libraries(ilbc PRIVATE absl::core_headers) | ||
|
|
||
| add_executable(ilbc_test modules/audio_coding/codecs/ilbc/test/iLBC_test.c) | ||
| target_link_libraries(ilbc_test ilbc) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,29 @@ | ||
| set(ILBC_VERSION 3.0.3) | ||
| vcpkg_download_distfile(ARCHIVE | ||
| URLS "https://github.com/TimothyGu/libilbc/releases/download/v${ILBC_VERSION}/libilbc-${ILBC_VERSION}.zip" | ||
| FILENAME "libilbc-${ILBC_VERSION}.zip" | ||
| SHA512 a5755db093529f6a3fd8fd47da63b57cffff1d3babef443d92f7c5a250ce8d1585adfba525c4037b142d9f00f1675a5054c172bf936be280dfcc22ed553c94c6 | ||
| ) | ||
|
|
||
| vcpkg_extract_source_archive_ex( | ||
| set(ILBC_VERSION 3.0.4) | ||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| ARCHIVE ${ARCHIVE} | ||
| REF ${ILBC_VERSION} | ||
| PATCHES do-not-build-ilbc_test.patch | ||
| REPO TimothyGu/libilbc | ||
| REF cd064edf2c6c104a4e1fd87b34fd24cfa6dbe401 | ||
| SHA512 323d32dbd54d5ef624940432bf19c29f5ead6f40bc84aba4261f067dfdc40cf4000e383f4dca65cd3b745a354a119a9e515949a1466af89c300cd7bf95991675 | ||
| PATCHES | ||
| do-not-build-ilbc_test.patch | ||
| absl.patch | ||
| ) | ||
|
|
||
| vcpkg_configure_cmake( | ||
| SOURCE_PATH ${SOURCE_PATH} | ||
| PREFER_NINJA | ||
| vcpkg_cmake_configure( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| OPTIONS | ||
| -DCMAKE_INSTALL_DOCDIR=share/${PORT} | ||
| ) | ||
|
|
||
| vcpkg_install_cmake() | ||
| vcpkg_cmake_install() | ||
|
|
||
| vcpkg_fixup_pkgconfig() | ||
|
|
||
| if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") | ||
| vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/ilbc_export.h "#ifdef ILBC_STATIC_DEFINE" "#if 1") | ||
| vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ilbc_export.h" "#ifdef ILBC_STATIC_DEFINE" "#if 1") | ||
| endif() | ||
|
|
||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") | ||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") | ||
|
|
||
| file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) | ||
| file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,15 @@ | ||
| { | ||
| "name": "libilbc", | ||
| "version-string": "3.0.3", | ||
| "port-version": 1, | ||
| "version": "3.0.4", | ||
| "description": "Open source implementation of the Internet Low Bit Rate Codec (iLBC) / RFC 3951 codec from the WebRTC project.", | ||
| "homepage": "https://github.com/TimothyGu/libilbc", | ||
| "supports": "!(arm & uwp)" | ||
| "license": "BSD-3-Clause", | ||
| "supports": "!(arm & uwp)", | ||
| "dependencies": [ | ||
| "abseil", | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| } | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
... why does it support x64-uwp, and arm64-windows, but not arm64-uwp?
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.
looks like maybe something to do with mixing arm and msbuild