diff --git a/media-sound/mixxx/mixxx-2.5.3.recipe b/media-sound/mixxx/mixxx-2.5.4.recipe similarity index 85% rename from media-sound/mixxx/mixxx-2.5.3.recipe rename to media-sound/mixxx/mixxx-2.5.4.recipe index e294992a8..5b1e0ee74 100644 --- a/media-sound/mixxx/mixxx-2.5.3.recipe +++ b/media-sound/mixxx/mixxx-2.5.4.recipe @@ -8,16 +8,19 @@ Mixxx is available for Windows, macOS, and Linux as well." HOMEPAGE="https://mixxx.org/" COPYRIGHT="2001-2024 Mixxx Development Team" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/mixxxdj/mixxx/archive/refs/tags/$portVersion.tar.gz" -CHECKSUM_SHA256="517612e85e933d7e261bf40feb12354aac924da0f783402bc20f584976bc9b23" -SOURCE_URI_2="https://github.com/xsco/libdjinterop/archive/refs/tags/0.24.3.tar.gz#noarchive" -CHECKSUM_SHA256_2="df41fe39bed9d16d27a3649d237b68edd2cdb6fc71a82cae5cd746d4e4ef6578" -SOURCE_FILENAME_2="libdjinterop-0.24.3.tar.gz" -SOURCE_URI_3="https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/2.2.8.zip#noarchive" -CHECKSUM_SHA256_3="4f10e9e5673d948776e47e78273fa4d61408155cb0e210af1538c83222f285d4" -SOURCE_FILENAME_3="libkeyfinder-2.2.8.zip" +CHECKSUM_SHA256="53fb1a2a6c5ac6eb3562cb99c5bcae8777d81e48b96b5b3c292794c0c105b269" +SOURCE_FILENAME="mixxx-$portVersion.tar.gz" PATCHES="mixxx-$portVersion.patchset" +libdjinteropVer="0.27.0" +SOURCE_URI_2="https://github.com/xsco/libdjinterop/archive/refs/tags/$libdjinteropVer.tar.gz#noarchive" +CHECKSUM_SHA256_2="c4e73bf3907fd45be1c9767bcd9f367cbb7c279b4fe047bf2216bc92ae3d1668" +SOURCE_FILENAME_2="libdjinterop-$libdjinteropVer.tar.gz" +libkeyfinderVer="2.2.8" +SOURCE_URI_3="https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/$libkeyfinderVer.zip#noarchive" +CHECKSUM_SHA256_3="4f10e9e5673d948776e47e78273fa4d61408155cb0e210af1538c83222f285d4" +SOURCE_FILENAME_3="libkeyfinder-$libkeyfinderVer.zip" ADDITIONAL_FILES="mixxx.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -84,7 +87,7 @@ BUILD_REQUIRES=" devel:ms_gsl # devel:libbenchmark$secondaryArchSuffix devel:libchromaprint$secondaryArchSuffix - devel:libcrypto$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix >= 3 devel:libebur128$secondaryArchSuffix devel:libfftw3$secondaryArchSuffix devel:libFLAC$secondaryArchSuffix @@ -111,7 +114,7 @@ BUILD_REQUIRES=" devel:libsndfile$secondaryArchSuffix devel:libsoundtouch$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix - devel:libssl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix >= 3 devel:libtag$secondaryArchSuffix >= 2.0 devel:libusb_1.0$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix @@ -119,8 +122,8 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" -# cmd:ccache cmd:cmake +# cmd:dia cmd:dot cmd:doxygen cmd:gcc$secondaryArchSuffix @@ -132,17 +135,18 @@ BUILD_PREREQUIRES=" BUILD() { mkdir -p build/downloads - cp $sourceDir2/libdjinterop-0.24.3.tar.gz build/downloads - cp $sourceDir3/libkeyfinder-2.2.8.zip build/downloads + cp $sourceDir2/libdjinterop-$libdjinteropVer.tar.gz build/downloads + cp $sourceDir3/libkeyfinder-$libkeyfinderVer.zip build/downloads export LDFLAGS="-lnetwork" cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ - -DCMAKE_INSTALL_BINDIR=$appsDir \ - -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON \ - -DBATTERY=OFF \ - -DBUILD_TESTING=OFF \ - -Wno-dev + -D CMAKE_INSTALL_BINDIR=$appsDir \ + -D CMAKE_DISABLE_PRECOMPILE_HEADERS=ON \ + -D QT_NO_PRIVATE_MODULE_WARNING=ON \ + -D BATTERY=OFF \ + -D BUILD_TESTING=OFF \ + -W no-dev make -C build $jobArgs } diff --git a/media-sound/mixxx/patches/mixxx-2.5.3.patchset b/media-sound/mixxx/patches/mixxx-2.5.4.patchset similarity index 82% rename from media-sound/mixxx/patches/mixxx-2.5.3.patchset rename to media-sound/mixxx/patches/mixxx-2.5.4.patchset index 50733604d..dd47997af 100644 --- a/media-sound/mixxx/patches/mixxx-2.5.3.patchset +++ b/media-sound/mixxx/patches/mixxx-2.5.4.patchset @@ -1,37 +1,30 @@ -From 38c9eddafe50cef75e6e6ee94ea4fd6fe3bcd71a Mon Sep 17 00:00:00 2001 +From 37f2cce5c645f5356e335b84c307d97db2cecbe7 Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Fri, 26 Sep 2025 13:33:49 +0200 Subject: Fix for missing byteswap.h diff --git a/lib/kaitai/kaitai/kaitaistream.cpp b/lib/kaitai/kaitai/kaitaistream.cpp -index 625b890..559097b 100644 +index 2ad14a4..0c61353 100644 --- a/lib/kaitai/kaitai/kaitaistream.cpp +++ b/lib/kaitai/kaitai/kaitaistream.cpp -@@ -27,6 +27,11 @@ +@@ -41,6 +41,11 @@ #define __BYTE_ORDER BYTE_ORDER #define __BIG_ENDIAN BIG_ENDIAN #define __LITTLE_ENDIAN LITTLE_ENDIAN -+#elif defined(__HAIKU__) -+ #include -+ #define bswap_16 B_SWAP_INT16 -+ #define bswap_32 B_SWAP_INT32 -+ #define bswap_64 B_SWAP_INT64 - #else // !__APPLE__ or !_MSC_VER or !__QNX__ +++#elif defined(__HAIKU__) ++#include ++#define bswap_16 B_SWAP_INT16 ++#define bswap_32 B_SWAP_INT32 ++#define bswap_64 B_SWAP_INT64 + #else // !__APPLE__ or !_MSC_VER or !__QNX__ or !BSD #include #include -@@ -874,4 +879,4 @@ std::string kaitai::kstream::bytes_to_str(const std::string src, int codepage) { - - #else - #error Need to decide how to handle strings: please define one of: KS_STR_ENCODING_ICONV, KS_STR_ENCODING_WIN32API, KS_STR_ENCODING_NONE --#endif -\ No newline at end of file -+#endif -- -2.50.1 +2.52.0 -From d8a949987480599333f287f8ad979e85e0c46dbc Mon Sep 17 00:00:00 2001 +From 37c1b6c04fb20f2801d163737db752669d787c7c Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Fri, 26 Sep 2025 14:00:10 +0200 Subject: Haiku doesn't have pthread_attr_setinheritsched @@ -51,17 +44,17 @@ index 2e1f2e3..8c1ff05 100644 #endif -- -2.50.1 +2.52.0 -From b7358b83f51586f76f74726b0bef6fcba7d70781 Mon Sep 17 00:00:00 2001 +From 8aa502bbc815d7a7f839b60d1dd1b9c2e83e849b Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Fri, 26 Sep 2025 14:42:31 +0200 Subject: We are not linux diff --git a/CMakeLists.txt b/CMakeLists.txt -index 82f83ea..058f024 100644 +index e948f17..18b7cdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1981,7 +1981,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf") @@ -74,10 +67,10 @@ index 82f83ea..058f024 100644 install( FILES -- -2.50.1 +2.52.0 -From 0170415245c996288ea5db3ac3e637834a73465e Mon Sep 17 00:00:00 2001 +From 4b674a6e6d67ba8701648490c977c495b8d65a2b Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Fri, 26 Sep 2025 16:32:26 +0200 Subject: Fix? @@ -112,10 +105,10 @@ index fa09b7e..5e9ccd5 100644 } } -- -2.50.1 +2.52.0 -From 9f1d9e647d6dcb319b8aac6bf702508a8d4c5b58 Mon Sep 17 00:00:00 2001 +From 960ae19a2687e66581aa125ab4630044212ead27 Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Fri, 26 Sep 2025 18:26:44 +0200 Subject: Fix fatal error: arch/1/limits.h: No such file or directory @@ -123,7 +116,7 @@ Subject: Fix fatal error: arch/1/limits.h: No such file or directory ticket created at: https://dev.haiku-os.org/ticket/19765 diff --git a/CMakeLists.txt b/CMakeLists.txt -index 058f024..03c4f93 100644 +index 18b7cdb..2326df0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1714,7 +1714,6 @@ if(WARNINGS_FATAL) @@ -135,17 +128,17 @@ index 058f024..03c4f93 100644 $<$:MIXXX_DEBUG_ASSERTIONS_ENABLED> $<$>:MIXXX_BUILD_RELEASE> -- -2.50.1 +2.52.0 -From 25faf4cc71d15ab12a12e4c40b8ecf6109ef10bf Mon Sep 17 00:00:00 2001 +From c9d43d5b5de44b2570f63a13e8fdd59a8eb48886 Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Sun, 28 Sep 2025 08:31:18 +0200 Subject: Set configuration path to config/settings/mixxx diff --git a/CMakeLists.txt b/CMakeLists.txt -index 03c4f93..c84a42e 100644 +index 2326df0..bc66b60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1593,9 +1593,12 @@ set_source_files_properties(src/util/moc_included_test.cpp PROPERTIES SKIP_PRECO @@ -163,10 +156,10 @@ index 03c4f93..c84a42e 100644 if(APPLE) -- -2.50.1 +2.52.0 -From 6db4003bf055a356312d5662dde348edf5831039 Mon Sep 17 00:00:00 2001 +From 27e572fd25c77d52ed6afb0a9df0651d290af883 Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Sun, 28 Sep 2025 09:33:00 +0200 Subject: Set resources path for Haiku @@ -193,5 +186,5 @@ index 81709fa..50eabd0 100644 // On Windows, set the config dir relative to the application dir if all // of the above fail. -- -2.50.1 +2.52.0