From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C050C433F5 for ; Mon, 11 Oct 2021 21:23:27 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D576160F0F for ; Mon, 11 Oct 2021 21:23:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D576160F0F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=buildroot.org Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 98BBF608EB; Mon, 11 Oct 2021 21:23:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1y25n0rgFy_p; Mon, 11 Oct 2021 21:23:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id C4F37608F2; Mon, 11 Oct 2021 21:23:24 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D0DDD1BF865 for ; Mon, 11 Oct 2021 21:21:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id CD4B781839 for ; Mon, 11 Oct 2021 21:21:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mNGJga58Cwsk for ; Mon, 11 Oct 2021 21:21:53 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) by smtp1.osuosl.org (Postfix) with ESMTPS id C518780D85 for ; Mon, 11 Oct 2021 21:21:53 +0000 (UTC) Received: by mail-oi1-x230.google.com with SMTP id z126so12081943oiz.12 for ; Mon, 11 Oct 2021 14:21:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0ZULZu/o/gsT7SOuXLenxC+1owMmmqLW/DRoYpU9SoI=; b=atNmoAjWMhKc5R91mauWNUtP6OSQrUHT5f5uh0DP6J1PKNJIy8riY1qKb4nVnUXmzo 7PEY/MXwna91k4YaDPduEzjrhxjqU5ZKaRENckIiqAwZn4f20ShTFtbFf1jO47gDfDe4 p5xKra/2eN0b1WIznf23Vb2Uv1Hpf6DDN2EfsBHWwLz2T7t7vjZMEEcWW8gzy1KGXvi3 R+XPJGUXFV+RjgVIlO71XvVqJGYUK2QELedOin+qCkdydDeXgcQT7RSMldPz5mSEc89P D/DvTcnO01f5hj9vE63o1EIipiVOIyE91WTDHBQNcZLi4rKkydMM39XA/RZlMeACSGCS WoUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0ZULZu/o/gsT7SOuXLenxC+1owMmmqLW/DRoYpU9SoI=; b=zdvaWiu2/5quLyE56/CbeMQjfjJegXMVCbIn/GKusyEXLsM+CPtb/DnuRjrg92zK7y Nbrs3rn72SiS1N+ejIhYXiiCImpWrQBJNZp+eXLWlz8S/v0XrAtJKbYTStnkLhvEMVw6 MkNupopI2vn9kJuQsm/bO6z0weHC7F1jH9MpIsSyUl0aRKzoaUCs7yaqSzNoPGM/GBWE D8weyTeQrtND7an4IaW9Xu0CZI5yYJHUcLzXZUDeB2JSu9aLNDbtATG75msa0eeimfsV BoGa2OgeK66AMJxP0ghUuH9ByndTW+8XzTNJsAc3nB0OV/pBaWFqlCvt7oSLV3TXJDas +5DQ== X-Gm-Message-State: AOAM5324l6UztFalUBsjCLxWY9GCJNw0xmFCqlrkARERon19ird5Rw7I Rl+E8vpQz4s7h+R4+ayEpN2RfogIZYiVuc9x X-Google-Smtp-Source: ABdhPJxhCHxr838vcguEfadU4vD6pB24AqVvGkEI7RmEjF/LgP3b8aZJrGBqkMKgWW+EygL6bKhGpQ== X-Received: by 2002:aca:f002:: with SMTP id o2mr1018315oih.32.1633987312574; Mon, 11 Oct 2021 14:21:52 -0700 (PDT) Received: from localhost ([189.174.209.191]) by smtp.gmail.com with UTF8SMTPSA id s18sm1934326oij.3.2021.10.11.14.21.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 11 Oct 2021 14:21:52 -0700 (PDT) From: Gleb Mazovetskiy To: buildroot@buildroot.org Date: Mon, 11 Oct 2021 22:21:25 +0100 Message-Id: <20211011212125.402086-3-glex.spb@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211011212125.402086-1-glex.spb@gmail.com> References: <20211011210241.396390-1-glex.spb@gmail.com> <20211011212125.402086-1-glex.spb@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 2/2] package: add smpq X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gleb Mazovetskiy , Samuel Martin , yann.morin.1998@free.fr Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" smpq is a utility for manipulating Blizzard MPQ archives. smpq is a build-time dependency of several source ports / reimplementations of Blizzard games, such as DevilutionX. Signed-off-by: Gleb Mazovetskiy --- package/Config.in | 1 + .../smpq/0001-CMake-Set-language-to-C.patch | 29 +++++++++++++++ .../0002-CMake-Disable-version-check.patch | 32 ++++++++++++++++ ...0003-CMake-Disable-manual-generation.patch | 37 +++++++++++++++++++ package/smpq/Config.in | 11 ++++++ package/smpq/smpq.hash | 3 ++ package/smpq/smpq.mk | 19 ++++++++++ 7 files changed, 132 insertions(+) create mode 100644 package/smpq/0001-CMake-Set-language-to-C.patch create mode 100644 package/smpq/0002-CMake-Disable-version-check.patch create mode 100644 package/smpq/0003-CMake-Disable-manual-generation.patch create mode 100644 package/smpq/Config.in create mode 100644 package/smpq/smpq.hash create mode 100644 package/smpq/smpq.mk diff --git a/package/Config.in b/package/Config.in index 2b561e6eaf..890a6be135 100644 --- a/package/Config.in +++ b/package/Config.in @@ -74,6 +74,7 @@ menu "Compressors and decompressors" source "package/p7zip/Config.in" source "package/pigz/Config.in" source "package/pixz/Config.in" + source "package/smpq/Config.in" source "package/unrar/Config.in" source "package/unzip/Config.in" source "package/xz/Config.in" diff --git a/package/smpq/0001-CMake-Set-language-to-C.patch b/package/smpq/0001-CMake-Set-language-to-C.patch new file mode 100644 index 0000000000..30624cc590 --- /dev/null +++ b/package/smpq/0001-CMake-Set-language-to-C.patch @@ -0,0 +1,29 @@ +From 70e43a4323f43d58a1b6c21bf251e7e8fe4cb345 Mon Sep 17 00:00:00 2001 +From: Gleb Mazovetskiy +Date: Mon, 11 Oct 2021 21:48:00 +0100 +Subject: [PATCH 1/3] CMake: Set language to C++ + +Signed-off-by: Gleb Mazovetskiy +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 291bf7f..71fb61f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,6 +18,11 @@ + # + + project(SMPQ) ++ ++# StormLib is C++ and must be linked with a C++ linker (e.g. via g++ instead of gcc). ++file(GLOB_RECURSE CFILES "${CMAKE_SOURCE_DIR}/*.c") ++SET_SOURCE_FILES_PROPERTIES(${CFILES} PROPERTIES LANGUAGE CXX) ++ + set(VERSION 1.6) + cmake_minimum_required(VERSION 2.6) + +-- +2.30.2 + diff --git a/package/smpq/0002-CMake-Disable-version-check.patch b/package/smpq/0002-CMake-Disable-version-check.patch new file mode 100644 index 0000000000..6333595849 --- /dev/null +++ b/package/smpq/0002-CMake-Disable-version-check.patch @@ -0,0 +1,32 @@ +From bce50c41d461dc53d304cd41efc561bc9fa01327 Mon Sep 17 00:00:00 2001 +From: Gleb Mazovetskiy +Date: Mon, 11 Oct 2021 21:48:32 +0100 +Subject: [PATCH 2/3] CMake: Disable version check + +Version check is currently broken. Disable it. + +Signed-off-by: Gleb Mazovetskiy +--- + CMakeLists.txt | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 71fb61f..2375b36 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,12 +46,6 @@ if(NOT STORMLIB_INCLUDE_DIR OR NOT STORMLIB_LIBRARY) + message(FATAL_ERROR "StormLib or storm library not found") + endif(NOT STORMLIB_LIBRARY) + +- try_compile(CHECK ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/check.c COMPILE_DEFINITIONS -I${STORMLIB_INCLUDE_DIR}) +- +- if(NOT CHECK) +- message(FATAL_ERROR "Found old StormLib version") +- endif(NOT CHECK) +- + message(STATUS "Found StormLib header: ${STORMLIB_INCLUDE_DIR}/StormLib.h") + message(STATUS "Found StormLib library: ${STORMLIB_LIBRARY}") + +-- +2.30.2 + diff --git a/package/smpq/0003-CMake-Disable-manual-generation.patch b/package/smpq/0003-CMake-Disable-manual-generation.patch new file mode 100644 index 0000000000..c293237cc9 --- /dev/null +++ b/package/smpq/0003-CMake-Disable-manual-generation.patch @@ -0,0 +1,37 @@ +From 6102660ba5ad0e8217e617fc53a6fc3d1bb12966 Mon Sep 17 00:00:00 2001 +From: Gleb Mazovetskiy +Date: Mon, 11 Oct 2021 21:49:57 +0100 +Subject: [PATCH 3/3] CMake: Disable manual generation + +We do not need the manual in buildroot and there is currently no +dedicated way to disable it. + +Signed-off-by: Gleb Mazovetskiy +--- + CMakeLists.txt | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2375b36..3a8b7c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -101,16 +101,6 @@ if(WITH_CMD) + + install(TARGETS smpq DESTINATION bin) + +- if(NOT CMAKE_CROSSCOMPILING) +- +- add_executable(mangen ${MANGEN_SRCS}) +- add_custom_command(OUTPUT smpq.1 COMMAND mangen > smpq.1 DEPENDS mangen) +- add_custom_target(man ALL DEPENDS smpq.1) +- +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smpq.1 DESTINATION share/man/man1) +- +- endif(NOT CMAKE_CROSSCOMPILING) +- + if(WIN32 AND WITH_NSIS) + + find_package(SelfPackers REQUIRED) +-- +2.30.2 + diff --git a/package/smpq/Config.in b/package/smpq/Config.in new file mode 100644 index 0000000000..589f5cf834 --- /dev/null +++ b/package/smpq/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_SMPQ + bool "smpq" + select BR2_PACKAGE_SMPQ + help + StormLib MPQ archiving utility + + This utility manipulates Blizzard MPQ archives. + It supports extracting, appending, renaming and deleting files + in MPQ archives, and creating new MPQ archives. + + https://launchpad.net/smpq diff --git a/package/smpq/smpq.hash b/package/smpq/smpq.hash new file mode 100644 index 0000000000..f14eaef49b --- /dev/null +++ b/package/smpq/smpq.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 b5d2dc8a5de8629b71ee5d3612b6e84d88418b86c5cd39ba315e9eb0462f18cb smpq_1.6.orig.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/smpq/smpq.mk b/package/smpq/smpq.mk new file mode 100644 index 0000000000..34f87f7f45 --- /dev/null +++ b/package/smpq/smpq.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# smpq +# +################################################################################ + +SMPQ_VERSION = 1.6 +SMPQ_SOURCE = smpq_$(SMPQ_VERSION).orig.tar.gz +SMPQ_SITE = https://launchpad.net/smpq/trunk/$(SMPQ_VERSION)/+download +SMPQ_LICENSE = GPL-3.0+ +SMPQ_LICENSE_FILES = LICENSE +SMPQ_DEPENDENCIES = stormlib +HOST_SMPQ_DEPENDENCIES = host-stormlib +SMPQ_CONF_OPTS += -DWITH_KDE=OFF +HOST_SMPQ_CONF_OPTS += -DWITH_KDE=OFF +SMPQ_INSTALL_STAGING = YES + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot