Skip to content

[freerdp] Update, cleanup + [libusb] Fix pc file#32416

Merged
JavierMatosD merged 27 commits intomicrosoft:masterfrom
dg0yt:freerdp
Jul 31, 2023
Merged

[freerdp] Update, cleanup + [libusb] Fix pc file#32416
JavierMatosD merged 27 commits intomicrosoft:masterfrom
dg0yt:freerdp

Conversation

@dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Jul 6, 2023 •
edited
Loading

Fixes freerdp[core,server,urbdrc]:x64-linux, sub-issue of #32398.
Fixes #32644.
Fix libusb-1.0.pc for windows.
Test features in CI.

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@dg0yt dg0yt marked this pull request as draft July 6, 2023 05:43
@Adela0814 Adela0814 added category:port-bug The issue is with a library, which is something the port should already support category:port-update The issue is with a library, which is requesting update new revision labels Jul 6, 2023
@dg0yt dg0yt marked this pull request as ready for review July 12, 2023 10:37
@dg0yt dg0yt marked this pull request as draft July 12, 2023 10:38
@dg0yt dg0yt mentioned this pull request Jul 20, 2023
Closed
7 tasks
@dg0yt dg0yt marked this pull request as ready for review July 26, 2023 05:46
@Adela0814
Copy link
Contributor

Adela0814 commented Jul 27, 2023

I encountered the following error while testing the feature urbdrc:

Repro step:
.\vcpkg.exe install freerdp[urbdrc]:x64-windows

Error:

/MANIFESTFILE:client\common\CMakeFiles\freerdp-client.dir/intermediate.manifest client\common\CMakeFiles\freerdp-client.dir/manifest.res" failed (exit code 1104) with the following output:
LINK : fatal error LNK1104: cannot open file 'usb-1.0.lib'

@dg0yt
Copy link
Contributor Author

dg0yt commented Jul 27, 2023

LINK : fatal error LNK1104: cannot open file 'usb-1.0.lib'

Fixed in port libusb. And now included in CI test coverage.

@dg0yt dg0yt changed the title [freerdp] Update, cleanup [freerdp] Update, cleanup + [libusb] Fix pc file Jul 27, 2023
@Adela0814
Copy link
Contributor

Adela0814 commented Jul 28, 2023

All feature test pass now.

I encountered a new error while testing usage:
Usage provided by vcpkg:

    find_package(FreeRDP CONFIG REQUIRED)
    target_link_libraries(main PRIVATE freerdp)

    find_package(FreeRDP-Client CONFIG REQUIRED)
    target_link_libraries(main PRIVATE freerdp-client)

    find_package(WinPR CONFIG REQUIRED)
    target_link_libraries(main PRIVATE winpr)

Error:
image

@dg0yt
Copy link
Contributor Author

dg0yt commented Jul 28, 2023

@Adela0814 The error message is incomplete. (Why not paste text?)

@Adela0814
Copy link
Contributor

Adela0814 commented Jul 28, 2023

@Adela0814 The error message is incomplete. (Why not paste text?)

That's all.

