Skip to content

Upstream merge#42

Merged
ywwg merged 218 commits intomixxxdj:2.4from
daschuer:upstream_merge
Apr 19, 2022
Merged

Upstream merge#42
ywwg merged 218 commits intomixxxdj:2.4from
daschuer:upstream_merge

Conversation

@daschuer
Copy link
Copy Markdown
Member

@daschuer daschuer commented Apr 14, 2022

This upstream merge is required to fix a regression in qtkeychain, fixed by microsoft#24013
This should finally allow to update the 2.4 branch to a recent vcpkg branch. mixxxdj/mixxx#4717

autoantwort and others added 30 commits March 21, 2022 10:14
…microsoft#23638)

* disable parallel configure

* run buildtypes manually

* correct close statement

* version stuff
* [shapelib] Fix shapelib usage

* update version
* Disable examples

* Fix version

* version

* license, https

* version
* [nanorange] update to master

* remove nanorange from CI baseline

* version

* Add homepage

* version
* [grpc] update to 1.44.0

* update version

* update patch EOL

* overwrite version

* update patch

* update version

* fix uwp-build

* overwrite version
* [libsquish] Add feature sse2 for OSX

* correct version field

* version

* apply suggestion

* version
* Update poppler to 22.03.0

* Private include dirs depend on feature private-api

* Update versions

* Fix usage

