sdrpp: 1.1.0-unstable-2024-01-22 -> 1.2.1-unstable-2025-10-09 (#450737)
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt
|
||||
index 7fce281d..b709255f 100644
|
||||
--- a/core/libcorrect/CMakeLists.txt
|
||||
+++ b/core/libcorrect/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8)
|
||||
+cmake_minimum_required(VERSION 3.13)
|
||||
project(Correct C)
|
||||
include(CheckLibraryExists)
|
||||
include(CheckIncludeFiles)
|
||||
diff --git a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
|
||||
index 1dc1c913..e9924677 100644
|
||||
--- a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
|
||||
+++ b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required (VERSION 3.2.0)
|
||||
+cmake_minimum_required (VERSION 3.13)
|
||||
project (DiscordRPC)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
@@ -11,4 +11,4 @@ file(GLOB_RECURSE ALL_SOURCE_FILES
|
||||
|
||||
# add subdirs
|
||||
|
||||
-add_subdirectory(src)
|
||||
\ No newline at end of file
|
||||
+add_subdirectory(src)
|
||||
@@ -69,18 +69,26 @@ stdenv.mkDerivation rec {
|
||||
# SDR++ uses a rolling release model.
|
||||
# Choose a git hash from head and use the date from that commit as
|
||||
# version qualifier
|
||||
git_hash = "27ab5bf3c194169ddf60ca312723fce96149cc8e";
|
||||
git_date = "2024-01-22";
|
||||
version = "1.1.0-unstable-" + git_date;
|
||||
git_rev = "4658a1ade6707dee6f2ae09ba9eb71097223ea93";
|
||||
git_hash = "sha256-UxYAcqOMPQYdUbL2636LpOGbCaxHjLiJhsH62s+0AZU=";
|
||||
git_date = "2025-10-09";
|
||||
version_number = "1.2.1";
|
||||
|
||||
version = "${version_number}-unstable-" + git_date;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexandreRouma";
|
||||
repo = "SDRPlusPlus";
|
||||
rev = git_hash;
|
||||
hash = "sha256-R4xWeqdHEAaje37VQaGlg+L2iYIOH4tXMHvZkZq4SDU=";
|
||||
rev = git_rev;
|
||||
hash = git_hash;
|
||||
};
|
||||
|
||||
patches = [ ./runtime-prefix.patch ];
|
||||
patches = [
|
||||
./runtime-prefix.patch
|
||||
# CMake 4 dropped support of versions lower than 3.5,
|
||||
# versions lower than 3.10 are deprecated.
|
||||
./cmake4.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
@@ -90,7 +98,7 @@ stdenv.mkDerivation rec {
|
||||
--replace "codec2.h" "codec2/codec2.h"
|
||||
# Since the __TIME_ and __DATE__ is canonicalized in the build,
|
||||
# use our qualified version shown in the programs window title.
|
||||
substituteInPlace core/src/version.h --replace "1.1.0" "$version"
|
||||
substituteInPlace core/src/version.h --replace-fail "${version_number}" "$version"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Reference in New Issue
Block a user