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

Jump to bottom

merge from upstream #65

Merged

JoergAtGithub merged 746 commits into mixxxdj:2.4 from daschuer:master_merge

Apr 8, 2023

Member

daschuer commented Apr 2, 2023

This is required, because the original required msys2-runtime is no longer available for download:
microsoft#30546

This also brings updates to these packages we us:

angle[core]: chromium_4472#7 -> chromium_5414#1
ffmpeg[avcodec,avdevice,avfilter,avformat,core,swresample,swscale]: 5.0.2#1 -> 5.1.2#5
harfbuzz[core]: 5.3.1 -> 7.0.0
libflac[core]: 1.3.4#1 -> 1.4.2
openssl[core]: 3.0.7#2 -> 3.1.0#1
opusfile[core]: 0.12#1 -> 0.12+20221121#1
zstd[core]: 1.5.2#3 -> 1.5.4#1

quyykk and others added 30 commits

March 12, 2023 21:31


          [harfbuzz] update to 7.0.0 (microsoft#29618)

c43dbae


          [llfio,ned14-internal-quickcpplib] Add version 2023-03-13 (microsoft#…

7509b4c

…30149)

* [ned14-internal-quickcpplib] Update to version 2023-03-13

* [llfio] Update to version 2023-03-13

* Update version database


          [libphonenumber] update to 8.13.7 (microsoft#30148)

c4b6dbf

* update to 8.13.7

* update


          [magnum] fix dependencies (microsoft#30138)

4c099a9


          [szip] Allow cross compiling for arm64-osx (microsoft#30134)

ad35705


          [cairo] fix feature cairo (microsoft#30132)

4205e3d


          [cxsparse] fix feature cxsparse (microsoft#30126)

be97a60


          [magnum-plugins] fix SHA512 (microsoft#30123)

28e440b


          [opencc] De-vendor marisa (microsoft#29997)

ac4f80a

* Add feature marisa

* update

* remove useless code

* add pkgconf

* update


          [vtk] Fix proj, trim feature dependencies (microsoft#29703)

f09a222


          Restore environment after make to avoid mixing-up linker flags (mic…

cfdeb75

…rosoft#29984)

Fixes microsoft#29983.


          [libcbor] Update to 0.10.2 (microsoft#30168)

72a711e

* update lincbor

* update version

---------

Co-authored-by: Monica <[email protected]>


          [nifticlib] fix installation of cmake config files (microsoft#30124)

090b767


          [openssl,vcpkg-cmake-get-vars] Fix android and emscripten, add featur…

73b9a2a

…e `tools` (microsoft#29966)

* [vcpkg-cmake-get-vars] Call 'project' early

System variables like 'APPLE' or 'ANDROID' aren't set before 'project()'.

* Get Android variables

* [openssl] Ensure that compiler is reached via 'PATH'

* Fix Android configuration

* Add 'tools' feature

* Update versions

* [openssl] Initialize android with vcpkg settings

* [openssl] Really don't build apps

* [vcpkg-cmake-get-vars] Update android vars

* [libpq] Pass openssl version from pkgconfig

* [vcpkg-cmake-get-vars] Update android vars

* [vcpkg-cmake-get-vars] Report generator

* [vcpkg-cmake-get-vars] Escape all output

* Transfer cmake-get-vars fixes

* Transfer cmake-get-vars extra flags

* no-asm for android-arm w/o neon

* [vcpkg_configure_make] Unquote as needed

Toolchain flags are passed into make via environment variables (e.g.
CFLAGS) and expanded by Makefiles regardless of quotes. And even vcm's
internal handling isn't prepared for these quotes. So we must remove
the early. This doesn't interfere with properly escaped quotes.

* Re-add lost 'project', amends 4cf7caa

* [openssl] Fix emscripten


          [asio-grpc] Update to v2.5.0 (microsoft#30153)

614a459

* asio-grpc: Update to v2.5.0

* asio-grpc: Re-add description for feature boost-container


          [simdjson] Update to 3.1.5 (microsoft#30107)

4f1cf8f

* [simdjson] Update to 3.1.3

* [simdjson] Bump version

* [simdjson] Update to 3.1.5

* [simdjson] Overwrite version

* [simdjson] Quote

* [simdjson] Overwrite version


          [sdl2pp] fix dependency error (microsoft#30085)

4674f57

* fix sdl2pp dependency

* update version

* update version

* fix CI error

* update version

* fix dependency

* update version


          [Openvdb] Build Tools in static (microsoft#29989)

b2b743a

* [Openvdb] Build Tools in static

* update version

* add function

* vdb


          [vcpkg_fixup_pkgconfig] Fix quoting (microsoft#29792)

5da7b20

* [unit-test-cmake] Check pkgconfig quoting

* [vcpkg_fixup_pkgconfig] Fix quoting


          [fmilib] Cleanup, de-vendor libs, fix linux (microsoft#29834)

2256cc9

* [fmilib] change to the github and update to fix bug of libexpat

* add license

* Cleanup and devendor expat, minizip, zlib

* Merge target objects, not archives

* Update "supports" and ci baseline

* zlib is a transitive dependency

* Fix config

---------

Co-authored-by: FrankXie <[email protected]>
Co-authored-by: Javier Matos Denizac <[email protected]>
Co-authored-by: Monica <[email protected]>


          Update vcpkg-tool to 2023-03-14 (microsoft#30165)

20759c8

https://github.com/microsoft/vcpkg-tool/releases/tag/2023-03-14


          [llfio] Fix commit reference (microsoft#30194)

a166d75


          [opentelemetry-cpp] Update to v1.8.3 (microsoft#30151)

a9875b3


          [qtdeclarative] Add qmlls tool (microsoft#30171)

66ae310

* [qtdeclarative] Add a qmlls tool

* update version


          [configcat] Update to version 2.0.0 (microsoft#30121)

311ad44

* [configcat] Update to version 2.0.0

* [configcat] Update to version 2.0.0

* [configcat] Update to version 2.0.0

* [configcat] Update to version 2.0.0

* Update ports/configcat/portfile.cmake

Co-authored-by: Frank <[email protected]>

* [configcat] Update to version 2.0.0

---------

Co-authored-by: Frank <[email protected]>


          update to 1.13.0 (microsoft#30167)

7c34d0c


          [colmap] Update COLMAP port to 3.8 (microsoft#29433)

44070cc

* Update COLMAP version to 3.8

* date

* version

* patch

* f

* format

* f

* c

* c

* f

* d

* d

* d

* f

* revert patch formating

* update version

* n

* n

* f

* f

* f

---------

Co-authored-by: Jonliu1993 <[email protected]>


          [libspatialite] Fix android (microsoft#30173)

f880a37


          [zstd] Fix emscripten (microsoft#30174)

c4aa1a2


          [Spout2] New Port (microsoft#30119)

b12243b

* Add Spout2

* Add Spout2

* Disable UWP

* Fixup

* Disable ARM64

* Disable ARM64

* Fix cmake config

* Explain dx feature

* Fix

* vcpkg_check_features

* FEATURE_OPTIONS

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

David-Ely and others added 4 commits

April 5, 2023 16:54


          Added chroma-format and disable-gpl features (microsoft#30631)


          [libigl] Always install as header-only lib (microsoft#30617)

dd28469

* [libigl] Always install as header-only lib

* [libigl] Update database


          [qca] Control plugin dependencies (microsoft#30686)

db2dcf4


          [gul14] Update to version 2.8.0 (microsoft#30581)

657bfe2

Member Author

daschuer commented Apr 6, 2023

Now the issue is fixed.
The upstream PR is this: microsoft#30692

You can here find Mixxx test builds using this new environment:
https://github.com/daschuer/mixxx/actions/runs/4628165601

Merge?

daschuer changed the title ~~merge form upstream~~ merge from upstream

daschuer requested a review from JoergAtGithub

April 6, 2023 13:47

Neumann-A and others added 11 commits

April 6, 2023 11:54


          [Fontconfig] fix internal search paths (microsoft#28236)

b0f2daa

* [fontconfig] hardcode paths instead of using the prefix from vcpkg

* v db

* bump version

* v db

* make the default search dir invalid

* v db


          [sail] Fix installing webp and avif features (microsoft#30423)

effb026

* Fix compiling AVIF and WEBP in static mode

* Bump port version to 2

* vcpkg x-add-version --all

---------

Co-authored-by: Monica <[email protected]>


          [zeroc-ice] fix arm64-osx build (microsoft#30519)

df1fcfb

Co-authored-by: Cheney-Wang <[email protected]>


          [issues] Use issue forms instead of markdown templates (microsoft#30605)

92acffb


          [stlab] Update to 1.7.1 (microsoft#30525)

b7b490a

* Update stlab to 1.7.1

* Apply suggestions from code review

Co-authored-by: Cheney Wang <[email protected]>

* Remove unnecessary closing bracket

* Run vcpkg x-add-version stlab --overwrite-version per @Cheney-W

* Add "shims" feature to port to match cmake expectations

* remove erroneous version object

* Formatting

* Run vcpkg x-add-version stlab --overwrite-version

---------

Co-authored-by: Cheney Wang <[email protected]>


          [rubberband] Update to version 3.2.0 (microsoft#30551)

8f6d7e2


          [gtsam] New Port (microsoft#30560)

51376a3

* Add GTSAM Port

* add missing dependencies

* update

* fix windows build

* update

* PR Review

* update version


          [tinyfsm] Add new port (microsoft#30575)

073df7f

* [tinyfsm] Initial port

* [tinyfsm] Mark as header-only port

* [tinyfsm] Remove CMake export


          [qt5-webengine] fix issue 30006 missing includes for msvc (microsoft#…

668bf87

…30612)

* [qt5-webengine] add missing includes in third party libraries

This fixes issue microsoft#30006. Newer versions of msvc require more includes than previous versions. To accommodate this change, two missing includes are added to the third party libraries chromium and libxml.

* [qt5-webengine] update port number

* [qt5-webengine] restore LF line endings on patch

* [qt5-webengine] re-run vcpkg x-add-version for qt5-webengine port-version 3


          [qpid-proton] Update, fix dependency control (microsoft#30688)

5864fd7


          [ffmpeg] Osx cross fix (microsoft#30692)

7f59e00

* [ffmpeg] Fix off-by-one issue when looping over the OSX_ARCHS

This fixes crosscompiling e.g. arm64 on x64

* [ffmpeg] Remove redundant --enable-cross-compile flag

* [ffmpeg] Bump port version

daschuer marked this pull request as draft

April 7, 2023 08:35

Member Author

daschuer commented Apr 7, 2023

Rubberband 3.2 and the ffmpeg patch have been merged. I will re-create this PR based on the new upstream master.


          Merge remote-tracking branch 'microsoft/master' into master_merge

b2c53a0

# Conflicts:
#	.github/workflows/untrustedPR.yml

daschuer force-pushed the master_merge branch from c5b2a10 to b2c53a0 Compare

April 7, 2023 08:59

daschuer marked this pull request as ready for review

April 7, 2023 21:23

Member

JoergAtGithub commented Apr 7, 2023 •

edited

Loading

I downloaded the Windows buildenv from the artifacts and noticed two huge files, which are not in the currnt buildenv of 2.4:
\mixxx\buildenv\mixxx-deps-2.4-x64-windows-90a30a7\installed\x64-windows\lib\ANGLE.lib
\mixxx\buildenv\mixxx-deps-2.4-x64-windows-90a30a7\installed\x64-windows\debug\lib\ANGLE.lib
Each file is ~1GByte of size.
We had ANGLE bundled before, but I couldn't find these files in mixxx-deps-2.4-x64-windows-db02b82

Member

JoergAtGithub commented Apr 7, 2023

I found, that it's just renamed, before it was called libANGLE.lib and only 840MByte.

Member

JoergAtGithub commented Apr 8, 2023

I build x64_portable and x64_off builds with this buildenv. x64_portable works
With the x64_off build, I ran into a Qt assert (mixxxdj/mixxx#11454), which is most likely a bug in the code of Mixxx itself and not related to this buildenv update.

Member

JoergAtGithub commented Apr 8, 2023

The code of this PR looks straight forward. Thanks for upstreaming the FFMPEG overlay!
This buildenv needs further testing in mixxxdj/mixxx#11398, especially on macOS, before we use it as default. But merging this PR doesn't harm anything until we change the default buildenv in Mixxx.
Thank you!

JoergAtGithub merged commit e2a51b1 into mixxxdj:2.4

Member Author

daschuer commented Apr 8, 2023

My test build was here: https://github.com/daschuer/mixxx/actions/runs/4642219218. I will prepare an mixxxdj/mixxx PR accordingly

daschuer mentioned this pull request

Update to vcpkg environment e2a51b1 mixxxdj/mixxx#11457

Merged

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

Labels

None yet

99 participants