1> CMake generation started for default configuration: 'x64-Debug'.
1> Found and using vcpkg toolchain file (E:/4/vcpkg/scripts/buildsystems/vcpkg.cmake).
1> Command line: "C:\WINDOWS\system32\cmd.exe" /c "%SYSTEMROOT%\System32\chcp.com 65001 >NUL && "C:\PROGRAM FILES\MICROSOFT VISUAL STUDIO\2022\COMMUNITY\COMMON7\IDE\COMMONEXTENSIONS\MICROSOFT\CMAKE\CMake\bin\cmake.exe"  -G "Ninja"  -DCMAKE_BUILD_TYPE:STRING="Debug" -DCMAKE_INSTALL_PREFIX:PATH="E:\CMakeTest\out\install\x64-Debug" -DCMAKE_C_COMPILER:FILEPATH="C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.34.31933/bin/Hostx64/x64/cl.exe" -DCMAKE_CXX_COMPILER:FILEPATH="C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.34.31933/bin/Hostx64/x64/cl.exe"  -DCMAKE_MAKE_PROGRAM="C:\PROGRAM FILES\MICROSOFT VISUAL STUDIO\2022\COMMUNITY\COMMON7\IDE\COMMONEXTENSIONS\MICROSOFT\CMAKE\Ninja\ninja.exe" -DCMAKE_TOOLCHAIN_FILE="E:/4/vcpkg/scripts/buildsystems/vcpkg.cmake" "E:\CMakeTest" 2>&1"
1> Working directory: E:\CMakeTest\out\build\x64-Debug
1> [CMake] CMake Error at E:/4/vcpkg/scripts/buildsystems/vcpkg.cmake:855 (_find_package):
1> [CMake]   Found package configuration file:
1> [CMake] 
1> [CMake]     E:/4/vcpkg/installed/x64-windows/share/freerdp-client2/FreeRDP-ClientConfig.cmake
1> [CMake] 
1> [CMake]   but it set FreeRDP-Client_FOUND to FALSE so package "FreeRDP-Client" is
1> [CMake]   considered to be NOT FOUND.  Reason given by package:
1> [CMake] 
1> [CMake]   The following imported targets are referenced, but are missing: winpr
1> [CMake] 
1> [CMake] Call Stack (most recent call first):
1> [CMake]   CMakeTest/CMakeLists.txt:15 (find_package)
1> [CMake] -- Configuring incomplete, errors occurred!
1> [CMake] See also "E:/CMakeTest/out/build/x64-debug/CMakeFiles/CMakeOutput.log".
1> 'C:\WINDOWS\system32\cmd.exe' '/c "%SYSTEMROOT%\System32\chcp.com 65001 >NUL && "C:\PROGRAM FILES\MICROSOFT VISUAL STUDIO\2022\COMMUNITY\COMMON7\IDE\COMMONEXTENSIONS\MICROSOFT\CMAKE\CMake\bin\cmake.exe"  -G "Ninja"  -DCMAKE_BUILD_TYPE:STRING="Debug" -DCMAKE_INSTALL_PREFIX:PATH="E:\CMakeTest\out\install\x64-Debug" -DCMAKE_C_COMPILER:FILEPATH="C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.34.31933/bin/Hostx64/x64/cl.exe" -DCMAKE_CXX_COMPILER:FILEPATH="C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.34.31933/bin/Hostx64/x64/cl.exe"  -DCMAKE_MAKE_PROGRAM="C:\PROGRAM FILES\MICROSOFT VISUAL STUDIO\2022\COMMUNITY\COMMON7\IDE\COMMONEXTENSIONS\MICROSOFT\CMAKE\Ninja\ninja.exe" -DCMAKE_TOOLCHAIN_FILE="E:/4/vcpkg/scripts/buildsystems/vcpkg.cmake" "E:\CMakeTest" 2>&1"' execution failed with error: ''C:\WINDOWS\system32\cmd.exe' '/c "%SYSTEMROOT%\System32\chcp.com 65001 >NUL && "C:\PROGRAM FILES\MICROSOFT VISUAL STUDIO\2022\COMMUNITY\COMMON7\IDE\COMMONEXTENSIONS\MICROSOFT\CMAKE\CMake\bin\cmake.exe"  -G "Ninja"  -DCMAKE_BUILD_TYPE:STRING="Debug" -DCMAKE_INSTALL_PREFIX:PATH="E:\CMakeTest\out\install\x64-Debug" -DCMAKE_C_COMPILER:FILEPATH="C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.34.31933/bin/Hostx64/x64/cl.exe" -DCMAKE_CXX_COMPILER:FILEPATH="C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.34.31933/bin/Hostx64/x64/cl.exe"  -DCMAKE_MAKE_PROGRAM="C:\PROGRAM FILES\MICROSOFT VISUAL STUDIO\2022\COMMUNITY\COMMON7\IDE\COMMONEXTENSIONS\MICROSOFT\CMAKE\Ninja\ninja.exe" -DCMAKE_TOOLCHAIN_FILE="E:/4/vcpkg/scripts/buildsystems/vcpkg.cmake" "E:\CMakeTest" 2>&1"' returned with exit code: 1'.

@dg0yt
Copy link
Contributor Author

dg0yt commented Jul 28, 2023

The following imported targets are referenced, but are missing: winpr

Added missing find_dependency(...) calls between the installed configs, guided by the output of

grep 'foreach._target "' packages/freerdp_x64-linux/share/*/*.cmake

@Adela0814
Copy link
Contributor

Adela0814 commented Jul 28, 2023

I'm not able to find any freerdp related header in my test project,the include directories may need to be fixed:
image

@dg0yt
Copy link
Contributor Author

dg0yt commented Jul 28, 2023

Maybe upstream wants you to use FreeRDP_INCLUDE_DIR?
I can add this to the targets' properties. But like find_dependency, this convenience will initially only exist in vcpkg, until I upstream the changes.

@Adela0814
Copy link
Contributor

Adela0814 commented Jul 31, 2023

Usage tested pass on x64-windows.

@Adela0814 Adela0814 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jul 31, 2023
@JavierMatosD JavierMatosD merged commit 2f6176c into microsoft:master Jul 31, 2023
@dg0yt dg0yt deleted the freerdp branch August 1, 2023 04:32
@dg0yt dg0yt mentioned this pull request Aug 1, 2023
Merged
@dg0yt dg0yt mentioned this pull request Feb 29, 2024
Closed
@BillyONeal BillyONeal mentioned this pull request Oct 5, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@Adela0814 Adela0814 Adela0814 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@Adela0814 Adela0814

Labels

category:port-bug The issue is with a library, which is something the port should already support category:port-update The issue is with a library, which is requesting update new revision info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[freerdp] update to 2.10.0

3 participants

@dg0yt @Adela0814 @JavierMatosD