From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 5 09:50:10 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE2891065670 for ; Thu, 5 Jan 2012 09:50:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 866468FC13 for ; Thu, 5 Jan 2012 09:50:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q059oATn017256 for ; Thu, 5 Jan 2012 09:50:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q059oAdZ017255; Thu, 5 Jan 2012 09:50:10 GMT (envelope-from gnats) Resent-Date: Thu, 5 Jan 2012 09:50:10 GMT Resent-Message-Id: <201201050950.q059oAdZ017255@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pietro Cerutti Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04FCC1065675 for ; Thu, 5 Jan 2012 09:40:29 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id E41448FC17 for ; Thu, 5 Jan 2012 09:40:28 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q059eSDC011595 for ; Thu, 5 Jan 2012 09:40:28 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q059eS6o011593; Thu, 5 Jan 2012 09:40:28 GMT (envelope-from nobody) Message-Id: <201201050940.q059eS6o011593@red.freebsd.org> Date: Thu, 5 Jan 2012 09:40:28 GMT From: Pietro Cerutti To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/163829: [patch] graphics/freeglut -- update to 2.8.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2012 09:50:10 -0000 >Number: 163829 >Category: ports >Synopsis: [patch] graphics/freeglut -- update to 2.8.0 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jan 05 09:50:10 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Pietro Cerutti >Release: >Organization: The FreeBSD Project >Environment: >Description: The attached is a patch to update graphics/freeglut to version 2.8.0. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/freeglut/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- Makefile 23 Sep 2011 22:23:09 -0000 1.26 +++ Makefile 5 Jan 2012 08:30:11 -0000 @@ -7,23 +7,25 @@ # PORTNAME= freeglut -PORTVERSION= 2.6.0 +PORTVERSION= 2.8.0 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/ +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 +USE_XORG= ice xi xxf86vm xrandr USE_GL= glu CONFIGURE_ARGS= --disable-warnings CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lusbhid +LDFLAGS+= -L${LOCALBASE}/lib -lusbhid USE_LDCONFIG= yes DOCS= download.html freeglut.html freeglut_logo.png \ @@ -31,12 +33,6 @@ progress.html structure.html BINS= CallbackMaker Fractals Fractals_random Lorenz One shapes -.include - -.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" \ @@ -63,10 +59,5 @@ .endfor @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." .endif -.if ${OSVERSION} >= 800000 - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} -.endif -.include +.include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/freeglut/distinfo,v retrieving revision 1.9 diff -u -r1.9 distinfo --- distinfo 3 Jul 2011 14:11:13 -0000 1.9 +++ distinfo 4 Jan 2012 13:03:12 -0000 @@ -1,2 +1,2 @@ -SHA256 (freeglut-2.6.0.tar.gz) = 615b41edc96c405ee6bb7e9a2942642140c3e57c1dd8c68e968a17ddfb59e98f -SIZE (freeglut-2.6.0.tar.gz) = 1124186 +SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05 +SIZE (freeglut-2.8.0.tar.gz) = 979459 Index: files/extra-patch-src__freeglut_joystick.c =================================================================== RCS file: files/extra-patch-src__freeglut_joystick.c diff -N files/extra-patch-src__freeglut_joystick.c --- files/extra-patch-src__freeglut_joystick.c 6 Jul 2010 17:35:46 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,34 +0,0 @@ ---- ./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 - # endif - # if defined(__FreeBSD__) || defined(__NetBSD__) -+# include - /* XXX The below hack is done until freeglut's autoconf is updated. */ - # define HAVE_USB_JS 1 - - # if defined(__FreeBSD__) - # include -+# include - # 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; - } - - Index: files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c =================================================================== RCS file: files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c diff -N files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c 4 Jan 2012 13:45:11 -0000 @@ -0,0 +1,18 @@ +--- 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; Index: files/patch-src_freeglut_joystick.c =================================================================== RCS file: files/patch-src_freeglut_joystick.c diff -N files/patch-src_freeglut_joystick.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src_freeglut_joystick.c 5 Jan 2012 08:51:12 -0000 @@ -0,0 +1,30 @@ +--- 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 + # endif + # endif +-# include ++# include ++# if __FreeBSD_version >= 800061 ++# include ++# endif + # include + + /* 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; + } + >Release-Note: >Audit-Trail: >Unformatted: