diff options
| author | sslivins <sslivins@users.noreply.github.com> | 2021-09-02 13:11:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-02 13:11:17 -0700 |
| commit | bff0e8fc31e4e00a9c2f51b84c9b43bc46478729 (patch) | |
| tree | 4512483dee8617d44b3b21a1cb14999c90f7dc46 | |
| parent | 4934cb4099937d01985ac51aa929e70bc962937a (diff) | |
| download | vcpkg-bff0e8fc31e4e00a9c2f51b84c9b43bc46478729.tar.gz vcpkg-bff0e8fc31e4e00a9c2f51b84c9b43bc46478729.zip | |
[libvpx] Add realtime and highbitdepth features. (#19532)
* added features for vpx to enable realtime, highbitdepth and pic
* output of vcpkg format-manifest
* added port version
* ran format-manifest again
* changed to port version 1 as implicit version is 0
* added updated version files
* removed pic feature and instead set --enable-pic as default option
* updated version database
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/libvpx/portfile.cmake | 24 | ||||
| -rw-r--r-- | ports/libvpx/vcpkg.json | 12 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libvpx.json | 5 |
4 files changed, 36 insertions, 7 deletions
diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index 2448cc6fb..10ce04878 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -70,6 +70,16 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(LIBVPX_TARGET_VS "vs15") endif() + set(OPTIONS "--disable-examples --disable-tools --disable-docs --enable-pic") + + if("realtime" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-realtime-only") + endif() + + if("highbitdepth" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-vp9-highbitdepth") + endif() + message(STATUS "Generating makefile") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") vcpkg_execute_required_process( @@ -78,9 +88,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) "${SOURCE_PATH}/configure" --target=${LIBVPX_TARGET_ARCH}-${LIBVPX_TARGET_VS} ${LIBVPX_CRT_LINKAGE} - --disable-examples - --disable-tools - --disable-docs + ${OPTIONS} --as=nasm WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}" LOGNAME configure-${TARGET_TRIPLET}) @@ -143,7 +151,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) else() - set(OPTIONS "--disable-examples --disable-tools --disable-docs --disable-unit-tests") + set(OPTIONS "--disable-examples --disable-tools --disable-docs --disable-unit-tests --enable-pic") set(OPTIONS_DEBUG "--enable-debug-libs --enable-debug --prefix=${CURRENT_PACKAGES_DIR}/debug") set(OPTIONS_RELEASE "--prefix=${CURRENT_PACKAGES_DIR}") @@ -154,6 +162,14 @@ else() set(OPTIONS "${OPTIONS} --enable-static --disable-shared") endif() + if("realtime" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-realtime-only") + endif() + + if("highbitdepth" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-vp9-highbitdepth") + endif() + if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) set(LIBVPX_TARGET_ARCH "x86") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json index ced530f21..c002bdddf 100644 --- a/ports/libvpx/vcpkg.json +++ b/ports/libvpx/vcpkg.json @@ -1,7 +1,15 @@ { "name": "libvpx", "version-semver": "1.10.0", - "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" + "homepage": "https://github.com/webmproject/libvpx", + "features": { + "highbitdepth": { + "description": "use VP9 high bit depth (10/12) profiles" + }, + "realtime": { + "description": "enable this option while building for real-time encoding" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 2233413ef..e333a3c34 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3782,7 +3782,7 @@ }, "libvpx": { "baseline": "1.10.0", - "port-version": 1 + "port-version": 2 }, "libwandio": { "baseline": "4.2.1", diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json index e4aa292ed..68e653796 100644 --- a/versions/l-/libvpx.json +++ b/versions/l-/libvpx.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "79a7e2cf4e6df063990dc59d1aa221150eb0ce0e", + "version-semver": "1.10.0", + "port-version": 2 + }, + { "git-tree": "55be5e09000631b1dacd6f86d174eb2cade91bf5", "version-semver": "1.10.0", "port-version": 1 |