Attachment #50059 for bug #76339

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




#

PORTNAME=	raine
PORTVERSION=	0.42.3
CATEGORIES=	emulators games
MASTER_SITES=	http://www.rainemu.com/html/archive/
DISTNAME=	${PORTNAME}s-${PORTVERSION}

ONLY_FOR_ARCHS=	i386

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 500000
BROKEN=		"pengo.c doesn't compile on 4.10 (see ports/69509)"
.endif

post-patch:
	${REINPLACE_CMD} -e "s, [$$]_mcpu,,g" ${WRKSRC}/detect-cpu

Lines 1-2 Link Here

(-)raine/distinfo (-2 / +2 lines)
1	MD5 (raines-0.40.5.tar.bz2) = d49cdd9186e5354290283e15866a2b32	1	MD5 (raines-0.42.3.tar.bz2) = a5adc3e4b8e92b28392bc77504707c9e
2	SIZE (raines-0.40.5.tar.bz2) = 1605975	2	SIZE (raines-0.42.3.tar.bz2) = 1683108

Line 0 Link Here

(-)raine/files/patch-source::alleg::blit.c (+11 lines)
	1	--- source/alleg/blit.c.orig Mon Jan 17 12:37:21 2005
	2	+++ source/alleg/blit.c Mon Jan 17 12:38:10 2005
	3	@@ -1,6 +1,8 @@
	4	#ifdef RAINE_WIN32
	5	#include <allegro.h>
	6	#include <winalleg.h>
	7	+#elif defined(RAINE_UNIX)
	8	+#include <sys/time.h>
	9	#endif
	10	#include "blit_x2.h"
	11	#include "eagle.h"




--- source/emumain.c.orig	Mon Jan 17 11:47:24 2005
+++ source/emumain.c	Mon Jan 17 11:49:36 2005
@@ -9,6 +9,10 @@
 #include <winalleg.h>
 #endif
 
+#ifdef RAINE_UNIX
+#include <sys/time.h>
+#endif
+
 #include "raine.h"              // General defines and stuff
 #include "gui.h"                // Interface stuff
 #include "sasound.h"            // Sound Sample stuff




