Merge branch '2.3' into 2.4

mixxxdj · Mar 2, 2023 · 08a33be · 08a33be
2 parents 03d2710 + 7e712c5
commit 08a33be
Show file tree

Hide file tree

Showing 4 changed files with 185 additions and 70 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -847,36 +847,28 @@
 
 ## [2.3.4](https://launchpad.net/mixxx/+milestone/2.3.4) (unreleased)
 
-* Numark DJ2GO2: Fix sliders and knobs [#4835](https://github.com/mixxxdj/mixxx/pull/4835) [lp:1948596](https://bugs.launchpad.net/mixxx/+bug/1948596)
-* Numark DJ2Go2: Support HotCue clear with pad [#10841](https://github.com/mixxxdj/mixxx/pull/10841)
-* Numark DJ2Go2: Fix inverted tempo fader [#10852](https://github.com/mixxxdj/mixxx/pull/10852) [#10586](https://github.com/mixxxdj/mixxx/issues/10586)
-* Numark Party Mix: Mapping added [#4720](https://github.com/mixxxdj/mixxx/pull/4720)
-* Numark N4: Inverted pitch slider, to match the GUI orientation [#11057](https://github.com/mixxxdj/mixxx/pull/11046)
-* Ableton Push: Show as one device [#10905](https://github.com/mixxxdj/mixxx/pull/10905)
-* Traktor S3: Fix issues with sampler and hotcue buttons [#4676](https://github.com/mixxxdj/mixxx/pull/4676)
-* Potmeters: Add support for arbitrary maximums in 7-/14-bit handlers from controller scripts [#4495](https://github.com/mixxxdj/mixxx/pull/4495)
-* Controller Preferences: Fix some usability issues [#10821](https://github.com/mixxxdj/mixxx/pull/10821)
 * Track Properties: Show 'date added' as local time [#4838](https://github.com/mixxxdj/mixxx/pull/4838) [lp:1980658](https://bugs.launchpad.net/mixxx/+bug/1980658)
 * Shade: Fix library sidebar splitter glitch [#4828](https://github.com/mixxxdj/mixxx/pull/4828) [lp:1979823](https://bugs.launchpad.net/mixxx/+bug/1979823)
 * LateNight: Add a border to the crossfader when Auto DJ is active. [#10913](https://github.com/mixxxdj/mixxx/pull/10913)
+* LateNight: Isolate searchbar so maximize button is attached to tracks view. [#11132](https://github.com/mixxxdj/mixxx/pull/11132)
 * macOS builds: Perform ad-hoc signing of macOS bundle in Pull request and personal repositories [#4774](https://github.com/mixxxdj/mixxx/pull/4774)
 * Waveform: Avoid visual glitch with ranges < 1 px [#4804](https://github.com/mixxxdj/mixxx/pull/4804)
 * Build Mixxx on macOS 11, replacing deprecated macOS 10.15 [#4863](https://github.com/mixxxdj/mixxx/pull/4863)
 * Add macOS 13.0 (Ventura) support, by using portaudio 19.7.0  [#11046](https://github.com/mixxxdj/mixxx/pull/11046)
 * EQ preferences: Properly restore 'One EQ for all decks' setting [#4886](https://github.com/mixxxdj/mixxx/pull/4886)
-* MC7000: Fix off-by-one indexing in the controller script [#4902](https://github.com/mixxxdj/mixxx/pull/4902)
 * Cover Art: Fix picking wrong cover file, when track file name contains extra dots [#4909](https://github.com/mixxxdj/mixxx/pull/4909)
 * MusicBrainz: Respect rate limits [#10874](https://github.com/mixxxdj/mixxx/pull/10874) [#10795](https://github.com/mixxxdj/mixxx/issues/10795)
 * MusicBrainz: Stop fetching after closing the dialog [#10878](https://github.com/mixxxdj/mixxx/pull/10878) [#10877](https://github.com/mixxxdj/mixxx/issues/10877)
 * MusicBrainz: Fixed stalled GUI after client timeout [#10875](https://github.com/mixxxdj/mixxx/pull/10875) [#10883](https://github.com/mixxxdj/mixxx/issues/10883)
 * macOs: Fix frozen skin control after Ctrl-Click [#10869](https://github.com/mixxxdj/mixxx/pull/10869) [10831](https://github.com/mixxxdj/mixxx/issues/10831)
 * Avoid redundant messages boxes after track loading fails [#10889](https://github.com/mixxxdj/mixxx/pull/10889)
-* Use OpenGL VU meter widgets. This aims to improve performaces with macOS.
+* Use OpenGL VU meter widgets. This aims to improve performance with macOS.
   [#10893](https://github.com/mixxxdj/mixxx/pull/10893)
   [#11052](https://github.com/mixxxdj/mixxx/pull/11052)
   [#10979](https://github.com/mixxxdj/mixxx/pull/10979)
   [#10973](https://github.com/mixxxdj/mixxx/pull/10973)
   [#10983](https://github.com/mixxxdj/mixxx/pull/10983)
+  [#11288](https://github.com/mixxxdj/mixxx/pull/11288)
 * Prevent wild numbers from appearing during scratching under vinyl control. [#10916](https://github.com/mixxxdj/mixxx/pull/10916)
 * Rekordbox: Fix missing playlists due to invalid child ID [#10955](https://github.com/mixxxdj/mixxx/pull/10955)
 * Fixed a possible crash due to a race condition when editing cue points. [#10976](https://github.com/mixxxdj/mixxx/pull/10976) [#10689](https://github.com/mixxxdj/mixxx/issues/10689)
@@ -885,9 +877,43 @@
 * WTrackMenu: Sort crates and playlists like in sidebar. [#11023](https://github.com/mixxxdj/mixxx/pull/11023)
 * WCoverArtLabel: Don't open full-size cover if no cover is loaded, to avoid an issue when closing. [#11022](https://github.com/mixxxdj/mixxx/pull/11022) [#11021](https://github.com/mixxxdj/mixxx/issues/11021)
 * Removed integer truncation of the position when reading cue points from the database. [#10998](https://github.com/mixxxdj/mixxx/pull/10998)
-* Auto DJ: Added a warning ina message box when it is started without decks with left and a right crossfader orientation [#11018](https://github.com/mixxxdj/mixxx/pull/11018)
+* Auto DJ: Added a warning in a message box when it is started without decks with left and a right crossfader orientation [#11018](https://github.com/mixxxdj/mixxx/pull/11018)
 * Fixed crash with FFmpeg decoder [#11044](https://github.com/mixxxdj/mixxx/pull/11044)
 * Fixed issue with finding moved library tracks. [#11051](https://github.com/mixxxdj/mixxx/pull/11051)
+* Preserve and synchronize ID3v1 tags (TagLib v1.12) [#11163](https://github.com/mixxxdj/mixxx/pull/11163) [#11123](https://github.com/mixxxdj/mixxx/issues/11123)
+* Replay Gain Preferences: Fix the "adjust by" text in case of negative adjustments [#11176](https://github.com/mixxxdj/mixxx/pull/11176)
+* macOs: Install Qt translation [#11134](https://github.com/mixxxdj/mixxx/pull/11134) [#11110](https://github.com/mixxxdj/mixxx/issues/11110)
+* macOs: Fix assuming wrong system language [#11218](https://github.com/mixxxdj/mixxx/pull/11218) [#11195](https://github.com/mixxxdj/mixxx/issues/11195)
+* Fix resetting track colors on metadata reimport (Serato metadata): [#11217](https://github.com/mixxxdj/mixxx/pull/11217) [#11213](https://github.com/mixxxdj/mixxx/issues/11213)
+* Preferences: Fix incomplete version check in 2.3 during upgrade [#11229](https://github.com/mixxxdj/mixxx/pull/11229) [#9709](https://github.com/mixxxdj/mixxx/issues/9709)
+* Allow search in external libraries [#11221](https://github.com/mixxxdj/mixxx/pull/11221) [#11216](https://github.com/mixxxdj/mixxx/issues/11216)
+* JACK buffer size fix [#11121](https://github.com/mixxxdj/mixxx/pull/11121)
+* Don't discard file tags with tuning information like "A#m +50" [#10992](https://github.com/mixxxdj/mixxx/pull/10992)
+* Year search: Find also full date entries [#11251](https://github.com/mixxxdj/mixxx/pull/11251) [#11251](https://github.com/mixxxdj/mixxx/issues/11113)
+* Fix visual alignment of beats and waveform in case of decoding issues [#11162](https://github.com/mixxxdj/mixxx/pull/11162)
+* Avoid "active key-value observers" messages during skin parsing on macOS [#11265](https://github.com/mixxxdj/mixxx/pull/11265)
+* Fullscreen on Linux: Fix issues caused by Ubuntu Unity workaround [#11295](https://github.com/mixxxdj/mixxx/pull/11295) [#11281](https://github.com/mixxxdj/mixxx/issues/11281) [#11294](https://github.com/mixxxdj/mixxx/issues/11294)
+
+### New Controller Mappings
+
+* Traktor Kontrol S2 Mk1: Add controller mapping [#3905](https://github.com/mixxxdj/mixxx/pull/3905)
+* Numark Party Mix: Mapping added [#4720](https://github.com/mixxxdj/mixxx/pull/4720)
+
+### Controller Fixes
+
+* Traktor S3: Fix issues with sampler and hotcue buttons [#4676](https://github.com/mixxxdj/mixxx/pull/4676)
+* Numark DJ2GO2: Fix sliders and knobs [#4835](https://github.com/mixxxdj/mixxx/pull/4835) [lp:1948596](https://bugs.launchpad.net/mixxx/+bug/1948596)
+* Numark DJ2Go2: Support HotCue clear with pad [#10841](https://github.com/mixxxdj/mixxx/pull/10841)
+* Numark DJ2Go2: Fix inverted tempo fader [#10852](https://github.com/mixxxdj/mixxx/pull/10852) [#10586](https://github.com/mixxxdj/mixxx/issues/10586)
+* Numark N4: Inverted pitch slider, to match the GUI orientation [#11057](https://github.com/mixxxdj/mixxx/pull/11046)
+* Ableton Push: Show as one device [#10905](https://github.com/mixxxdj/mixxx/pull/10905)
+* Denon DJ MC7000: off-by-one fix, soft-start/break effect, pitch play, 32 velocity samplers
+  [#4902](https://github.com/mixxxdj/mixxx/pull/4902)
+  [#4729](https://github.com/mixxxdj/mixxx/pull/4729)
+* Potmeters: Add support for arbitrary maximums in 7-/14-bit handlers from controller scripts [#4495](https://github.com/mixxxdj/mixxx/pull/4495)
+* Controller Preferences: Fix some usability issues [#10821](https://github.com/mixxxdj/mixxx/pull/10821)
+* Controller mapping table: show readable/translated strings for script bindings [#11139](https://github.com/mixxxdj/mixxx/pull/11139)
+* Control picker menu: Added loop_in/out_goto to list [#11133](https://github.com/mixxxdj/mixxx/pull/11133)
 
 ### Packaging
 

diff --git a/cmake/modules/GitInfo.cmake b/cmake/modules/GitInfo.cmake
@@ -33,19 +33,13 @@ if(NOT GIT_DESCRIBE)
     else()
       message(NOTICE "Git branch: ${GIT_BRANCH}")
     endif()
-
-    # Get the number of commits on the working branch
-    execute_process(
-      COMMAND git rev-list --count --first-parent HEAD
-      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-      OUTPUT_VARIABLE GIT_COMMIT_COUNT
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      ERROR_QUIET
-    )
-    if(NOT GIT_COMMIT_COUNT)
-      message(NOTICE "Git commit count: unknown")
-    else()
+    # Get the number of commits since the version tag
+    string(REGEX MATCH ".*-([0-9]*)-.*" GIT_COMMIT_COUNT_MATCH "${GIT_DESCRIBE}")
+    if (GIT_COMMIT_COUNT_MATCH)
+      set(GIT_COMMIT_COUNT "${CMAKE_MATCH_1}")
       message(NOTICE "Git commit count: ${GIT_COMMIT_COUNT}")
+    else()
+      message(NOTICE "Git commit count: unknown")
     endif()
   endif()
 else()

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+mixxx (2.3.3-1~bionic) bionic; urgency=medium
+
+  * Build of 2.3.3
+
+ -- RJ Skerry-Ryan <[email protected]>  Tue, 21 Jun 2022 21:24:47 +0000
+
 mixxx (2.3.2-1~bionic) bionic; urgency=medium
 
   * Build of 2.3.2

diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -96,7 +96,7 @@
   Do not edit it manually.
   -->
   <releases>
-    <release version="2.4.0" type="development" date="2022-11-23" timestamp="1669217482">
+    <release version="2.4.0" type="development" date="2023-02-22" timestamp="1677050229">
       <description>
  <p>
   Cover Art
@@ -1529,47 +1529,9 @@
  </ul>
 </description>
     </release>
-    <release version="2.3.4" type="development" date="2022-11-23" timestamp="1669217482">
+    <release version="2.3.4" type="development" date="2023-02-22" timestamp="1677050229">
       <description>
  <ul>
-  <li>
-   Numark DJ2GO2: Fix sliders and knobs
-   #4835
-   lp:1948596
-  </li>
-  <li>
-   Numark DJ2Go2: Support HotCue clear with pad
-   #10841
-  </li>
-  <li>
-   Numark DJ2Go2: Fix inverted tempo fader
-   #10852
-   #10586
-  </li>
-  <li>
-   Numark Party Mix: Mapping added
-   #4720
-  </li>
-  <li>
-   Numark N4: Inverted pitch slider, to match the GUI orientation
-   #11057
-  </li>
-  <li>
-   Ableton Push: Show as one device
-   #10905
-  </li>
-  <li>
-   Traktor S3: Fix issues with sampler and hotcue buttons
-   #4676
-  </li>
-  <li>
-   Potmeters: Add support for arbitrary maximums in 7-/14-bit handlers from controller scripts
-   #4495
-  </li>
-  <li>
-   Controller Preferences: Fix some usability issues
-   #10821
-  </li>
   <li>
    Track Properties: Show 'date added' as local time
    #4838
@@ -1584,6 +1546,10 @@
    LateNight: Add a border to the crossfader when Auto DJ is active.
    #10913
   </li>
+  <li>
+   LateNight: Isolate searchbar so maximize button is attached to tracks view.
+   #11132
+  </li>
   <li>
    macOS builds: Perform ad-hoc signing of macOS bundle in Pull request and personal repositories
    #4774
@@ -1604,10 +1570,6 @@
    EQ preferences: Properly restore 'One EQ for all decks' setting
    #4886
   </li>
-  <li>
-   MC7000: Fix off-by-one indexing in the controller script
-   #4902
-  </li>
   <li>
    Cover Art: Fix picking wrong cover file, when track file name contains extra dots
    #4909
@@ -1637,12 +1599,13 @@
    #10889
   </li>
   <li>
-   Use OpenGL VU meter widgets. This aims to improve performaces with macOS.
+   Use OpenGL VU meter widgets. This aims to improve performance with macOS.
    #10893
    #11052
    #10979
    #10973
    #10983
+   #11288
   </li>
   <li>
    Prevent wild numbers from appearing during scratching under vinyl control.
@@ -1681,7 +1644,7 @@
    #10998
   </li>
   <li>
-   Auto DJ: Added a warning ina message box when it is started without decks with left and a right crossfader orientation
+   Auto DJ: Added a warning in a message box when it is started without decks with left and a right crossfader orientation
    #11018
   </li>
   <li>
@@ -1692,6 +1655,132 @@
    Fixed issue with finding moved library tracks.
    #11051
   </li>
+  <li>
+   Preserve and synchronize ID3v1 tags (TagLib v1.12)
+   #11163
+   #11123
+  </li>
+  <li>
+   Replay Gain Preferences: Fix the "adjust by" text in case of negative adjustments
+   #11176
+  </li>
+  <li>
+   macOs: Install Qt translation
+   #11134
+   #11110
+  </li>
+  <li>
+   macOs: Fix assuming wrong system language
+   #11218
+   #11195
+  </li>
+  <li>
+   Fix resetting track colors on metadata reimport (Serato metadata):
+   #11217
+   #11213
+  </li>
+  <li>
+   Preferences: Fix incomplete version check in 2.3 during upgrade
+   #11229
+   #9709
+  </li>
+  <li>
+   Allow search in external libraries
+   #11221
+   #11216
+  </li>
+  <li>
+   JACK buffer size fix
+   #11121
+  </li>
+  <li>
+   Don't discard file tags with tuning information like "A#m +50"
+   #10992
+  </li>
+  <li>
+   Year search: Find also full date entries
+   #11251
+   #11251
+  </li>
+  <li>
+   Fix visual alignment of beats and waveform in case of decoding issues
+   #11162
+  </li>
+  <li>
+   Avoid "active key-value observers" messages during skin parsing on macOS
+   #11265
+  </li>
+  <li>
+   Fullscreen on Linux: Fix issues caused by Ubuntu Unity workaround
+   #11295
+   #11281
+   #11294
+  </li>
+ </ul>
+ <p>
+  New Controller Mappings
+ </p>
+ <ul>
+  <li>
+   Traktor Kontrol S2 Mk1: Add controller mapping
+   #3905
+  </li>
+  <li>
+   Numark Party Mix: Mapping added
+   #4720
+  </li>
+ </ul>
+ <p>
+  Controller Fixes
+ </p>
+ <ul>
+  <li>
+   Traktor S3: Fix issues with sampler and hotcue buttons
+   #4676
+  </li>
+  <li>
+   Numark DJ2GO2: Fix sliders and knobs
+   #4835
+   lp:1948596
+  </li>
+  <li>
+   Numark DJ2Go2: Support HotCue clear with pad
+   #10841
+  </li>
+  <li>
+   Numark DJ2Go2: Fix inverted tempo fader
+   #10852
+   #10586
+  </li>
+  <li>
+   Numark N4: Inverted pitch slider, to match the GUI orientation
+   #11057
+  </li>
+  <li>
+   Ableton Push: Show as one device
+   #10905
+  </li>
+  <li>
+   Denon DJ MC7000: off-by-one fix, soft-start/break effect, pitch play, 32 velocity samplers
+   #4902
+   #4729
+  </li>
+  <li>
+   Potmeters: Add support for arbitrary maximums in 7-/14-bit handlers from controller scripts
+   #4495
+  </li>
+  <li>
+   Controller Preferences: Fix some usability issues
+   #10821
+  </li>
+  <li>
+   Controller mapping table: show readable/translated strings for script bindings
+   #11139
+  </li>
+  <li>
+   Control picker menu: Added loop_in/out_goto to list
+   #11133
+  </li>
  </ul>
  <p>
   Packaging