-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into feat/add-stem-controls
- Loading branch information
Showing
193 changed files
with
3,957 additions
and
1,215 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,7 +25,7 @@ jobs: | |
| name: ${{ matrix.name }} | ||
| steps: | ||
| - name: Check out repository | ||
| uses: actions/[email protected].1 | ||
| uses: actions/[email protected].5 | ||
| - name: Install build dependencies | ||
| run: tools/debian_buildenv.sh setup | ||
| - name: Create build directory | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,8 +48,8 @@ jobs: | |
| -DMODPLUG=ON | ||
| -DQT6=ON | ||
| -DWAVPACK=ON | ||
| -DVCPKG_TARGET_TRIPLET=x64-osx-min1015-release | ||
| -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015-release | ||
| -DVCPKG_TARGET_TRIPLET=x64-osx-min1100-release | ||
| -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1100-release | ||
| # TODO: Fix this broken test on macOS | ||
| ctest_args: --exclude-regex DirectoryDAOTest.relocateDirectory | ||
| cpack_generator: DragNDrop | ||
|
|
@@ -73,7 +73,7 @@ jobs: | |
| -DQT6=ON | ||
| -DWAVPACK=ON | ||
| -DVCPKG_TARGET_TRIPLET=arm64-osx-min1100-release | ||
| -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1015-release | ||
| -DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1100-release | ||
| # TODO: Fix this broken test on macOS | ||
| crosscompile: true | ||
| cpack_generator: DragNDrop | ||
|
|
@@ -131,7 +131,7 @@ jobs: | |
| artifact-windows-win64: ${{ steps.prepare_deploy.outputs.artifact-windows-win64 }} | ||
| steps: | ||
| - name: "Check out repository" | ||
| uses: actions/[email protected].1 | ||
| uses: actions/[email protected].5 | ||
| with: | ||
| # This is necessary for making `git describe` work. | ||
| fetch-depth: 0 | ||
|
|
@@ -470,7 +470,7 @@ jobs: | |
| - name: "Upload GitHub Actions artifacts" | ||
| if: matrix.artifacts_path != null | ||
| uses: actions/[email protected].1 | ||
| uses: actions/[email protected].3 | ||
| with: | ||
| name: ${{ matrix.artifacts_name }} | ||
| path: ${{ matrix.artifacts_path }} | ||
|
|
@@ -484,7 +484,7 @@ jobs: | |
| if: always() | ||
| steps: | ||
| - name: "Check out repository" | ||
| uses: actions/[email protected].1 | ||
| uses: actions/[email protected].5 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,6 @@ jobs: | |
| runs-on: ubuntu-22.04 | ||
|
|
||
| steps: | ||
| - uses: actions/[email protected].1 | ||
| - uses: actions/[email protected].5 | ||
| - name: Block Fixup Commit Merge | ||
| uses: 13rac1/[email protected] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ jobs: | |
| container: holzhaus/mixxx-ci:20220930 | ||
| steps: | ||
| - name: "Check out repository" | ||
| uses: actions/[email protected].1 | ||
| uses: actions/[email protected].5 | ||
| with: | ||
| # Unfortunately we need the whole history and can't use a shallow clone | ||
| # because the Appstream Metadata hook parses the history to find the | ||
|
|
@@ -67,14 +67,14 @@ jobs: | |
|
|
||
| - name: "Upload patch artifact" | ||
| if: failure() && env.UPLOAD_PATCH_FILE != null | ||
| uses: actions/[email protected].1 | ||
| uses: actions/[email protected].3 | ||
| with: | ||
| name: ${{ env.UPLOAD_PATCH_FILE }} | ||
| path: ${{ env.UPLOAD_PATCH_FILE }} | ||
|
|
||
| - name: "Upload pre-commit.log" | ||
| if: failure() && env.UPLOAD_PATCH_FILE == null | ||
| uses: actions/[email protected].1 | ||
| uses: actions/[email protected].3 | ||
| with: | ||
| name: pre-commit.log | ||
| path: /github/home/.cache/pre-commit/pre-commit.log | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1301,6 +1301,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL | |
| src/widget/wpixmapstore.cpp | ||
| src/widget/wpushbutton.cpp | ||
| src/widget/wraterange.cpp | ||
| src/widget/wstarratingaction.cpp | ||
| src/widget/wrecordingduration.cpp | ||
| src/widget/wscrollable.cpp | ||
| src/widget/wsearchlineedit.cpp | ||
|
|
@@ -1501,19 +1502,22 @@ endif() | |
| if(QOPENGL) | ||
| target_sources(mixxx-lib PRIVATE | ||
| src/shaders/endoftrackshader.cpp | ||
| src/shaders/slipmodeshader.cpp | ||
| src/shaders/patternshader.cpp | ||
| src/shaders/rgbashader.cpp | ||
| src/shaders/rgbshader.cpp | ||
| src/shaders/shader.cpp | ||
| src/shaders/textureshader.cpp | ||
| src/shaders/unicolorshader.cpp | ||
| src/shaders/vinylqualityshader.cpp | ||
| src/util/texture.cpp | ||
| src/util/opengltexture2d.cpp | ||
| src/waveform/renderers/allshader/digitsrenderer.cpp | ||
| src/waveform/renderers/allshader/matrixforwidgetgeometry.cpp | ||
| src/waveform/renderers/allshader/waveformrenderbackground.cpp | ||
| src/waveform/renderers/allshader/waveformrenderbeat.cpp | ||
| src/waveform/renderers/allshader/waveformrenderer.cpp | ||
| src/waveform/renderers/allshader/waveformrendererendoftrack.cpp | ||
| src/waveform/renderers/allshader/waveformrendererslipmode.cpp | ||
| src/waveform/renderers/allshader/waveformrendererfiltered.cpp | ||
| src/waveform/renderers/allshader/waveformrendererhsv.cpp | ||
| src/waveform/renderers/allshader/waveformrendererlrrgb.cpp | ||
|
|
@@ -1650,8 +1654,11 @@ if(MSVC) | |
| if(WARNINGS_PEDANTIC) | ||
| target_compile_options(mixxx-lib PUBLIC /W4) | ||
| else() | ||
| # Warning Level 3 (production quality) | ||
| target_compile_options(mixxx-lib PUBLIC /W3) | ||
| target_compile_options(mixxx-lib PUBLIC | ||
| /W3 # Warning Level 3 (production quality) | ||
| /wd4200 # C4200: nonstandard extension used: zero-sized array in struct/union | ||
| # Note: Even with CMAKE_C_STANDARD = 99 MSVC does not complain about C99 flexible array members | ||
| ) | ||
| target_compile_definitions(mixxx-lib PUBLIC _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING _CRT_SECURE_NO_WARNINGS) | ||
| endif() | ||
| else() | ||
|
|
@@ -3817,6 +3824,7 @@ file(RELATIVE_PATH MIXXX_INSTALL_DOCDIR_RELATIVE_TO_DATADIR "${CMAKE_INSTALL_PRE | |
| configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/config.h" @ONLY) | ||
|
|
||
| # Packaging | ||
| set(CPACK_PACKAGE_NAME "Mixxx") | ||
| set(CPACK_PACKAGE_VENDOR "Mixxx Project") | ||
| set(CPACK_PACKAGE_CONTACT "RJ Skerry-Ryan <[email protected]>") | ||
| set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Digital DJ Application") | ||
|
|
@@ -3885,7 +3893,7 @@ set(CPACK_DEBIAN_UPLOAD_PPA_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/packaging/CPackD | |
| set(CPACK_DEBIAN_INSTALL_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/packaging/CPackDebInstall.cmake") | ||
|
|
||
| set(CPACK_WIX_UPGRADE_GUID "921DC99C-4DCF-478D-B950-50685CB9E6BE") | ||
| set(CPACK_WIX_LICENSE_RTF "${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix/LICENSE.rtf") | ||
| set(CPACK_WIX_LICENSE_RTF "${CMAKE_CURRENT_BINARY_DIR}/packaging/wix/LICENSE.rtf") | ||
| set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/res/images/icons/ic_mixxx.ico") | ||
| set(CPACK_WIX_PROPERTY_ARPHELPLINK "${CPACK_PACKAGE_HOMEPAGE_URL}") | ||
| set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix/images/banner.bmp") | ||
|
|
@@ -3896,6 +3904,8 @@ set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/packaging/CPackConfig.cmake" | |
| if(WIN32) | ||
| # override not working default NSIS | ||
| set(CPACK_GENERATOR WIX) | ||
| # uses CMAKE_PROJECT_VERSION | ||
| configure_file(packaging/wix/LICENSE.rtf.in packaging/wix/LICENSE.rtf @ONLY) | ||
| endif() | ||
|
|
||
| include(CPack) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,9 @@ | ||
| mixxx (2.4.0-1~focal) focal; urgency=medium | ||
|
|
||
| * Build of 2.4.0 | ||
|
|
||
| -- RJ Skerry-Ryan <[email protected]> Thu, 15 Feb 2024 23:55:01 +0000 | ||
|
|
||
| mixxx (2.3.6-1~bionic) bionic; urgency=medium | ||
|
|
||
| * Build of 2.3.6 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.