update freeglut to 3.0.0

patch-include_GL_freeglut_ext_tweak to fix lang/parrot build from and ok jca@
This commit is contained in:
rsadowski 2017-07-05 21:29:42 +00:00
parent 1454049cff
commit 515607dd59
4 changed files with 30 additions and 22 deletions

View File

@ -1,28 +1,25 @@
# $OpenBSD: Makefile,v 1.17 2016/03/11 20:28:26 naddy Exp $
# no libGL (toolchain issue)
NOT_FOR_ARCHS= m88k
# $OpenBSD: Makefile,v 1.18 2017/07/05 21:29:42 rsadowski Exp $
COMMENT = open source alternative to glut
DISTNAME = freeglut-2.8.0
REVISION = 4
SHARED_LIBS = glut 5.0
DISTNAME = freeglut-3.0.0
SHARED_LIBS += glut 6.0 # 3.10
CATEGORIES = graphics
HOMEPAGE = http://freeglut.sourceforge.net/
MAINTAINER = Tobias Ulmer <tobiasu@tmux.org>
# X11
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += GL X11 X11-xcb Xdamage Xext Xfixes Xi Xrandr
WANTLIB += Xrender Xxf86vm drm expat glapi m expat pthread
WANTLIB += usbhid xcb xcb-dri2 xcb-glx
WANTLIB += GL ICE SM X11 Xext Xi Xrandr Xxf86vm m
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=freeglut/}
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --enable-warnings=no
CONFIGURE_ENV += LDFLAGS="-L${X11BASE}/lib"
MODULES = devel/cmake
NO_TEST = Yes

View File

@ -1,2 +1,2 @@
SHA256 (freeglut-2.8.0.tar.gz) = GXKT/4hqvmE7yetKdi2RYbDJ5ks+jmE+18XjU5dPugU=
SIZE (freeglut-2.8.0.tar.gz) = 979459
SHA256 (freeglut-3.0.0.tar.gz) = KkO+hRWwHqgrz6F9Ka4NQL0Sg0LwkwzR83Xx/5mfdqI=
SIZE (freeglut-3.0.0.tar.gz) = 419095

View File

@ -1,12 +1,23 @@
$OpenBSD: patch-include_GL_freeglut_ext_h,v 1.2 2012/09/11 10:07:07 sthen Exp $
--- include/GL/freeglut_ext.h.orig Sun Sep 4 21:38:32 2011
+++ include/GL/freeglut_ext.h Thu Aug 30 07:10:04 2012
@@ -170,7 +170,7 @@ FGAPI void FGAPIENTRY glutSolidCylinder( GLdouble r
$OpenBSD: patch-include_GL_freeglut_ext_h,v 1.3 2017/07/05 21:29:42 rsadowski Exp $
Index: include/GL/freeglut_ext.h
--- include/GL/freeglut_ext.h.orig
+++ include/GL/freeglut_ext.h
@@ -193,7 +193,7 @@ FGAPI void FGAPIENTRY glutSolidTeaspoon( double siz
/*
* Extension functions, see freeglut_ext.c
* Extension functions, see fg_ext.c
*/
-typedef void (*GLUTproc)();
+typedef void (*GLUTproc)(void);
FGAPI GLUTproc FGAPIENTRY glutGetProcAddress( const char *procName );
/*
@@ -249,7 +249,7 @@ FGAPI void FGAPIENTRY glutSetVertexAttribNormal(GLi
FGAPI void FGAPIENTRY glutSetVertexAttribTexCoord2(GLint attrib);
/* Mobile platforms lifecycle */
-FGAPI void FGAPIENTRY glutInitContextFunc(void (* callback)());
+FGAPI void FGAPIENTRY glutInitContextFunc(void (* callback)(void));
FGAPI void FGAPIENTRY glutAppStatusFunc(void (* callback)(int));
/* state flags that can be passed to callback set by glutAppStatusFunc */
#define GLUT_APPSTATUS_PAUSE 0x0001

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2015/03/16 18:07:46 naddy Exp $
@comment $OpenBSD: PLIST,v 1.3 2017/07/05 21:29:42 rsadowski Exp $
@conflict glut-*
@pkgpath graphics/glut
include/GL/
@ -7,5 +7,5 @@ include/GL/freeglut_ext.h
include/GL/freeglut_std.h
include/GL/glut.h
lib/libglut.a
lib/libglut.la
@lib lib/libglut.so.${LIBglut_VERSION}
lib/pkgconfig/freeglut.pc