Attachment 129535 Details for Bug 173535 – file.diff

[patch] file.diff

file.diff (text/plain), 4.51 KB, created by fiziologus on 2012-11-10 19:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fiziologus

Created: 2012-11-10 19:20:01 UTC

Size: 4.51 KB

patch

obsolete

>diff -ruN frogatto.orig/Makefile frogatto/Makefile
>--- frogatto.orig/Makefile	2012-06-01 09:18:44.000000000 +0400
>+++ frogatto/Makefile	2012-11-10 21:11:39.000000000 +0400
>@@ -6,20 +6,24 @@
> #
> 
> PORTNAME=	frogatto
>-PORTVERSION=	1.1.1
>-PORTREVISION=	3
>+PORTVERSION=	1.2
> CATEGORIES=	games
>-MASTER_SITES=	http://www.frogatto.com/files/
>+MASTER_SITES=	GH
> 
> MAINTAINER=	fiziologus@gmail.com
> COMMENT=	An old-school 2D classic adventure platformer game
> 
> NO_PACKAGE=	Package will be 144M, set FORCE_PACKAGE if you really want it
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	frogatto
>+GH_PROGECT=	frogatto
>+GH_TAGNAME=	${PORTVERSION}
>+GH_COMMIT=	64c84bf
>+
> LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
> 		png15:${PORTSDIR}/graphics/png
> 
>-USE_BZIP2=	yes
> USE_GMAKE=	yes
> ALL_TARGET=	game server
> USE_GL=		glew
>@@ -35,7 +39,7 @@
> 		-e 's,= (ccache )?g\+\+,:= $$(CXX) $$(CXXFLAGS),' \
> 		-e 's, -O2,, ; s, -g,, ; s, -L/usr/lib,, ; s, -L/sw/lib,,' \
> 		-e '/server/s,`.*mixer,-L${LOCALBASE}/lib ${PTHREAD_LIBS},' \
>-		-e 's,-mt,,g' ${WRKSRC}/Makefile
>+		-e 's,-mt,,g' -e 's,-lpng,-lpng15,g' ${WRKSRC}/Makefile
> # Point to the right location where to look for resources on FreeBSD
> 	@${REINPLACE_CMD} -e 's,HAVE_CONFIG_H,__FreeBSD__,' \
> 		-e 's,DATADIR,"${DATADIR}",' ${WRKSRC}/src/filesystem.cpp
>diff -ruN frogatto.orig/distinfo frogatto/distinfo
>--- frogatto.orig/distinfo	2011-11-07 18:33:45.000000000 +0400
>+++ frogatto/distinfo	2012-11-10 20:33:43.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (frogatto-1.1.1.tar.bz2) = d2404d8d83d5d5e2b42b25f632113d5fbfc22d2ef72c4a44ec7833257e550670
>-SIZE (frogatto-1.1.1.tar.bz2) = 151088361
>+SHA256 (frogatto-1.2.tar.gz) = b735bda8d409612eecc79e84d218b3bd460470f8bccca3472d08c893d91d1232
>+SIZE (frogatto-1.2.tar.gz) = 261545835
>diff -ruN frogatto.orig/files/patch-data-objects-enemies-milgramen-milgram_pod_launcher.cfg frogatto/files/patch-data-objects-enemies-milgramen-milgram_pod_launcher.cfg
>--- frogatto.orig/files/patch-data-objects-enemies-milgramen-milgram_pod_launcher.cfg	1970-01-01 03:00:00.000000000 +0300
>+++ frogatto/files/patch-data-objects-enemies-milgramen-milgram_pod_launcher.cfg	2012-11-10 21:55:35.000000000 +0400
>@@ -0,0 +1,11 @@
>+--- data/objects/enemies/milgramen/milgram_pod_launcher.cfg.orig	2012-11-10 21:52:46.000000000 +0400
>++++ data/objects/enemies/milgramen/milgram_pod_launcher.cfg	2012-11-10 21:54:05.000000000 +0400
>+@@ -74,7 +74,7 @@
>+ 	
>+ 	on_die="spawn('explosion_big_recurring',  midpoint_x, midpoint_y, facing)"
>+ 	
>+-	solid_area=10,20,38,50
>++	solid_area=14,20,34,50
>+ 
>+ 		[base:animation]
>+ 		image=enemies/milgram-pod-launcher.png
>diff -ruN frogatto.orig/files/patch-src-IMG_savepng.cpp frogatto/files/patch-src-IMG_savepng.cpp
>--- frogatto.orig/files/patch-src-IMG_savepng.cpp	2012-06-01 09:18:44.000000000 +0400
>+++ frogatto/files/patch-src-IMG_savepng.cpp	1970-01-01 03:00:00.000000000 +0300
>@@ -1,10 +0,0 @@
>---- src/IMG_savepng.cpp.orig	2011-04-08 16:11:45.000000000 +0200
>-+++ src/IMG_savepng.cpp	2012-05-25 18:51:10.000000000 +0200
>-@@ -27,6 +27,7 @@
>- 
>- #ifdef IMPLEMENT_SAVE_PNG
>- #include <png.h>
>-+#include <zlib.h>
>- #endif
>- 
>- #include <stdlib.h>
>diff -ruN frogatto.orig/files/patch-src-custom_object.cpp frogatto/files/patch-src-custom_object.cpp
>--- frogatto.orig/files/patch-src-custom_object.cpp	1970-01-01 03:00:00.000000000 +0300
>+++ frogatto/files/patch-src-custom_object.cpp	2012-11-10 21:40:37.000000000 +0400
>@@ -0,0 +1,11 @@
>+--- src/custom_object.cpp.orig	2011-11-30 09:31:31.000000000 +0400
>++++ src/custom_object.cpp	2012-11-10 21:39:11.000000000 +0400
>+@@ -1394,7 +1394,7 @@
>+ 	set_driver_position();
>+ 
>+ 	if(blur_) {
>+-		blur_->next_frame(start_x, start_y, x(), y(), frame_, time_in_frame_, face_right(), upside_down(), rotate_.value());
>++		blur_->next_frame(start_x, start_y, x(), y(), frame_, time_in_frame_, face_right(), upside_down(), rotate_.as_float());
>+ 		if(blur_->destroyed()) {
>+ 			blur_.reset();
>+ 		}
>diff -ruN frogatto.orig/files/patch-src-server.cpp frogatto/files/patch-src-server.cpp
>--- frogatto.orig/files/patch-src-server.cpp	2012-05-16 20:09:14.000000000 +0400
>+++ frogatto/files/patch-src-server.cpp	1970-01-01 03:00:00.000000000 +0300
>@@ -1,11 +0,0 @@
>---- src/server.cpp.orig	2012-03-12 10:21:03.000000000 +0300
>-+++ src/server.cpp	2012-03-12 10:21:15.000000000 +0300
>-@@ -37,7 +37,7 @@
>- private:
>- 	void start_accept()
>- 	{
>--		socket_ptr socket(new tcp::socket(acceptor_.io_service()));
>-+		socket_ptr socket(new tcp::socket(acceptor_.get_io_service()));
>- 		acceptor_.async_accept(*socket, boost::bind(&server::handle_accept, this, socket, boost::asio::placeholders::error));
>- 	}
>-

Actions: View | Diff

Attachments on bug 173535: 129535 | 129536