Skip to content
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

[libvpx] Use msys2 perl on win32 hosts #35593

Merged
merged 4 commits into from
Dec 20, 2023
Merged

[libvpx] Use msys2 perl on win32 hosts #35593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc8cad7
[libvpx] Use msys2 perl on win32 hosts
HybridEidolon Dec 10, 2023
efa2412
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 18, 2023
d3ae76c
Fix version DB.
BillyONeal Dec 18, 2023
fe5dbd3
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 20, 2023
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
12 changes: 5 additions & 7 deletions ports/libvpx/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,16 @@ vcpkg_from_github(
0005-fix-arm64-build.patch # Upstream commit: https://github.com/webmproject/libvpx/commit/858a8c611f4c965078485860a6820e2135e6611b
)

vcpkg_find_acquire_program(PERL)

get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)

if(CMAKE_HOST_WIN32)
vcpkg_acquire_msys(MSYS_ROOT PACKAGES make)
set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}")
vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl)
set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH}")
else()
vcpkg_find_acquire_program(PERL)
get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}")
endif()
find_program(BASH NAME bash HINTS ${MSYS_ROOT}/usr/bin REQUIRED NO_CACHE)

find_program(BASH NAME bash HINTS ${MSYS_ROOT}/usr/bin REQUIRED NO_CACHE)

vcpkg_find_acquire_program(NASM)
get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
Expand Down
2 changes: 1 addition & 1 deletion ports/libvpx/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libvpx",
"version": "1.13.1",
"port-version": 1,
"port-version": 2,
"description": "The reference software implementation for the video coding formats VP8 and VP9.",
"homepage": "https://github.com/webmproject/libvpx",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5010,7 +5010,7 @@
},
"libvpx": {
"baseline": "1.13.1",
"port-version": 1
"port-version": 2
},
"libwandio": {
"baseline": "4.2.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libvpx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "66ea767e9ce55da152694d49a74ad2125ca4d937",
"version": "1.13.1",
"port-version": 2
},
{
"git-tree": "88491a53de6cdc69ec82882d44aab8cf3b315577",
"version": "1.13.1",
Expand Down