From 4b3a33f2a9601422cb2ef6e8a44a1e2da43a454f Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 7 May 2023 11:58:48 -0700 Subject: [PATCH 1/3] Fix RPM architecture for non-x86_64 builds. --- .cmake/GeneratePackage.cmake | 8 ++++---- CHANGELOG.txt | 1 + CMakeLists.txt | 2 +- script/archive-standalone-nix.sh | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.cmake/GeneratePackage.cmake b/.cmake/GeneratePackage.cmake index 2947a0cc6..238b678ff 100644 --- a/.cmake/GeneratePackage.cmake +++ b/.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 "^/.*$") diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d99e0b220..429deebbd 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ * 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. -------------------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 44827ebf9..fa52afa53 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/script/archive-standalone-nix.sh b/script/archive-standalone-nix.sh index e5449cdf2..45b9343c3 100755 --- a/script/archive-standalone-nix.sh +++ b/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" From d2f83f750896818e6fd192432ca228e41cb4c8a7 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 7 May 2023 11:59:51 -0700 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 429deebbd..34d2f20a7 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,7 @@ 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 -------------------------------------------------------------------------------- From 5ef3037278cfab1c468d70f855d932ede1794a0f Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 7 May 2023 12:00:10 -0700 Subject: [PATCH 3/3] Version/hash bump --- CMakeLists.txt | 2 +- musikcube.spec | 2 +- src/musikcore/sdk/version.h | 8 ++++---- src/musikcube/musikcube.rc | Bin 4872 -> 4872 bytes 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa52afa53..b0e425b73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/musikcube.spec b/musikcube.spec index 0a0763057..6a80b0ce5 100644 --- a/musikcube.spec +++ b/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} diff --git a/src/musikcore/sdk/version.h b/src/musikcore/sdk/version.h index cc6896e4b..3675e9bda 100644 --- a/src/musikcore/sdk/version.h +++ b/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 { diff --git a/src/musikcube/musikcube.rc b/src/musikcube/musikcube.rc index 6361efd5e97f0922291885be386a8d35503bcb9c..49937502ddc210c87d7173c6d100c1cd9d871358 100644 GIT binary patch delta 50 zcmeBB>rmUE$HizkS)WUv(QtD-*JdVGLk2wtgUJVZv^P8Po?wJ?MK`PPKVb#{O)CvG delta 50 zcmeBB>rmUE$HizcS)WUv(O`2t*JdVG0|q??gUJVZv^P8Po?wJ?MK`PPKVb#{OtK9z