From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 26 17:40:27 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 807C116A4DE for ; Tue, 26 Sep 2006 17:40:27 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A00E43D45 for ; Tue, 26 Sep 2006 17:40:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8QHeQjl071664 for ; Tue, 26 Sep 2006 17:40:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8QHeQE8071663; Tue, 26 Sep 2006 17:40:26 GMT (envelope-from gnats) Resent-Date: Tue, 26 Sep 2006 17:40:26 GMT Resent-Message-Id: <200609261740.k8QHeQE8071663@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, Dmitry Marakasov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C269116A417 for ; Tue, 26 Sep 2006 17:34:30 +0000 (UTC) (envelope-from amdmi3@mail.ru) Received: from mx3.mail.ru (mx3.mail.ru [194.67.23.149]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF07343D6D for ; Tue, 26 Sep 2006 17:34:27 +0000 (GMT) (envelope-from amdmi3@mail.ru) Received: from [213.148.29.33] (port=37065 helo=nexii.panopticon) by mx3.mail.ru with esmtp id 1GSGp8-000EOz-00 for FreeBSD-gnats-submit@freebsd.org; Tue, 26 Sep 2006 21:34:26 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.2]) by nexii.panopticon (Postfix) with ESMTP id 8B1FF1703E for ; Tue, 26 Sep 2006 21:33:56 +0400 (MSD) Received: by hades.panopticon (Postfix, from userid 1000) id A84734480; Tue, 26 Sep 2006 21:34:38 +0400 (MSD) Message-Id: <20060926173438.A84734480@hades.panopticon> Date: Tue, 26 Sep 2006 21:34:38 +0400 (MSD) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/103686: [MAINTAINER] games/diameter: chase forthcoming guichan update X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Marakasov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Sep 2006 17:40:27 -0000 >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@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 + #include + #include ++#include + #include + #include + +@@ -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: