On Thu, Jan 9, 2014 at 1:38 AM, Anthony J. Bentley <[email protected]>
wrote:
> Hi,
>
> Attached is a trivial update to desmume-0.9.10.
>
> Works fine on i386/amd64.
>
> ok?
sthen@ pointed out I forgot the patches... new diff attached.
Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/desmume/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile 6 Sep 2013 03:06:44 -0000 1.8
+++ Makefile 9 Jan 2014 15:47:03 -0000
@@ -2,7 +2,7 @@
COMMENT = Nintendo DS emulator
-DISTNAME = desmume-0.9.9
+DISTNAME = desmume-0.9.10
CATEGORIES = emulators
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/desmume/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 6 Sep 2013 03:06:44 -0000 1.2
+++ distinfo 9 Jan 2014 15:47:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (desmume-0.9.9.tar.gz) = zSrXDN3hI266Wk/4zqg49Ct9xHDjKsk4Jj9J8SpV11Q=
-SIZE (desmume-0.9.9.tar.gz) = 4107513
+SHA256 (desmume-0.9.10.tar.gz) = iQCnofyEn90zsBR0jdl6bNpMMlSLjS4GUR5u2NW6dEU=
+SIZE (desmume-0.9.10.tar.gz) = 4141586
Index: patches/patch-src_gtk_glx_3Demu_cpp
===================================================================
RCS file: patches/patch-src_gtk_glx_3Demu_cpp
diff -N patches/patch-src_gtk_glx_3Demu_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_gtk_glx_3Demu_cpp 9 Jan 2014 15:47:03 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+From upstream r4907.
+--- src/gtk/glx_3Demu.cpp.orig Tue Dec 24 02:25:47 2013
++++ src/gtk/glx_3Demu.cpp Tue Dec 24 02:25:51 2013
+@@ -31,7 +31,7 @@ static bool glx_init(void) { return true; }
+ static GLXContext ctx;
+ static GLXPbuffer pbuf;
+
+-void deinit_glx_3Demu(void)
++int deinit_glx_3Demu(void)
+ {
+ Display *dpy = glXGetCurrentDisplay();
+
Index: patches/patch-src_gtk_glx_3Demu_h
===================================================================
RCS file: patches/patch-src_gtk_glx_3Demu_h
diff -N patches/patch-src_gtk_glx_3Demu_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_gtk_glx_3Demu_h 9 Jan 2014 15:47:03 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+From upstream r4907.
+--- src/gtk/glx_3Demu.h.orig Tue Dec 24 02:25:56 2013
++++ src/gtk/glx_3Demu.h Tue Dec 24 02:25:58 2013
+@@ -20,5 +20,5 @@
+
+ #ifdef HAVE_GL_GLX
+ int init_glx_3Demu(void);
+-void deinit_glx_3Demu(void);
++int deinit_glx_3Demu(void);
+ #endif
Index: patches/patch-src_utils_task_cpp
===================================================================
RCS file: patches/patch-src_utils_task_cpp
diff -N patches/patch-src_utils_task_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_utils_task_cpp 9 Jan 2014 15:47:03 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+From upstream r4949.
+
+--- src/utils/task.cpp.orig Tue Dec 24 02:20:11 2013
++++ src/utils/task.cpp Tue Dec 24 02:21:44 2013
+@@ -42,7 +42,7 @@ int getOnlineCores (void)
+ #elif defined HOST_BSD
+ int cores;
+ const int mib[4] = { CTL_HW, HW_NCPU, 0, 0 };
+- const size_t len = sizeof(cores);
++ size_t len = sizeof(cores); //don't make this const, i guess sysctl
can't take a const *
+ sysctl(mib, 2, &cores, &len, NULL, 0);
+ return (cores < 1) ? 1 : cores;
+ #else