cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- switch ports that are currently using glut to use freeglut

Browse Source 
from tobias ulmer (MAINTAINER),
objections from oga@, testing and ok sthen@
This commit is contained in:
jasper 2009-04-09 13:01:53 +00:00
parent cd3a29447f
commit 6ea22ca3a3
8 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
games/crack-attack/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2009/02/16 15:28:58 sthen Exp $
# $OpenBSD: Makefile,v 1.5 2009/04/09 13:01:53 jasper Exp $
COMMENT= OpenGL game based on SNES classic Tetris Attack
DISTNAME= crack-attack-1.1.14
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= games
MAINTAINER= Mattieu Baptiste <mattieu.b@free.fr>
@ -27,7 +27,7 @@ MASTER_SITES= ${MASTER_SITE_SAVANNAH:=crack-attack/}
MODULES= devel/gettext
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
glut.>=3::graphics/glut
glut.>=4::graphics/freeglut
USE_X11= Yes

11
games/crack-attack/patches/patch-src_Attack_cxx Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_Attack_cxx,v 1.1 2009/04/09 13:01:53 jasper Exp $
--- src/Attack.cxx.orig Sun Nov 9 18:45:06 2008
+++ src/Attack.cxx Sun Nov 9 18:45:58 2008
@@ -83,6 +83,7 @@ int main ( int argc, char **argv )
int height = -1, width = -1;
player_name[0] = '\0';
+ glutInit(&argc, argv);
parseCommandLine(argc, argv, mode, port, host_name, player_name, height, width);
run_crack_attack(mode, port, host_name, player_name, height, width);

6
games/crossfire-client/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.19 2008/06/15 00:08:09 sthen Exp $
# $OpenBSD: Makefile,v 1.20 2009/04/09 13:01:53 jasper Exp $
COMMENT= graphical networked AD&D style game
VERSION= 1.11.0
DISTNAME= crossfire-client-${VERSION}
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= games x11
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@ -30,7 +30,7 @@ MODULES= devel/gettext
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
SDL_image.>=2::devel/sdl-image \
glut.>=3::graphics/glut \
glut.>=4::graphics/freeglut \
curl.>=8::net/curl
USE_X11= Yes

6
games/glsfcave/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2008/05/08 06:48:37 simon Exp $
# $OpenBSD: Makefile,v 1.3 2009/04/09 13:01:53 jasper Exp $
COMMENT= control a ribbon to avoid hitting walls
V= 1.0
DISTNAME= glsfcave-$V-mitl
PKGNAME= glsfcave-$Vp0
PKGNAME= glsfcave-$Vp1
CATEGORIES= games
EXTRACT_SUFX= .tar.bz2
@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP= Yes
WANTLIB= GL GLU X11 Xext Xi Xmu c m
LIB_DEPENDS= glut::graphics/glut
LIB_DEPENDS= glut.>=4::graphics/freeglut
WRKDIST= ${WRKDIR}/glsfcave

6
graphics/glpng/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2007/09/15 20:09:41 simon Exp $
# $OpenBSD: Makefile,v 1.5 2009/04/09 13:01:53 jasper Exp $
COMMENT= load PNG graphics files and bind them to an OpenGL texture
VERSION= 1.45
DISTNAME= glpng
PKGNAME= ${DISTNAME}-${VERSION}p0
PKGNAME= ${DISTNAME}-${VERSION}p1
SHARED_LIBS= glpng 0.0
CATEGORIES= graphics
@ -29,7 +29,7 @@ USE_X11= Yes
# This regression test wants an X11 display
REGRESS_IS_INTERACTIVE= Yes
REGRESS_DEPENDS= ::graphics/glut
REGRESS_DEPENDS= ::graphics/freeglut
DIST_SUBDIR= ${DISTNAME}-${VERSION}
WRKDIST= ${WRKDIR}

23
graphics/glpng/patches/patch-Example_Test_c
View File

@ -1,14 +1,27 @@
$OpenBSD: patch-Example_Test_c,v 1.1.1.1 2006/11/20 09:35:48 ajacoutot Exp $
--- Example/Test.c.orig Sun Nov 19 18:49:52 2006
+++ Example/Test.c Sun Nov 19 18:50:04 2006
$OpenBSD: patch-Example_Test_c,v 1.2 2009/04/09 13:01:53 jasper Exp $
--- Example/Test.c.orig Mon Jul 10 21:23:42 2000
+++ Example/Test.c Thu Apr 9 06:58:13 2009
@@ -6,8 +6,8 @@
* http://www.wyatt100.freeserve.co.uk/download.htm
*/
-#include <gl/glpng.h>
-#include <gl/glut.h>
+#include <GL/glpng.h>
+#include <GL/glut.h>
+#include <GL/glpng.h>
+#include <GL/glut.h>
#include <stdlib.h>
int angle = 0;
@@ -64,10 +64,11 @@ void Reshape(int w, int h) {
/***** Main function *****/
-void main() {
+void main(int argc, char **argv) {
pngInfo info;
GLuint texture;
+ glutInit(&argc, argv);
glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB);
glutInitWindowSize(300, 300);
glutCreateWindow("glpng test");

8
graphics/makehuman/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2007/09/15 20:09:42 simon Exp $
# $OpenBSD: Makefile,v 1.7 2009/04/09 13:01:53 jasper Exp $
COMMENT= parametrical modeling of 3D humanoid characters
DISTNAME= makehuman-0.9
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= graphics
HOMEPAGE= http://www.dedalo-3d.com/
@ -18,11 +18,11 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=makehuman/}
WANTLIB= GL GLU ICE SM X11 Xi Xmu c m stdc++ z Xau Xdmcp Xext Xt
WANTLIB= GL GLU ICE SM X11 Xi Xmu c m stdc++ z Xau Xdmcp Xext Xt Xxf86vm
RUN_DEPENDS= ::graphics/aqsis
LIB_DEPENDS= animorph::graphics/animorph \
glut.>=3::graphics/glut \
glut.>=4::graphics/freeglut \
mhgui::graphics/mhgui \
png.>=5::graphics/png

8
graphics/mhgui/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2007/09/15 20:09:42 simon Exp $
# $OpenBSD: Makefile,v 1.6 2009/04/09 13:01:53 jasper Exp $
COMMENT= GUI widget library used in MakeHuman
DISTNAME= mhgui-0.1
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
SHARED_LIBS += mhgui 0.0 # .0.0
CATEGORIES= graphics
@ -19,10 +19,10 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=makehuman/}
WANTLIB= GL GLU ICE SM X11 Xi Xmu Xau Xdmcp Xext Xt m z
WANTLIB= GL GLU ICE SM X11 Xi Xmu Xau Xdmcp Xext Xt m z Xxf86vm
LIB_DEPENDS= animorph::graphics/animorph \
glut.>=3:glut->=3.7p2:graphics/glut \
glut.>=4::graphics/freeglut \
png.>=5::graphics/png
USE_X11= Yes