Fix build issues and more on FreeBSD #4111

alonsobsd · 2021-07-17T18:36:04Z

mixxx was update to 2.3 on FreeBSD but I applied some patches to fix some issues

Add lost timelinePath and logFlushLevel parsing

QML: Add support for selecting/loading effects

…8 already existing)

…ware/mixxxdj/mixxx2-4/. Compile QM files out of TS files that are used by the localized app

Enable export of hot cue colours to EnginePrime

Update Mixxx version in LICENSE to 2.4

Classes inheriting from QAbstractItemModel are QObjects, but also have a `parent()` method that takes a QModelIndex. In these cases, an error like this may be thrown: src/util/parented_ptr.h: In instantiation of ‘parented_ptr<T>::~parented_ptr() [with T = TreeItemModel]’: src/library/itunes/itunesfeature.cpp:67:55: required from here src/util/parented_ptr.h:31:45: error: no matching function for call to ‘TreeItemModel::parent()’ 31 | DEBUG_ASSERT(!m_ptr || m_ptr->parent()); | ~~~~~~~~~~~~~^~ This fixes the issue by casting to QObject first.

LibraryFeature: Rename getChildModel to sidebarModel and make it const

mixxxlibraryfeature: remove wrong ENGINE_PRIME ifdef

We currently have two beats implementations (`BeatGrid` and `BeatMap`) and both support scaling and translating. Hence, it's unnecessary to maintain these flags. In fact, the `BEATSCAP_SCALE` capability wasn't even checked in the calling code but nobody noticed because both support it anyway. The `BEATSCAP_ADDREMOVE` and `BEATSCAP_MOVEBEAT` capabilities are only supported by the `BeatMap`, but we don't have any code that makes use of them. Therefore, these can be removed as well.

Beats: Fix outdated comment

CMake: use CXX_COMPILER_LAUNCHER instead of RULE_LAUNCH_COMPILE

The previous implementation was hard to use on a touchscreen because the surface where it was touching was very small. The new version makes use of a slider internally which allows the control to be changed more intiutively by swiping.

…iendlier QMLDemo: improve OrientationToggleButton touch friendlyness

Beats: Remove unnecessary capabilities

Be-ing · 2021-07-17T18:41:09Z

Thanks for this! Can you do an interactive rebase on the 2.3 branch and make the commit messages more descriptive?

Where does the __FREEBSD__ define come from? Our CMake scripts don't define it. Is that always defined when compiling on FreeBSD?

Be-ing · 2021-07-17T18:42:53Z

src/util/versionstore.cpp

