Attachment 75163 Details for Bug 108613 – diameter.diff

[patch] diameter.diff

diameter.diff (text/plain), 7.50 KB, created by Dmitry Marakasov on 2007-01-31 18:20:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2007-01-31 18:20:17 UTC

Size: 7.50 KB

patch

obsolete

>diff -ruN diameter.orig/Makefile diameter/Makefile
>--- diameter.orig/Makefile	Wed Jan 31 16:31:25 2007
>+++ diameter/Makefile	Wed Jan 31 21:08:57 2007
>@@ -6,18 +6,17 @@
> #
> 
> PORTNAME=	diameter
>-DISTVERSION=	0.3.5-r1
>-PORTREVISION=	1
>+PORTVERSION=	0.4.0.1
> CATEGORIES=	games
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	gamediameter
>-DISTNAME=	${PORTNAME}-${DISTVERSION}src
>+DISTNAME=	${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	amdmi3@amdmi3.ru
> COMMENT=	Arcade-style game with elements of economy and adventure
> 
>-BUILD_DEPENDS=	guichan>=0.5.0:${PORTSDIR}/devel/guichan
>-RUN_DEPENDS=	guichan>=0.5.0:${PORTSDIR}/devel/guichan
>+BUILD_DEPENDS=	guichan>=0.6.1:${PORTSDIR}/devel/guichan
>+RUN_DEPENDS=	guichan>=0.6.1:${PORTSDIR}/devel/guichan
> 
> USE_BZIP2=	yes
> GNU_CONFIGURE=	yes
>@@ -25,6 +24,9 @@
> 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"
>diff -ruN diameter.orig/distinfo diameter/distinfo
>--- diameter.orig/distinfo	Wed Jan 31 16:31:25 2007
>+++ diameter/distinfo	Wed Jan 31 16:34:15 2007
>@@ -1,3 +1,3 @@
>-MD5 (diameter-0.3.5-r1src.tar.bz2) = da29296f99dc7bb9d0350b469bb8830c
>-SHA256 (diameter-0.3.5-r1src.tar.bz2) = 0db31e344de11fa245eb7b9882918535db3e87f0c8cc6229765f8dafb45ae4d3
>-SIZE (diameter-0.3.5-r1src.tar.bz2) = 4775031
>+MD5 (diameter-0.4.0.1.tar.bz2) = 9a6c397c99188d0dc214b4455c2bf032
>+SHA256 (diameter-0.4.0.1.tar.bz2) = c62687bbd469cec4ef99f73bf4682b645119943dbd4f55143f60cc7427afe68f
>+SIZE (diameter-0.4.0.1.tar.bz2) = 4760022
>diff -ruN diameter.orig/files/patch-configure diameter/files/patch-configure
>--- diameter.orig/files/patch-configure	Wed Jan 31 16:31:25 2007
>+++ diameter/files/patch-configure	Thu Jan  1 03:00:00 1970
>@@ -1,19 +0,0 @@
>---- 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=
>- 
>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	Wed Jan 31 16:31:25 2007
>+++ diameter/files/patch-src-gra-2d-gui.cpp	Thu Jan  1 03:00:00 1970
>@@ -1,25 +0,0 @@
>---- 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	Wed Jan 31 16:31:25 2007
>+++ diameter/files/patch-src-gra-2d-gui.h	Thu Jan  1 03:00:00 1970
>@@ -1,19 +0,0 @@
>---- 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;
>- 
>- /*
>diff -ruN diameter.orig/files/patch-src-main.cpp diameter/files/patch-src-main.cpp
>--- diameter.orig/files/patch-src-main.cpp	Thu Jan  1 03:00:00 1970
>+++ diameter/files/patch-src-main.cpp	Wed Jan 31 16:36:56 2007
>@@ -0,0 +1,18 @@
>+--- 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;
>diff -ruN diameter.orig/pkg-plist diameter/pkg-plist
>--- diameter.orig/pkg-plist	Wed Jan 31 16:31:25 2007
>+++ diameter/pkg-plist	Wed Jan 31 16:42:15 2007
>@@ -13,6 +13,16 @@
> %%DATADIR%%/music/sample/explode_06.wav
> %%DATADIR%%/music/sample/explode_07.wav
> %%DATADIR%%/music/sample/s1.wav
>+%%DATADIR%%/pyscripts/arena.py
>+%%DATADIR%%/pyscripts/test_mission1.py
>+%%DATADIR%%/pyscripts/test_mission1d1_next.py
>+%%DATADIR%%/pyscripts/test_mission1d1_ok.py
>+%%DATADIR%%/pyscripts/test_mission1d2_ok.py
>+%%DATADIR%%/pyscripts/test_mission1d4_ok.py
>+%%DATADIR%%/pyscripts/test_mission1state1.py
>+%%DATADIR%%/pyscripts/test_mission1state2.py
>+%%DATADIR%%/pyscripts/test_mission1state3.py
>+%%DATADIR%%/pyscripts/test_mission1state4.py
> %%DATADIR%%/sprites/sprites.xml
> %%DATADIR%%/texture/Argon.jpg
> %%DATADIR%%/texture/Brat.jpg
>@@ -56,6 +66,15 @@
> %%DATADIR%%/texture/gui/eng/main/start-.png
> %%DATADIR%%/texture/gui/eng/main/start.png
> %%DATADIR%%/texture/gui/logo.png
>+%%DATADIR%%/texture/gui/other/back.png
>+%%DATADIR%%/texture/gui/other/back_b.png
>+%%DATADIR%%/texture/gui/other/button_ok.png
>+%%DATADIR%%/texture/gui/other/button_ok_b.png
>+%%DATADIR%%/texture/gui/other/forward.png
>+%%DATADIR%%/texture/gui/other/forward_b.png
>+%%DATADIR%%/texture/gui/other/lucas.png
>+%%DATADIR%%/texture/gui/other/magnaguard.png
>+%%DATADIR%%/texture/gui/other/noface.png
> %%DATADIR%%/texture/gui/rus/main/credits-.png
> %%DATADIR%%/texture/gui/rus/main/credits.png
> %%DATADIR%%/texture/gui/rus/main/logo-.png
>@@ -85,8 +104,8 @@
> %%DATADIR%%/texture/spaceshiptexture.jpg
> %%DATADIR%%/texture/test.png
> %%DATADIR%%/texture/textures.xml
>-%%DATADIR%%/world/test_decor1.xml
>-%%DATADIR%%/world/test_level.xml
>+%%DATADIR%%/world/arena.xml
>+%%DATADIR%%/world/test_mission1.xml
> @dirrm %%DATADIR%%/world
> @dirrm %%DATADIR%%/texture/ship4
> @dirrm %%DATADIR%%/texture/ship3
>@@ -94,6 +113,7 @@
> @dirrm %%DATADIR%%/texture/ship1
> @dirrm %%DATADIR%%/texture/gui/rus/main
> @dirrm %%DATADIR%%/texture/gui/rus
>+@dirrm %%DATADIR%%/texture/gui/other
> @dirrm %%DATADIR%%/texture/gui/eng/main
> @dirrm %%DATADIR%%/texture/gui/eng
> @dirrm %%DATADIR%%/texture/gui/curs/weapons
>@@ -102,6 +122,7 @@
> @dirrm %%DATADIR%%/texture/Rockets
> @dirrm %%DATADIR%%/texture
> @dirrm %%DATADIR%%/sprites
>+@dirrm %%DATADIR%%/pyscripts
> @dirrm %%DATADIR%%/music/sample
> @dirrm %%DATADIR%%/music
> @dirrm %%DATADIR%%/models/Ships/ship4

Actions: View | Diff

Attachments on bug 108613: 75163