ports/103686: [MAINTAINER] games/diameter: chase forthcoming guichan update
Dmitry Marakasov
amdmi3 at mail.ru
Tue Sep 26 17:40:27 UTC 2006
>Number: 103686
>Category: ports
>Synopsis: [MAINTAINER] games/diameter: chase forthcoming guichan update
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 26 17:40:25 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 6.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p5 FreeBSD 6.1-RELEASE-p5 #0: Fri Sep 1 14:24:31 MSD 2006 amdmi3 at hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
These are patches to support new guichan 0.5.0, which have API changed since 0.4.0 which is currently in ports.
NOTE: This change should be comitted along with guichan update, which should be submitted pretty soon.
I'll ask guichan maintainer to note this PR in his update.
>How-To-Repeat:
>Fix:
--- diameter.diff begins here ---
diff -ruN diameter.orig/Makefile diameter/Makefile
--- diameter.orig/Makefile Tue Sep 26 21:17:59 2006
+++ diameter/Makefile Tue Sep 26 21:27:51 2006
@@ -7,6 +7,7 @@
PORTNAME= diameter
DISTVERSION= 0.3.5-r1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gamediameter
diff -ruN diameter.orig/files/patch-src-gra-2d-gui.cpp diameter/files/patch-src-gra-2d-gui.cpp
--- diameter.orig/files/patch-src-gra-2d-gui.cpp Thu Jan 1 03:00:00 1970
+++ diameter/files/patch-src-gra-2d-gui.cpp Tue Sep 26 21:24:19 2006
@@ -0,0 +1,25 @@
+--- src/gra/2d/gui.cpp.orig Sat Jun 24 02:16:12 2006
++++ src/gra/2d/gui.cpp Tue Sep 26 21:23:20 2006
+@@ -3,11 +3,11 @@
+ void DGUI::Init(Options in_option)
+ {
+ option=in_option;
+-imageLoader = new gcn::OpenGLImageLoader();
++imageLoader = new gcn::OpenGLSDLImageLoader();
+ hostImageLoader = new gcn::SDLImageLoader();
+ // The OpenGL imageloader cant load images by itself, it needs
+ // a host imageloader. So we give it an SDL imageloader.
+-imageLoader->setHostImageLoader(hostImageLoader);
++//imageLoader->setHostImageLoader(hostImageLoader);
+ gcn::Image::setImageLoader(imageLoader);
+ graphics = new gcn::OpenGLGraphics();
+ // We need to tell OpenGL graphics how big the screen is.
+@@ -83,7 +83,7 @@
+ b_ExitGame->setPosition(top->getWidth()/2-b_ExitGame->getWidth()/2, top->getHeight()/2+100);
+
+ std::string temp_string = "texture/gui/logo.png";
+-TempImage1 = new gcn::Image(PKGDATADIR+temp_string);
++TempImage1 = gcn::Image::load(PKGDATADIR+temp_string);
+ diameter_icon = new gcn::Icon(TempImage1);
+ diameter_icon->setPosition(top->getWidth()/2-diameter_icon->getWidth()/2, top->getHeight()/2-150);
+
diff -ruN diameter.orig/files/patch-src-gra-2d-gui.h diameter/files/patch-src-gra-2d-gui.h
--- diameter.orig/files/patch-src-gra-2d-gui.h Thu Jan 1 03:00:00 1970
+++ diameter/files/patch-src-gra-2d-gui.h Tue Sep 26 21:24:30 2006
@@ -0,0 +1,19 @@
+--- src/gra/2d/gui.h.orig Thu Jun 22 17:11:02 2006
++++ src/gra/2d/gui.h Tue Sep 26 21:23:20 2006
+@@ -4,6 +4,7 @@
+ #include <guichan.hpp>
+ #include <guichan/sdl.hpp>
+ #include <guichan/opengl.hpp>
++#include <guichan/opengl/openglsdlimageloader.hpp>
+ #include <GL/gl.h>
+ #include <sstream>
+
+@@ -17,7 +18,7 @@
+ {
+ gcn::SDLInput* input;
+ gcn::OpenGLGraphics* graphics;
+-gcn::OpenGLImageLoader* imageLoader;
++gcn::OpenGLSDLImageLoader* imageLoader;
+ gcn::SDLImageLoader* hostImageLoader;
+
+ /*
--- diameter.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list