Attachment #75163 for bug #108613

View | Details | Raw Unified | Return to bug 108613
Collapse All | Expand All




#

PORTNAME=	diameter
PORTVERSION=	0.4.0.1
PORTREVISION=	1
CATEGORIES=	games
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	gamediameter
DISTNAME=	${PORTNAME}-${PORTVERSION}

MAINTAINER=	amdmi3@amdmi3.ru
COMMENT=	Arcade-style game with elements of economy and adventure

BUILD_DEPENDS=	guichan>=0.6.1:${PORTSDIR}/devel/guichan
RUN_DEPENDS=	guichan>=0.6.1:${PORTSDIR}/devel/guichan

USE_BZIP2=	yes
GNU_CONFIGURE=	yes

USE_GL=		yes
USE_SDL=	sdl mixer image
USE_GCC=	3.4+
USE_PYTHON=	yes

WRKSRC=		${WRKDIR}/gamediameter

CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" \
		LDFLAGS="`${SDL_CONFIG} --libs` -L${X11BASE}/lib"

Lines 1-3 Link Here

(-)diameter/distinfo (-3 / +3 lines)
1	MD5 (diameter-0.3.5-r1src.tar.bz2) = da29296f99dc7bb9d0350b469bb8830c	1	MD5 (diameter-0.4.0.1.tar.bz2) = 9a6c397c99188d0dc214b4455c2bf032
2	SHA256 (diameter-0.3.5-r1src.tar.bz2) = 0db31e344de11fa245eb7b9882918535db3e87f0c8cc6229765f8dafb45ae4d3	2	SHA256 (diameter-0.4.0.1.tar.bz2) = c62687bbd469cec4ef99f73bf4682b645119943dbd4f55143f60cc7427afe68f
3	SIZE (diameter-0.3.5-r1src.tar.bz2) = 4775031	3	SIZE (diameter-0.4.0.1.tar.bz2) = 4760022




--- configure.orig	Fri Jun 16 07:19:13 2006
+++ configure	Fri Jun 16 07:20:05 2006
@@ -3171,11 +3171,11 @@
   echo '#endif'             >>confdefs.h
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+#ac_ext=c
+#ac_cpp='$CPP $CPPFLAGS'
+#ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+#ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+#ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 




--- 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);
 




