10:12 p.m.
commit 09363b7105ada60054d5a3dce3e53ad7e8b11ab1
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Aug 19 23:11:59 2021 +0100
Rebuild for new boost
.gitignore | 2 +
licence.txt | 347 -------------------------------------------
performous-ced-offline.patch | 19 +++
performous.spec | 22 +--
sources | 5 +-
5 files changed, 35 insertions(+), 360 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac6d91a..78bdc86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
/ced-26faf8f.tar.gz
/aubio-712511e.tar.gz
/performous-57ad2fc.tar.gz
+/performous-e0a28a6.tar.gz
+/ced-0fe8be4.tar.gz
diff --git a/performous-ced-offline.patch b/performous-ced-offline.patch
new file mode 100644
index 0000000..e092b15
--- /dev/null
+++ b/performous-ced-offline.patch
@@ -0,0 +1,19 @@
+--- ./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
+ )
+
+@@ -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.spec b/performous.spec
index 32956c7..ca263d5 100644
--- a/performous.spec
+++ b/performous.spec
@@ -1,6 +1,8 @@
-%global commit0 57ad2fc71f625a432f5e82b15bcf44081a29e8f8
-%global gitdate 20201029
+%global gitdate 20210814
+%global commit0 e0a28a61df442b4a4a34521cd3aa8e37e3f9ce3c
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global commit1 0fe8be431ebc7562379cd0f791110233c04420da
+%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
%undefine __cmake_in_source_build
@@ -13,11 +15,12 @@ Summary: Free cross-platform music and rhythm / party game
License: GPLv2+ and ASL 2.0 and OFL
URL: https://performous.org
Source0:
https://github.com/performous/performous/archive/%{commit0}/%{name}-%{sho...
-Source1:
https://github.com/performous/compact_enc_det/archive/26faf8f/ced-26faf8f...
-Source2: https://github.com/performous/aubio/archive/712511e/aubio-712511e.tar.gz
+Source1:
https://github.com/performous/compact_enc_det/archive/%{commit1}/ced-%{sh...
Source3: performous.appdata.xml
+Patch0: performous-ced-offline.patch
BuildRequires: alsa-lib-devel
+BuildRequires: aubio-devel
BuildRequires: boost-devel
BuildRequires: boost-system
BuildRequires: boost-filesystem
@@ -78,17 +81,16 @@ package.
%prep
%autosetup -p1 -n %{name}-%{commit0}
-tar -xf %{SOURCE1} -C 3rdparty/ced/ --strip 1
-tar -xf %{SOURCE2} -C 3rdparty/aubio/ --strip 1
+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
%build
# Jack support is disabled because the engine can't be chosen at run-time and
# jack will always take precedence over pulseaudio
-#cmake -DSHARE_INSTALL:PATH=share/performous \
%cmake -DSHARE_INSTALL:PATH=%{_datadir}/performous \
- -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DUSE_BOOST_REGEX=1
+ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
%cmake_build
@@ -108,7 +110,7 @@ rm -rf %buildroot%{_libdir}/*.{a,la}
%find_lang Performous
%files -f Performous.lang
-%license licence.txt
+%license LICENSE.md
%doc docs/*.txt
%{_bindir}/*
%{_datadir}/applications/*.desktop
@@ -117,7 +119,7 @@ rm -rf %buildroot%{_libdir}/*.{a,la}
%{_mandir}/man*/*
%files data
-%license licence.txt
+%license LICENSE.md
%license docs/license/Apache-2.0-DroidSansMono.txt
%license SIL-OFL.txt
%{_datadir}/%{name}
diff --git a/sources b/sources
index f44ce5f..8c5f65d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (ced-26faf8f.tar.gz) =
6dbd8f99e18f9b1aa6562938a148789b540d6d52f48289d140a02745ef5190bd84f3f658ec89e7fa72f2640f4d42e165bf4fba29a5b1a51f4aea2490613341ab
-SHA512 (aubio-712511e.tar.gz) =
bebfba9b53d22f078b3c0a4a77deeaf3fe8f1015ce441d2309311c4b1c696f8596b94182bb1f2bf65d40e91227d69d696f42a1dadb2944344ab76c21844b9a86
-SHA512 (performous-57ad2fc.tar.gz) =
5b58698cf80a49aa0e56c5580701b281e156f4898a9ea58ad40a382297bdf69db1e57674d86ec26f2b77a6055a5a8e3f1b5b853cde3c0dd953f6f2bb719f4447
+SHA512 (performous-e0a28a6.tar.gz) =
76130c7d25544660a93350cae5f3aa72a39534c574b034836ea9e2149d36d586820e86f1a8033d1ce8dfd9e74283bc4fbe0195f56f705929511caf088055d55b
+SHA512 (ced-0fe8be4.tar.gz) =
9bcd762cda771ba8c2792cd48c8135904127082e10542616e69a257a1e717e71e2b6b50c6590c21392d4e459fd61094c7696893c8f531bcf23f56e6f50f075fe