From owner-svn-ports-head@freebsd.org Thu Oct 25 18:48:24 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B65EE1089BFA; Thu, 25 Oct 2018 18:48:24 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6C6006D4C1; Thu, 25 Oct 2018 18:48:24 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3354C15CAD; Thu, 25 Oct 2018 18:48:24 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9PImO94077239; Thu, 25 Oct 2018 18:48:24 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9PImN3b077238; Thu, 25 Oct 2018 18:48:23 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201810251848.w9PImN3b077238@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Thu, 25 Oct 2018 18:48:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482977 - in head/graphics/freeglut: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/graphics/freeglut: . files X-SVN-Commit-Revision: 482977 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Oct 2018 18:48:24 -0000 Author: zeising Date: Thu Oct 25 18:48:23 2018 New Revision: 482977 URL: https://svnweb.freebsd.org/changeset/ports/482977 Log: graphics/freeglut: Fix build after joy(4) removal Fix build of graphics/freeglut after the removal of the joy(4) driver in FreeBSD CURRENT. The same fix is applied for all FreeBSD versions though. Simply remove the include of sys/joystick.h, and instead bring in the definition of struct joystick from that file into the freeglut source. None of the ioctls in sys/joystick.h are ever used in freeglut. Please note that juystick support in freeglut on FreeBSD is not really tested, so no promises are made about it. Reported by: goshanecr on the FreeBSD forum in collaboration with: imp Modified: head/graphics/freeglut/Makefile head/graphics/freeglut/files/patch-src_x11_fg__internal__x11.h Modified: head/graphics/freeglut/Makefile ============================================================================== --- head/graphics/freeglut/Makefile Thu Oct 25 17:17:48 2018 (r482976) +++ head/graphics/freeglut/Makefile Thu Oct 25 18:48:23 2018 (r482977) @@ -3,7 +3,7 @@ PORTNAME= freeglut PORTVERSION= 3.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF Modified: head/graphics/freeglut/files/patch-src_x11_fg__internal__x11.h ============================================================================== --- head/graphics/freeglut/files/patch-src_x11_fg__internal__x11.h Thu Oct 25 17:17:48 2018 (r482976) +++ head/graphics/freeglut/files/patch-src_x11_fg__internal__x11.h Thu Oct 25 18:48:23 2018 (r482977) @@ -1,6 +1,6 @@ --- src/x11/fg_internal_x11.h.orig 2014-10-20 15:27:04 UTC +++ src/x11/fg_internal_x11.h -@@ -136,8 +136,42 @@ struct tagSFG_PlatformWindowState +@@ -136,11 +136,50 @@ struct tagSFG_PlatformWindowState #include # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) @@ -35,15 +35,24 @@ +# endif +# include +# include -+ + +/* Compatibility with older usb.h revisions */ +# if !defined(USB_MAX_DEVNAMES) && defined(MAXDEVNAMES) +# define USB_MAX_DEVNAMES MAXDEVNAMES +# endif - ++ # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - # include -@@ -189,6 +223,30 @@ struct tagSFG_PlatformWindowState +-# include ++struct joystick { ++ int x; ++ int y; ++ int b1; ++ int b2; ++}; + # else + /* + * XXX NetBSD/amd64 systems may find that they have to steal the +@@ -189,6 +228,30 @@ struct tagSFG_PlatformWindowState */ # define _JS_MAX_AXES 16 typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;