Fix inline usage. Don't use -O4 when the user didn't ask for it.

3 files changed, 90 insertions, 6 deletions

diff --git a/emulators/handy_sdl/distinfo b/emulators/handy_sdl/distinfo
index a3fc2937f1f..a38d1d72fec 100644
--- a/emulators/handy_sdl/distinfo
+++ b/emulators/handy_sdl/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2011/10/03 04:20:34 dholland Exp $
+$NetBSD: distinfo,v 1.3 2012/11/19 23:22:39 joerg Exp $
 
 SHA1 (handy_sdl-0.5-src.tar.bz2) = a65f18781886d19878b9b14a577e1387ed3f6f19
 RMD160 (handy_sdl-0.5-src.tar.bz2) = 5dcc9ec50dcfbe6ca418b21dcb8ad5e36b14fc97
 Size (handy_sdl-0.5-src.tar.bz2) = 209616 bytes
-SHA1 (patch-Makefile-0_95) = 6da149e49491876a698e7c40a125833840f27637
+SHA1 (patch-Makefile-0_95) = c0d8ecde7d72f98ddb843254cd2e873f029261bd
+SHA1 (patch-src_sdlemu_sdlemu__overlay.c) = 6d4ac7c433cabe2f84592ea17d1048baaad61d49
diff --git a/emulators/handy_sdl/patches/patch-Makefile-0_95 b/emulators/handy_sdl/patches/patch-Makefile-0_95
index a43f92bc39f..816f5d13d78 100644
--- a/emulators/handy_sdl/patches/patch-Makefile-0_95
+++ b/emulators/handy_sdl/patches/patch-Makefile-0_95
@@ -1,16 +1,23 @@
-$NetBSD: patch-Makefile-0_95,v 1.1 2011/10/03 04:20:34 dholland Exp $
+$NetBSD: patch-Makefile-0_95,v 1.2 2012/11/19 23:22:39 joerg Exp $
 
 Set LDFLAGS vs. LIBS properly, so the right things happen when LDFLAGS
 is set from the pkgsrc makefile.
 
---- Makefile-0.95~	2008-11-02 23:23:50.000000000 +0000
+--- Makefile-0.95.orig	2008-11-02 23:23:50.000000000 +0000
 +++ Makefile-0.95
-@@ -55,9 +55,9 @@ CPPFLAGS = -MMD -Wall -Wno-switch -Wno-n
+@@ -49,15 +49,14 @@ LD         = gcc
+ TARGET     = handy_sdl
+ 
+ # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
+-CFLAGS   = -MMD -Wall -Wno-switch -O4 -D$(SYSTYPE) -DANSI_GCC -DSDL_PATCH -ffast-math -fomit-frame-pointer `sdl-config --cflags` 
+-CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -O4 -D$(SYSTYPE) -DANSI_GCC -DSDL_PATCH \
++CFLAGS   += -MMD -Wall -Wno-switch -D$(SYSTYPE) -DANSI_GCC -DSDL_PATCH -ffast-math -fomit-frame-pointer `sdl-config --cflags` 
++CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -D$(SYSTYPE) -DANSI_GCC -DSDL_PATCH \
+ 		-ffast-math -fomit-frame-pointer `sdl-config --cflags` -g \
  #		-fomit-frame-pointer `sdl-config --cflags` -g
  #		-fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
  
 -LDFLAGS =
-+LDFLAGS = -L/usr/local/lib -L/usr/lib
  
 -LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
 +LIBS = `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
diff --git a/emulators/handy_sdl/patches/patch-src_sdlemu_sdlemu__overlay.c b/emulators/handy_sdl/patches/patch-src_sdlemu_sdlemu__overlay.c
new file mode 100644
index 00000000000..3f57ad16cf0
--- /dev/null
+++ b/emulators/handy_sdl/patches/patch-src_sdlemu_sdlemu__overlay.c
@@ -0,0 +1,76 @@
+$NetBSD: patch-src_sdlemu_sdlemu__overlay.c,v 1.1 2012/11/19 23:22:39 joerg Exp $
+
+--- src/sdlemu/sdlemu_overlay.c.orig	2012-11-19 20:00:29.000000000 +0000
++++ src/sdlemu/sdlemu_overlay.c
+@@ -41,7 +41,7 @@ void sdlemu_close_overlay(void)
+ /* NOTE: These RGB conversion functions are not intended for speed,
+          only as examples.
+ */
+-inline void RGBtoYUV(Uint8 *rgb, int *yuv)
++static inline void RGBtoYUV(Uint8 *rgb, int *yuv)
+ {
+ //#if 1 /* these are the two formulas that I found on the FourCC site... */
+ //	yuv[0] = 0.299*rgb[0] + 0.587*rgb[1] + 0.114*rgb[2];
+@@ -64,7 +64,7 @@ inline void RGBtoYUV(Uint8 *rgb, int *yu
+ 	*/
+ }
+ 
+-inline void ConvertRGBtoYV12(SDL_Surface *s, SDL_Overlay *o)
++static inline void ConvertRGBtoYV12(SDL_Surface *s, SDL_Overlay *o)
+ {
+ 	int x,y;
+ 	int yuv[3];
+@@ -104,7 +104,7 @@ inline void ConvertRGBtoYV12(SDL_Surface
+ 	SDL_UnlockSurface(s);
+ }
+ 
+-inline void ConvertRGBtoIYUV(SDL_Surface *s, SDL_Overlay *o)
++static inline void ConvertRGBtoIYUV(SDL_Surface *s, SDL_Overlay *o)
+ {
+ 	int x,y;
+ 	int yuv[3];
+@@ -144,7 +144,7 @@ inline void ConvertRGBtoIYUV(SDL_Surface
+ 	SDL_UnlockSurface(s);
+ }
+ 
+-inline void ConvertRGBtoUYVY(SDL_Surface *s, SDL_Overlay *o)
++static inline void ConvertRGBtoUYVY(SDL_Surface *s, SDL_Overlay *o)
+ {
+ 	int x,y;
+ 	int yuv[3];
+@@ -177,7 +177,7 @@ inline void ConvertRGBtoUYVY(SDL_Surface
+ 	SDL_UnlockSurface(s);
+ }
+ 
+-inline void ConvertRGBtoYVYU(SDL_Surface *s, SDL_Overlay *o)
++static inline void ConvertRGBtoYVYU(SDL_Surface *s, SDL_Overlay *o)
+ {
+ 	int x,y;
+ 	int yuv[3];
+@@ -213,7 +213,7 @@ inline void ConvertRGBtoYVYU(SDL_Surface
+ 	SDL_UnlockSurface(s);
+ }
+ 
+-inline void ConvertRGBtoYUY2(SDL_Surface *s, SDL_Overlay *o)
++static inline void ConvertRGBtoYUY2(SDL_Surface *s, SDL_Overlay *o)
+ {
+ 	int x,y;
+ 	int yuv[3];
+@@ -249,7 +249,7 @@ inline void ConvertRGBtoYUY2(SDL_Surface
+ 	SDL_UnlockSurface(s);
+ }
+ 
+-inline void Convert32bit(SDL_Surface *display)
++static inline void Convert32bit(SDL_Surface *display)
+ {
+ 
+ 		SDL_Surface *newsurf;
+@@ -312,7 +312,7 @@ inline void Convert32bit(SDL_Surface *di
+ 
+ }
+ 
+-inline void sdlemu_draw_overlay(SDL_Surface *s, int size, int width, int height)
++void sdlemu_draw_overlay(SDL_Surface *s, int size, int width, int height)
+ {
+         static SDL_Rect		  src;
+         static SDL_Rect		  dest;