Attachment #60822 for bug #91228

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

Lines 19-26 Link Here

(-)devel/gauche-sdl/Makefile (-2 / +2 lines)
19	RUN_DEPENDS= gosh:${PORTSDIR}/lang/gauche \	19	RUN_DEPENDS= gosh:${PORTSDIR}/lang/gauche \
20	${X11BASE}/lib/X11/rgb.txt:${X_CLIENTS_PORT}	20	${X11BASE}/lib/X11/rgb.txt:${X_CLIENTS_PORT}
21		21
22	BROKEN= Does not compile
23
24	PLIST_SUB= GAUCHE_VERSION="`gauche-config -V`"\	22	PLIST_SUB= GAUCHE_VERSION="`gauche-config -V`"\
25	TARGET="${CONFIGURE_TARGET}"	23	TARGET="${CONFIGURE_TARGET}"
26	WRKSRC= ${WRKDIR}/${PORTFAKENAME}	24	WRKSRC= ${WRKDIR}/${PORTFAKENAME}
Lines 40-44 Link Here
40	-e "s\|SDL/SDL\|SDL\|g"\	38	-e "s\|SDL/SDL\|SDL\|g"\
41	-e "s\|%%SDL_CFLAGS%%\|`${SDL_CONFIG} --cflags`\|"\	39	-e "s\|%%SDL_CFLAGS%%\|`${SDL_CONFIG} --cflags`\|"\
42	${WRKSRC}/configure	40	${WRKSRC}/configure
		41	${REINPLACE_CMD} -e "s\|^CFLAGS.*\|& `${SDL_CONFIG} --cflags`\|" \
		42	${WRKSRC}/src/gfx/Makefile.in
43		43
44	.include <bsd.port.mk>	44	.include <bsd.port.mk>




--- configure.orig	Tue Jan 21 23:22:40 2003
+++ configure	Mon Jan  2 04:06:03 2006
@@ -737,7 +737,7 @@
 fi
 echo "$ac_t""$CPP" 1>&6
 
-for ac_hdr in SDL/SDL.h
+for ac_hdr in SDL.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -777,8 +777,10 @@
 fi
 done
 
+MYLAMEOLDCPPFLAGS="${CPPFLAGS}"
+CPPFLAGS="${CPPFLAGS} -I/usr/local/include/SDL11 -I/usr/local/include -D_REENTRANT"
 
-for ac_hdr in SDL/SDL_framerate.h
+for ac_hdr in SDL_framerate.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -812,7 +814,7 @@
   cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
- HAVE_SDL_GFX=1
+# HAVE_SDL_GFX=1
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -820,7 +822,7 @@
 
 
 
-for ac_hdr in SDL/SDL_image.h
+for ac_hdr in SDL_image.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -862,7 +864,7 @@
 
 
 
-for ac_hdr in SDL/SDL_mixer.h
+for ac_hdr in SDL_mixer.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -904,7 +906,7 @@
 
 
 
-for ac_hdr in SDL/SDL_ttf.h
+for ac_hdr in SDL_ttf.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -944,7 +946,7 @@
 fi
 done




--- src/image/sdl-image-lib.stub.orig	Mon Jan  2 04:11:06 2006
+++ src/image/sdl-image-lib.stub	Mon Jan  2 04:11:38 2006
@@ -61,7 +61,7 @@
 (define-cproc img-load (file::<string>)
   "ScmSdlSurface *s = SCM_NEW(ScmSdlSurface);
    SCM_SET_CLASS(s, SCM_CLASS_SDL_SURFACE);
-   s->surface = IMG_Load((const char *)(SCM_STRING(file)->start));
+   s->surface = IMG_Load((const char *)(SCM_STRING_START(file)));
 
    if (s->surface == NULL) SCM_RETURN(SCM_UNDEFINED);
 
@@ -82,7 +82,7 @@
   "ScmSdlSurface *s = SCM_NEW(ScmSdlSurface);
    SCM_SET_CLASS(s, SCM_CLASS_SDL_SURFACE);
    s->surface = IMG_LoadTyped_RW(src, 0,
-                                 (char *)(SCM_STRING(type)->start));
+                                 (char *)(SCM_STRING_START(type)));
 
    if (s->surface == NULL) SCM_RETURN(SCM_UNDEFINED);
 




