Merge branch 'clangen:master' into master

.cmake/GeneratePackage.cmake

@@ -1,6 +1,6 @@
 if (${GENERATE_DEB} MATCHES "true" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
   if (${BUILD_STANDALONE} MATCHES "true")
-    set(CPACK_PACKAGE_FILE_NAME "musikcube_linux_${musikcube_VERSION}_${DEB_ARCHITECTURE}")
+    set(CPACK_PACKAGE_FILE_NAME "musikcube_linux_${musikcube_VERSION}_${PACKAGE_ARCHITECTURE}")
   else()
     set(DEB_MICROHTTPD_VERSION "10")
     set(DEB_LIBCURL_VERSION "3")
@@ -43,7 +43,7 @@ if (${GENERATE_DEB} MATCHES "true" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
     set(DEPENDENCIES "libmicrohttpd${DEB_MICROHTTPD_VERSION}, libcurl${DEB_LIBCURL_VERSION}, libogg0, libvorbis0a, libvorbisfile3, libncursesw${DEB_NCURSES_VERSION}, libasound2, libpulse0, pulseaudio, libmp3lame0, libev4, libopenmpt0, libssl1.1")
     set(DEPENDENCIES "${DEPENDENCIES}, libtag1v5, libavcodec-extra, libavutil${DEB_AVUTIL_VERSION}, libavformat${DEB_AVFORMAT_VERSION}, libswresample${DEB_SWRESAMPLE_VERSION}")
 
-    set(CPACK_PACKAGE_FILE_NAME "musikcube_linux_${musikcube_VERSION}_${DEB_PLATFORM}_${DEB_DISTRO}_${DEB_ARCHITECTURE}")
+    set(CPACK_PACKAGE_FILE_NAME "musikcube_linux_${musikcube_VERSION}_${DEB_PLATFORM}_${DEB_DISTRO}_${PACKAGE_ARCHITECTURE}")
     set(CPACK_DEBIAN_PACKAGE_DEPENDS ${DEPENDENCIES})
     set(CPACK_RPM_PACKAGE_REQUIRES "libogg, libvorbis, ffmpeg-libs, ncurses, zlib, alsa-lib, pulseaudio-libs, openssl, libcurl, libmicrohttpd, lame, libev, taglib, libopenmpt")
   endif()
@@ -56,10 +56,10 @@ if (${GENERATE_DEB} MATCHES "true" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
   set(CPACK_PACKAGE_VERSION_PATCH "${musikcube_VERSION_PATCH}")
 
   set(CPACK_DEBIAN_PACKAGE_MAINTAINER "casey langen")
-  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEB_ARCHITECTURE})
+  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${PACKAGE_ARCHITECTURE})
 
   set(CPACK_RPM_PACKAGE_LICENSE "BSD-3-Clause")
-  set(CPACK_RPM_PACKAGE_ARCHITECTURE, ${DEB_ARCHITECTURE})
+  set(CPACK_RPM_PACKAGE_ARCHITECTURE ${PACKAGE_ARCHITECTURE})
   set(CPACK_RPM_PACKAGE_URL "https://www.musikcube.com")
   set(CPACK_RPM_PACKAGE_VERSION "${musikcube_VERSION_MAJOR}.${musikcube_VERSION_MINOR}.${musikcube_VERSION_PATCH}")
   set(CPACK_RPM_REQUIRES_EXCLUDE_FROM "^/.*$")

CHANGELOG.txt

@@ -3,6 +3,8 @@
 * fixed a bug where album artist (and potentially other) metadata values were
   being double encoded.
 * fixed a bug where re-arranging the play queue may cause unnecessary i/o.
+* fixed bug where `rpm` architecture was incorrect for `armhf` builds.
+* updated `asio` to 1.28.0
 
 --------------------------------------------------------------------------------
 

CMakeLists.txt

@@ -1,6 +1,6 @@
 #cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .
 #cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr .
-#cmake -DGENERATE_DEB=true -DDEB_ARCHITECTURE=i386|amd64|armhf -DDEB_PLATFORM=ubuntu -DDEB_DISTRO=eoan -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
+#cmake -DGENERATE_DEB=true -DPACKAGE_ARCHITECTURE=i386|amd64|armhf -DDEB_PLATFORM=ubuntu -DDEB_DISTRO=eoan -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
 #cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_STANDALONE=true .
 
 cmake_minimum_required(VERSION 3.0)
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.0)
 project(musikcube)
 set (musikcube_VERSION_MAJOR 3)
 set (musikcube_VERSION_MINOR 0)
-set (musikcube_VERSION_PATCH 0)
+set (musikcube_VERSION_PATCH 1)
 set (musikcube_VERSION "${musikcube_VERSION_MAJOR}.${musikcube_VERSION_MINOR}.${musikcube_VERSION_PATCH}")
 set (LIBRARY_OUTPUT_PATH ${musikcube_SOURCE_DIR}/bin/plugins)
 set (EXECUTABLE_OUTPUT_PATH ${musikcube_SOURCE_DIR}/bin)

musikcube.spec

@@ -1,6 +1,6 @@
 %define name musikcube
 %define build_timestamp %{lua: print(os.date("%Y%m%d"))}
-%define version 3.0.0
+%define version 3.0.1
 Name: %{name}
 Version: %{version}
 Release: %{dist}

script/archive-standalone-nix.sh

@@ -44,7 +44,7 @@ fi
 
 OS_SPECIFIC_BUILD_FLAGS=""
 if [[ $OS == "Linux" ]]; then
-  OS_SPECIFIC_BUILD_FLAGS="-DGENERATE_DEB=true -DDEB_ARCHITECTURE=${DEB_ARCH} -DCMAKE_INSTALL_PREFIX=/usr"
+  OS_SPECIFIC_BUILD_FLAGS="-DGENERATE_DEB=true -DPACKAGE_ARCHITECTURE=${DEB_ARCH} -DCMAKE_INSTALL_PREFIX=/usr"
   if [[ $CROSSCOMPILE == "rpi" ]]; then
     # for now we don't support pipewire when cross compiling...
     OS_SPECIFIC_BUILD_FLAGS="$OS_SPECIFIC_BUILD_FLAGS -DENABLE_PIPEWIRE=false"

src/musikcore/sdk/version.h

@@ -38,10 +38,10 @@
 
 #define MUSIKCUBE_VERSION_MAJOR 3
 #define MUSIKCUBE_VERSION_MINOR 0
-#define MUSIKCUBE_VERSION_PATCH 0
-#define MUSIKCUBE_VERSION "3.0.0"
-#define MUSIKCUBE_VERSION_COMMIT_HASH "#abfd4877"
-#define MUSIKCUBE_VERSION_WITH_COMMIT_HASH "3.0.0-#abfd4877"
+#define MUSIKCUBE_VERSION_PATCH 1
+#define MUSIKCUBE_VERSION "3.0.1"
+#define MUSIKCUBE_VERSION_COMMIT_HASH "#d2f83f75"
+#define MUSIKCUBE_VERSION_WITH_COMMIT_HASH "3.0.1-#d2f83f75"
 
 namespace musik {
     namespace cube {