Newest version of dgen-sdl. Upstream took our joystick code, so a lot of patches disappear.
There is a new filter that uses a lot of memory to compile, hence VMEM_WARNING. I notice that red zone now works on dgen :) OK? Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/dgen-sdl/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 23 Jan 2012 09:22:59 -0000 1.1.1.1 +++ Makefile 17 Feb 2012 19:15:10 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.1.1.1 2012/01/23 09:22:59 edd Exp $ COMMENT = Sega Megadrive/Genesis emulator -DISTNAME = dgen-sdl-1.28 +DISTNAME = dgen-sdl-1.29 CATEGORIES = emulators games HOMEPAGE = http://dgen.sourceforge.net/ MAINTAINER = Edd Barrett <e...@openbsd.org> @@ -27,6 +27,10 @@ BUILD_DEPENDS = devel/sdl .if ${MACHINE_ARCH} == "i386" BUILD_DEPENDS += devel/nasm .endif + +# when building hq4x.o: +# cc1: out of memory allocating 4072 bytes after a total of 0 bytes +VMEM_WARNING = Yes LIB_DEPENDS = devel/sdl \ archivers/libarchive Index: distinfo =================================================================== RCS file: /cvs/ports/emulators/dgen-sdl/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 23 Jan 2012 09:22:59 -0000 1.1.1.1 +++ distinfo 17 Feb 2012 19:15:10 -0000 @@ -1,5 +1,5 @@ -MD5 (dgen-sdl-1.28.tar.gz) = T6cc0EN15t5UfclwPFGMsw== -RMD160 (dgen-sdl-1.28.tar.gz) = qj9tdWLPYcpSG7eHnKgfZBSUEo8= -SHA1 (dgen-sdl-1.28.tar.gz) = RIQnbkYd/5PfYWrHZ0IEox56LK0= -SHA256 (dgen-sdl-1.28.tar.gz) = 0qgIxp6dCXl/N/yGEX6r/WmNmmqRPXvuNWxLF5UIASw= -SIZE (dgen-sdl-1.28.tar.gz) = 464906 +MD5 (dgen-sdl-1.29.tar.gz) = S2NJadpHS6Ji97JctP1G/g== +RMD160 (dgen-sdl-1.29.tar.gz) = R/Lx8Mg6G7Xpbec5ajPtFdpRAZs= +SHA1 (dgen-sdl-1.29.tar.gz) = kQTa+robkLRa0kMS6hPXbX1FeTc= +SHA256 (dgen-sdl-1.29.tar.gz) = vwGEFPP4MYES5O+JdJiT9yIcNCKlwLB6yjlMkOXCD+E= +SIZE (dgen-sdl-1.29.tar.gz) = 508039 Index: patches/patch-dgenrc_5 =================================================================== RCS file: patches/patch-dgenrc_5 diff -N patches/patch-dgenrc_5 --- patches/patch-dgenrc_5 23 Jan 2012 09:22:59 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-dgenrc_5,v 1.1.1.1 2012/01/23 09:22:59 edd Exp $ - -Document our joystick hack. - ---- dgenrc.5.orig Sun Jan 22 17:45:57 2012 -+++ dgenrc.5 Sun Jan 22 17:47:55 2012 -@@ -62,6 +62,10 @@ corresponding "key_pad2" field, to map to the second c - Use joysticks to emulate the controllers. Note that the keyboard keys will - still work if this value is set. This field is only available if you have - joystick support enabled. -+.It int_joystick1_dev [0] -+.It int_joystick2_dev [1] -+Select which joystick device to use. Parameter is an integer passed to -+.Fn SDL_JoystickOpen . - .It joypadX_bY - Maps button number Y, on joystick X to a Genesis controller button. Valid - button values are "a", "b", "c", "x", "y", "z", "mode", and "start". Joystick Index: patches/patch-main_cpp =================================================================== RCS file: patches/patch-main_cpp diff -N patches/patch-main_cpp --- patches/patch-main_cpp 23 Jan 2012 09:22:59 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-main_cpp,v 1.1.1.1 2012/01/23 09:22:59 edd Exp $ - -Make joystick devices configurable via config file - ---- main.cpp.orig Sun Jan 22 16:46:51 2012 -+++ main.cpp Sun Jan 22 16:47:32 2012 -@@ -387,7 +387,7 @@ int main(int argc, char *argv[]) - megad.pad[0] = megad.pad[1] = 0xF303F; - #ifdef WITH_JOYSTICK - if(dgen_joystick) -- megad.init_joysticks(); -+ megad.init_joysticks(dgen_joystick1_dev, dgen_joystick2_dev); - #endif - // Load patches, if given - if(patches) Index: patches/patch-md-phil_cpp =================================================================== RCS file: patches/patch-md-phil_cpp diff -N patches/patch-md-phil_cpp --- patches/patch-md-phil_cpp 23 Jan 2012 09:22:59 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,41 +0,0 @@ -$OpenBSD: patch-md-phil_cpp,v 1.1.1.1 2012/01/23 09:22:59 edd Exp $ - -Make joystick devices configurable via config file - ---- md-phil.cpp.orig Thu Nov 17 21:49:02 2011 -+++ md-phil.cpp Sun Jan 22 16:50:21 2012 -@@ -165,7 +165,7 @@ void md::read_joysticks() - - static SDL_Joystick *js_handle[2] = { NULL, NULL }; - --void md::init_joysticks() { -+void md::init_joysticks(int js1, int js2) { - // Initialize the joystick support - // Thanks to Cameron Moore <came...@unbeatenpath.net> - if(SDL_Init(SDL_INIT_JOYSTICK) < 0) -@@ -174,9 +174,11 @@ void md::init_joysticks() { - return; - } - -+ printf("Initialising SDL system joysticks %d and %d\n", js1, js2); -+ - // Open the first couple of joysticks, if possible -- js_handle[0] = SDL_JoystickOpen(0); -- js_handle[1] = SDL_JoystickOpen(1); -+ js_handle[0] = SDL_JoystickOpen(js1); -+ js_handle[1] = SDL_JoystickOpen(js2); - - // If neither opened, quit - if(!(js_handle[0] || js_handle[1])) -@@ -187,9 +189,9 @@ void md::init_joysticks() { - - // Print the joystick names - printf("Using "); -- if(js_handle[0]) printf("%s (#0) as pad1 ", SDL_JoystickName(0)); -+ if(js_handle[0]) printf("%s (#0) as pad1 ", SDL_JoystickName(js1)); - if(js_handle[0] && js_handle[1]) printf("and "); -- if(js_handle[1]) printf("%s (#1) as pad2 ", SDL_JoystickName(1)); -+ if(js_handle[1]) printf("%s (#1) as pad2 ", SDL_JoystickName(js2)); - printf("\n"); - - // Enable joystick events Index: patches/patch-md_h =================================================================== RCS file: patches/patch-md_h diff -N patches/patch-md_h --- patches/patch-md_h 23 Jan 2012 09:22:59 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-md_h,v 1.1.1.1 2012/01/23 09:22:59 edd Exp $ - -Make joystick devices configurable via config file - ---- md.h.orig Thu Nov 17 21:49:02 2011 -+++ md.h Sun Jan 22 16:57:17 2012 -@@ -356,7 +356,11 @@ class md (public) - - // Added by Phillip K. Hornung <r...@pknet.com> - // Linux joystick initialization and handling routines -+#ifdef WITH_LINUX_JOYSTICK - void init_joysticks(); -+#else -+ void init_joysticks(int, int); -+#endif - void read_joysticks(); - }; - Index: patches/patch-rc-vars_h =================================================================== RCS file: patches/patch-rc-vars_h diff -N patches/patch-rc-vars_h --- patches/patch-rc-vars_h 23 Jan 2012 09:22:59 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-rc-vars_h,v 1.1.1.1 2012/01/23 09:22:59 edd Exp $ - -Make joystick devices configurable via config file - ---- rc-vars.h.orig Sun Jan 22 16:37:17 2012 -+++ rc-vars.h Sun Jan 22 16:38:02 2012 -@@ -77,6 +77,8 @@ RCVAR(dgen_soundsamples, 0); - RCVAR(dgen_craptv, 0); - RCVAR(dgen_nice, 0); - RCVAR(dgen_joystick, 0); -+RCVAR(dgen_joystick1_dev, 0); -+RCVAR(dgen_joystick2_dev, 1); - - RCVAR(dgen_fullscreen, 0); - RCVAR(dgen_scale, 1); Index: patches/patch-rc_cpp =================================================================== RCS file: patches/patch-rc_cpp diff -N patches/patch-rc_cpp --- patches/patch-rc_cpp 23 Jan 2012 09:22:59 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-rc_cpp,v 1.1.1.1 2012/01/23 09:22:59 edd Exp $ - -Make joystick devices configurable via config file - ---- rc.cpp.orig Thu Nov 17 21:49:02 2011 -+++ rc.cpp Sun Jan 22 16:46:25 2012 -@@ -405,6 +405,8 @@ struct rc_field { - { "bool_opengl_32bit", boolean, &dgen_opengl_32bit }, - { "bool_opengl_swap", boolean, &dgen_opengl_swap }, - { "bool_joystick", boolean, &dgen_joystick }, -+ { "int_joystick1_dev", number, &dgen_joystick1_dev }, -+ { "int_joystick2_dev", number, &dgen_joystick2_dev }, - { "joypad1_b0", jsmap, &js_map_button[0][0] }, - { "joypad1_b1", jsmap, &js_map_button[0][1] }, - { "joypad1_b2", jsmap, &js_map_button[0][2] }, Index: patches/patch-sample_dgenrc =================================================================== RCS file: patches/patch-sample_dgenrc diff -N patches/patch-sample_dgenrc --- patches/patch-sample_dgenrc 23 Jan 2012 09:22:59 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-sample_dgenrc,v 1.1.1.1 2012/01/23 09:22:59 edd Exp $ - -Make joystick devices configurable via config file - ---- sample.dgenrc.orig Sun Jan 22 16:50:59 2012 -+++ sample.dgenrc Sun Jan 22 16:51:24 2012 -@@ -141,6 +141,8 @@ int_scale = 1 - - # Use a joystick? - bool_joystick = no -+int_joystick1_dev = 0 -+int_joystick2_dev = 1 - - # Use OpenGL mode? - bool_opengl = yes -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
