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.

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

Fix QML build regressions on macOS #13334

Merged
merged 8 commits into from
Jun 7, 2024
Merged

Fix QML build regressions on macOS #13334

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ad263b
ControllerRenderingEngine: Fix GL includes
fwcd Jun 6, 2024
8976465
ControllerScriptEngineLegacy: Disable execution policy with libc++
fwcd Jun 6, 2024
eb30639
CI: Reenable QML in macOS builds
fwcd Jun 6, 2024
db9a9af
ControllerScriptEngineLegacy: Remove execution policy
fwcd Jun 6, 2024
9064f94
ControllerScriptEngineLegacy: Use reinterpret_cast for image buffer
fwcd Jun 6, 2024
1cb286f
ControllerScriptEngineLegacy: Add short comment on `bit_cast`
fwcd Jun 6, 2024
9ad776e
ControllerScriptEngineLegacy: Update comment on `bit_cast`
fwcd Jun 6, 2024
0ccf1c1
CI: Disable QML CI on macOS x64 for now
fwcd Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
-DMACOS_BUNDLE=ON
-DMODPLUG=ON
-DQT6=ON
-DQML=OFF
-DQML=ON
-DWAVPACK=ON
-DVCPKG_TARGET_TRIPLET=x64-osx-min1100-release
-DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1100-release
Expand All @@ -72,7 +72,7 @@ jobs:
-DMACOS_BUNDLE=ON
-DMODPLUG=ON
-DQT6=ON
-DQML=OFF
-DQML=ON
-DWAVPACK=ON
-DVCPKG_TARGET_TRIPLET=arm64-osx-min1100-release
-DVCPKG_DEFAULT_HOST_TRIPLET=x64-osx-min1100-release
Expand Down
4 changes: 2 additions & 2 deletions src/controllers/rendering/controllerrenderingengine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

#include <GL/gl.h>

#include <QObject>
#include <QOpenGLContext>
#include <QOpenGLFramebufferObject>
#include <chrono>
#include <gsl/pointers>

Expand Down
7 changes: 6 additions & 1 deletion src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <QQuickWindow>
#include <QtEndian>
#include <algorithm>
#include <version>

// Prevent conflict with methods called 'emit' in <execution> source
#pragma push_macro("emit")
Expand Down Expand Up @@ -323,7 +324,11 @@
m_scriptFiles = scripts;

#ifdef MIXXX_USE_QML
setQMLMode(std::any_of(std::execution::par_unseq,
setQMLMode(std::any_of(
#ifndef _LIBCPP_VERSION // Still experimental in Clang's libc++ as of June 2024:
// https://github.com/llvm/llvm-project/issues/65125
std::execution::par_unseq,
#endif
fwcd marked this conversation as resolved.
Show resolved Hide resolved
m_scriptFiles.cbegin(),
m_scriptFiles.cend(),
[](const auto& scriptFileInfo) {
Expand Down Expand Up @@ -660,7 +665,7 @@
emit previewRenderedScreen(screenInfo, screenDebug);
}

QByteArray input(std::bit_cast<const char*>(frame.constBits()), frame.sizeInBytes());

Check failure on line 668 in src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp

View workflow job for this annotation

GitHub Actions / macOS 11 x64 

no member named 'bit_cast' in namespace 'std'

Check failure on line 668 in src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp

View workflow job for this annotation

GitHub Actions / macOS 11 x64 

expected expression

Check failure on line 668 in src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp

View workflow job for this annotation

GitHub Actions / macOS 11 arm64 

no member named 'bit_cast' in namespace 'std'

Check failure on line 668 in src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp

View workflow job for this annotation

GitHub Actions / macOS 11 arm64 

expected expression
const TransformScreenFrameFunction& transformMethod =
m_transformScreenFrameFunctions[screenInfo.identifier];

Expand Down
Loading