From patchwork Sun May 11 10:13:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8725 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4ZwJVJ5Q2Zz3x4T for ; Sun, 11 May 2025 10:13:44 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZwJVG4T37z6R1 for ; Sun, 11 May 2025 10:13:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZwJV41GHkz36Vs for ; Sun, 11 May 2025 10:13:32 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZwJV11lj4z33lq for ; Sun, 11 May 2025 10:13:29 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4ZwJTz5mKfz6R3; Sun, 11 May 2025 10:13:27 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1746958408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZusjfhjuCitmr0Y2tFCYLS10AUIhx834pCqKcg5pU7U=; b=ka5d53X7xvjxkJ/hJGRmBffLxfkIOkuQKr/uyLdEZUccCzmSHGLLyxYhsVeoAwC6Florxk N9xY2YbrW4vxzlDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1746958408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZusjfhjuCitmr0Y2tFCYLS10AUIhx834pCqKcg5pU7U=; b=N+0Te790blr36i0ty6KSgOoaBv1GGboNrGOU05Dy2qXkPtmLrtaz7BAy1lrfyN9CK+FAkZ Ik7GyWoMGi4GfvAQa2nkejCmgUqH9d90cRJ2nUM+zHABdnp1lmcwS2swVjqW0Zvd5Wsa7P 0GpK1YSBVzYTQO6D2gCbkjbCvfp6ogvkEQ3ccD0y4aBfqe9fswX38Mu7N7EJxhD/Vijs6x tplfKWaZjvlDDOe8FGHq3fKaEr6F4nkZxm+dFtdhfcUqpY7Lad09uBbqgC9eqeZy3lh0ry OpjZp1SLVcl5Skqf13kG/i1A3oknfGNfcXcumHsHuY6USFFGmRgU8moiqtsr1w== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 8/9] soxr: Update CMakeLists.txt with cmake min version Date: Sun, 11 May 2025 12:13:03 +0200 Message-ID: <20250511101311.7315-8-adolf.belka@ipfire.org> In-Reply-To: <20250511101311.7315-1-adolf.belka@ipfire.org> References: <20250511101311.7315-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - The last update and commit on this package was 7 years ago so unlikely that there will be an update for this. - An issue has been raised on the github site but as none of the other raised issues have been dealt with in the last 7 years it looks like this repo is dead. - Will raise a separate discussion on whether this package should be left in IPFire. - Patch created to update the min cmake version to 3.10 and the build completed successfully with that. Signed-off-by: Adolf Belka --- lfs/soxr | 8 +++++--- .../soxr-0.1.3-allow_build_with_cmake-4.0.x.patch | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 src/patches/soxr-0.1.3-allow_build_with_cmake-4.0.x.patch diff --git a/lfs/soxr b/lfs/soxr index ae00ebd32..039c1b945 100644 --- a/lfs/soxr +++ b/lfs/soxr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2025 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP)-Source TARGET = $(DIR_INFO)/$(THISAPP) PROG = soxr -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -81,9 +81,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/soxr-0.1.3-allow_build_with_cmake-4.0.x.patch cd $(DIR_APP) && mkdir -p build cd $(DIR_APP)/build && cmake -Wno-dev \ - -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. cd $(DIR_APP)/build && make $(MAKETUNING) cd $(DIR_APP)/build && make install @rm -rf $(DIR_APP) diff --git a/src/patches/soxr-0.1.3-allow_build_with_cmake-4.0.x.patch b/src/patches/soxr-0.1.3-allow_build_with_cmake-4.0.x.patch new file mode 100644 index 000000000..dfee3d103 --- /dev/null +++ b/src/patches/soxr-0.1.3-allow_build_with_cmake-4.0.x.patch @@ -0,0 +1,11 @@ +--- soxr-0.1.3-Source/CMakeLists.txt.orig 2018-02-23 22:39:25.000000000 +0100 ++++ soxr-0.1.3-Source/CMakeLists.txt 2025-05-08 17:35:15.017048157 +0200 +@@ -1,7 +1,7 @@ + # SoX Resampler Library Copyright (c) 2007-18 robs@users.sourceforge.net + # Licence for this file: LGPL v2.1 See LICENCE for details. + +-cmake_minimum_required (VERSION 3.1 FATAL_ERROR) ++cmake_minimum_required (VERSION 3.10 FATAL_ERROR) + + project (soxr C) + set (DESCRIPTION_SUMMARY