11:07 p.m.
commit c1f0af1245cd138f2c155b53713a88abb1207b88
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Apr 19 00:05:58 2022 +0100
Update performous to 1.2.0
This new version is not 2.0.0 as someone wrote, so we need add a new epoch
.gitignore | 1 +
performous-ced-offline.patch | 7 -------
performous-ffmpeg.patch | 11 +++++++++++
performous-gcc12.patch | 16 ++++++++++++++++
performous.spec | 15 +++++++++++----
sources | 2 +-
6 files changed, 40 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 78bdc86..1f2ec62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/performous-57ad2fc.tar.gz
/performous-e0a28a6.tar.gz
/ced-0fe8be4.tar.gz
+/performous-1.2.0.tar.gz
diff --git a/performous-ced-offline.patch b/performous-ced-offline.patch
index e092b15..f8aad7d 100644
--- a/performous-ced-offline.patch
+++ b/performous-ced-offline.patch
@@ -10,10 +10,3 @@
SOURCE_DIR ced-src
)
-@@ -175,4 +172,4 @@ set(CPACK_NSIS_MUI_HEADERIMAGE "${CMAKE_
- set(CPACK_NSIS_MANIFEST_DPI_AWARE ON)
- set(CPACK_NSIS_BRANDING_TEXT "Performous installer ${PROJECT_VERSION}
2009-${YEAR}")
-
--include(CPack)
-\ No newline at end of file
-+include(CPack)
diff --git a/performous-ffmpeg.patch b/performous-ffmpeg.patch
new file mode 100644
index 0000000..cf0d05d
--- /dev/null
+++ b/performous-ffmpeg.patch
@@ -0,0 +1,11 @@
+--- performous-1.2.0/game/ffmpeg.cc.orig 2022-04-18 23:50:35.461091985 +0100
++++ performous-1.2.0/game/ffmpeg.cc 2022-04-18 23:51:44.772857009 +0100
+@@ -251,7 +251,7 @@ FFmpeg::FFmpeg(fs::path const& _filename
+ if (err < 0) throw Error(*this, err);
+ m_formatContext->flags |= AVFMT_FLAG_GENPTS;
+ // Find a track and open the codec
+- AVCodec* codec = nullptr;
++ const AVCodec* codec = nullptr;
+ m_streamId = av_find_best_stream(m_formatContext.get(),
static_cast<AVMediaType>(mediaType), -1, -1, &codec, 0);
+ if (m_streamId < 0) throw Error(*this, m_streamId);
+
diff --git a/performous-gcc12.patch b/performous-gcc12.patch
new file mode 100644
index 0000000..31ea6e2
--- /dev/null
+++ b/performous-gcc12.patch
@@ -0,0 +1,16 @@
+--- performous-1.2.0/game/libda/sample.hpp.orig 2022-04-15 01:54:03.737378256 +0100
++++ performous-1.2.0/game/libda/sample.hpp 2022-04-15 01:55:05.137168373 +0100
+@@ -62,10 +62,12 @@ namespace da {
+ static inline int conv_to_s24_fast(sample_t s) { return static_cast<int>(s *
max_s24); }
+ static inline int conv_to_s32_fast(sample_t s) { return static_cast<int>(s *
max_s32); }
+
+- template <typename ValueType> class step_iterator: public
std::iterator<std::random_access_iterator_tag, ValueType> {
++ template <typename ValueType> class step_iterator {
+ ValueType* m_pos;
+ std::ptrdiff_t m_step;
+ public:
++ using iterator_category = std::random_access_iterator_tag;
++ using value_type = ValueType;
+ step_iterator(ValueType* pos, std::ptrdiff_t step): m_pos(pos), m_step(step) {}
+ ValueType& operator*() { return *m_pos; }
+ step_iterator operator+(std::ptrdiff_t rhs) { return step_iterator(m_pos + m_step *
rhs, m_step); }
diff --git a/performous.spec b/performous.spec
index 5af7ec7..30ed69c 100644
--- a/performous.spec
+++ b/performous.spec
@@ -7,17 +7,20 @@
%undefine __cmake_in_source_build
Name: performous
-Version: 2.0.0
-Release: 0.9.%{gitdate}git%{shortcommit0}%{?dist}
+Epoch: 1
+Version: 1.2.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
License: GPLv2+ and ASL 2.0 and OFL
URL: https://performous.org
-Source0:
https://github.com/performous/performous/archive/%{commit0}/%{name}-%{sho...
+Source0:
https://github.com/performous/performous/archive/refs/tags/%{version}/%{n...
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
@@ -80,7 +83,7 @@ package.
%prep
-%autosetup -p1 -n %{name}-%{commit0}
+%autosetup -p1 -n %{name}-%{version}
mkdir -p %{__cmake_builddir}/ced-src
tar -xf %{SOURCE1} -C %{__cmake_builddir}/ced-src/ --strip 1
cp -p "docs/license/SIL OFL Font License New Rocker.txt" SIL-OFL.txt
@@ -126,6 +129,10 @@ rm -rf %buildroot%{_libdir}/*.{a,la}
%changelog
+* Thu Apr 14 2022 Sérgio Basto <sergio(a)serjux.com> - 1:1.2.0-1
+- Update performous to 1.2.0
+- This new version is not 2.0.0 as someone wrote, so we need add a new epoch
+
* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
2.0.0-0.9.20210814gite0a28a6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 8c5f65d..9ec3c2d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (performous-e0a28a6.tar.gz) =
76130c7d25544660a93350cae5f3aa72a39534c574b034836ea9e2149d36d586820e86f1a8033d1ce8dfd9e74283bc4fbe0195f56f705929511caf088055d55b
+SHA512 (performous-1.2.0.tar.gz) =
a8fbbe3768f46915eacb65adcc1592295e4c6a84775ca55def01ebcff2218b1860daee0d4d5fcccc407d8df71da1ac25da667b47dd4a17239041a3d5fbfa1c56
SHA512 (ced-0fe8be4.tar.gz) =
9bcd762cda771ba8c2792cd48c8135904127082e10542616e69a257a1e717e71e2b6b50c6590c21392d4e459fd61094c7696893c8f531bcf23f56e6f50f075fe