Skip to content
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.

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

2.6: merge upstream master #150

Open
wants to merge 3,695 commits into
base: 2.6
Choose a base branch
from
Open

2.6: merge upstream master #150

wants to merge 3,695 commits into from

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Jan 19, 2025

This is a VCPKG update for our upcoming Mixxx 2.6-beta

I consider these changes significant:

  • Qt 6.5.3 -> 6.8.1
  • libusb 1.0.26 -> 1.0.27 (new API)
  • rubberband 3.3.0 -> 4.0.0 (new API)

I have pinned taglib to 1.13.1 until mixxxdj/mixxx#12790 is fixed

Here is the full list of Updates (* = indirect dependencies)

    ableton-link 3.0.6#1 -> 3.1.2 
  * asio 1.28.1 -> 1.32.0
    benchmark  1.8.3 -> 1.9.1
    egl-registry 2022-09-20 -> 2024-01-25
    ffmpeg[...] 6.0#2 -> 7.1#2
    freetype[brotli,bzip2,core,png,zlib]  2.12.1#4 -> 2.13.3	 
  * harfbuzz[core,freetype] 8.3.0#1 -> 10.2.0
    icu[core,tools] 73.1#2 -> 74.2#4
    liblo 0.31#4 -> 0.32
  * libpng 1.6.45 -> 0.16.4#3
  * libpq[...] 16.0 -> 16.4
    libusb 1.0.26.11791#1 -> 1.0.27#2
    lilv 0.24.10#2 -> 0.24.24#1																   
  * lv2  1.18.2#1-> 1.18.10#1
  * lz4 1.9.4#1 -> 1.10.0
  * mpg123 1.31.3#3 -> 1.32.9#1
    ms-gsl 4.0.0 -> 4.1.0
  * opengl-registry 2022-09-29 -> 2024-02-10#1
  * openssl 3.1.3 -> 3.4.0#1
    opus 1.4 -> 1.5.2
  * pcre2[...] 10.42#2 -> 10.43
  * pkgconf 1.8.0#5-> 2.3.0
    protobuf 3.21.12#1 -> 5.29.2 
    qt5compat[...] 6.5.3 -> 6.8.1
    qtbase[...] 6.5.3#2 -> 6.8.1#1
    qtdeclarative 6.5.3 -> 6.8.1
    qtkeychain-qt6 0.14.1#1 -> 0.14.3
  * qtshadertools  6.5.3 -> 6.8.1
  * qttools[core,designer,linguist] 6.5.3 -> 6.8.1
    qttranslations[core,default-features] 6.5.3 -> 6.8.1
    rubberband 3.3.0 -> 4.0.0
  * serd 0.30.4#2 -> 0.32.2
  * sleef 3.5.1#4 -> 3.7
  * sord 0.16.4#2 -> 0.16.16
    soundtouch  2.3.2#3 -> 2.3.3
  * sqlite3[core,json1] 3.43.1 -> 3.47.2
  * sratom 0.6.4#2 -> 0.6.16#1
    wavpack 5.6.0 -> 5.7.0
  * zlib 1.3 -> 1.3.1
  * zstd 1.5.5#1 -> 1.5.6

AenBleidd and others added 30 commits December 19, 2024 13:03
tartanpaint and others added 30 commits January 14, 2025 01:28
* [vcpkg-scripts] Update msys2

* Don't update to pkgconf 2.0

* Missed SHA

* Limit CI

* [vcpkg_find_acquire_program] Update PKGCONFIG to 2.1.0

* Update msys2

* Fixup

* Revert "Limit CI"

This reverts commit aa27037.

* Fix PKGCONFIG program version

* Add x64 pkgconf
* Limit CI

* Update msys2

* Declare msys packages for pkgconfig and fortran...

... with explicit DEPS and PROVIDES, instead of using DIRECT_PACKAGES.
This change makes it possible to notice changed dependencies
in `vcpkg-ci-msys2` update checks. (Current case: zstd.)
It also enables reuse of general declarations from `vcpkg_acquire_msys`
in specialized cases (`vpckg_find_fortran`).

Last not least, using the the Z_DECLARE_EXTRA_PACKAGES_COMMAND
simplifies the implementation of `vcpkg-ci-msys2`, in particular for
checks across platform boundaries.

* Revert "Limit CI"
msys2-runtime no longer supports Windows 7 since version 3.5.
msys2-runtime-3.4 is the replacement for user who cannot upgrade. YMMV.

autoconf-wrapper is not updated, cf. microsoft#36774.

pkgconf is not updated, waiting for 2.2.
Thre macos-12 runner is no longer available
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.