commit 63f2605b9e07f28f89c5ac122541c14685237c9e
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Mon Sep 30 21:54:37 2024 +0200
- updated to 1.3.1
ced-no-forced-cxx11.patch | 25 --------------------
find-ced.patch | 13 ----------
performous.spec | 60 +++++++++++++++++------------------------------
3 files changed, 21 insertions(+), 77 deletions(-)
---
diff --git a/performous.spec b/performous.spec
index a7424ad..0d7b38f 100644
--- a/performous.spec
+++ b/performous.spec
@@ -1,41 +1,41 @@
+# TODO: cpprestsdk or cpprest for webserver support
Summary: Performous - The All-in-One Music Game
Summary(pl.UTF-8): Performous - wiele gier muzycznych w jednej
Name: performous
-Version: 1.3.0
+Version: 1.3.1
Release: 1
License: GPL v2+
Group: Applications/Sound
#Source0Download: https://github.com/performous/performous/releases
Source0:
https://github.com/performous/performous/archive/refs/tags/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 1579905ea88e09611e90b737e9417895
-Source1: compact_enc_det.tar.xz
-# Source1-md5: c4af58e784fe054b787254acf5c1af12
-Patch0: ced-no-forced-cxx11.patch
-Patch1: find-ced.patch
+# Source0-md5: 02fd71009bc2ecece42f723aa4baca7c
Patch2: no-Werror.patch
URL: http://performous.org/
-BuildRequires: ImageMagick-c++-devel
+BuildRequires: GLM-devel
BuildRequires: SDL2-devel >= 2
-BuildRequires: aubio-devel
-BuildRequires: boost-devel >= 1.36
-BuildRequires: cmake >= 2.8
-# avformat avresample swscale
+BuildRequires: aubio-devel >= 0.4.9
+BuildRequires: boost-devel >= 1.55
+BuildRequires: cairo-devel
+BuildRequires: cmake >= 3.15
+# avformat swresample swscale
BuildRequires: ffmpeg-devel
BuildRequires: fontconfig-devel
BuildRequires: gettext-tools
BuildRequires: glew-devel
-BuildRequires: glibmm-devel
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: glibmm-devel >= 2.4
BuildRequires: gmock-devel
BuildRequires: help2man
BuildRequires: libepoxy-devel >= 1.2
-BuildRequires: libfmt-devel
+BuildRequires: libicu-devel >= 60
+BuildRequires: libfmt-devel >= 9.0.0
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
-BuildRequires: librsvg-devel
+BuildRequires: librsvg-devel >= 2
BuildRequires: libsigc++-devel
-BuildRequires: libstdc++-devel >= 6:4.6
+BuildRequires: libstdc++-devel >= 6:7
BuildRequires: libxml2-devel >= 2.0
-BuildRequires: libxml++2-devel >= 2.6
+BuildRequires: libxml++5-devel >= 5.0
BuildRequires: nlohmann-json-devel >= 3.10.5
BuildRequires: opencv-devel
BuildRequires: pango-devel >= 1:1.12
@@ -61,36 +61,18 @@ SingStar, Guitar Hero i Rock Band oraz maty do tańca są
automatycznie
wykrywane.
%prep
-%setup -q -a1
-%patch0 -p1
-%patch1 -p1
+%setup -q
%patch2 -p1
%build
-cd compact_enc_det
-install -d build
-cd build
-%cmake .. \
- -DBUILD_SHARED_LIBS=OFF
-%{__make} ced
-cp -p lib/libced.a ../compact_enc_det
-cd ../..
-
-SRC=$(pwd)
-install -d build/game
-cd build
-%cmake .. \
+%cmake -B build \
-DCMAKE_INSTALL_MANDIR=%{_mandir}/man6 \
-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
-DCMAKE_CXX_FLAGS_RELEASE="%{rpmcxxflags}" \
-DCMAKE_DEBUG_FLAGS_RELEASE="%{debugcflags}" \
- -DMagick_LIBRARY="$(echo %{_libdir}/libMagickCore-*.so)" \
- -DMagick++_LIBRARY="$(echo %{_libdir}/libMagick++-*.so)" \
- -DSELF_BUILT_CED=NEVER \
- -DCed_INCLUDE_DIRS="$SRC/compact_enc_det" \
- -DCed_LIBRARIES="-L$SRC/compact_enc_det/compact_enc_det
$SRC/compact_enc_det/compact_enc_det/libced.a"
+ -DSELF_BUILT_CED=NEVER
-%{__make}
+%{__make} -C build
%install
rm -rf $RPM_BUILD_ROOT
@@ -113,4 +95,4 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/games/%{name}
%{_mandir}/man6/performous.6*
%{_desktopdir}/performous.desktop
-%{_pixmapsdir}/performous.svg
+%{_iconsdir}/hicolor/scalable/apps/performous.svg
diff --git a/ced-no-forced-cxx11.patch b/ced-no-forced-cxx11.patch
deleted file mode 100644
index 8f95cf9..0000000
--- a/ced-no-forced-cxx11.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- performous-1.3.0/compact_enc_det/CMakeLists.txt~ 2023-10-20
09:53:57.000000000 +0200
-+++ performous-1.3.0/compact_enc_det/CMakeLists.txt 2023-10-20
10:16:13.557473026 +0200
-@@ -28,22 +28,6 @@
-
- option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
-
--if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing")
--elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-c++11-narrowing")
--elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-- if (NOT BUILD_SHARED_LIBS)
-- foreach(flag_var
-- CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-- CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-- if(${flag_var} MATCHES "/MD")
-- string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-- endif(${flag_var} MATCHES "/MD")
-- endforeach(flag_var)
-- endif()
--endif()
--
- set(EXTRA_TARGET_LINK_LIBRARIES)
-
- if(WIN32)
diff --git a/find-ced.patch b/find-ced.patch
deleted file mode 100644
index 2913ed9..0000000
--- a/find-ced.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- performous-1.3.0/cmake/Modules/FindCed.cmake.orig 2023-08-21
21:48:26.000000000 +0200
-+++ performous-1.3.0/cmake/Modules/FindCed.cmake 2023-10-20
10:23:51.966127665 +0200
-@@ -2,10 +2,4 @@
-
- set(Ced_GIT_VERSION "master")
-
--libfetch_git_pkg(Ced
-- REPOSITORY ${SELF_BUILT_GIT_BASE}/compact_enc_det.git
-- #https://github.com/google/compact_enc_det.git
-- REFERENCE ${Ced_GIT_VERSION}
-- FIND_PATH compact_enc_det/compact_enc_det.h
--)
- message(STATUS "Found Google CED ${Ced_VERSION}")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/performous.git/commitdiff/63f2605b9e07f28f89c5ac122541c14685237c9e
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