@@ -77,6 +77,8 @@ QString VersionStore::platform() {
    QString base = QStringLiteral("Linux");
 #elif defined(__WINDOWS__)
    QString base = QStringLiteral("Windows");
+#elif defined(__FreeBSD__)
+    QString base = QStringLiteral("FreeBSD");        


extra spaces at the end of the line

Be-ing · 2021-07-17T18:45:29Z

Maybe we could use #ifdef __UNIX__ instead to make this more general?

Be-ing · 2021-07-17T18:47:11Z

Let's use __BSD__ instead. We already have that set by the build system:

elseif(UNIX)
  if(APPLE)
    target_compile_definitions(mixxx-lib PUBLIC __APPLE__)
  else()
    target_compile_definitions(mixxx-lib PUBLIC __UNIX__)
    if(CMAKE_SYSTEM_NAME STREQUAL Linux)
      target_compile_definitions(mixxx-lib PUBLIC __LINUX__)
    elseif(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$")
      target_compile_definitions(mixxx-lib PUBLIC __BSD__)
    endif()
  endif()
endif()

Be-ing · 2021-07-17T18:53:13Z

cmake/modules/FindLibUSB.cmake

+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+  NAMES usb
+else
  NAMES usb-1.0
+endif()


I think this should work without any special casing for BSD:

NAMES usb-1.0 usb

uklotzde

The proposed changes have to be applied upstream. We are not going to maintain custom patches for 3rd party libs.

Be-ing · 2021-07-17T21:38:59Z

@uklotzde I do not understand your comment. This does not change third party dependencies.

Be-ing · 2021-07-17T21:39:51Z

Oh do you mean the hack for SPSCQue? Upstream already decided they didn't want that so we decided to keep it in Mixxx.

uklotzde · 2021-07-17T21:54:29Z

I have noticed changes in lib for SPSC and Kaitai Struct. If you need to apply patches for FreeBSD you have to do this during packaging. Otherwise please submit the changes upstream.

The PR is not reviewable until it is properly rebased.

uklotzde · 2021-07-17T21:57:06Z

If it only modifies a custom patch of us it is acceptable. I didn't verify this.

uklotzde · 2021-07-17T21:59:17Z

Disclaimer: I am not able to properly review PRs during the next days. I'll try to check occasionally for updates.

Be-ing · 2021-07-17T22:27:55Z

The change to Kaitai Struct should be sent upstream.

Be-ing · 2021-07-17T22:39:55Z

I would prefer the patch for Kaitai Struct to stay in the FreeBSD port until that's merged upstream.

Be-ing · 2021-07-20T01:02:22Z

I redid these changes except the one for the Kaitai Struct file on the 2.3 branch in #4122, #4123, and #4124. Please submit the fix for Kaitai Struct upstream. In the meantime you can keep using that patch in the FreeBSD port. Thanks for bringing these issues to our attention.

alonsobsd · 2021-07-21T17:00:00Z

Thanks for you too

Holzhaus and others added 30 commits June 21, 2021 21:26

skins/QMLDemo: Remove obsolete TODO comment

8b5eeef

QML: Add TODO for enum usage to QmlEffectManifestParametersModel

aa271d8

skins/QMLDemo: Use JS template strings instead of concatenation

93dec8e

skins/QMLDemo: Fix MiniKnob indicator and reduce duplication

c8cb59a

skins/QMLDemo: Use fixed width for knob indicator

f58eabc

skins/QMLDemo: Fix label for FX parameters where shortName is not set

ae7408f

skins/QMLDemo: Increase effect parameter width to prevent elided text

c20b1e2

Merge pull request #4022 from daschuer/command_line_fix_1

ee37875

Add lost timelinePath and logFlushLevel parsing

skins/QMLDemo: Add TODO regarding null coalescing

fdb46c0

skins/QMLDemo: Make effect param buttons toggleable and add label

77650d1

skins/QMLDemo: Show dryWet/superKnob only when EffectUnit is expanded

3265842

QML: Add a way to retrieve the Effect parameter control key from model

a99bd50

skins/QMLDemo: Fix wrong effect parameter control keys

c8cfefa

Merge pull request #4000 from Holzhaus/qml-effects

5c20663

QML: Add support for selecting/loading effects

LibraryFeature: Rename getChildModel to sidebarModel and make it const

a4c9d6a

Merge remote-tracking branch 'upstream/2.3' into main

66e6c0a

Update Translation template. Found 2720 source text(s) (2 new and 271…

851715f

…8 already existing)

Pull latest translations from https://www.transifex.com/mixxx-dj-soft…

b65432f

…ware/mixxxdj/mixxx2-4/. Compile QM files out of TS files that are used by the localized app

Enable export of hot cue colours to EnginePrime

0014f24

Merge pull request #4025 from xsco/enh/engineprime-export-cue-colours

44f2976

Enable export of hot cue colours to EnginePrime

Update Mixxx version in LICENSE to 2.4

94939d0

Merge pull request #4026 from daschuer/license24

0244af2

Update Mixxx version in LICENSE to 2.4

Sync Lock: rename functions to make them clearer

42984dd

Sync Lock: Don't recalc half/double multiplier on every callback

47cd79e

library: Use parented_ptr for feature sidebar model instances

3cb730a

SidebarModel: Add basic support for icon names

d6eed39

BrowseFeature: Add missing overrides

002b9c8

Merge remote-tracking branch 'upstream/2.3' into main

8fabcaa

Merge pull request #4024 from Holzhaus/feature-sidebarmodel-const

f64910c

LibraryFeature: Rename getChildModel to sidebarModel and make it const

ronso0 and others added 12 commits July 12, 2021 19:46

Merge pull request #4102 from ronso0/mixxxlibraryfeature-include-fix

53e774e

mixxxlibraryfeature: remove wrong ENGINE_PRIME ifdef

Beats: Fix outdated comment

f6ca3ec

Merge pull request #4104 from Holzhaus/beats-comment-fix

193b01e

Beats: Fix outdated comment

Merge pull request #4098 from Be-ing/sccache_hack_remove

82f8c78

CMake: use CXX_COMPILER_LAUNCHER instead of RULE_LAUNCH_COMPILE

Merge pull request #3934 from Swiftb0y/qml-orientation-button-touchfr…

441cfed

…iendlier QMLDemo: improve OrientationToggleButton touch friendlyness

Merge pull request #4103 from Holzhaus/remove-beatscap-scale-translate

705955a

Beats: Remove unnecessary capabilities

Make mixxx more FreeBSD friendly

bcf9a6f

Make mixxx more FreeBSD friendly

1de76fd

Make mixxx more FreeBSD friendly

28a1486

Make mixxx more FreeBSD friendly

056d9c2

github-actions bot added the build label Jul 17, 2021

Be-ing changed the base branch from main to 2.3 July 17, 2021 18:39

Be-ing reviewed Jul 17, 2021

View reviewed changes

uklotzde suggested changes Jul 17, 2021

View reviewed changes

Be-ing closed this Jul 20, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix build issues and more on FreeBSD #4111

Fix build issues and more on FreeBSD #4111

alonsobsd commented Jul 17, 2021

Be-ing commented Jul 17, 2021 •

edited

Loading

Be-ing Jul 17, 2021

Be-ing commented Jul 17, 2021

Be-ing commented Jul 17, 2021

Be-ing Jul 17, 2021

uklotzde left a comment

Be-ing commented Jul 17, 2021

Be-ing commented Jul 17, 2021 •

edited

Loading

uklotzde commented Jul 17, 2021

uklotzde commented Jul 17, 2021

uklotzde commented Jul 17, 2021

Be-ing commented Jul 17, 2021

Be-ing commented Jul 17, 2021

Be-ing commented Jul 20, 2021 •

edited

Loading

alonsobsd commented Jul 21, 2021

Fix build issues and more on FreeBSD #4111

Fix build issues and more on FreeBSD #4111

Conversation

alonsobsd commented Jul 17, 2021

Be-ing commented Jul 17, 2021 • edited Loading

Be-ing Jul 17, 2021

Choose a reason for hiding this comment

Be-ing commented Jul 17, 2021

Be-ing commented Jul 17, 2021

Be-ing Jul 17, 2021

Choose a reason for hiding this comment

uklotzde left a comment

Choose a reason for hiding this comment

Be-ing commented Jul 17, 2021

Be-ing commented Jul 17, 2021 • edited Loading

uklotzde commented Jul 17, 2021

uklotzde commented Jul 17, 2021

uklotzde commented Jul 17, 2021

Be-ing commented Jul 17, 2021

Be-ing commented Jul 17, 2021

Be-ing commented Jul 20, 2021 • edited Loading

alonsobsd commented Jul 21, 2021

Be-ing commented Jul 17, 2021 •

edited

Loading

Be-ing commented Jul 17, 2021 •

edited

Loading

Be-ing commented Jul 20, 2021 •

edited

Loading