The package rpms/hyperrogue.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/hyperrogue.git/commit/?id=3924217....
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 392421760a4c63451aca0f368546be8f72eb428b
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Aug 24 21:39:53 2020 -0400
Disable build on 32-bit ARM, at least for now.
diff --git a/hyperrogue.spec b/hyperrogue.spec
index 52b0477..aad3fd8 100644
--- a/hyperrogue.spec
+++ b/hyperrogue.spec
@@ -30,6 +30,11 @@ Provides: bundled(savepng)
Recommends: %{name}-music
+# Hmm.. it seems that hyperrogue does not build on 32-bit arm anymore?
+# "as: out of memory allocating 32 bytes after a total of 3020046336 bytes"
+#
https://kojipkgs.fedoraproject.org//work/tasks/8579/50098579/build.log
+ExcludeArch: armv7hl
+
%description
You are a lone outsider in a strange, non-Euclidean world.
Fight to find treasures and get the fabulous Orbs of Yendor!
commit d3c97d8ddd1af13c119161ac31b6cbddd9725378
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Aug 24 20:24:28 2020 -0400
Update hyperrogue to version 11.1a, fix FTBFS
Some other minor packaging improvements-- using a git tag instead of
a commit, using the configure macro correctly, etc.
diff --git a/.gitignore b/.gitignore
index bec16c9..e7d6e0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/hyperrogue-83j.zip
/816a868d9489b4a423606698eac876dbc11fd00f.zip
/48e6434a61fa83c298451245f3f22d2061bbb4f9.zip
+/hyperrogue-11.3a.tar.gz
diff --git a/hyperrogue.fixfontlocation.patch b/hyperrogue.fixfontlocation.patch
index 45d7ab4..f63bf13 100644
--- a/hyperrogue.fixfontlocation.patch
+++ b/hyperrogue.fixfontlocation.patch
@@ -1,11 +1,12 @@
---- Makefile.orig.am 2017-06-20 16:44:36.000000000 +0200
-+++ Makefile.am 2017-06-21 11:28:01.495446057 +0200
-@@ -6,7 +6,7 @@
- hyperrogue_SOURCES = hyper.cpp savepng.c
-
- # Some definitions used in graph.cpp
+diff -rupN hyperrogue-11.3a/Makefile.am hyperrogue-patched/Makefile.am
+--- hyperrogue-11.3a/Makefile.am 2020-03-07 19:51:03.000000000 -0500
++++ hyperrogue-patched/Makefile.am 2020-08-24 19:48:36.568414264 -0400
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = hyperrogue
+ hyperroguedir = $(datadir)/hyperrogue
+ hyperrogue_SOURCES = hyper.cpp savepng.cpp
-hyperrogue_CPPFLAGS = -DFONTDESTDIR=\"$(pkgdatadir)/DejaVuSans-Bold.ttf\"
-DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\"
-DSOUNDDESTDIR=\"$(pkgdatadir)/sounds/\"
-+hyperrogue_CPPFLAGS =
-DFONTDESTDIR=\"$(datadir)/fonts/dejavu/DejaVuSans-Bold.ttf\"
-DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\"
-DSOUNDDESTDIR=\"$(pkgdatadir)/sounds/\" -O2
++hyperrogue_CPPFLAGS =
-DFONTDESTDIR=\"$(datadir)/fonts/dejavu/DejaVuSans-Bold.ttf\"
-DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\"
-DSOUNDDESTDIR=\"$(pkgdatadir)/sounds/\"
+ hyperrogue_CXXFLAGS = -O2 -std=c++11 ${AM_CXXFLAGS}
+ dist_hyperrogue_DATA = hyperrogue-music.txt DejaVuSans-Bold.ttf
- # Musicdir
- musicdir=$(datadir)/hyperrogue/music
diff --git a/hyperrogue.spec b/hyperrogue.spec
index e02724d..52b0477 100644
--- a/hyperrogue.spec
+++ b/hyperrogue.spec
@@ -1,15 +1,14 @@
-%global git_commit 48e6434a61fa83c298451245f3f22d2061bbb4f9
-# This repository is "safe" used by the main developper to push his tested
changes.
+%global version_tag 11.3a
Name: hyperrogue
-Version: 10.0
-Release: 11.d%{?dist}
+Version: 11.3
+Release: 1.a%{?dist}
Summary: An SDL roguelike in a non-euclidean world
# The game is under the GPLv2 (src/mtrand.h is under BSD, src/savepng.* is under zlib)
and the music under CC-BY (v3)
License: GPLv2 and BSD and zlib
URL:
http://www.roguetemple.com/z/hyper/
-Source0:
https://github.com/zenorogue/%{name}/archive/%{git_commit}.zip
+Source0:
https://github.com/zenorogue/hyperrogue/archive/v%{version_tag}/%{name}-%...
Source1: %{name}.desktop
Source2: %{name}.appdata.xml
Source3:
http://roguetemple.com/z/hyper/bigicon-osx.png
@@ -17,7 +16,8 @@ Source3:
http://roguetemple.com/z/hyper/bigicon-osx.png
Patch0: %{name}.fixfontlocation.patch
BuildRequires: gcc, gcc-c++
-BuildRequires: SDL_mixer-devel SDL_ttf-devel SDL_gfx-devel
+BuildRequires: SDL-devel
+BuildRequires: SDL_mixer-devel, SDL_ttf-devel, SDL_gfx-devel
BuildRequires: libpng-devel
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -44,15 +44,15 @@ License: CC-BY
Set of 11 music for hypperrogue.
%prep
-%autosetup -n %{name}-%{git_commit}
+%autosetup -n %{name}-%{version_tag}
rm -f src/glew.c
-./autogen.sh --prefix=%{_prefix}
-
+autoreconf -fvi
%build
-#pushd src/
-%make_build CFLAGS="%{optflags} -O0 -fPIC"
-#popd
+%configure
+
+# Hmm... this seems like a bug somewhere.
+%make_build CXXFLAGS="%{optflags} -I%{_includedir}/SDL"
%install
# Upstream not provides "install" target. I have to install files "by
hands".
@@ -97,6 +97,9 @@ appstream-util validate-relax --nonet
%{buildroot}/%{_datadir}/appdata/%{name}.a
%changelog
+* Mon Aug 24 2020 Ben Rosser <rosser.bjr(a)gmail.com> - 11.3-1.a
+- Update to newer upstream release, fix FTBFS.
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
10.0-11.d
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index fba3bdd..fabbeaa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (48e6434a61fa83c298451245f3f22d2061bbb4f9.zip) =
a41e061d1d4a5a855a5a2be0641c5985e34275a15a3a7564da984ad2f8cb9039c4526eebc46ed607db7376ca1af4659dbbe6486a6e96343c965ae802abc2f25f
+SHA512 (hyperrogue-11.3a.tar.gz) =
12fce28658772a009061bcadb3866bee8c97cbdb799c135eaeea829974cedb087d9e7a6b229f4653463cd96db7abf58e9168387023aca274a5287e0ccbd1c49c