Attachment #120947 for bug #163829

View | Details | Raw Unified | Return to bug 163829
Collapse All | Expand All




#

PORTNAME=	freeglut
PORTVERSION=	2.8.0
CATEGORIES=	graphics
MASTER_SITES=	SF

MAINTAINER=	graudeejs@gmail.com
COMMENT=	An alternative to the OpenGL Utility Toolkit (GLUT) library

LICENSE=	MIT

CONFLICTS=	libglut-[0-9].*

USE_AUTOTOOLS=	libtool
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
USE_XORG=	ice xi xxf86vm xrandr
USE_GL=		glu
CONFIGURE_ARGS=	--disable-warnings
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib -lusbhid
USE_LDCONFIG=	yes

DOCS=	download.html freeglut.html freeglut_logo.png		\

	progress.html structure.html
BINS=	CallbackMaker Fractals Fractals_random Lorenz One shapes

.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 800000
EXTRA_PATCHES=	${FILESDIR}/extra-patch-src__freeglut_joystick.c
.endif

pre-configure:
.for fract in Fractals/fractals.c Fractals_random/fractals_random.c
	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g"		\

.endfor
	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
.endif
.if ${OSVERSION} >= 800000
	@${ECHO_MSG}
	@${CAT} ${PKGMESSAGE}
	@${ECHO_MSG}
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (freeglut-2.6.0.tar.gz) = 615b41edc96c405ee6bb7e9a2942642140c3e57c1dd8c68e968a17ddfb59e98f	1	SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05
2	SIZE (freeglut-2.6.0.tar.gz) = 1124186	2	SIZE (freeglut-2.8.0.tar.gz) = 979459




--- ./src/freeglut_joystick.c.orig	2009-11-14 06:31:39.000000000 +0200
+++ ./src/freeglut_joystick.c	2010-05-31 21:27:13.362358514 +0300
@@ -79,11 +79,13 @@
 #        include <errno.h>
 #    endif
 #    if defined(__FreeBSD__) || defined(__NetBSD__)
+#        include <osreldate.h>
 /* XXX The below hack is done until freeglut's autoconf is updated. */
 #        define HAVE_USB_JS    1
 
 #        if defined(__FreeBSD__)
 #            include <sys/joystick.h>
+#            include <dev/usb/usb_ioctl.h>
 #        else
 /*
  * XXX NetBSD/amd64 systems may find that they have to steal the
@@ -200,7 +202,7 @@
  */
 static char *fghJoystickWalkUSBdev(int f, char *dev, char *out, int outlen)
 {
-  struct usb_device_info di;
+/*  struct usb_device_info di;
   int i, a;
   char *cp;
 
@@ -221,6 +223,7 @@
         return out;
       }
   }
+  */
   return NULL;
 }
 





--- progs/demos/smooth_opengl3/smooth_opengl3.c.orig	2012-01-04 14:38:43.000000000 +0100
+++ progs/demos/smooth_opengl3/smooth_opengl3.c	2012-01-04 14:39:10.000000000 +0100
@@ -98,6 +98,7 @@
 #define APIENTRY
 #endif
 
+#ifndef GL_VERSION_1_5
 typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
 typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
 typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage);
@@ -117,6 +118,7 @@
 typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
 typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name);
 typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif
 
 PFNGLGENBUFFERSPROC gl_GenBuffers;
 PFNGLBINDBUFFERPROC gl_BindBuffer;




--- src/freeglut_joystick.c.orig	2011-09-28 03:37:26.000000000 +0200
+++ src/freeglut_joystick.c	2012-01-05 09:51:03.000000000 +0100
@@ -152,7 +152,10 @@
 #                include <libusbhid.h>
 #            endif
 #        endif
-#        include <legacy/dev/usb/usb.h>
+#        include <dev/usb/usb.h>
+#        if __FreeBSD_version >= 800061
+#            include <dev/usb/usb_ioctl.h>
+#        endif
 #        include <dev/usb/usbhid.h>
 
 /* Compatibility with older usb.h revisions */
@@ -199,6 +202,7 @@
  */
 static char *fghJoystickWalkUSBdev(int f, char *dev, char *out, int outlen)
 {
+#if __FreeBSD_version < 800061
   struct usb_device_info di;
   int i, a;
   char *cp;
@@ -220,6 +224,7 @@
         return out;
       }
   }
+#endif
   return NULL;
 }


Return to bug 163829

Lines 7-29 Link Here

(-)Makefile (-16 / +7 lines)
7	#	7	#
8		8
9	PORTNAME= freeglut	9	PORTNAME= freeglut
10	PORTVERSION= 2.6.0	10	PORTVERSION= 2.8.0
11	CATEGORIES= graphics	11	CATEGORIES= graphics
12	MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/	12	MASTER_SITES= SF
13		13
14	MAINTAINER= graudeejs@gmail.com	14	MAINTAINER= graudeejs@gmail.com
15	COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library	15	COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library
16		16
		17	LICENSE= MIT
		18
