Compare commits

...
Sign in to create a new pull request.

22 commits

Author SHA1 Message Date
Fedora Release Engineering
4b7ae469e1 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 20:42:04 +00:00
Gwyn Ciesla
07daff24b6 Fix FTBFS 2025-01-31 11:13:09 -06:00
Fedora Release Engineering
308e97874b Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 18:38:13 +00:00
Fedora Release Engineering
97f2675122 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 23:27:58 +00:00
Gwyn Ciesla
79266413ea Patch for stricter flags 2024-02-05 16:07:21 -06:00
Fedora Release Engineering
966d72c2a3 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 11:53:17 +00:00
Fedora Release Engineering
cec543bacf Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 19:38:00 +00:00
Fedora Release Engineering
cad789ef73 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 20:04:07 +00:00
Gwyn Ciesla
7c489fb371 migrated to SPDX license 2023-03-08 15:00:14 -06:00
Fedora Release Engineering
f2ad257f0a Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 03:45:01 +00:00
Florian Weimer
eb0adc37eb Port to C99 (#2155183)
Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
2022-12-20 12:38:10 +01:00
Kalev Lember
e71d302db4 Install an additional 256x256 px sized icon
256x256 px is important because it's the icon size that gnome-shell uses
for its overview.
2022-12-09 16:02:04 +01:00
Kalev Lember
879e42ce8e Make sure the installed icon is square
This fixes the flatpak build failure:

error: /tmp/tmpzjeojbj5/build/export/share/icons/hicolor/48x48/apps/dk.sunsite.foobillard.png is not a valid icon: Expected a square icon but got: 48x30
2022-12-09 15:50:34 +01:00
Fedora Release Engineering
f18e70821e Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 03:28:47 +00:00
Fedora Release Engineering
422d143499 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 03:17:18 +00:00
Fedora Release Engineering
be368e10c0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 23:13:59 +00:00
Kalev Lember
876e165460 Honor LDFLAGS from the build system
This fixes the flatpak build, and also makes sure that as-needed and
other global ldflags are correctly used.
2021-04-02 18:44:56 +02:00
Kalev Lember
c129e5f972 Fix whitespace 2021-04-02 18:30:52 +02:00
Fedora Release Engineering
90fce3cc27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 05:48:08 +00:00
Tom Stellard
78a9341466 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2020-12-18 22:48:40 +00:00
Fedora Release Engineering
208e63abf5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 17:42:25 +00:00
Gwyn Ciesla
e5df46d1fb Fix dejavu font paths. 2020-05-18 16:16:09 -05:00
5 changed files with 148 additions and 14 deletions

View file

@ -38,13 +38,13 @@ diff -urN foobillard/src/options.h foobillard-3.0a/src/options.h
-#define options_ball_fontname "bluebold.ttf"
-#define options_score_fontname "bluebold.ttf"
-#define options_roster_fontname "bluebold.ttf"
+#define options_player_fontname "/usr/share/fonts/dejavu/DejaVuSans.ttf"
+#define options_help_fontname "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+#define options_menu_fontname "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+#define options_winner_fontname "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+#define options_ball_fontname "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+#define options_score_fontname "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+#define options_roster_fontname "/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+#define options_player_fontname "/usr/share/fonts/dejavu-sans-fonts/DejaVuSans.ttf"
+#define options_help_fontname "/usr/share/fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf"
+#define options_menu_fontname "/usr/share/fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf"
+#define options_winner_fontname "/usr/share/fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf"
+#define options_ball_fontname "/usr/share/fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf"
+#define options_score_fontname "/usr/share/fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf"
+#define options_roster_fontname "/usr/share/fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf"
#define options_snd_volume 1.0

15
foobillard-c99.patch Normal file
View file

@ -0,0 +1,15 @@
Avoid an implicit int to improve compatibility with future compilers.
diff --git a/src/billmove.c b/src/billmove.c
index 447e31a6736fddf7..0182dc2bcad87998 100644
--- a/src/billmove.c
+++ b/src/billmove.c
@@ -409,7 +409,7 @@ void record_move_log_event( enum event_type event,
}
-int my_rand(nr)
+int my_rand(int nr)
{
return rand()%nr;
}

View file

@ -0,0 +1,18 @@
Fix generic C99 compatibility issue in autoconf output. Newer autoconf
versions no longer generate this C fragment.
diff --git a/configure b/configure
index 3caa19b115998588..fa9ee347ab4d20b9 100755
--- a/configure
+++ b/configure
@@ -3555,8 +3555,8 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext

View file

@ -1,10 +1,10 @@
Name: foobillard
Version: 3.0a
Release: 34%{?dist}
Release: 52%{?dist}
Summary: OpenGL billard game
License: GPLv2
License: GPL-2.0-only
URL: http://foobillard.sunsite.dk/
# Based on http://foobillard.sunsite.dk/dnl/foobillard-3.0a.tar.gz
Source0: foobillard-3.0a-hobbled.tar.bz2
@ -13,11 +13,15 @@ Source2: hobble-foobillard.sh
Patch0: foobillard-3.0a-nonv.patch
Patch1: foobillard-3.0a-no-fonts.patch
Patch2: foobillard-3.0a-clothtex.patch
Patch3: foobillard-configure-c99.patch
Patch4: foobillard-c99.patch
Patch5: pointer-types.patch
Requires: dejavu-sans-fonts
BuildRequires: gcc
BuildRequires: SDL-devel ImageMagick alsa-lib-devel
BuildRequires: freetype-devel libpng-devel perl-interpreter zlib-devel freeglut-devel
BuildRequires: libGL-devel libGLU-devel libX11-devel libXaw-devel libXi-devel
BuildRequires: make
%description
FooBillard is an attempt to create a free OpenGL-billard for Linux.
@ -26,16 +30,20 @@ FooBillard is still under development but the main physics is implemented.
%prep
%setup -q -n foobillard-3.0a
%patch0 -p1
%patch1 -p1 -b .no-fonts
%patch2 -p0 -b .clothtex
%patch -P 0 -p1
%patch -P 1 -p1 -b .no-fonts
%patch -P 2 -p0 -b .clothtex
%patch -P 3 -p1
%patch -P 4 -p1
%patch -P 5 -p0
%build
iconv -f iso-8859-1 -t utf-8 < ChangeLog > _
mv _ ChangeLog
./configure --prefix=%{_prefix} --disable-nvidia --enable-SDL CFLAGS="${RPM_OPT_FLAGS} -DUSE_SOUND"
./configure --prefix=%{_prefix} --disable-nvidia --enable-SDL CFLAGS="${RPM_OPT_FLAGS} -DUSE_SOUND -std=gnu17" LDFLAGS="${RPM_LD_FLAGS}"
make %{?_smp_mflags}
convert -resize 48 data/foobillard.png foobillard.png
convert -resize 48x48 -background transparent -gravity center -extent 48x48 data/foobillard.png foobillard.png
convert -resize 256x256 -background transparent -gravity center -extent 256x256 data/foobillard.png foobillard-256x256.png
%install
@ -51,6 +59,9 @@ install -D -p -m 644 foobillard.png \
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 foobillard.png \
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
install -p -m 644 foobillard-256x256.png \
%{buildroot}%{_datadir}/icons/hicolor/256x256/apps
@ -62,10 +73,66 @@ install -p -m 644 foobillard.png \
%{_datadir}/foobillard
%{_datadir}/pixmaps/foobillard.png
%{_datadir}/icons/hicolor/48x48/apps/*
%{_datadir}/icons/hicolor/256x256/apps/*
%{_mandir}/man6/*
%changelog
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0a-52
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0a-51
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0a-50
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Feb 05 2024 Gwyn Ciesla <gwync@protonmail.com> - 3.0a-49
- Patch for stricter flags
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0a-48
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0a-47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0a-46
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Mar 08 2023 Gwyn Ciesla <gwync@protonmail.com> - 3.0a-45
- migrated to SPDX license
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0a-44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Dec 20 2022 Florian Weimer <fweimer@redhat.com> - 3.0a-43
- Port to C99 (#2155183)
* Fri Dec 09 2022 Kalev Lember <klember@redhat.com> - 3.0a-42
- Make sure the installed icon is square
- Install an additional 256x256 px sized icon
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0a-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0a-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0a-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Apr 02 2021 Kalev Lember <klember@redhat.com> - 3.0a-38
- Honor LDFLAGS from the build system
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0a-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0a-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon May 18 2020 Gwyn Ciesla <gwync@protonmail.com> - 3.0a-35
- Update dejavu font paths.
* Thu Apr 23 2020 Gwyn Ciesla <gwync@protonmail.com> - 3.0a-34
- Configure macro results in freeze in f32+

34
pointer-types.patch Normal file
View file

@ -0,0 +1,34 @@
--- src/billard3d.c~ 2004-04-23 20:20:49.000000000 -0500
+++ src/billard3d.c 2024-02-05 15:51:12.482203297 -0600
@@ -5100,7 +5100,7 @@
#if __BYTE_ORDER == __BIG_ENDIAN
{
- char *snd=ball_ball_snd.data;
+ char *snd=(char *)ball_ball_snd.data;
for(i=0;i<ball_ball_snd.len;i+=2)
{
char t=snd[i];
--- src/font.c~ 2003-08-01 17:16:02.000000000 -0500
+++ src/font.c 2024-02-05 16:01:02.310962392 -0600
@@ -436,14 +436,14 @@
struct TessData * tessdata = new_tessdata();
gluTessNormal(tessdata->tobj, 0.0, 0.0, -1.0 );
- gluTessCallback(tessdata->tobj, GLU_TESS_BEGIN, glBegin);
- gluTessCallback(tessdata->tobj, GLU_TESS_VERTEX, my_Vertex_cb);
+ gluTessCallback(tessdata->tobj, GLU_TESS_BEGIN, (_GLUfuncptr)glBegin);
+ gluTessCallback(tessdata->tobj, GLU_TESS_VERTEX, (_GLUfuncptr)my_Vertex_cb);
gluTessCallback(tessdata->tobj, GLU_TESS_END, glEnd);
- funcs.move_to = cb_tess_move_to;
- funcs.line_to = cb_tess_line_to;
- funcs.conic_to = cb_tess_conic_to;
- funcs.cubic_to = cb_tess_cubic_to;
+ funcs.move_to = (FT_Outline_MoveToFunc)cb_tess_move_to;
+ funcs.line_to = (FT_Outline_LineToFunc)cb_tess_line_to;
+ funcs.conic_to = (FT_Outline_ConicToFunc)cb_tess_conic_to;
+ funcs.cubic_to = (FT_Outline_CubicToFunc)cb_tess_cubic_to;
funcs.shift = 0;
funcs.delta = 0;
gluTessBeginPolygon(tessdata->tobj, NULL);