[packages/foobillard] Release 6

[arekm]

commit aed25f64cd4748e2c54e6409ef01dd958c88bb48
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu May 21 15:57:50 2026 +0200

    Release 6

 foobillard-c99-modern-gl.patch | 95 ++++++++++++++++++++++++++++++++++++++++++
 foobillard.spec                |  4 +-
 2 files changed, 98 insertions(+), 1 deletion(-)
---
diff --git a/foobillard.spec b/foobillard.spec
index 89033a5..5a614ab 100644
--- a/foobillard.spec
+++ b/foobillard.spec
@@ -7,13 +7,14 @@ Summary:	A free OpenGL game of playing billard
 Summary(pl.UTF-8):	Wolnodostępna gra w bilard oparta na OpenGL
 Name:		foobillard
 Version:	3.0a
-Release:	5
+Release:	6
 License:	GPL
 Group:		X11/Applications/Games
 Source0:	http://foobillard.sunsite.dk/dnl/%{name}-%{version}.tar.gz
 # Source0-md5:	c2d92edeaaf8bfb18aa26f1c79931b7d
 Source1:	%{name}.desktop
 Source2:	%{name}.xpm
+Patch0:		%{name}-c99-modern-gl.patch
 URL:		http://foobillard.sourceforge.net/
 BuildRequires:	OpenGL-GLU-devel
 %{!?with_glut:BuildRequires:	SDL-devel}
@@ -54,6 +55,7 @@ nieco różnić od rzeczywistości.
 
 %prep
 %setup -q
+%patch -P0 -p1
 
 %build
 rm -f missing
diff --git a/foobillard-c99-modern-gl.patch b/foobillard-c99-modern-gl.patch
new file mode 100644
index 0000000..8ba755b
--- /dev/null
+++ b/foobillard-c99-modern-gl.patch
@@ -0,0 +1,95 @@
+diff -urN foobillard-3.0a.orig/src/ball.c foobillard-3.0a/src/ball.c
+--- foobillard-3.0a.orig/src/ball.c	2004-02-23 02:09:01.000000000 +0100
++++ foobillard-3.0a/src/ball.c	2026-05-21 01:39:02.303277426 +0200
+@@ -1821,6 +1821,7 @@
+             } else if( options_cuberef && cuberef_binds!=0 ){
+                 glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, cuberef_binds[i]);
+ #ifdef GL_VERTEX_PROGRAM_NV
++#ifndef NO_NV_BUMPREF
+                 {
+                     myvec cam_pos2;
+ //                    cam_pos2=vec_scale(vec_unit(vec_diff(cam_pos,balls.ball[i].r)),BALL_D/2.5);
+@@ -1829,6 +1830,7 @@
+                                            BALL_D/2.0,BALL_D/2.5,0,0 );
+                 }
+ #endif
++#endif
+                 draw_ball(&balls.ball[i],cam_pos,cam_FOV,win_width,0);
+             }else{
+                 draw_ball(&balls.ball[i],cam_pos,cam_FOV,win_width,0);
+diff -urN foobillard-3.0a.orig/src/billmove.c foobillard-3.0a/src/billmove.c
+--- foobillard-3.0a.orig/src/billmove.c	2003-06-27 00:00:20.000000000 +0200
++++ foobillard-3.0a/src/billmove.c	2026-05-21 01:39:02.303097192 +0200
+@@ -409,7 +409,7 @@
+ }
+ 
+ 
+-int my_rand(nr)
++int my_rand(int nr)
+ {
+     return rand()%nr;
+ }
+diff -urN foobillard-3.0a.orig/src/font.c foobillard-3.0a/src/font.c
+--- foobillard-3.0a.orig/src/font.c	2003-08-02 00:16:02.000000000 +0200
++++ foobillard-3.0a/src/font.c	2026-05-21 01:39:02.302863148 +0200
+@@ -269,7 +269,7 @@
+ 
+ 
+ 
+-int cb_tess_move_to( FT_Vector * to, void * user )
++int cb_tess_move_to( const FT_Vector * to, void * user )
+ {
+     //    int * first_call = (int *) user;
+     VMvect v;
+@@ -289,7 +289,7 @@
+     return 0;
+ }
+ 
+-int cb_tess_line_to( FT_Vector * to, void * user )
++int cb_tess_line_to( const FT_Vector * to, void * user )
+ {
+     VMvect v;
+     struct TessData * data = (struct TessData *) user;
+@@ -322,7 +322,7 @@
+     return v;
+ }
+ 
+-int cb_tess_conic_to( FT_Vector * ctrl, FT_Vector * to, void * user )
++int cb_tess_conic_to( const FT_Vector * ctrl, const FT_Vector * to, void * user )
+ {
+     VMvect vi,vf,vc, v;
+     double t, dt;
+@@ -343,7 +343,7 @@
+     return 0;
+ }
+ 
+-int cb_tess_cubic_to( FT_Vector * ctrl1, FT_Vector * ctrl2, FT_Vector * to, void * user )
++int cb_tess_cubic_to( const FT_Vector * ctrl1, const FT_Vector * ctrl2, const FT_Vector * to, void * user )
+ {
+     VMvect vi,vf, vc1,vc2, v;
+     double t, dt;
+@@ -436,9 +436,9 @@
+         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_END, glEnd);
++        gluTessCallback(tessdata->tobj, GLU_TESS_BEGIN, (_GLUfuncptr)glBegin);
++        gluTessCallback(tessdata->tobj, GLU_TESS_VERTEX, (_GLUfuncptr)my_Vertex_cb);
++        gluTessCallback(tessdata->tobj, GLU_TESS_END, (_GLUfuncptr)glEnd);
+ 
+         funcs.move_to  = cb_tess_move_to;
+         funcs.line_to  = cb_tess_line_to;
+diff -urN foobillard-3.0a.orig/src/queue.h foobillard-3.0a/src/queue.h
+--- foobillard-3.0a.orig/src/queue.h	2002-04-30 22:32:17.000000000 +0200
++++ foobillard-3.0a/src/queue.h	2026-05-21 01:39:02.303170035 +0200
+@@ -24,7 +24,7 @@
+ 
+ void delete_queue_texbind( void );
+ void create_queue_texbind( void );
+-int create_queue();
++int create_queue(double (*rfunc)(double));
+ void draw_queue( VMvect pos, GLfloat Xrot, GLfloat Zrot, GLfloat zoffs,
+                  GLfloat xoffs, GLfloat yoffs, int spheretexbind, VMvect * lightpos, int lightnr );
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/foobillard.git/commitdiff/aed25f64cd4748e2c54e6409ef01dd958c88bb48