--- source/games/cps1.c.orig	Mon Jan 17 10:56:50 2005
+++ source/games/cps1.c	Mon Jan 17 11:35:07 2005
@@ -1437,11 +1437,13 @@
 
 void load_cps2() {
   UINT16 *rom = (UINT16*)load_region[REGION_ROM1];
-  xor = (UINT16*)load_region[REGION_USER1];
+  UINT8 *tmp;
+  int i, size_code, size_user1;
 /*   int size = get_region_size(REGION_USER1)/2,i,size_code; */
-  int size_code = get_region_size(REGION_ROM1),i;
-  int size_user1 = get_region_size(REGION_USER1);
-  UINT8 *tmp = AllocateMem(size_user1);
+  xor = (UINT16*)load_region[REGION_USER1];
+  size_code = get_region_size(REGION_ROM1);
+  size_user1 = get_region_size(REGION_USER1);
+  tmp = AllocateMem(size_user1);
   if (!init_tilequeue()) return;
   init_pbitmap();
 




--- source/games/dkong.c.orig	Mon Jan 17 10:04:09 2005
+++ source/games/dkong.c	Mon Jan 17 10:33:14 2005
@@ -479,7 +479,7 @@
 
 static void draw_emudx() {
   UINT8 code, color;
-  SCROLL_REGS;
+  SCROLL_REGS
   UINT8 *map,*gfx;
   int offs;
   int curlev = 0;
@@ -517,8 +517,8 @@
     gfx = gfx_ram;
 
   if( check_layer_enabled(layer_id_data[0])) {
-    MAKE_SCROLL_n_16(512,512,1,0, 0);
-    START_SCROLL_16(BORDER,BORDER,512,512);
+    MAKE_SCROLL_n_16(512,512,1,0, 0)
+    START_SCROLL_16(BORDER,BORDER,512,512)
 
     int sy = y-16*2;
     if (sy < 0 || sy > 224*2+BORDER)
@@ -716,20 +716,21 @@
   /* As always for the color prom, great thanks go to mame for their decoding work */
   for (i=0; i<256; i++) {
     UINT8 bit0, bit1, bit2;
+    int r,g,b;
     /* red component */
     bit0 = (color_prom[256] >> 1) & 1;
     bit1 = (color_prom[256] >> 2) & 1;
     bit2 = (color_prom[256] >> 3) & 1;
-    int r = 7 - (bit0 | (bit1<<1) | (bit2 << 2));
+    r = 7 - (bit0 | (bit1<<1) | (bit2 << 2));
     /* green component */
     bit0 = (color_prom[0] >> 2) & 1;
     bit1 = (color_prom[0] >> 3) & 1;
     bit2 = (color_prom[256] >> 0) & 1;
-    int g = 7 - (bit0 | (bit1<<1) | (bit2 << 2));
+    g = 7 - (bit0 | (bit1<<1) | (bit2 << 2));
     /* blue component */
     bit0 = (color_prom[0] >> 0) & 1;
     bit1 = (color_prom[0] >> 1) & 1;
-    int b = 7 - ((bit0<<1) | (bit1 << 2));
+    b = 7 - ((bit0<<1) | (bit1 << 2));
     RAM_PAL[i] = (b) | (g<<3) | (r<<6);
     color_prom++;
   }
@@ -800,9 +801,9 @@
 
 static void draw_dkong() {
   UINT8 code, color;
-  SCROLL_REGS;
+  SCROLL_REGS
   UINT8 *map,*gfx;
-  int offs;
+  int offs,sy;
 
   if (*gfx_bank) {
     gfx = gfx_ram + 0x100;
@@ -813,7 +814,7 @@
     MAKE_SCROLL_n_8(256,256,1,0, 0);
     START_SCROLL_8(BORDER,BORDER,256,256);
 
-    int sy = y-16;
+    sy = y-16;
     if (sy < 0 || sy > 224+BORDER)
       continue;
     code = gfx[tile_index];




--- source/games/frogger.c.orig	Mon Jan 17 10:37:51 2005
+++ source/games/frogger.c	Mon Jan 17 10:40:26 2005
@@ -437,7 +437,7 @@
 
 static void draw_emudx() {
   UINT8 code,color;
-  SCROLL_REGS;
+  SCROLL_REGS
   UINT8 *map,*solid;
   int coul1, coul2;
 
@@ -794,7 +794,7 @@
      rotated you call it either col or row scroll ! */
 
   UINT8 code, color;
-  SCROLL_REGS;
+  SCROLL_REGS
   UINT8 *map,*solid;
   int coul1, coul2;
 
@@ -865,8 +865,8 @@
   }
 
   if( check_layer_enabled(layer_id_data[1])) {
-    solid = GFX_SOLID[1];
     int offs;
+    solid = GFX_SOLID[1];
     for (offs = 0x20 - 4;offs >= 0;offs -= 4) {
       UINT8 sx,sy,color;
       int flipx,flipy,code;




--- source/games/pengo.c.orig	Mon Jan 17 10:46:35 2005
+++ source/games/pengo.c	Mon Jan 17 10:47:35 2005
@@ -444,11 +444,11 @@
 }
 
 static void load_pengo() {
-  RAMSize = 0x1032+0x8000;
   UINT8 *color_prom = load_region[REGION_PROMS];
   UINT8 *decode1,*decode2,palette[32*2];
   UINT32 dest_size;
   int i;
+  RAMSize = 0x1032+0x8000;
 
   if(!(RAM=AllocateMem(RAMSize))) return;
 
@@ -1536,10 +1536,10 @@
 {
   // quite different from pengo for the init : no encoding, different memory map,
   // different palette...
-  RAMSize = 0x103a;
   UINT8 *color_prom = load_region[REGION_PROMS];
   UINT8 palette[32*2];
   int i;
+  RAMSize = 0x103a;
 
   if (!strcmp(current_game->main_name,"pacplus")) {
     for (i = 0; i < 0x4000; i++)




--- source/gui/rgui.c.orig	Mon Jan 17 12:07:21 2005
+++ source/gui/rgui.c	Mon Jan 17 12:23:46 2005
@@ -9,6 +9,10 @@
 #include <winalleg.h>
 #endif
 
+#ifdef RAINE_UNIX
+#include <sys/time.h>
+#endif
+
 #include "raine.h"
 #include "rgui.h"
 #include "rguiproc.h"
@@ -1507,6 +1511,10 @@
 void dialog_oxygen(void)
 {
 
+#ifdef RAINE_UNIX
+  struct timeval timeout;
+#endif
+
 #ifdef BUFFER_GUI
    static int z,z1,z2,z3;
    int ta;
@@ -1560,7 +1568,6 @@
   // its sleep function has a 1ms resolution instead of 1us. Too bad...
    Sleep(1000/60);
 #elif defined(RAINE_UNIX)
-  struct timeval timeout;
   timeout.tv_sec = 0;
   timeout.tv_usec = 1000000/60;
   select(0, NULL, NULL, NULL, &timeout);




bin/raine
%%DATADIR%%/cheats.cfg
%%DATADIR%%/hiscore.dat
%%DATADIR%%/languages/brasil.cfg
%%DATADIR%%/languages/czech.cfg
%%DATADIR%%/languages/catala.cfg
%%DATADIR%%/languages/dansk.cfg
%%DATADIR%%/languages/dutch.cfg
%%DATADIR%%/languages/english.cfg
%%DATADIR%%/languages/espanol.cfg
%%DATADIR%%/languages/euskera.cfg
%%DATADIR%%/languages/finnish.cfg
%%DATADIR%%/languages/french.cfg
%%DATADIR%%/languages/french2.cfg
%%DATADIR%%/languages/german.cfg
%%DATADIR%%/languages/german2.cfg
%%DATADIR%%/languages/italian.cfg
%%DATADIR%%/languages/japanese.cfg
%%DATADIR%%/languages/polish.cfg
%%DATADIR%%/languages/portugal.cfg
%%DATADIR%%/languages/spanish.cfg
%%DATADIR%%/languages/svenska.cfg
%%DATADIR%%/languages/template.cfg
%%DATADIR%%/languages/turkish.cfg
%%DATADIR%%/languages/galego.cfg
%%DATADIR%%/raine.dat
@exec mkdir -p %D/%%DATADIR%%/roms
@unexec rmdir %D/%%DATADIR%%/roms 2> /dev/null || true
@dirrm %%DATADIR%%/languages
@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true

Return to bug 76339

Lines 6-12 Link Here

(-)raine/Makefile (-5 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= raine	8	PORTNAME= raine
9	PORTVERSION= 0.40.5	9	PORTVERSION= 0.42.3
10	CATEGORIES= emulators games	10	CATEGORIES= emulators games
11	MASTER_SITES= http://www.rainemu.com/html/archive/	11	MASTER_SITES= http://www.rainemu.com/html/archive/
12	DISTNAME= ${PORTNAME}s-${PORTVERSION}	12	DISTNAME= ${PORTNAME}s-${PORTVERSION}
Lines 29-38 Link Here
29	ONLY_FOR_ARCHS= i386	29	ONLY_FOR_ARCHS= i386
30		30
31	.include <bsd.port.pre.mk>	31	.include <bsd.port.pre.mk>
32
33	.if ${OSVERSION} < 500000
34	BROKEN= "pengo.c doesn't compile on 4.10 (see ports/69509)"
35	.endif
36		32
37	post-patch:	33	post-patch:
38	${REINPLACE_CMD} -e "s, [$$]_mcpu,,g" ${WRKSRC}/detect-cpu	34	${REINPLACE_CMD} -e "s, [$$]_mcpu,,g" ${WRKSRC}/detect-cpu

Line 0 Link Here

(-)raine/files/patch-source::emumain.c (+13 lines)
	1	--- source/emumain.c.orig Mon Jan 17 11:47:24 2005
	2	+++ source/emumain.c Mon Jan 17 11:49:36 2005
	3	@@ -9,6 +9,10 @@
	4	#include <winalleg.h>
	5	#endif
	6
	7	+#ifdef RAINE_UNIX
	8	+#include <sys/time.h>
	9	+#endif
	10	+
	11	#include "raine.h" // General defines and stuff
	12	#include "gui.h" // Interface stuff
	13	#include "sasound.h" // Sound Sample stuff

Line 0 Link Here

(-)raine/files/patch-source::games::cps1.c (+20 lines)
	1	--- source/games/cps1.c.orig Mon Jan 17 10:56:50 2005
	2	+++ source/games/cps1.c Mon Jan 17 11:35:07 2005
	3	@@ -1437,11 +1437,13 @@
	4
	5	void load_cps2() {
	6	UINT16 rom = (UINT16)load_region[REGION_ROM1];
	7	- xor = (UINT16*)load_region[REGION_USER1];
	8	+ UINT8 *tmp;
	9	+ int i, size_code, size_user1;
	10	/* int size = get_region_size(REGION_USER1)/2,i,size_code; */
	11	- int size_code = get_region_size(REGION_ROM1),i;
	12	- int size_user1 = get_region_size(REGION_USER1);
	13	- UINT8 *tmp = AllocateMem(size_user1);
	14	+ xor = (UINT16*)load_region[REGION_USER1];
	15	+ size_code = get_region_size(REGION_ROM1);
	16	+ size_user1 = get_region_size(REGION_USER1);
	17	+ tmp = AllocateMem(size_user1);
	18	if (!init_tilequeue()) return;
	19	init_pbitmap();
	20

Line 0 Link Here

(-)raine/files/patch-source::games::dkong.c (+68 lines)
		1	--- source/games/dkong.c.orig Mon Jan 17 10:04:09 2005
		2	+++ source/games/dkong.c Mon Jan 17 10:33:14 2005
		3	@@ -479,7 +479,7 @@
		4
		5	static void draw_emudx() {
		6	UINT8 code, color;
		7	- SCROLL_REGS;
		8	+ SCROLL_REGS
		9	UINT8 map,gfx;
		10	int offs;
		11	int curlev = 0;
		12	@@ -517,8 +517,8 @@
		13	gfx = gfx_ram;
		14
		15	if( check_layer_enabled(layer_id_data[0])) {
		16	- MAKE_SCROLL_n_16(512,512,1,0, 0);
		17	- START_SCROLL_16(BORDER,BORDER,512,512);
		18	+ MAKE_SCROLL_n_16(512,512,1,0, 0)
		19	+ START_SCROLL_16(BORDER,BORDER,512,512)
		20
		21	int sy = y-16*2;
		22	if (sy < 0 \|\| sy > 224*2+BORDER)
		23	@@ -716,20 +716,21 @@
		24	/* As always for the color prom, great thanks go to mame for their decoding work */
		25	for (i=0; i<256; i++) {
		26	UINT8 bit0, bit1, bit2;
		27	+ int r,g,b;
		28	/* red component */
		29	bit0 = (color_prom[256] >> 1) & 1;
		30	bit1 = (color_prom[256] >> 2) & 1;
		31	bit2 = (color_prom[256] >> 3) & 1;
		32	- int r = 7 - (bit0 \| (bit1<<1) \| (bit2 << 2));
		33	+ r = 7 - (bit0 \| (bit1<<1) \| (bit2 << 2));
		34	/* green component */
		35	bit0 = (color_prom[0] >> 2) & 1;
		36	bit1 = (color_prom[0] >> 3) & 1;
		37	bit2 = (color_prom[256] >> 0) & 1;
		38	- int g = 7 - (bit0 \| (bit1<<1) \| (bit2 << 2));
		39	+ g = 7 - (bit0 \| (bit1<<1) \| (bit2 << 2));
		40	/* blue component */
		41	bit0 = (color_prom[0] >> 0) & 1;
		42	bit1 = (color_prom[0] >> 1) & 1;
		43	- int b = 7 - ((bit0<<1) \| (bit1 << 2));
		44	+ b = 7 - ((bit0<<1) \| (bit1 << 2));
		45	RAM_PAL[i] = (b) \| (g<<3) \| (r<<6);
		46	color_prom++;
		47	}
		48	@@ -800,9 +801,9 @@
		49
		50	static void draw_dkong() {
		51	UINT8 code, color;
		52	- SCROLL_REGS;
		53	+ SCROLL_REGS
		54	UINT8 map,gfx;
		55	- int offs;
		56	+ int offs,sy;
		57
		58	if (*gfx_bank) {
		59	gfx = gfx_ram + 0x100;
		60	@@ -813,7 +814,7 @@
		61	MAKE_SCROLL_n_8(256,256,1,0, 0);
		62	START_SCROLL_8(BORDER,BORDER,256,256);
		63
		64	- int sy = y-16;
65	+ sy = y-16;
66	if (sy < 0 \|\| sy > 224+BORDER)
67	continue;
68	code = gfx[tile_index];

Line 0 Link Here

(-)raine/files/patch-source::games::frogger.c (+30 lines)
	1	--- source/games/frogger.c.orig Mon Jan 17 10:37:51 2005
	2	+++ source/games/frogger.c Mon Jan 17 10:40:26 2005
	3	@@ -437,7 +437,7 @@
	4
	5	static void draw_emudx() {
	6	UINT8 code,color;
	7	- SCROLL_REGS;
	8	+ SCROLL_REGS
	9	UINT8 map,solid;
	10	int coul1, coul2;
	11
	12	@@ -794,7 +794,7 @@
	13	rotated you call it either col or row scroll ! */
	14
	15	UINT8 code, color;
	16	- SCROLL_REGS;
	17	+ SCROLL_REGS
	18	UINT8 map,solid;
	19	int coul1, coul2;
	20
	21	@@ -865,8 +865,8 @@
	22	}
	23
	24	if( check_layer_enabled(layer_id_data[1])) {
	25	- solid = GFX_SOLID[1];
	26	int offs;
	27	+ solid = GFX_SOLID[1];
	28	for (offs = 0x20 - 4;offs >= 0;offs -= 4) {
	29	UINT8 sx,sy,color;
	30	int flipx,flipy,code;

Line 0 Link Here

(-)raine/files/patch-source::games::pengo.c (+27 lines)
	1	--- source/games/pengo.c.orig Mon Jan 17 10:46:35 2005
	2	+++ source/games/pengo.c Mon Jan 17 10:47:35 2005
	3	@@ -444,11 +444,11 @@
	4	}
	5
	6	static void load_pengo() {
	7	- RAMSize = 0x1032+0x8000;
	8	UINT8 *color_prom = load_region[REGION_PROMS];
	9	UINT8 decode1,decode2,palette[32*2];
	10	UINT32 dest_size;
	11	int i;
	12	+ RAMSize = 0x1032+0x8000;
	13
	14	if(!(RAM=AllocateMem(RAMSize))) return;
	15
	16	@@ -1536,10 +1536,10 @@
	17	{
	18	// quite different from pengo for the init : no encoding, different memory map,
	19	// different palette...
	20	- RAMSize = 0x103a;
	21	UINT8 *color_prom = load_region[REGION_PROMS];
	22	UINT8 palette[32*2];
	23	int i;
	24	+ RAMSize = 0x103a;
	25
	26	if (!strcmp(current_game->main_name,"pacplus")) {
	27	for (i = 0; i < 0x4000; i++)

Line 0 Link Here

(-)raine/files/patch-source::gui::rgui.c (+32 lines)
	1	--- source/gui/rgui.c.orig Mon Jan 17 12:07:21 2005
	2	+++ source/gui/rgui.c Mon Jan 17 12:23:46 2005
	3	@@ -9,6 +9,10 @@
	4	#include <winalleg.h>
	5	#endif
	6
	7	+#ifdef RAINE_UNIX
	8	+#include <sys/time.h>
	9	+#endif
	10	+
	11	#include "raine.h"
	12	#include "rgui.h"
	13	#include "rguiproc.h"
	14	@@ -1507,6 +1511,10 @@
	15	void dialog_oxygen(void)
	16	{
	17
	18	+#ifdef RAINE_UNIX
	19	+ struct timeval timeout;
	20	+#endif
	21	+
	22	#ifdef BUFFER_GUI
	23	static int z,z1,z2,z3;
	24	int ta;
	25	@@ -1560,7 +1568,6 @@
	26	// its sleep function has a 1ms resolution instead of 1us. Too bad...
	27	Sleep(1000/60);
	28	#elif defined(RAINE_UNIX)
	29	- struct timeval timeout;
	30	timeout.tv_sec = 0;
	31	timeout.tv_usec = 1000000/60;
	32	select(0, NULL, NULL, NULL, &timeout);

Lines 1-29 Link Here

(-)raine/pkg-plist (-23 / +24 lines)
1	bin/raine	1	bin/raine
2	%%DATADIR%%/cheats.cfg	2	%%DATADIR%%/cheats.cfg
3	%%DATADIR%%/hiscore.dat	3	%%DATADIR%%/hiscore.dat
4	%%DATADIR%%/languages/Brasil.cfg	4	%%DATADIR%%/languages/brasil.cfg
5	%%DATADIR%%/languages/CZECH.CFG	5	%%DATADIR%%/languages/czech.cfg
6	%%DATADIR%%/languages/Catala.cfg	6	%%DATADIR%%/languages/catala.cfg
7	%%DATADIR%%/languages/Dansk.cfg	7	%%DATADIR%%/languages/dansk.cfg
8	%%DATADIR%%/languages/Dutch.cfg	8	%%DATADIR%%/languages/dutch.cfg
9	%%DATADIR%%/languages/English.cfg	9	%%DATADIR%%/languages/english.cfg
10	%%DATADIR%%/languages/Español.cfg	10	%%DATADIR%%/languages/espanol.cfg
11	%%DATADIR%%/languages/Euskera.cfg	11	%%DATADIR%%/languages/euskera.cfg
12	%%DATADIR%%/languages/Finnish.cfg	12	%%DATADIR%%/languages/finnish.cfg
13	%%DATADIR%%/languages/French.cfg	13	%%DATADIR%%/languages/french.cfg
14	%%DATADIR%%/languages/French2.cfg	14	%%DATADIR%%/languages/french2.cfg
15	%%DATADIR%%/languages/German.cfg	15	%%DATADIR%%/languages/german.cfg
16	%%DATADIR%%/languages/German2.cfg	16	%%DATADIR%%/languages/german2.cfg
17	%%DATADIR%%/languages/Italian.cfg	17	%%DATADIR%%/languages/italian.cfg
18	%%DATADIR%%/languages/Japanese.cfg	18	%%DATADIR%%/languages/japanese.cfg
19	%%DATADIR%%/languages/POLISH.CFG	19	%%DATADIR%%/languages/polish.cfg
20	%%DATADIR%%/languages/Portugal.cfg	20	%%DATADIR%%/languages/portugal.cfg
21	%%DATADIR%%/languages/Spanish.cfg	21	%%DATADIR%%/languages/spanish.cfg
22	%%DATADIR%%/languages/Svenska.cfg	22	%%DATADIR%%/languages/svenska.cfg
23	%%DATADIR%%/languages/Template.cfg	23	%%DATADIR%%/languages/template.cfg
24	%%DATADIR%%/languages/Turkish.cfg	24	%%DATADIR%%/languages/turkish.cfg
25	%%DATADIR%%/languages/galego.cfg	25	%%DATADIR%%/languages/galego.cfg
26	%%DATADIR%%/raine.dat	26	%%DATADIR%%/raine.dat
27	@dirrm %%DATADIR%%/roms	27	@exec mkdir -p %D/%%DATADIR%%/roms
		28	@unexec rmdir %D/%%DATADIR%%/roms 2> /dev/null \|\| true
28	@dirrm %%DATADIR%%/languages	29	@dirrm %%DATADIR%%/languages
29	@dirrm %%DATADIR%%	30	@unexec rmdir %D/%%DATADIR%% 2> /dev/null \|\| true