--- 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;
 
 /*




--- src/main.cpp.orig	Mon Jan 29 18:36:35 2007
+++ src/main.cpp	Wed Jan 31 16:36:40 2007
@@ -9,7 +9,6 @@
 #ifdef _POSIX_C_SOURCE	// shut up pyconfig.h complaints
 #undef _POSIX_C_SOURCE
 #endif
-#include <Python.h>
 
 #ifdef __unix__
 #else
@@ -41,6 +40,7 @@
 #include "./res/loadworld.h"
 #include "./wor/pylevel.h"
 
+#include <Python.h>
 
 TextureList TTemp;
 UTextureList TextureDelet;

Lines 13-18 Link Here

(-)diameter/pkg-plist (-2 / +23 lines)
13	%%DATADIR%%/music/sample/explode_06.wav	13	%%DATADIR%%/music/sample/explode_06.wav
14	%%DATADIR%%/music/sample/explode_07.wav	14	%%DATADIR%%/music/sample/explode_07.wav
15	%%DATADIR%%/music/sample/s1.wav	15	%%DATADIR%%/music/sample/s1.wav
		16	%%DATADIR%%/pyscripts/arena.py
		17	%%DATADIR%%/pyscripts/test_mission1.py
		18	%%DATADIR%%/pyscripts/test_mission1d1_next.py
		19	%%DATADIR%%/pyscripts/test_mission1d1_ok.py
		20	%%DATADIR%%/pyscripts/test_mission1d2_ok.py
		21	%%DATADIR%%/pyscripts/test_mission1d4_ok.py
		22	%%DATADIR%%/pyscripts/test_mission1state1.py
		23	%%DATADIR%%/pyscripts/test_mission1state2.py
		24	%%DATADIR%%/pyscripts/test_mission1state3.py
		25	%%DATADIR%%/pyscripts/test_mission1state4.py
16	%%DATADIR%%/sprites/sprites.xml	26	%%DATADIR%%/sprites/sprites.xml
17	%%DATADIR%%/texture/Argon.jpg	27	%%DATADIR%%/texture/Argon.jpg
18	%%DATADIR%%/texture/Brat.jpg	28	%%DATADIR%%/texture/Brat.jpg
Lines 56-61 Link Here
56	%%DATADIR%%/texture/gui/eng/main/start-.png	66	%%DATADIR%%/texture/gui/eng/main/start-.png
57	%%DATADIR%%/texture/gui/eng/main/start.png	67	%%DATADIR%%/texture/gui/eng/main/start.png
58	%%DATADIR%%/texture/gui/logo.png	68	%%DATADIR%%/texture/gui/logo.png
		69	%%DATADIR%%/texture/gui/other/back.png
		70	%%DATADIR%%/texture/gui/other/back_b.png
		71	%%DATADIR%%/texture/gui/other/button_ok.png
		72	%%DATADIR%%/texture/gui/other/button_ok_b.png
		73	%%DATADIR%%/texture/gui/other/forward.png
		74	%%DATADIR%%/texture/gui/other/forward_b.png
		75	%%DATADIR%%/texture/gui/other/lucas.png
		76	%%DATADIR%%/texture/gui/other/magnaguard.png
		77	%%DATADIR%%/texture/gui/other/noface.png
59	%%DATADIR%%/texture/gui/rus/main/credits-.png	78	%%DATADIR%%/texture/gui/rus/main/credits-.png
60	%%DATADIR%%/texture/gui/rus/main/credits.png	79	%%DATADIR%%/texture/gui/rus/main/credits.png
61	%%DATADIR%%/texture/gui/rus/main/logo-.png	80	%%DATADIR%%/texture/gui/rus/main/logo-.png
Lines 85-92 Link Here
85	%%DATADIR%%/texture/spaceshiptexture.jpg	104	%%DATADIR%%/texture/spaceshiptexture.jpg
86	%%DATADIR%%/texture/test.png	105	%%DATADIR%%/texture/test.png
87	%%DATADIR%%/texture/textures.xml	106	%%DATADIR%%/texture/textures.xml
88	%%DATADIR%%/world/test_decor1.xml	107	%%DATADIR%%/world/arena.xml
89	%%DATADIR%%/world/test_level.xml	108	%%DATADIR%%/world/test_mission1.xml
90	@dirrm %%DATADIR%%/world	109	@dirrm %%DATADIR%%/world
91	@dirrm %%DATADIR%%/texture/ship4	110	@dirrm %%DATADIR%%/texture/ship4
92	@dirrm %%DATADIR%%/texture/ship3	111	@dirrm %%DATADIR%%/texture/ship3
Lines 94-99 Link Here
94	@dirrm %%DATADIR%%/texture/ship1	113	@dirrm %%DATADIR%%/texture/ship1
95	@dirrm %%DATADIR%%/texture/gui/rus/main	114	@dirrm %%DATADIR%%/texture/gui/rus/main
96	@dirrm %%DATADIR%%/texture/gui/rus	115	@dirrm %%DATADIR%%/texture/gui/rus
		116	@dirrm %%DATADIR%%/texture/gui/other
97	@dirrm %%DATADIR%%/texture/gui/eng/main	117	@dirrm %%DATADIR%%/texture/gui/eng/main
98	@dirrm %%DATADIR%%/texture/gui/eng	118	@dirrm %%DATADIR%%/texture/gui/eng
99	@dirrm %%DATADIR%%/texture/gui/curs/weapons	119	@dirrm %%DATADIR%%/texture/gui/curs/weapons
Lines 102-107 Link Here
102	@dirrm %%DATADIR%%/texture/Rockets	122	@dirrm %%DATADIR%%/texture/Rockets
103	@dirrm %%DATADIR%%/texture	123	@dirrm %%DATADIR%%/texture
104	@dirrm %%DATADIR%%/sprites	124	@dirrm %%DATADIR%%/sprites
		125	@dirrm %%DATADIR%%/pyscripts
105	@dirrm %%DATADIR%%/music/sample	126	@dirrm %%DATADIR%%/music/sample
106	@dirrm %%DATADIR%%/music	127	@dirrm %%DATADIR%%/music
107	@dirrm %%DATADIR%%/models/Ships/ship4	128	@dirrm %%DATADIR%%/models/Ships/ship4

Return to bug 108613

Lines 6-23 Link Here

(-)diameter/Makefile (-5 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= diameter	8	PORTNAME= diameter
9	DISTVERSION= 0.3.5-r1	9	PORTVERSION= 0.4.0.1
10	PORTREVISION= 1
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= gamediameter	12	MASTER_SITE_SUBDIR= gamediameter
14	DISTNAME= ${PORTNAME}-${DISTVERSION}src	13	DISTNAME= ${PORTNAME}-${PORTVERSION}
15		14
16	MAINTAINER= amdmi3@amdmi3.ru	15	MAINTAINER= amdmi3@amdmi3.ru
17	COMMENT= Arcade-style game with elements of economy and adventure	16	COMMENT= Arcade-style game with elements of economy and adventure
18		17
19	BUILD_DEPENDS= guichan>=0.5.0:${PORTSDIR}/devel/guichan	18	BUILD_DEPENDS= guichan>=0.6.1:${PORTSDIR}/devel/guichan
20	RUN_DEPENDS= guichan>=0.5.0:${PORTSDIR}/devel/guichan	19	RUN_DEPENDS= guichan>=0.6.1:${PORTSDIR}/devel/guichan
21		20
22	USE_BZIP2= yes	21	USE_BZIP2= yes
23	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
Lines 25-30 Link Here
25	USE_GL= yes	24	USE_GL= yes
26	USE_SDL= sdl mixer image	25	USE_SDL= sdl mixer image
27	USE_GCC= 3.4+	26	USE_GCC= 3.4+
		27	USE_PYTHON= yes
		28
		29	WRKSRC= ${WRKDIR}/gamediameter
28		30
29	CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" \	31	CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" \
30	LDFLAGS="`${SDL_CONFIG} --libs` -L${X11BASE}/lib"	32	LDFLAGS="`${SDL_CONFIG} --libs` -L${X11BASE}/lib"

Lines 1-19 Link Here

(-)diameter/files/patch-configure (-19 lines)
1	--- configure.orig Fri Jun 16 07:19:13 2006
2	+++ configure Fri Jun 16 07:20:05 2006
3	@@ -3171,11 +3171,11 @@
4	echo '#endif' >>confdefs.h
5	fi
6
7	-ac_ext=c
8	-ac_cpp='$CPP $CPPFLAGS'
9	-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
10	-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11	-ac_compiler_gnu=$ac_cv_c_compiler_gnu
12	+#ac_ext=c
13	+#ac_cpp='$CPP $CPPFLAGS'
14	+#ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
15	+#ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
16	+#ac_compiler_gnu=$ac_cv_c_compiler_gnu
17
18	depcc="$CXX" am_compiler_list=
19

Lines 1-25 Link Here

(-)diameter/files/patch-src-gra-2d-gui.cpp (-25 lines)
1	--- src/gra/2d/gui.cpp.orig Sat Jun 24 02:16:12 2006
2	+++ src/gra/2d/gui.cpp Tue Sep 26 21:23:20 2006
3	@@ -3,11 +3,11 @@
4	void DGUI::Init(Options in_option)
5	{
6	option=in_option;
7	-imageLoader = new gcn::OpenGLImageLoader();
8	+imageLoader = new gcn::OpenGLSDLImageLoader();
9	hostImageLoader = new gcn::SDLImageLoader();
10	// The OpenGL imageloader cant load images by itself, it needs
11	// a host imageloader. So we give it an SDL imageloader.
12	-imageLoader->setHostImageLoader(hostImageLoader);
13	+//imageLoader->setHostImageLoader(hostImageLoader);
14	gcn::Image::setImageLoader(imageLoader);
15	graphics = new gcn::OpenGLGraphics();
16	// We need to tell OpenGL graphics how big the screen is.
17	@@ -83,7 +83,7 @@
18	b_ExitGame->setPosition(top->getWidth()/2-b_ExitGame->getWidth()/2, top->getHeight()/2+100);
19
20	std::string temp_string = "texture/gui/logo.png";
21	-TempImage1 = new gcn::Image(PKGDATADIR+temp_string);
22	+TempImage1 = gcn::Image::load(PKGDATADIR+temp_string);
23	diameter_icon = new gcn::Icon(TempImage1);
24	diameter_icon->setPosition(top->getWidth()/2-diameter_icon->getWidth()/2, top->getHeight()/2-150);
25

Lines 1-19 Link Here

(-)diameter/files/patch-src-gra-2d-gui.h (-19 lines)
1	--- src/gra/2d/gui.h.orig Thu Jun 22 17:11:02 2006
2	+++ src/gra/2d/gui.h Tue Sep 26 21:23:20 2006
3	@@ -4,6 +4,7 @@
4	#include <guichan.hpp>
5	#include <guichan/sdl.hpp>
6	#include <guichan/opengl.hpp>
7	+#include <guichan/opengl/openglsdlimageloader.hpp>
8	#include <GL/gl.h>
9	#include <sstream>
10
11	@@ -17,7 +18,7 @@
12	{
13	gcn::SDLInput* input;
14	gcn::OpenGLGraphics* graphics;
15	-gcn::OpenGLImageLoader* imageLoader;
16	+gcn::OpenGLSDLImageLoader* imageLoader;
17	gcn::SDLImageLoader* hostImageLoader;
18
19	/*

Line 0 Link Here

(-)diameter/files/patch-src-main.cpp (+18 lines)
	1	--- src/main.cpp.orig Mon Jan 29 18:36:35 2007
	2	+++ src/main.cpp Wed Jan 31 16:36:40 2007
	3	@@ -9,7 +9,6 @@
	4	#ifdef _POSIX_C_SOURCE // shut up pyconfig.h complaints
	5	#undef _POSIX_C_SOURCE
	6	#endif
	7	-#include <Python.h>
	8
	9	#ifdef __unix__
	10	#else
	11	@@ -41,6 +40,7 @@
	12	#include "./res/loadworld.h"
	13	#include "./wor/pylevel.h"
	14
	15	+#include <Python.h>
	16
	17	TextureList TTemp;
	18	UTextureList TextureDelet;