[ffmpeg] fix up the pkgconfig files #15127
Merged
Conversation
This file contains 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
JackBoosY
added
category:port-bug
BillyONeal
approved these changes
Dec 15, 2020
Co-authored-by: Billy O'Neal <[email protected]>
|
@jmoguillansky-gpsw Can you please test this PR? Thanks. |
JackBoosY
commented
Dec 16, 2020
Comment on lines
+523
to
+525
| string(REGEX MATCH "${PATH_NAME}=[^\n]*\n" PATH_VALUE "${PKGCONFIG_CONTENT}") | ||
| string(REPLACE "${PATH_NAME}=" "" PATH_VALUE "${PATH_VALUE}") | ||
| string(REPLACE "\n" "" PATH_VALUE "${PATH_VALUE}") |
There was a problem hiding this comment.
I think regular expressions can be more beautiful, but I don’t know how to do it
PhoebeHui
approved these changes
Dec 16, 2020
Thanks @JackBoos , -- Downloading https://www.tortall.net/projects/yasm/snapshots/v1.3.0.6.g1962/yasm-1.3.0.6.g1962.exe... Failed. Status: 28;"Timeout was reached" |
BillyONeal
approved these changes
Dec 18, 2020
|
@jmoguillansky-gpsw Can you please try again? |
BillyONeal
approved these changes
Dec 21, 2020
|
It looks ok to me.
Thanks,
Jeff
Get Outlook for Android<https://aka.ms/ghei36>
…________________________________
From: BillyONeal <[email protected]>
Sent: Monday, December 21, 2020 2:07:28 PM
To: microsoft/vcpkg <[email protected]>
Cc: Jeffrey Moguillansky <[email protected]>; Mention <[email protected]>
Subject: Re: [microsoft/vcpkg] [ffmpeg] fix up the pkgconfig files (#15127)
@BillyONeal approved this pull request.
This looks good to me but waiting to merge until the issue submitter confirms that the fix works for them
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub<#15127 (review)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AO3BUEZAN55JCJSUE6C2M6TSV7BKBANCNFSM4U35YNKA>.
|
|
Thanks! |
Jimmy-Hu
added a commit
to Jimmy-Hu/vcpkg
that referenced
this pull request
Dec 22, 2020
[ffmpeg] fix up the pkgconfig files (microsoft#15127)
ryukw7
pushed a commit
to ryukw7/vcpkg
that referenced
this pull request
Dec 24, 2020
|
I think there's room to simplify the logic.
The current logic (with this PR) if I understand correctly:
1) check if cygwin is present
2) if has cygwin generate cygwin paths, else generate windows paths
3) convert cygwin paths to windows paths using regex.
Maybe we can add a user param to choose cygwin or windows paths?
Get Outlook for Android<https://aka.ms/ghei36>
…________________________________
From: Be <[email protected]>
Sent: Friday, January 22, 2021 10:53:49 PM
To: microsoft/vcpkg <[email protected]>
Cc: Jeffrey Moguillansky <[email protected]>; Mention <[email protected]>
Subject: Re: [microsoft/vcpkg] [ffmpeg] fix up the pkgconfig files (#15127)
I think there's still more to do on this issue. Using ffmpeg from vcpkg fails with:
CMake Error at C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.18/Modules/FindPkgConfig.cmake:75 (set):
Syntax error in cmake code at
C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.18/Modules/FindPkgConfig.cmake:75
when parsing string
\a\mixxx\mixxx\build\vcpkg_installed\x64-windows\lib\pkgconfig/../..
Invalid character escape '\a'.
Call Stack (most recent call first):
C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.18/Modules/FindPkgConfig.cmake:102 (_pkgconfig_set)
C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.18/Modules/FindPkgConfig.cmake:828 (_pkgconfig_invoke)
C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.18/Modules/FindPkgConfig.cmake:564 (pkg_get_variable)
C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.18/Modules/FindPkgConfig.cmake:733 (_pkg_check_modules_internal)
cmake/modules/FindFFMPEG.cmake:82 (pkg_check_modules)
cmake/modules/FindFFMPEG.cmake:124 (find_component)
build/vcpkg_installed/x64-windows/share/ffmpeg/vcpkg-cmake-wrapper.cmake:4 (_find_package)
vcpkg/scripts/buildsystems/vcpkg.cmake:597 (include)
CMakeLists.txt:2252 (find_package)
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub<#15127 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AO3BUE746VSKYPK6W7KCJGDS3JW73ANCNFSM4U35YNKA>.
|
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Since ffmpeg is built using cygin on windows, cygpath format is used instead of local path format when generating pkgconfig, fix this issue.
Fixes #15111.