From patchwork Sun May 11 10:13:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8723 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 4ZwJVD1YTDz3x4T for ; Sun, 11 May 2025 10:13:40 +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 4ZwJVC6nxkz6SL for ; Sun, 11 May 2025 10:13:39 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZwJV05QZWz37Cj for ; Sun, 11 May 2025 10:13:28 +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 4ZwJTx6811z371D for ; Sun, 11 May 2025 10:13:25 +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 4ZwJTw1851z6R4; Sun, 11 May 2025 10:13:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1746958404; 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=GCRtkK6kn7iotumbU4I0u8hBi/IvmwqoGqc2tIqZ7C0=; b=Z+z3rblsS9gln8QaSXLD9Ft4mkvzVKOLtqe29HxMKjAvk3YyyTBuqww6cqKe8hH5bxGCge 5D0L9aO7qs45wc+faPPqOm852lPTltsec3F26hQ8ER4n0YvBE36alfEmzQD5InX6n8Phzl ju+vwiXhXQLnUCsPT6u6W+0Dtb/IAU15lk/fWOxQTSIthAZ0oVqHuqvETzRgp99cvhCqjQ o6lRYRhQ2Ht/ekhsDxSnsoNuMuTy1IQ9LrTsOvOrDGBGOCqlb+U6Bu+lgDLqPn5k+Y+EoG Fj/FOa8KMhMf5I1Dgr0ylZx34yKYpcrApVF50h+Jgwv7w/akDfGMK1SsP6r+pg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1746958405; 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=GCRtkK6kn7iotumbU4I0u8hBi/IvmwqoGqc2tIqZ7C0=; b=tATqCU1po2YqBGYNbOwr8v4zyWuP6x/+UJyd5nqhqJHeKJ9Bv4WC23txu/VWmd8vEUx/2S qPEhgG516cf/uXCA== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 6/9] libid3tag: Update CMakeLists.txt with min cmake version Date: Sun, 11 May 2025 12:13:01 +0200 Message-ID: <20250511101311.7315-6-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 - Patch has been created in the libid3tag source but not yet released. - This patch can be removed when the next version of libid3tag is released. Signed-off-by: Adolf Belka --- lfs/libid3tag | 9 +++++---- .../libid3tag-0.16.3-allow_build_with_cmake-4.0.x.patch | 8 ++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 src/patches/libid3tag-0.16.3-allow_build_with_cmake-4.0.x.patch diff --git a/lfs/libid3tag b/lfs/libid3tag index b7f1ff19d..4cace7a74 100644 --- a/lfs/libid3tag +++ b/lfs/libid3tag @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2024 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)/$(PROG) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libid3tag -PAK_VER = 4 +PAK_VER = 5 DEPS = @@ -81,10 +81,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libid3tag-0.16.3-allow_build_with_cmake-4.0.x.patch $(UPDATE_AUTOMAKE) cd $(DIR_APP) && mkdir build - cd $(DIR_APP)/build && cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr + cd $(DIR_APP)/build && cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr cd $(DIR_APP)/build && make $(MAKETUNING) cd $(DIR_APP)/build && make install @rm -rf $(DIR_APP) diff --git a/src/patches/libid3tag-0.16.3-allow_build_with_cmake-4.0.x.patch b/src/patches/libid3tag-0.16.3-allow_build_with_cmake-4.0.x.patch new file mode 100644 index 000000000..9a8e11e25 --- /dev/null +++ b/src/patches/libid3tag-0.16.3-allow_build_with_cmake-4.0.x.patch @@ -0,0 +1,8 @@ +--- libid3tag/CMakeLists.txt.orig 2023-09-24 03:52:54.000000000 +0200 ++++ libid3tag/CMakeLists.txt 2025-05-08 17:22:58.411633461 +0200 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1.0) ++cmake_minimum_required(VERSION 3.10) + project(id3tag VERSION 0.16.3) + + option(BUILD_SHARED_LIBS "Build dynamic library" ON)