* Update versions
* [glib] Update to 2.70.5 (microsoft#23647)

See https://github.com/GNOME/glib/commits/glib-2-70 for an
extensive list of changes

* [glibmm] update to 2.70 (microsoft#23649)

See https://github.com/GNOME/glibmm/commits/glibmm-2-70 for an
extensive list of changes

* [glibmm] support msvc2022 (microsoft#23650)

The latest release of glibmm manually configures the v142 compiler
toolchain to be used on msvc2022 environments, which results in
binarycache and export metadata to indicate msvc's v143 compiler
having built the package while it was in fact the v142 toolchain
from the windows sdk.

Upstream has "fixed" this issue, but the patch didn't make it into
the latest release. Apply
  GNOME/glibmm@b3a77c3
manually on our side to make sure we use the toolchain we
instructed to be used.
* Update to 3.4.2

* Disable ATL for uwp and for arm64

* Fix linking on uwp

* Fix pc file fixup

* Update versions

* Declare dependency on atlmfc.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [OpenVDB] Update to V9.0.0

* update version

* add license

* update version
* bullet3: Add patch for windows-arm64

* bullet3: Add patch for uwp

* Bullet: Remove platform restrictions

Bullet claims to support all platforms. ARM works on android and UWP seems to be taken into consideration.
Vcpkg's restrictions are historical and seem to date back to when the CI was unable to properly test all platforms.
qt5-base[vulkan] feature will introduce --vulkan=yes or --vulkan=no option,
which redundants/confilicts with inherent option -no-vulkan,
which is ambiguous in configure stage.
* [nspr] Add new port 4.33

* [nss] Add new port 3.73.1

* [nss] Add new port 3.73.1

* Improve code

* Add supports field

* improve code

* version

* Update doc

* [nss] Switch to gyp-nss fork to fix msvc 17 build

* [nss] Improve code

* [nss] Bump version to 3.74

* [nspr] Add new port 4.33

* [nss] Add new port 3.73.1

* improve code

* Update doc

* [nss] Switch to gyp-nss fork to fix msvc 17 build

* [nss] Improve code

* [nss] Bump to 3.74

* [nss] Bump to 3.75

* [nss] Fix mpi.h confusion

When GYP generates rules for ninja, it puts nspr include dirs before nss's
own include dirs. When the msmpi package is installed, this causes
mpi.h from msmpi to be found, instead of multi-precision integer library
that comes bundled with nss.

This patch uses nspr headers from include/nspr subdirectory which sidesteps
the mpi.h from the include root

* [nss] add quotes around paths

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* [nss] remove debug versions of tools

* [nspr] Remove redundant environment variable assignments

* Add dependencies vcpkg-tool-mozbuild and vcpkg-tool-gyp-nss

* clean doc

* version

* Remove unnecessary vcpkg_crosscompiling block on vcpkg-tool-gyp-nss.

Guard for VCPKG_BUILD_TYPE
Improve error reporting for unsupported VCPKG_TARGET_ARCHITECTURE
Declare support for x64 rather than !x86 (given that the URI in question only has x64 binaries)
Fix version numbers to use 'version'.

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update to gamenetworkingsockets 1.4.0

* Added version using x-add-version
* [chartdir] Update SHA512 to fix install error

* update version
* add itk[opencv] supporting the ITKBridgeOpenCV module

see https://github.com/InsightSoftwareConsortium/ITK/tree/master/Modules/Video/BridgeOpenCV

* Add version

* update version

* reduce dependencies to opencv

* update version

Co-authored-by: Andre Mueller <amueller@opsira.de>
Co-authored-by: Jonliu1993 <13720414433@163.com>
* Libdatrie fixes

* Libdatrie fixes and update to v0.2.13

* Add usage

* Create feature 'tool'

* Update versions

* Install pkg-config module

* Update versions

Co-authored-by: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com>
* [fbthrift] Fix incorrect path in FBThriftConfig.cmake

* update version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
* Version 0.21.0

Solves microsoft#23695

* Version 0.21.0

Solves microsoft#23695

Correct port format
x-add-version called

* Correct sha
PASSING, REMOVE FROM FAIL LIST: intelrdfpmathlib:x64-linux
PASSING, REMOVE FROM FAIL LIST: ocilib:x64-windows-static
PASSING, REMOVE FROM FAIL LIST: skia:arm64-windows
PASSING, REMOVE FROM FAIL LIST: yato:x64-windows-static-md

REGRESSION: argtable3:arm-uwp
No repro. Maybe fixed by microsoft#23655

REGRESSION: infoware:x64-windows-static

```
-- Found Git: C:/agent/externals/git/cmd/git.exe (found version "2.30.2.windows.1")
Cloning into 'pciids'...
fatal: unable to access 'https://github.com/pciutils/pciids/': Could not resolve host: github.com
CMake Error at CMakeLists.txt:111 (message):
  Cloning/pulling pciids repository from https://github.com/pciutils/pciids
  failed with 128.

  The pci.ids file, downloadable from https://github.com/pciutils/pciids or
  http://pci-ids.ucw.cz, is required for building infoware, and cloned
  automatically from that GitHub repository by default.

  To use a local copy, set INFOWARE_PCI_IDS_PATH to its location.
```

Looks like this port needs to be fixed to work with artifact caching.

REGRESSION: libgpg-error:x64-uwp

```
       "D:\buildtrees\libgpg-error\x64-uwp-rel\error-1.42-2324ddbc71.clean\SMP\libgpg-error.sln" (Rebuild target) (1) ->
       "D:\buildtrees\libgpg-error\x64-uwp-rel\error-1.42-2324ddbc71.clean\SMP\libgpg-error_winrt.vcxproj" (Rebuild target) (2) ->
       (_GetPackageFileExtensions target) ->
         C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VisualStudio\v17.0\AppxPackage\Microsoft.AppXPackage.Targets(892,25): error MSB4086: A numeric comparison was attempted on "$(TargetPlatformMinVersion)" that evaluates to "" instead of a number, in condition "'$(TargetPlatformMinVersion)' >= '10.0.17200.0'". [D:\buildtrees\libgpg-error\x64-uwp-rel\error-1.42-2324ddbc71.clean\SMP\libgpg-error_winrt.vcxproj]
```

This looks like a VS2022 regression.

REGRESSION: chromium-base:x64-osx

This port is still having the strange behavior where building it once fails but building it again succeeds O_O

REGRESSION: libmikmod:x64-osx

This is emitting a bunch of spew about standard library symbols.

REGRESSION: qtapplicationmanager:x64-windows
Should be fixed by microsoft#23638
* [WinReg] update to v5.0.1

* update version
* color-console port

* :trollface:

* 🚀

* git hates me for that :trollface: emoji

* Update ports/color-console/portfile.cmake

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>

* Update ports/color-console/vcpkg.json

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>

* Update ports/color-console/vcpkg.json

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>

* vcpkg x-add-version color-console

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
* [nss] Verbump 3.76

* [nss] Update version
walbourn and others added 25 commits April 11, 2022 17:28
…soft#24063)

* [dstorage] new port for Microsoft.Direct3D.DirectStorage NuGet

* Format fix

* Update baseline

* Moved headers up a folder per code review

* Update baselnie

* More code review feedback

* Refresh baseline
* [ffmpeg] fix flag handling

* version stuff

* make sure it is the correct flag

* version stuff

Co-authored-by: Alexander Neumann <you@example.com>
* [glfw] Update to 3.3.7

* [glfw] Add license field

* [glfw] Fix git-tree version
…ft#24054)

* [dxsdk-d3dx, xaudio2redist] ports updated to use config find

* Update baseline

* Update license to indicate proprietary

* Refresh baseline

* Code review feedback based on the dstorage port

* Refresh baseline
* [getdns] Disable building docs

* version
* [expat] Delete docs

* version
* [cpuinfo] update to latest

* use official support of CMake find_package

* [cpuinfo] update triplet support

* [nnpack] fix cpuinfo usage

* [qnnpack] fix cpuinfo usage

* [fbgemm] fix cpuinfo usage

* [xnnpack] fix cpuinfo usage

* [cpuinfo] add license

* [nnpack] port license/dependencies

* [qnnpack] port license

* [xnnpack] port license

* [fbgemm] port license

* fix supports

* I think this should work?

* alright, arm&windows is unsupported... for now

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* Initial commit

* clean up

* updated manifest and version

* Removed C++11 mapping option (feature) and made C++11 the default mapping.

* updated version

* added main target

added entries to ci.baseline.txt

* corrected ci.baseline.txt entries

* updated version

* fixed generated header path

* Updated version

* fixed include paths

* updated version

* expect x64-windows-static to fail

* added patches for clang 13

* update version

* Update ports/zeroc-ice/portfile.cmake

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

* 2->4 spaces

* Removed v144/5 stuff

* check for .DS_Store file before deletion

* several changes

* format vcpkg.json

* update version

* remove typo

* updated version

* reformatting

* resolve review issues

* regex

* updated version

* windows-static

* allow static builds on windows and added maintainer

* updated version

* added openssl as a dependency for Ice core library

* updated version

* minor updates

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* [libatomic-ops] Disable docs

* version

* Fix license

* uppercase

* version

* confusing license terms

* version
* Create patch to add missing header

* Updated package version

* Updated checksum

Co-authored-by: vetegrodd <ccederberg@burken.localdomain>
* Use EMSCRIPTEN variable instead of EMSDK

Because it's directly point to appropriate version

* Use EMSCRIPTEN_ROOT variable in addition to EMSDK
…rosoft#24013)

This allows to link the target application using CMake < 3.18
and fixing a regression since v0.13.0
…-md triplets (microsoft#24104)

* Update ports to support static-md triplets

* Update baseline

* !(static & staticcrt) -> !staticcrt

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* Update to v1.2.2

* Fix libwebpmux Windows name breakage

The pc file relies on the original output name:
No 'lib' prefix for MSVC. No 'liblib' prefix for mingw.

* Minor portfile updates

* Don't self-depend on default features

* Fix the libwebpmux feature

* Fix internal tool dependencies

* Drop Xrandr patch (fixed in freeglut)

* Drop X11 patch (fixed in freeglut)

* Cleanup CMake config patch, no extra case hacks

* Adjust webp lib names in skia, qt5-imageformats

* Adjust downstream WEBP cmake usage

* Debug qtimageformats [skip actions]

* [tiff] Drive-by fix for CMake warning

* Drop non-standard debug postfix

* Update indentation

* Update port versions

* Update versions

* Revert qtimageformat debug change

* Fixup qt5-imageformats change

* Update versions
* Update ceres to v2.1.0

* update

* fix build issue

* fix findpackage issue

* update

* update patch

* Add feature 'CUDA'

* update
…icrosoft#24108)

* Updated osg port to be able to set the OPENGL_PROFILE setting via
a triplet variable.

* Format osg/ports/vcpkg.json

* Added osg port version 12
* Stop using linker optimization

These optimizations require the gold linker on Linux, and this linker is
not typically available.

* Add license

* Fix formatting
* [clipboardcxx] Add new port

* Run x-add-version

* license

* Update clipboardcxx.json

* Add homepage

* update version

* Update ports/clipboardcxx/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Update and rename ports/clipboardcxx/portfile.cmake to ports/clipboardxx/portfile.cmake

* Rename ports/clipboardcxx/vcpkg.json to ports/clipboardxx/vcpkg.json

* Rename clipboardcxx.json to clipboardxx.json

* Update baseline.json

* Update portfile.cmake

* Update vcpkg.json

* Update clipboardxx.json

* .

* Update clipboardxx.json

* Nicole CRs

- add `supports: !osx`
- add `unofficial-clipboardxx-config.cmake`

Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* add upstream patch

* [skip actions] add the patch file

* fine tune

* [opencv] update portfiles to use vcpkg-get-python-packages

* fix references

* try another fix

* add all deps

* add code from tensorflow about venv

* retry

* fix file path

* new approach

* unset pythonhome

* next unset

* try this instead.

* retry without the PYTHON_LIB_PATH stuff

* try and error

* next try

* retry

* typo fix

* try updating

* retry

* more try and error

* reorder

* drop qface version

* use qface 2.0.5

* bump watchdog

* fix call on !windows

* fine tuning

* refactor function signature

* update version

* fix formating

* version stuff

* create dir before usage

* fine tuning

* version stuff

* update and patch libilbc

* formating stuff

* fix version-string

* version stuff

* add license

* version update

* bump version

* version stuff

* version stuff

Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
…#24150)

This will make dependabot happy, and maybe fix issues for our users

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
# Conflicts:
#	.github/workflows/trustedPR.yml
#	.github/workflows/untrustedPR.yml
@daschuer daschuer requested review from Holzhaus and ywwg April 14, 2022 21:36
@ywwg ywwg merged commit aec8774 into mixxxdj:2.4 Apr 19, 2022
@daschuer
Copy link
Copy Markdown
Member Author

Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.