--- src/sdl-lib.stub.orig	Mon Feb 24 21:20:18 2003
+++ src/sdl-lib.stub	Sat Dec 31 13:22:35 2005
@@ -868,7 +868,7 @@
 (define-cproc sdl-load-bmp (file::<string>)
   "ScmSdlSurface *s = SCM_NEW(ScmSdlSurface);
    SCM_SET_CLASS(s, SCM_CLASS_SDL_SURFACE);
-   s->surface = SDL_LoadBMP((const char *)(SCM_STRING(file)->start));
+   s->surface = SDL_LoadBMP((const char *)(SCM_STRING_START(file)));
 
    if (s->surface == NULL) SCM_RETURN(SCM_UNDEFINED);
 
@@ -876,7 +876,7 @@
    SCM_RETURN(SCM_OBJ(s));")
 
 (define-cproc sdl-save-bmp (surface::<sdl-surface> file::<string>)
-  "int result = SDL_SaveBMP(surface, (const char *)(SCM_STRING(file)->start));
+  "int result = SDL_SaveBMP(surface, (const char *)(SCM_STRING_START(file)));
    SCM_RETURN(SCM_MAKE_INT(result));")
 
 (define-cproc sdl-set-color-key (surface::<sdl-surface> flag::<uint> key::<uint>)
@@ -950,7 +950,7 @@
   (return <int> "SDL_ShowCursor"))
 
 (define-cproc sdl-gl-load-library (path::<string>)
-  "int result = SDL_GL_LoadLibrary((const char *)(SCM_STRING(path)->start));
+  "int result = SDL_GL_LoadLibrary((const char *)(SCM_STRING_START(path)));
    SCM_RETURN(SCM_MAKE_INT(result));")
 
 ;; MISSING:
@@ -1055,8 +1055,8 @@
 ;;
 
 (define-cproc sdl-wm-set-caption (title::<string> icon::<string>)
-  "SDL_WM_SetCaption((const char *)(SCM_STRING(title)->start),
-                     (const char *)(SCM_STRING(icon)->start));
+  "SDL_WM_SetCaption((const char *)(SCM_STRING_START(title)),
+                     (const char *)(SCM_STRING_START(icon)));
    SCM_RETURN(SCM_UNDEFINED);")
 
 (define-cproc sdl-wm-get-caption ()
@@ -1269,7 +1269,7 @@
    SCM_SET_CLASS(w, SCM_CLASS_SDL_WAV);
    spec = &(SCM_SDL_WAV_SPEC(w));
 
-   spec = SDL_LoadWAV((const char *)(SCM_STRING(file)->start), spec, &buffer,
+   spec = SDL_LoadWAV((const char *)(SCM_STRING_START(file)), spec, &buffer,
                       &len);
 
    SCM_SDL_WAV_BUFFER(w) = Scm_MakeU8VectorFromArrayShared(len, buffer);
@@ -1384,8 +1384,8 @@
 (define-cproc sdl-rw-from-file (file::<string> mode::<string>)
   "ScmSdlRWops *rw = SCM_NEW(ScmSdlRWops);
    SCM_SET_CLASS(rw, SCM_CLASS_SDL_RWOPS);
-   rw->rwops = SDL_RWFromFile((const char *)(SCM_STRING(file)->start),
-                              (const char *)(SCM_STRING(mode)->start));
+   rw->rwops = SDL_RWFromFile((const char *)(SCM_STRING_START(file)),
+                              (const char *)(SCM_STRING_START(mode)));
 
    if (rw->rwops == NULL) SCM_RETURN(SCM_UNDEFINED);
 

Return to bug 91228

Lines 1-14 Link Here

(-)devel/gauche-sdl/files/patch-configure (-5 / +53 lines)
1	--- configure.orig Sun Feb 15 16:47:50 2004	1	--- configure.orig Tue Jan 21 23:22:40 2003
2	+++ configure Sun Feb 15 16:49:38 2004	2	+++ configure Mon Jan 2 04:06:03 2006
3	@@ -777,6 +777,8 @@	3	@@ -737,7 +737,7 @@
		4	fi
		5	echo "$ac_t""$CPP" 1>&6
		6
		7	-for ac_hdr in SDL/SDL.h
		8	+for ac_hdr in SDL.h
		9	do
		10	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
		11	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
		12	@@ -777,8 +777,10 @@
4	fi	13	fi
5	done	14	done
6		15
7	+MYLAMEOLDCPPFLAGS="${CPPFLAGS}"	16	+MYLAMEOLDCPPFLAGS="${CPPFLAGS}"
8	+CPPFLAGS="${CPPFLAGS} %%SDL_CFLAGS%%"	17	+CPPFLAGS="${CPPFLAGS} -I/usr/local/include/SDL11 -I/usr/local/include -D_REENTRANT"
		18
		19	-for ac_hdr in SDL/SDL_framerate.h
		20	+for ac_hdr in SDL_framerate.h
		21	do
		22	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
		23	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
		24	@@ -812,7 +814,7 @@
		25	cat >> confdefs.h <<EOF
		26	#define $ac_tr_hdr 1
		27	EOF
		28	- HAVE_SDL_GFX=1
		29	+# HAVE_SDL_GFX=1
		30	else
		31	echo "$ac_t""no" 1>&6
		32	fi
		33	@@ -820,7 +822,7 @@
		34
		35
		36
		37	-for ac_hdr in SDL/SDL_image.h
		38	+for ac_hdr in SDL_image.h
		39	do
		40	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
		41	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
		42	@@ -862,7 +864,7 @@
		43
		44
		45
		46	-for ac_hdr in SDL/SDL_mixer.h
		47	+for ac_hdr in SDL_mixer.h
		48	do
		49	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
		50	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
		51	@@ -904,7 +906,7 @@
		52
		53
9		54
10	for ac_hdr in SDL/SDL_framerate.h	55	-for ac_hdr in SDL/SDL_ttf.h
		56	+for ac_hdr in SDL_ttf.h
11	do	57	do
		58	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
		59	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
12	@@ -944,7 +946,7 @@	60	@@ -944,7 +946,7 @@
13	fi	61	fi
14	done	62	done

Added Link Here

(-)devel/gauche-sdl/files/patch-src::image::sdl-image-lib.stub (+20 lines)
1	--- src/image/sdl-image-lib.stub.orig Mon Jan 2 04:11:06 2006
2	+++ src/image/sdl-image-lib.stub Mon Jan 2 04:11:38 2006
3	@@ -61,7 +61,7 @@
4	(define-cproc img-load (file::<string>)
5	"ScmSdlSurface *s = SCM_NEW(ScmSdlSurface);
6	SCM_SET_CLASS(s, SCM_CLASS_SDL_SURFACE);
7	- s->surface = IMG_Load((const char *)(SCM_STRING(file)->start));
8	+ s->surface = IMG_Load((const char *)(SCM_STRING_START(file)));
9
10	if (s->surface == NULL) SCM_RETURN(SCM_UNDEFINED);
11
12	@@ -82,7 +82,7 @@
13	"ScmSdlSurface *s = SCM_NEW(ScmSdlSurface);
14	SCM_SET_CLASS(s, SCM_CLASS_SDL_SURFACE);
15	s->surface = IMG_LoadTyped_RW(src, 0,
16	- (char *)(SCM_STRING(type)->start));
17	+ (char *)(SCM_STRING_START(type)));
18
19	if (s->surface == NULL) SCM_RETURN(SCM_UNDEFINED);
20

Added Link Here

(-)devel/gauche-sdl/files/patch-src::sdl-lib.stub (+60 lines)
1	--- src/sdl-lib.stub.orig Mon Feb 24 21:20:18 2003
2	+++ src/sdl-lib.stub Sat Dec 31 13:22:35 2005
3	@@ -868,7 +868,7 @@
4	(define-cproc sdl-load-bmp (file::<string>)
5	"ScmSdlSurface *s = SCM_NEW(ScmSdlSurface);
6	SCM_SET_CLASS(s, SCM_CLASS_SDL_SURFACE);
7	- s->surface = SDL_LoadBMP((const char *)(SCM_STRING(file)->start));
8	+ s->surface = SDL_LoadBMP((const char *)(SCM_STRING_START(file)));
9
10	if (s->surface == NULL) SCM_RETURN(SCM_UNDEFINED);
11
12	@@ -876,7 +876,7 @@
13	SCM_RETURN(SCM_OBJ(s));")
14
15	(define-cproc sdl-save-bmp (surface::<sdl-surface> file::<string>)
16	- "int result = SDL_SaveBMP(surface, (const char *)(SCM_STRING(file)->start));
17	+ "int result = SDL_SaveBMP(surface, (const char *)(SCM_STRING_START(file)));
18	SCM_RETURN(SCM_MAKE_INT(result));")
19
20	(define-cproc sdl-set-color-key (surface::<sdl-surface> flag::<uint> key::<uint>)
21	@@ -950,7 +950,7 @@
22	(return <int> "SDL_ShowCursor"))
23
24	(define-cproc sdl-gl-load-library (path::<string>)
25	- "int result = SDL_GL_LoadLibrary((const char *)(SCM_STRING(path)->start));
26	+ "int result = SDL_GL_LoadLibrary((const char *)(SCM_STRING_START(path)));
27	SCM_RETURN(SCM_MAKE_INT(result));")
28
29	;; MISSING:
30	@@ -1055,8 +1055,8 @@
31	;;
32
33	(define-cproc sdl-wm-set-caption (title::<string> icon::<string>)
34	- "SDL_WM_SetCaption((const char *)(SCM_STRING(title)->start),
35	- (const char *)(SCM_STRING(icon)->start));
36	+ "SDL_WM_SetCaption((const char *)(SCM_STRING_START(title)),
37	+ (const char *)(SCM_STRING_START(icon)));
38	SCM_RETURN(SCM_UNDEFINED);")
39
40	(define-cproc sdl-wm-get-caption ()
41	@@ -1269,7 +1269,7 @@
42	SCM_SET_CLASS(w, SCM_CLASS_SDL_WAV);
43	spec = &(SCM_SDL_WAV_SPEC(w));
44
45	- spec = SDL_LoadWAV((const char *)(SCM_STRING(file)->start), spec, &buffer,
46	+ spec = SDL_LoadWAV((const char *)(SCM_STRING_START(file)), spec, &buffer,
47	&len);
48
49	SCM_SDL_WAV_BUFFER(w) = Scm_MakeU8VectorFromArrayShared(len, buffer);
50	@@ -1384,8 +1384,8 @@
51	(define-cproc sdl-rw-from-file (file::<string> mode::<string>)
52	"ScmSdlRWops *rw = SCM_NEW(ScmSdlRWops);
53	SCM_SET_CLASS(rw, SCM_CLASS_SDL_RWOPS);
54	- rw->rwops = SDL_RWFromFile((const char *)(SCM_STRING(file)->start),
55	- (const char *)(SCM_STRING(mode)->start));
56	+ rw->rwops = SDL_RWFromFile((const char *)(SCM_STRING_START(file)),
57	+ (const char *)(SCM_STRING_START(mode)));
58
59	if (rw->rwops == NULL) SCM_RETURN(SCM_UNDEFINED);
60