mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 18:30:11 +08:00
[libvpx] update version to 1.12.0 (#26159)
* [libvpx] update version to 1.12.0 * update version * update patch * overwrite version
This commit is contained in:
parent
eb40ddf467
commit
578a0c61a4
@ -1,8 +1,8 @@
|
|||||||
diff --git a/build/make/configure.sh b/build/make/configure.sh
|
diff --git a/build/make/configure.sh b/build/make/configure.sh
|
||||||
index 325017e..5ab54e4 100644
|
index 119d206..41bac75 100644
|
||||||
--- a/build/make/configure.sh
|
--- a/build/make/configure.sh
|
||||||
+++ b/build/make/configure.sh
|
+++ b/build/make/configure.sh
|
||||||
@@ -1016,7 +1016,7 @@ EOF
|
@@ -1038,7 +1038,7 @@ EOF
|
||||||
# A number of ARM-based Windows platforms are constrained by their
|
# A number of ARM-based Windows platforms are constrained by their
|
||||||
# respective SDKs' limitations. Fortunately, these are all 32-bit ABIs
|
# respective SDKs' limitations. Fortunately, these are all 32-bit ABIs
|
||||||
# and so can be selected as 'win32'.
|
# and so can be selected as 'win32'.
|
||||||
@ -11,7 +11,7 @@ index 325017e..5ab54e4 100644
|
|||||||
asm_conversion_cmd="${source_path_mk}/build/make/ads2armasm_ms.pl"
|
asm_conversion_cmd="${source_path_mk}/build/make/ads2armasm_ms.pl"
|
||||||
AS_SFX=.S
|
AS_SFX=.S
|
||||||
msvs_arch_dir=arm-msvs
|
msvs_arch_dir=arm-msvs
|
||||||
@@ -1250,6 +1250,9 @@ EOF
|
@@ -1272,6 +1272,9 @@ EOF
|
||||||
android)
|
android)
|
||||||
soft_enable realtime_only
|
soft_enable realtime_only
|
||||||
;;
|
;;
|
||||||
@ -21,7 +21,7 @@ index 325017e..5ab54e4 100644
|
|||||||
win*)
|
win*)
|
||||||
enabled gcc && add_cflags -fno-common
|
enabled gcc && add_cflags -fno-common
|
||||||
;;
|
;;
|
||||||
@@ -1368,6 +1371,16 @@ EOF
|
@@ -1390,6 +1393,16 @@ EOF
|
||||||
fi
|
fi
|
||||||
AS_SFX=.asm
|
AS_SFX=.asm
|
||||||
case ${tgt_os} in
|
case ${tgt_os} in
|
||||||
@ -38,7 +38,7 @@ index 325017e..5ab54e4 100644
|
|||||||
win32)
|
win32)
|
||||||
add_asflags -f win32
|
add_asflags -f win32
|
||||||
enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
|
enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
|
||||||
@@ -1488,6 +1501,8 @@ EOF
|
@@ -1519,6 +1532,8 @@ EOF
|
||||||
# Almost every platform uses pthreads.
|
# Almost every platform uses pthreads.
|
||||||
if enabled multithread; then
|
if enabled multithread; then
|
||||||
case ${toolchain} in
|
case ${toolchain} in
|
||||||
@ -47,31 +47,10 @@ index 325017e..5ab54e4 100644
|
|||||||
*-win*-vs*)
|
*-win*-vs*)
|
||||||
;;
|
;;
|
||||||
*-android-gcc)
|
*-android-gcc)
|
||||||
diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh
|
|
||||||
index d1adfd7..a03ea59 100644
|
|
||||||
--- a/build/make/gen_msvs_sln.sh
|
|
||||||
+++ b/build/make/gen_msvs_sln.sh
|
|
||||||
@@ -219,6 +219,7 @@ for opt in "$@"; do
|
|
||||||
14) vs_year=2015 ;;
|
|
||||||
15) vs_year=2017 ;;
|
|
||||||
16) vs_year=2019 ;;
|
|
||||||
+ 17) vs_year=2022 ;;
|
|
||||||
*) die Unrecognized Visual Studio Version in $opt ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
|
diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
|
||||||
index 6f91ad4..b4cad6c 100644
|
index 58bb66b..b4cad6c 100644
|
||||||
--- a/build/make/gen_msvs_vcxproj.sh
|
--- a/build/make/gen_msvs_vcxproj.sh
|
||||||
+++ b/build/make/gen_msvs_vcxproj.sh
|
+++ b/build/make/gen_msvs_vcxproj.sh
|
||||||
@@ -170,7 +170,7 @@ for opt in "$@"; do
|
|
||||||
--ver=*)
|
|
||||||
vs_ver="$optval"
|
|
||||||
case "$optval" in
|
|
||||||
- 1[4-6])
|
|
||||||
+ 1[4-7])
|
|
||||||
;;
|
|
||||||
*) die Unrecognized Visual Studio Version in $opt
|
|
||||||
;;
|
|
||||||
@@ -296,7 +296,22 @@ generate_vcxproj() {
|
@@ -296,7 +296,22 @@ generate_vcxproj() {
|
||||||
tag_content ProjectGuid "{${guid}}"
|
tag_content ProjectGuid "{${guid}}"
|
||||||
tag_content RootNamespace ${name}
|
tag_content RootNamespace ${name}
|
||||||
@ -96,17 +75,7 @@ index 6f91ad4..b4cad6c 100644
|
|||||||
tag_content AppContainerApplication true
|
tag_content AppContainerApplication true
|
||||||
# The application type can be one of "Windows Store",
|
# The application type can be one of "Windows Store",
|
||||||
# "Windows Phone" or "Windows Phone Silverlight". The
|
# "Windows Phone" or "Windows Phone Silverlight". The
|
||||||
@@ -344,6 +359,9 @@ generate_vcxproj() {
|
@@ -394,7 +409,7 @@ generate_vcxproj() {
|
||||||
if [ "$vs_ver" = "16" ]; then
|
|
||||||
tag_content PlatformToolset v142
|
|
||||||
fi
|
|
||||||
+ if [ "$vs_ver" = "17" ]; then
|
|
||||||
+ tag_content PlatformToolset v143
|
|
||||||
+ fi
|
|
||||||
tag_content CharacterSet Unicode
|
|
||||||
if [ "$config" = "Release" ]; then
|
|
||||||
tag_content WholeProgramOptimization true
|
|
||||||
@@ -391,7 +409,7 @@ generate_vcxproj() {
|
|
||||||
Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'"
|
Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'"
|
||||||
if [ "$name" == "vpx" ]; then
|
if [ "$name" == "vpx" ]; then
|
||||||
hostplat=$plat
|
hostplat=$plat
|
||||||
@ -116,12 +85,12 @@ index 6f91ad4..b4cad6c 100644
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
diff --git a/configure b/configure
|
diff --git a/configure b/configure
|
||||||
index da631a4..2804678 100644
|
index beea650..91ae3c8 100644
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -101,16 +101,24 @@ all_platforms="${all_platforms} arm64-android-gcc"
|
@@ -102,16 +102,24 @@ all_platforms="${all_platforms} arm64-darwin-gcc"
|
||||||
all_platforms="${all_platforms} arm64-darwin-gcc"
|
|
||||||
all_platforms="${all_platforms} arm64-darwin20-gcc"
|
all_platforms="${all_platforms} arm64-darwin20-gcc"
|
||||||
|
all_platforms="${all_platforms} arm64-darwin21-gcc"
|
||||||
all_platforms="${all_platforms} arm64-linux-gcc"
|
all_platforms="${all_platforms} arm64-linux-gcc"
|
||||||
+all_platforms="${all_platforms} arm64-uwp-vs16"
|
+all_platforms="${all_platforms} arm64-uwp-vs16"
|
||||||
+all_platforms="${all_platforms} arm64-uwp-vs17"
|
+all_platforms="${all_platforms} arm64-uwp-vs17"
|
||||||
@ -143,8 +112,8 @@ index da631a4..2804678 100644
|
|||||||
+all_platforms="${all_platforms} armv7-win32-vs17"
|
+all_platforms="${all_platforms} armv7-win32-vs17"
|
||||||
all_platforms="${all_platforms} armv7s-darwin-gcc"
|
all_platforms="${all_platforms} armv7s-darwin-gcc"
|
||||||
all_platforms="${all_platforms} armv8-linux-gcc"
|
all_platforms="${all_platforms} armv8-linux-gcc"
|
||||||
all_platforms="${all_platforms} mips32-linux-gcc"
|
all_platforms="${all_platforms} loongarch32-linux-gcc"
|
||||||
@@ -135,10 +143,13 @@ all_platforms="${all_platforms} x86-linux-gcc"
|
@@ -138,6 +146,8 @@ all_platforms="${all_platforms} x86-linux-gcc"
|
||||||
all_platforms="${all_platforms} x86-linux-icc"
|
all_platforms="${all_platforms} x86-linux-icc"
|
||||||
all_platforms="${all_platforms} x86-os2-gcc"
|
all_platforms="${all_platforms} x86-os2-gcc"
|
||||||
all_platforms="${all_platforms} x86-solaris-gcc"
|
all_platforms="${all_platforms} x86-solaris-gcc"
|
||||||
@ -153,12 +122,7 @@ index da631a4..2804678 100644
|
|||||||
all_platforms="${all_platforms} x86-win32-gcc"
|
all_platforms="${all_platforms} x86-win32-gcc"
|
||||||
all_platforms="${all_platforms} x86-win32-vs14"
|
all_platforms="${all_platforms} x86-win32-vs14"
|
||||||
all_platforms="${all_platforms} x86-win32-vs15"
|
all_platforms="${all_platforms} x86-win32-vs15"
|
||||||
all_platforms="${all_platforms} x86-win32-vs16"
|
@@ -161,6 +171,8 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
|
||||||
+all_platforms="${all_platforms} x86-win32-vs17"
|
|
||||||
all_platforms="${all_platforms} x86_64-android-gcc"
|
|
||||||
all_platforms="${all_platforms} x86_64-darwin9-gcc"
|
|
||||||
all_platforms="${all_platforms} x86_64-darwin10-gcc"
|
|
||||||
@@ -156,10 +167,13 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc"
|
|
||||||
all_platforms="${all_platforms} x86_64-linux-gcc"
|
all_platforms="${all_platforms} x86_64-linux-gcc"
|
||||||
all_platforms="${all_platforms} x86_64-linux-icc"
|
all_platforms="${all_platforms} x86_64-linux-icc"
|
||||||
all_platforms="${all_platforms} x86_64-solaris-gcc"
|
all_platforms="${all_platforms} x86_64-solaris-gcc"
|
||||||
@ -167,12 +131,7 @@ index da631a4..2804678 100644
|
|||||||
all_platforms="${all_platforms} x86_64-win64-gcc"
|
all_platforms="${all_platforms} x86_64-win64-gcc"
|
||||||
all_platforms="${all_platforms} x86_64-win64-vs14"
|
all_platforms="${all_platforms} x86_64-win64-vs14"
|
||||||
all_platforms="${all_platforms} x86_64-win64-vs15"
|
all_platforms="${all_platforms} x86_64-win64-vs15"
|
||||||
all_platforms="${all_platforms} x86_64-win64-vs16"
|
@@ -485,11 +497,10 @@ process_targets() {
|
||||||
+all_platforms="${all_platforms} x86_64-win64-vs17"
|
|
||||||
all_platforms="${all_platforms} generic-gnu"
|
|
||||||
|
|
||||||
# all_targets is a list of all targets that can be configured
|
|
||||||
@@ -476,11 +490,10 @@ process_targets() {
|
|
||||||
! enabled multithread && DIST_DIR="${DIST_DIR}-nomt"
|
! enabled multithread && DIST_DIR="${DIST_DIR}-nomt"
|
||||||
! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs"
|
! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs"
|
||||||
DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}"
|
DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}"
|
||||||
@ -188,7 +147,7 @@ index da631a4..2804678 100644
|
|||||||
if [ -f "${source_path}/build/make/version.sh" ]; then
|
if [ -f "${source_path}/build/make/version.sh" ]; then
|
||||||
ver=`"$source_path/build/make/version.sh" --bare "$source_path"`
|
ver=`"$source_path/build/make/version.sh" --bare "$source_path"`
|
||||||
DIST_DIR="${DIST_DIR}-${ver}"
|
DIST_DIR="${DIST_DIR}-${ver}"
|
||||||
@@ -569,6 +582,10 @@ process_detect() {
|
@@ -578,6 +589,10 @@ process_detect() {
|
||||||
|
|
||||||
# Specialize windows and POSIX environments.
|
# Specialize windows and POSIX environments.
|
||||||
case $toolchain in
|
case $toolchain in
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||||
|
|
||||||
set(LIBVPX_VERSION 1.11.0)
|
set(LIBVPX_VERSION 1.12.0)
|
||||||
|
|
||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO webmproject/libvpx
|
REPO webmproject/libvpx
|
||||||
REF v${LIBVPX_VERSION}
|
REF v${LIBVPX_VERSION}
|
||||||
SHA512 7aa5d30afa956dccda60917fd82f6f9992944ca893437c8cd53a04d1b7a94e0210431954aa136594dc400340123cc166dcc855753e493c8d929667f4c42b65a5
|
SHA512 dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
0002-Fix-nasm-debug-format-flag.patch
|
0002-Fix-nasm-debug-format-flag.patch
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "libvpx",
|
"name": "libvpx",
|
||||||
"version": "1.11.0",
|
"version": "1.12.0",
|
||||||
"port-version": 1,
|
|
||||||
"description": "The reference software implementation for the video coding formats VP8 and VP9.",
|
"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",
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
|
@ -4241,8 +4241,8 @@
|
|||||||
"port-version": 2
|
"port-version": 2
|
||||||
},
|
},
|
||||||
"libvpx": {
|
"libvpx": {
|
||||||
"baseline": "1.11.0",
|
"baseline": "1.12.0",
|
||||||
"port-version": 1
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"libwandio": {
|
"libwandio": {
|
||||||
"baseline": "4.2.1",
|
"baseline": "4.2.1",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "5bad78764d9138da1f5f2b1c49ec291377166a30",
|
||||||
|
"version": "1.12.0",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "5d03c5487a2e01ccc310c1d3e5b0b2c78232cf2b",
|
"git-tree": "5d03c5487a2e01ccc310c1d3e5b0b2c78232cf2b",
|
||||||
"version": "1.11.0",
|
"version": "1.11.0",
|
||||||
|
Loading…
Reference in New Issue
Block a user