[libvpx] Bump to 1.13.1 #35047

basilgello · 2023-11-11T19:06:44Z

Based on #34814 by @LilyWangLL
Fixes #34809
but tailored for RustDesk to build on arm64-ios, arm*-linux etc.

Signed-off-by: Vasyl Gello vasek.gello@gmail.com

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.

basilgello · 2023-11-11T19:07:54Z

Wondering how many builds fail with current revision of libvpx MR but dont want hijacking @LilyWangLL :)

JonLiu1993 · 2023-11-13T06:38:39Z

All features are tested successfully in the following triplet:

x86-windows
x64-windows
x64-windows-static

Tested usage successfully by libvpx[*]:x64-windows:

libvpx provides CMake targets:

  # this is heuristically generated, and may not be correct
  find_package(unofficial-libvpx CONFIG REQUIRED)
  target_link_libraries(main PRIVATE unofficial::libvpx::libvpx)

dg0yt

unofficial-libvpx.config.cmake.in has whitespace-only changes. Please restore the last revision of this file.

dg0yt · 2023-11-13T06:53:14Z

ports/libvpx/portfile.cmake

 WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
 LOGNAME configure-${TARGET_TRIPLET}-rel)

 message(STATUS "Building libvpx for Release")
 vcpkg_execute_required_process(
 COMMAND
- ${BASH} --noprofile --norc -c "make -j8"
+ ${BASH} --noprofile --norc -c "make -j"


Suggested change

${BASH} --noprofile --norc -c "make -j"

${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"

dg0yt · 2023-11-13T06:53:23Z

ports/libvpx/portfile.cmake

 WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
 LOGNAME configure-${TARGET_TRIPLET}-dbg)

 message(STATUS "Building libvpx for Debug")
 vcpkg_execute_required_process(
 COMMAND
- ${BASH} --noprofile --norc -c "make -j8"
+ ${BASH} --noprofile --norc -c "make -j"


Suggested change

${BASH} --noprofile --norc -c "make -j"

${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"

basilgello · 2023-11-13T07:04:04Z

@dg0yt Addressed the points! Thanks!

basilgello · 2023-11-13T07:22:37Z

And fixed the remnants from old crossbuild fix. Tested on arm64-linux and arm-linux, as well as arm64-android amd arm-neon-android

dg0yt · 2023-11-13T07:30:00Z

... if we only could use vcpkg_configure_make and friends...

basilgello · 2023-11-13T07:31:15Z

vpx is special :( Properly this needs a cmake file just like we do for selected dependencies in Kodi. Ideally, merged into upstream. But this is separate effort and we are missing security update right now.

dg0yt · 2023-11-13T07:42:11Z

For other "special" ports such as openssl, I added configure wrapper scripts.

basilgello · 2023-11-14T07:09:01Z

@dg0yt If I understand the openssl port correctly, you created the wrapper so that canonical configure invocation is transformed to openssl's nonstandard flags?

dg0yt · 2023-11-14T07:52:45Z

@dg0yt If I understand the openssl port correctly, you created the wrapper so that canonical configure invocation is transformed to openssl's nonstandard flags?

Yes. Plus the openssl particularity of Configure being a Perl script, spelled like that...
The motivation is to leverage all the toolchain detection and forwarding implemented in vcpkg_configure/build/install_make, instead of maintaining another poor copy.

Other examples are botan, libcap, luajit. Some packages don't have configure, but ask for variables to be passed directly to make. Then the port's configure script captures configuration input (e.g. --prefix, --enable-shared) and generates a top-level Makefile hard-coding the parameters of interest.

You don't have to add this to this PR... I just want to indicate that there is an alternative.

basilgello · 2023-11-14T08:34:22Z

I am not going to spoil this PR as this is a security update. Port version 1 is another story :)

data-queue · 2023-11-15T00:31:22Z

ports/libvpx/portfile.cmake

+ set(LIBVPX_TARGET "generic-gnu")
+ # Settings
+ if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+ set(ANDROID_TARGET_TRIPLET i686-linux-android)


unused variable?

Yep, another leftover from my attempt to use "proper" new-style invocation of NDK.

Android NDK... that's another blocker for vcpkg_configure_make, since r26. #31228 😢

data-queue · 2023-11-15T00:33:15Z

ports/libvpx/vcpkg.json

 {
 "name": "vcpkg-msbuild",
 "host": true,
 "platform": "windows"
+ },
+ {
+ "name": "yasm",


What was the reasoning for adding this dependency, as opposed to using NASM?

By defailt, yasm is preferred by upstream: https://github.com/webmproject/libvpx/blob/main/configure#L33

Plus I recall I had issues with nasm on non-windows architectures but I can cross-check once more

So far yasm can be dropped safely :)

@LilyWangLL

Based on microsoft#34814 by @LilyWangLL but tailored for RustDesk to build on arm64-ios, arm*-linux etc. Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

basilgello force-pushed the libvpx-1.13.1 branch 7 times, most recently from 15c1604 to b030b12 Compare November 11, 2023 21:46

basilgello marked this pull request as ready for review November 12, 2023 10:42

LilyWangLL mentioned this pull request Nov 13, 2023

[libvpx] Update to 1.13.1 #34814

Closed

7 tasks

Cheney-W assigned JonLiu1993 Nov 13, 2023

JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Nov 13, 2023

JonLiu1993 previously approved these changes Nov 13, 2023

View reviewed changes

JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Nov 13, 2023

dg0yt suggested changes Nov 13, 2023

View reviewed changes

basilgello dismissed JonLiu1993’s stale review via 0237c04 November 13, 2023 07:02

basilgello force-pushed the libvpx-1.13.1 branch from b030b12 to 0237c04 Compare November 13, 2023 07:02

JonLiu1993 removed the info:reviewed Pull Request changes follow basic guidelines label Nov 13, 2023

basilgello force-pushed the libvpx-1.13.1 branch from 0237c04 to 774ca2f Compare November 13, 2023 07:21

basilgello force-pushed the libvpx-1.13.1 branch from 774ca2f to 7010da9 Compare November 13, 2023 07:28

JonLiu1993 previously approved these changes Nov 13, 2023

View reviewed changes

JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Nov 13, 2023

data-queue previously approved these changes Nov 15, 2023

View reviewed changes

data-queue marked this pull request as draft November 15, 2023 00:33

JonLiu1993 removed the info:reviewed Pull Request changes follow basic guidelines label Nov 15, 2023

[libvpx] Bump to 1.13.1

83a712a

Based on microsoft#34814 by @LilyWangLL but tailored for RustDesk to build on arm64-ios, arm*-linux etc. Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>

basilgello dismissed stale reviews from data-queue and JonLiu1993 via 83a712a November 15, 2023 10:07

basilgello force-pushed the libvpx-1.13.1 branch from 7010da9 to 83a712a Compare November 15, 2023 10:07

basilgello marked this pull request as ready for review November 15, 2023 12:49

JonLiu1993 approved these changes Nov 16, 2023

View reviewed changes

JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Nov 16, 2023

data-queue approved these changes Nov 16, 2023

View reviewed changes

data-queue merged commit ac2a14f into microsoft:master Nov 16, 2023
15 checks passed

LilyWangLL mentioned this pull request Nov 20, 2023

[vcpkg baseline][libvpx/libressl] Update status in ci.baseline.txt #35201

Merged

This was referenced Nov 21, 2023

[libvpx] Update to 1.13.1 #34371

Closed

[libvpx] update to 1.13.1 (CVE-2023-5217) #34237

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[libvpx] Bump to 1.13.1 #35047

[libvpx] Bump to 1.13.1 #35047

basilgello commented Nov 11, 2023 •

edited by LilyWangLL

Loading

basilgello commented Nov 11, 2023

JonLiu1993 commented Nov 13, 2023

dg0yt left a comment

dg0yt Nov 13, 2023

dg0yt Nov 13, 2023

basilgello commented Nov 13, 2023

basilgello commented Nov 13, 2023 •

edited

Loading

dg0yt commented Nov 13, 2023

basilgello commented Nov 13, 2023 •

edited

Loading

dg0yt commented Nov 13, 2023

basilgello commented Nov 14, 2023

dg0yt commented Nov 14, 2023

basilgello commented Nov 14, 2023

data-queue Nov 15, 2023

basilgello Nov 15, 2023

dg0yt Nov 15, 2023

data-queue Nov 15, 2023

basilgello Nov 15, 2023

basilgello Nov 15, 2023

	${BASH} --noprofile --norc -c "make -j"
	${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"

[libvpx] Bump to 1.13.1 #35047

[libvpx] Bump to 1.13.1 #35047

Conversation

basilgello commented Nov 11, 2023 • edited by LilyWangLL Loading

basilgello commented Nov 11, 2023

JonLiu1993 commented Nov 13, 2023

dg0yt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

basilgello commented Nov 13, 2023

basilgello commented Nov 13, 2023 • edited Loading

dg0yt commented Nov 13, 2023

basilgello commented Nov 13, 2023 • edited Loading

dg0yt commented Nov 13, 2023

basilgello commented Nov 14, 2023

dg0yt commented Nov 14, 2023

basilgello commented Nov 14, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

basilgello commented Nov 11, 2023 •

edited by LilyWangLL

Loading

basilgello commented Nov 13, 2023 •

edited

Loading

basilgello commented Nov 13, 2023 •

edited

Loading