[performous] Update performous to 1.3.0

commit 000e8c1faecb03dee61934a9534a80123f3096b6 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Sep 27 04:57:25 2023 +0100 Update performous to 1.3.0 .gitignore | 2 ++ performous-ced-offline.patch | 54 +++++++++++++++++++++++++++++++++++--------- performous-ffmpeg.patch | 11 --------- performous-gcc12.patch | 16 ------------- performous.spec | 21 +++++++++-------- sources | 4 ++-- 6 files changed, 59 insertions(+), 49 deletions(-) --- diff --git a/.gitignore b/.gitignore index 1f2ec62..a596744 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /performous-e0a28a6.tar.gz /ced-0fe8be4.tar.gz /performous-1.2.0.tar.gz +/ced-9ca1351.tar.gz +/performous-1.3.0.tar.gz diff --git a/performous-ced-offline.patch b/performous-ced-offline.patch index f8aad7d..a6395d0 100644 --- a/performous-ced-offline.patch +++ b/performous-ced-offline.patch @@ -1,12 +1,44 @@ ---- ./CMakeLists.txt.orig 2021-08-14 11:51:13.000000000 +0100 -+++ ./CMakeLists.txt 2021-08-19 22:19:26.292918145 +0100 -@@ -78,9 +78,6 @@ endif() - - include(FetchContent) - FetchContent_Declare(ced-sources -- GIT_REPOSITORY https://github.com/performous/compact_enc_det.git -- #https://github.com/google/compact_enc_det.git -- GIT_TAG master - SOURCE_DIR ced-src - ) +From: Markus Koschany <apo(a)debian.org&gt; +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,6 +106,9 @@ else() + message(STATUS "Localization disabled: Gettext tools (msgfmt) missing") + endif() ++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ced) ++add_subdirectory(ced) ++ + add_subdirectory(data) + + add_subdirectory(game) +--- a/game/CMakeLists.txt ++++ b/game/CMakeLists.txt +@@ -132,7 +132,7 @@ if (MINGW) + target_link_libraries(performous PRIVATE mingw32) + endif() + +-foreach(lib ${OUR_LIBS} SDL2 PangoCairo LibRSVG LibXML++ AVFormat SWResample SWScale ZLIB JPEG PNG PortAudio Fontconfig GLM Json Ced Aubio) ++foreach(lib ${OUR_LIBS} SDL2 PangoCairo LibRSVG LibXML++ AVFormat SWResample SWScale ZLIB JPEG PNG PortAudio Fontconfig GLM Json Aubio) + find_package(${lib} ${${lib}_REQUIRED_VERSION} REQUIRED) + message(STATUS "${lib} includes: ${${lib}_INCLUDE_DIRS}") + target_include_directories(performous SYSTEM PRIVATE ${${lib}_INCLUDE_DIRS}) +@@ -140,6 +140,8 @@ foreach(lib ${OUR_LIBS} SDL2 PangoCairo + add_definitions(${${lib}_DEFINITIONS}) + endforeach(lib) + ++target_link_libraries(performous PRIVATE ced) ++ + find_package(fmt REQUIRED CONFIG) + # CppRESTSDK and their godforsaken U macro. + if(fmt_VERSION VERSION_GREATER_EQUAL 9.0.0) +--- a/game/unicode.cc ++++ b/game/unicode.cc +@@ -8,7 +8,7 @@ + #include <unicode/unistr.h> + #include <unicode/ustream.h> + #include <unicode/ubidi.h> +-#include "compact_enc_det/compact_enc_det.h" ++#include "../ced/compact_enc_det/compact_enc_det.h" + + std::unique_ptr<icu::RuleBasedCollator> UnicodeUtil::m_searchCollator; + std::unique_ptr<icu::RuleBasedCollator> UnicodeUtil::m_sortCollator; diff --git a/performous.spec b/performous.spec index fd49781..8894f2b 100644 --- a/performous.spec +++ b/performous.spec @@ -1,13 +1,13 @@ %global gitdate 20210814 %global commit0 e0a28a61df442b4a4a34521cd3aa8e37e3f9ce3c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global commit1 0fe8be431ebc7562379cd0f791110233c04420da +%global commit1 9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) Name: performous Epoch: 1 -Version: 1.2.0 -Release: 8%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: Free cross-platform music and rhythm / party game # The main code is GPLv2+, and there are fonts under ASL 2.0 and SIL licenses @@ -17,8 +17,6 @@ Source0: https://github.com/performous/performous/archive/refs/tags/%{ver Source1: https://github.com/performous/compact_enc_det/archive/%{commit1}/ced-%{sh... Source3: performous.appdata.xml Patch0: performous-ced-offline.patch -Patch1: performous-gcc12.patch -Patch2: performous-ffmpeg.patch BuildRequires: alsa-lib-devel BuildRequires: aubio-devel @@ -30,6 +28,7 @@ BuildRequires: cairo-devel BuildRequires: cpprest-devel BuildRequires: desktop-file-utils BuildRequires: ffmpeg-devel +BuildRequires: fmt-devel BuildRequires: glew-devel BuildRequires: gcc-c++ BuildRequires: gettext @@ -38,6 +37,7 @@ BuildRequires: glm-devel BuildRequires: help2man BuildRequires: ImageMagick-devel BuildRequires: ImageMagick-c++-devel +BuildRequires: json-devel BuildRequires: libepoxy-devel BuildRequires: libappstream-glib BuildRequires: libjpeg-turbo-devel @@ -83,8 +83,8 @@ package. %prep %autosetup -p1 -n %{name}-%{version} -mkdir -p %{__cmake_builddir}/ced-src -tar -xf %{SOURCE1} -C %{__cmake_builddir}/ced-src/ --strip 1 +mkdir -p ced +tar -xf %{SOURCE1} -C ced/ --strip 1 cp -p "docs/license/SIL OFL Font License New Rocker.txt" SIL-OFL.txt @@ -118,16 +118,19 @@ rm -rf %buildroot%{_libdir}/*.{a,la} %{_datadir}/applications/*.desktop %{_metainfodir}/%{name}.appdata.xml %{_datadir}/pixmaps/*.svg -%{_mandir}/man*/* +%{_mandir}/performous.6.* %files data %license LICENSE.md %license docs/license/Apache-2.0-DroidSansMono.txt %license SIL-OFL.txt -%{_datadir}/%{name}/ +%{_datadir}/games/%{name}/ %changelog +* Wed Sep 27 2023 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1:1.3.0-1 +- Update performous to 1.3.0 + * Mon Aug 07 2023 Sérgio Basto <sergio(a)serjux.com&gt; - 1:1.2.0-8 - Rebuild for opencv soname bump diff --git a/sources b/sources index 9ec3c2d..0091352 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (performous-1.2.0.tar.gz) = a8fbbe3768f46915eacb65adcc1592295e4c6a84775ca55def01ebcff2218b1860daee0d4d5fcccc407d8df71da1ac25da667b47dd4a17239041a3d5fbfa1c56 -SHA512 (ced-0fe8be4.tar.gz) = 9bcd762cda771ba8c2792cd48c8135904127082e10542616e69a257a1e717e71e2b6b50c6590c21392d4e459fd61094c7696893c8f531bcf23f56e6f50f075fe +SHA512 (ced-9ca1351.tar.gz) = 6721ae5936a58b8298d175f3875675bfb8249208642eaf2766dc6a62c7db96454d4f95d8c39de0ca862aa3edc741de535af69242f0d2d0b8f7527408ab673089 +SHA512 (performous-1.3.0.tar.gz) = d10e52e82034ae6ef5ae5efc9980d39f473c4f5be10082fd0ce6e776cb382e1cb2c546649c477c03684b207e06c051e1a9a488330f1421db38baf5c0e47de594