17	CONFLICTS= libglut-[0-9].*	19	CONFLICTS= libglut-[0-9].*
18		20
19	USE_AUTOTOOLS= libtool	21	USE_AUTOTOOLS= libtool
20	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
21	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
22	USE_XORG= ice xi	24	USE_XORG= ice xi xxf86vm xrandr
23	USE_GL= glu	25	USE_GL= glu
24	CONFIGURE_ARGS= --disable-warnings	26	CONFIGURE_ARGS= --disable-warnings
25	CPPFLAGS+= -I${LOCALBASE}/include	27	CPPFLAGS+= -I${LOCALBASE}/include
26	LDFLAGS+= -lusbhid	28	LDFLAGS+= -L${LOCALBASE}/lib -lusbhid
27	USE_LDCONFIG= yes	29	USE_LDCONFIG= yes
28		30
29	DOCS= download.html freeglut.html freeglut_logo.png \	31	DOCS= download.html freeglut.html freeglut_logo.png \
Lines 31-42 Link Here
31	progress.html structure.html	33	progress.html structure.html
32	BINS= CallbackMaker Fractals Fractals_random Lorenz One shapes	34	BINS= CallbackMaker Fractals Fractals_random Lorenz One shapes
33		35
34	.include <bsd.port.pre.mk>
35
36	.if ${OSVERSION} >= 800000
37	EXTRA_PATCHES= ${FILESDIR}/extra-patch-src__freeglut_joystick.c
38	.endif
39
40	pre-configure:	36	pre-configure:
41	.for fract in Fractals/fractals.c Fractals_random/fractals_random.c	37	.for fract in Fractals/fractals.c Fractals_random/fractals_random.c
42	@${REINPLACE_CMD} -e "s\|/usr/local\|${PREFIX}\|g" \	38	@${REINPLACE_CMD} -e "s\|/usr/local\|${PREFIX}\|g" \
Lines 63-72 Link Here
63	.endfor	59	.endfor
64	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."	60	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
65	.endif	61	.endif
66	.if ${OSVERSION} >= 800000
67	@${ECHO_MSG}
68	@${CAT} ${PKGMESSAGE}
69	@${ECHO_MSG}
70	.endif
71		62
72	.include <bsd.port.post.mk>	63	.include <bsd.port.mk>

Removed Link Here

(-)files/extra-patch-src__freeglut_joystick.c (-34 lines)
1	--- ./src/freeglut_joystick.c.orig 2009-11-14 06:31:39.000000000 +0200
2	+++ ./src/freeglut_joystick.c 2010-05-31 21:27:13.362358514 +0300
3	@@ -79,11 +79,13 @@
4	# include <errno.h>
5	# endif
6	# if defined(__FreeBSD__) \|\| defined(__NetBSD__)
7	+# include <osreldate.h>
8	/* XXX The below hack is done until freeglut's autoconf is updated. */
9	# define HAVE_USB_JS 1
10
11	# if defined(__FreeBSD__)
12	# include <sys/joystick.h>
13	+# include <dev/usb/usb_ioctl.h>
14	# else
15	/*
16	* XXX NetBSD/amd64 systems may find that they have to steal the
17	@@ -200,7 +202,7 @@
18	*/
19	static char fghJoystickWalkUSBdev(int f, char dev, char *out, int outlen)
20	{
21	- struct usb_device_info di;
22	+/* struct usb_device_info di;
23	int i, a;
24	char *cp;
25
26	@@ -221,6 +223,7 @@
27	return out;
28	}
29	}
30	+ */
31	return NULL;
32	}
33
34

Added Link Here

(-)files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c (+18 lines)
1	--- progs/demos/smooth_opengl3/smooth_opengl3.c.orig 2012-01-04 14:38:43.000000000 +0100
2	+++ progs/demos/smooth_opengl3/smooth_opengl3.c 2012-01-04 14:39:10.000000000 +0100
3	@@ -98,6 +98,7 @@
4	#define APIENTRY
5	#endif
6
7	+#ifndef GL_VERSION_1_5
8	typedef void (APIENTRY PFNGLGENBUFFERSPROC) (GLsizei n, GLuint buffers);
9	typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
10	typedef void (APIENTRY PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid data, GLenum usage);
11	@@ -117,6 +118,7 @@
12	typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
13	typedef GLint (APIENTRY PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar name);
14	typedef void (APIENTRY PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat value);
15	+#endif
16
17	PFNGLGENBUFFERSPROC gl_GenBuffers;
18	PFNGLBINDBUFFERPROC gl_BindBuffer;

Added Link Here

(-)files/patch-src_freeglut_joystick.c (+30 lines)
1	--- src/freeglut_joystick.c.orig 2011-09-28 03:37:26.000000000 +0200
2	+++ src/freeglut_joystick.c 2012-01-05 09:51:03.000000000 +0100
3	@@ -152,7 +152,10 @@
4	# include <libusbhid.h>
5	# endif
6	# endif
7	-# include <legacy/dev/usb/usb.h>
8	+# include <dev/usb/usb.h>
9	+# if __FreeBSD_version >= 800061
10	+# include <dev/usb/usb_ioctl.h>
11	+# endif
12	# include <dev/usb/usbhid.h>
13
14	/* Compatibility with older usb.h revisions */
15	@@ -199,6 +202,7 @@
16	*/
17	static char fghJoystickWalkUSBdev(int f, char dev, char *out, int outlen)
18	{
19	+#if __FreeBSD_version < 800061
20	struct usb_device_info di;
21	int i, a;
22	char *cp;
23	@@ -220,6 +224,7 @@
24	return out;
25	}
26	}
27	+#endif
28	return NULL;
29	}
30