Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 May 2016 17:52:24 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r414714 - in head/games/palomino: . files
Message-ID:  <201605061752.u46HqORr049856@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Fri May  6 17:52:23 2016
New Revision: 414714
URL: https://svnweb.freebsd.org/changeset/ports/414714

Log:
  Allow build with upcoming version of graphics/osg 3.4.0; bump PORTREVISION
  
  PR:		209235
  Submitted by:	woodsb02@gmail.com

Added:
  head/games/palomino/files/
  head/games/palomino/files/patch-src_input_device__keyboard__osg.cc   (contents, props changed)
  head/games/palomino/files/patch-src_input_device__keyboard__osg.hh   (contents, props changed)
  head/games/palomino/files/patch-src_input_device__mouse__osg.cc   (contents, props changed)
  head/games/palomino/files/patch-src_input_device__mouse__osg.hh   (contents, props changed)
Modified:
  head/games/palomino/Makefile

Modified: head/games/palomino/Makefile
==============================================================================
--- head/games/palomino/Makefile	Fri May  6 16:52:08 2016	(r414713)
+++ head/games/palomino/Makefile	Fri May  6 17:52:23 2016	(r414714)
@@ -3,7 +3,7 @@
 
 PORTNAME=	palomino
 PORTVERSION=	20131231
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/palomino-sim
 DISTFILES=	${PORTNAME}_src_${PORTVERSION}.txz \
@@ -83,6 +83,15 @@ post-patch:
 		${WRKSRC}/src/lua_bind/defs.hh
 	@${REINPLACE_CMD} -e 's|doc/html/|${DOCSDIR}/|' ${WRKSRC}/src/gui/gui.cc
 
+	@${REINPLACE_CMD} -e 's/computeBound/computeBoundingBox/g' \
+		${WRKSRC}/src/object/object.cc \
+		${WRKSRC}/src/fx/partsys_medium.cc
+
+	@${REINPLACE_CMD} -e 's/CameraNode/Camera/g' \
+		${WRKSRC}/src/hud/hud.cc \
+		${WRKSRC}/src/hud/hud.hh \
+		${WRKSRC}/src/hud/hud_text.cc
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "data scripts" ${STAGEDIR}${DATADIR})

Added: head/games/palomino/files/patch-src_input_device__keyboard__osg.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/palomino/files/patch-src_input_device__keyboard__osg.cc	Fri May  6 17:52:23 2016	(r414714)
@@ -0,0 +1,15 @@
+--- src/input/device_keyboard_osg.cc.orig	2012-10-26 01:35:57 UTC
++++ src/input/device_keyboard_osg.cc
+@@ -105,12 +105,6 @@ KeyboardDeviceOSG::HandlerOSG::handle( c
+     }
+ }
+ 
+-void
+-KeyboardDeviceOSG::HandlerOSG::accept( osgGA::GUIEventHandlerVisitor& v )
+-{
+-    v.visit( *this );
+-}
+-
+ } // namespace input
+ 
+ #endif // COMPILE_OSG

Added: head/games/palomino/files/patch-src_input_device__keyboard__osg.hh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/palomino/files/patch-src_input_device__keyboard__osg.hh	Fri May  6 17:52:23 2016	(r414714)
@@ -0,0 +1,10 @@
+--- src/input/device_keyboard_osg.hh.orig	2009-11-22 23:05:48 UTC
++++ src/input/device_keyboard_osg.hh
+@@ -57,7 +57,6 @@ private:
+                         HandlerOSG( void ) { }
+         virtual         ~HandlerOSG() { }
+         virtual bool    handle( const osgGA::GUIEventAdapter& event, osgGA::GUIActionAdapter& action );
+-        virtual void    accept( osgGA::GUIEventHandlerVisitor& visitor );
+     };
+ };
+ 

Added: head/games/palomino/files/patch-src_input_device__mouse__osg.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/palomino/files/patch-src_input_device__mouse__osg.cc	Fri May  6 17:52:23 2016	(r414714)
@@ -0,0 +1,15 @@
+--- src/input/device_mouse_osg.cc.orig	2012-10-26 01:35:57 UTC
++++ src/input/device_mouse_osg.cc
+@@ -145,12 +145,6 @@ MouseDeviceOSG::HandlerOSG::handle( cons
+     }
+ }
+ 
+-void
+-MouseDeviceOSG::HandlerOSG::accept( osgGA::GUIEventHandlerVisitor& v )
+-{
+-    v.visit( *this );
+-}
+-
+ } // namespace input
+ 
+ #endif // COMPILE_OSG

Added: head/games/palomino/files/patch-src_input_device__mouse__osg.hh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/palomino/files/patch-src_input_device__mouse__osg.hh	Fri May  6 17:52:23 2016	(r414714)
@@ -0,0 +1,10 @@
+--- src/input/device_mouse_osg.hh.orig	2011-12-14 01:56:48 UTC
++++ src/input/device_mouse_osg.hh
+@@ -41,7 +41,6 @@ private:
+                         HandlerOSG( void ) { }
+         virtual         ~HandlerOSG() { }
+         virtual bool    handle( const osgGA::GUIEventAdapter& event, osgGA::GUIActionAdapter& action );
+-        virtual void    accept( osgGA::GUIEventHandlerVisitor& visitor );
+     };
+ };
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605061752.u46HqORr049856>