Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
6c2389534a | ||
|
|
9e801bec28 | ||
|
27cae51b1c | ||
|
|
e80a732070 |
4 changed files with 111 additions and 4 deletions
21
zasx-1.30-Makefile.patch
Normal file
21
zasx-1.30-Makefile.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
diff -up Zasx/Makefile~ Zasx/Makefile
|
||||
--- Zasx/Makefile~ 2025-08-07 23:05:43.000000000 +0200
|
||||
+++ Zasx/Makefile 2025-08-08 16:18:49.071125278 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
PREFIX = /usr/local
|
||||
DATADIR = $(PREFIX)/share/$(TARGET)
|
||||
CFLAGS = -g -Wall -Wno-deprecated-declarations -O2 -fsigned-char
|
||||
-LDFLAGS = `allegro-config --libs` -ldumb -laldmb -lm -lpthread
|
||||
+LIBS = `allegro-config --libs` -ldumb -laldmb -lm -lpthread
|
||||
DEFINES = -DDATADIR=\"$(DATADIR)/\" -Iinclude
|
||||
OBJS = obj/anim.o obj/dataload.o obj/gamemenu.o obj/input.o obj/log.o \
|
||||
obj/particle.o obj/scorer.o obj/asteroid.o obj/drs.o obj/gametimer.o \
|
||||
@@ -10,7 +10,7 @@ OBJS = obj/anim.o obj/dataload.o obj/
|
||||
TARGET = zasx
|
||||
|
||||
$(TARGET): $(OBJS)
|
||||
- $(CC) $(LDFLAGS) -o $@ $^
|
||||
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
|
||||
|
||||
obj/%.o: src/%.c
|
||||
$(CC) $(CFLAGS) $(DEFINES) -o $@ -c $<
|
||||
65
zasx-1.30-remove-al-fix-aliases.patch
Normal file
65
zasx-1.30-remove-al-fix-aliases.patch
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
Remove the use of / need for -DALLEGRO_FIX_ALIASES
|
||||
|
||||
Starting with gcc 15 the default C-level is -std=gnu23 this enables
|
||||
the fsub, fadd, fcos, etc function protypes in math.h causing
|
||||
a conflict with the use of ALLEGRO_FIX_ALIASES which adds aliased
|
||||
for allegro's fixed math functions back to the old allegro names
|
||||
which conflict with the math.h prototypes.
|
||||
|
||||
Since zasx only uses fcos, this can be fixed by dropping the use of
|
||||
ALLEGRO_FIX_ALIASES, combined with s/fcos/fixcos/
|
||||
|
||||
diff -up Zasx/Makefile~ Zasx/Makefile
|
||||
--- Zasx/Makefile~ 2025-08-07 22:08:56.000000000 +0200
|
||||
+++ Zasx/Makefile 2025-08-07 23:05:43.640169740 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
PREFIX = /usr/local
|
||||
DATADIR = $(PREFIX)/share/$(TARGET)
|
||||
-CFLAGS = -g -Wall -Wno-deprecated-declarations -O2 -fsigned-char -DALLEGRO_FIX_ALIASES
|
||||
+CFLAGS = -g -Wall -Wno-deprecated-declarations -O2 -fsigned-char
|
||||
LDFLAGS = `allegro-config --libs` -ldumb -laldmb -lm -lpthread
|
||||
DEFINES = -DDATADIR=\"$(DATADIR)/\" -Iinclude
|
||||
OBJS = obj/anim.o obj/dataload.o obj/gamemenu.o obj/input.o obj/log.o \
|
||||
diff -up Zasx/src/scorer.c~ Zasx/src/scorer.c
|
||||
--- Zasx/src/scorer.c~ 2025-08-07 22:08:56.000000000 +0200
|
||||
+++ Zasx/src/scorer.c 2025-08-07 23:04:39.992540810 +0200
|
||||
@@ -39,28 +39,28 @@ void ShowCredits() {
|
||||
do {
|
||||
DrawBG();
|
||||
|
||||
- textout(BackBuffer, font, " Programming and Design", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick) / 10)),
|
||||
+ textout(BackBuffer, font, " Programming and Design", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick) / 10)),
|
||||
30, makecol(255, 255, 255));
|
||||
- textout(BackBuffer, font, " Robert J Ohannessian", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 50) / 10)),
|
||||
+ textout(BackBuffer, font, " Robert J Ohannessian", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 50) / 10)),
|
||||
40, makecol(255, 255, 255));
|
||||
- textout(BackBuffer, font, " Music:", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 150) / 10)),
|
||||
+ textout(BackBuffer, font, " Music:", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 150) / 10)),
|
||||
60, makecol(255, 255, 255));
|
||||
- textout(BackBuffer, font, " Ben Davis", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 200) / 10)),
|
||||
+ textout(BackBuffer, font, " Ben Davis", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 200) / 10)),
|
||||
70, makecol(255, 255, 255));
|
||||
- textout(BackBuffer, font, " Graphics:", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 300) / 10)),
|
||||
+ textout(BackBuffer, font, " Graphics:", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 300) / 10)),
|
||||
90, makecol(255, 255, 255));
|
||||
- textout(BackBuffer, font, " Robert J Ohannessian", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 350) / 10)),
|
||||
+ textout(BackBuffer, font, " Robert J Ohannessian", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 350) / 10)),
|
||||
100, makecol(255, 255, 255));
|
||||
- textout(BackBuffer, font, " Jonathan Soulard", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 400) / 10)),
|
||||
+ textout(BackBuffer, font, " Jonathan Soulard", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 400) / 10)),
|
||||
110, makecol(255, 255, 255));
|
||||
|
||||
- textout(BackBuffer, font, " Special thanks to:", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 500) / 10)),
|
||||
+ textout(BackBuffer, font, " Special thanks to:", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 500) / 10)),
|
||||
130, makecol(255, 255, 255));
|
||||
- textout(BackBuffer, font, " Shawn Hargreaves, (Allegro, one asteroid graphics and some sound effects)", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 550) / 10)),
|
||||
+ textout(BackBuffer, font, " Shawn Hargreaves, (Allegro, one asteroid graphics and some sound effects)", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 550) / 10)),
|
||||
140, makecol(255, 255, 255));
|
||||
- textout(BackBuffer, font, " Ivan Baldo, (PPCol)", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 600) / 10)),
|
||||
+ textout(BackBuffer, font, " Ivan Baldo, (PPCol)", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 600) / 10)),
|
||||
150, makecol(255, 255, 255));
|
||||
- textout(BackBuffer, font, " Jeffery Guan, (JGMOD)", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 650) / 10)),
|
||||
+ textout(BackBuffer, font, " Jeffery Guan, (JGMOD)", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 650) / 10)),
|
||||
160, makecol(255, 255, 255));
|
||||
|
||||
|
||||
5
zasx.rpmlintrc
Normal file
5
zasx.rpmlintrc
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
addFilter("W: invalid-url Source0")
|
||||
addFilter("W: no-%check-section")
|
||||
addFilter("W: no-manual-page-for-binary")
|
||||
addFilter("E: spelling-error")
|
||||
addFilter("E: incorrect-fsf-address")
|
||||
24
zasx.spec
24
zasx.spec
|
|
@ -1,6 +1,6 @@
|
|||
Name: zasx
|
||||
Version: 1.30
|
||||
Release: 40%{?dist}
|
||||
Release: 44%{?dist}
|
||||
Summary: Asteroid like game with powerups
|
||||
License: GPL-2.0-or-later AND Giftware
|
||||
URL: https://www.allegro.cc/depot/Zasx/
|
||||
|
|
@ -12,8 +12,9 @@ Patch0: zasx-1.30-fixes.patch
|
|||
Patch1: zasx-1.30-datadir.patch
|
||||
Patch2: zasx-1.30-format-security.patch
|
||||
Patch3: zasx-1.30-locale-fix.patch
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
Patch4: zasx-1.30-remove-al-fix-aliases.patch
|
||||
Patch5: zasx-1.30-Makefile.patch
|
||||
BuildRequires: gcc make
|
||||
BuildRequires: dumb-devel ImageMagick desktop-file-utils libappstream-glib
|
||||
Requires: hicolor-icon-theme
|
||||
|
||||
|
|
@ -31,7 +32,8 @@ mv docs html
|
|||
|
||||
%build
|
||||
make %{?_smp_mflags} PREFIX=%{_prefix} \
|
||||
CFLAGS="$RPM_OPT_FLAGS -fsigned-char -DALLEGRO_FIX_ALIASES -Wno-deprecated-declarations"
|
||||
CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations" \
|
||||
LDFLAGS="$RPM_LD_FLAGS"
|
||||
convert -transparent black -resize 64x64 %{name}.ico %{name}.png
|
||||
|
||||
|
||||
|
|
@ -63,6 +65,20 @@ appstream-util validate-relax --nonet \
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.30-44
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.30-43
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Thu Aug 7 2025 Hans de Goede <hans@hansg.org> - 1.30-42
|
||||
- Fix FTBFS with gcc15
|
||||
- Resolves: rhbz#2341600
|
||||
- Resolves: rhbz#2385756
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.30-41
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.30-40
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue