diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2004-06-03 12:01:07 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2004-06-03 12:01:07 +0000 |
| commit | d247857e794cd0d58a6948670b6490ec34ad8cc7 (patch) | |
| tree | ac8968fb30106086a52c079663707f15fc11e1d1 /games-sports | |
| parent | Initial import. Fixes #50005. (Manifest recommit) (diff) | |
| download | gentoo-2-d247857e794cd0d58a6948670b6490ec34ad8cc7.tar.gz gentoo-2-d247857e794cd0d58a6948670b6490ec34ad8cc7.tar.bz2 gentoo-2-d247857e794cd0d58a6948670b6490ec34ad8cc7.zip | |
Added to patch to fix compile on non-nvidia hardware and closing bug #52600.
Diffstat (limited to 'games-sports')
| -rw-r--r-- | games-sports/foobillard/ChangeLog | 6 | ||||
| -rw-r--r-- | games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch | 18 | ||||
| -rw-r--r-- | games-sports/foobillard/foobillard-3.0a.ebuild | 3 |
3 files changed, 25 insertions, 2 deletions
diff --git a/games-sports/foobillard/ChangeLog b/games-sports/foobillard/ChangeLog index c60908b2365b..c04e617505e3 100644 --- a/games-sports/foobillard/ChangeLog +++ b/games-sports/foobillard/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-sports/foobillard # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/ChangeLog,v 1.6 2004/06/02 07:33:35 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/ChangeLog,v 1.7 2004/06/03 12:01:07 wolf31o2 Exp $ + + 03 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> + +files/foobillard-3.0a-no_nvidia.patch, foobillard-3.0a.ebuild: + Added to patch to fix compile on non-nvidia hardware and closing bug #52600. 02 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> foobillard-3.0a.ebuild: Attempt to address bug #52600 diff --git a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch new file mode 100644 index 000000000000..b43707bc403b --- /dev/null +++ b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch @@ -0,0 +1,18 @@ +--- src/ball.c.orig 2004-06-02 07:00:57.000000000 -0400 ++++ src/ball.c 2004-06-02 07:03:52.000000000 -0400 +@@ -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 ++#ifdef USE_BALL_FRESNEL + { + 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 --git a/games-sports/foobillard/foobillard-3.0a.ebuild b/games-sports/foobillard/foobillard-3.0a.ebuild index b8f0ea8bc42a..3099f065a3d8 100644 --- a/games-sports/foobillard/foobillard-3.0a.ebuild +++ b/games-sports/foobillard/foobillard-3.0a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-3.0a.ebuild,v 1.2 2004/06/02 07:33:35 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-3.0a.ebuild,v 1.3 2004/06/03 12:01:07 wolf31o2 Exp $ inherit games @@ -25,6 +25,7 @@ DEPEND="virtual/x11 )" src_compile() { + epatch ${FILESDIR}/${P}-no_nvidia.patch local myconf="" [ "$(ls /usr/include/GL/gl.h -al | awk '{print $NF}' | cut -d/ -f5)" == "nvidia" ] \ && myconf="--enable-nvidia=yes" \ |