Hi,

Below is an update to desmume-0.9.9. Works well on i386 and amd64.

ok?


Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/desmume/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile    11 Mar 2013 11:06:03 -0000      1.7
+++ Makefile    22 Aug 2013 05:23:17 -0000
@@ -2,8 +2,7 @@
 
 COMMENT =      Nintendo DS emulator
 
-DISTNAME =     desmume-0.9.7
-REVISION =     3
+DISTNAME =     desmume-0.9.9
 
 CATEGORIES =   emulators
 
@@ -14,13 +13,12 @@ MAINTAINER =        Anthony J. Bentley <anthony
 # GPLv2+
 PERMIT_PACKAGE_CDROM =         Yes
 
-WANTLIB += agg c m pthread stdc++ z GL GLU ICE SM X11 Xcomposite
-WANTLIB += Xcursor Xdamage Xext Xfixes Xi Xinerama Xmu Xrandr Xrender
-WANTLIB += Xt expat fontconfig freetype pixman-1 pthread-stubs
-WANTLIB += xcb xcb-render xcb-shm png xml2 gdk_pixbuf-2.0 gio-2.0
-WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 pangox-1.0 SDL
-WANTLIB += glade-2.0 atk-1.0 cairo gdk-x11-2.0 gdkglext-x11-1.0 gtk-x11-2.0
-WANTLIB += gtkglext-x11-1.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 zzip
+WANTLIB += agg c m pthread stdc++ z GL GLU X11 Xcomposite
+WANTLIB += Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender
+WANTLIB += fontconfig freetype gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 SDL
+WANTLIB += atk-1.0 cairo gdk-x11-2.0 gtk-x11-2.0
+WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 zzip
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=desmume/}
 
@@ -28,12 +26,9 @@ RUN_DEPENDS =        devel/desktop-file-utils
 
 LIB_DEPENDS =  archivers/zziplib \
                devel/sdl \
-               devel/libglade2 \
                graphics/agg \
                graphics/gdk-pixbuf2 \
-               graphics/png \
-               textproc/libxml \
-               x11/gtkglext
+               x11/gtk+2
 
 CONFIGURE_ENV +=       CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
                        LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
Index: distinfo
===================================================================
RCS file: /cvs/ports/emulators/desmume/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo    21 Sep 2011 03:58:08 -0000      1.1.1.1
+++ distinfo    22 Aug 2013 05:23:17 -0000
@@ -1,5 +1,2 @@
-MD5 (desmume-0.9.7.tar.gz) = wzRA5qAsRCSIcewu7Go3YA==
-RMD160 (desmume-0.9.7.tar.gz) = h3Ct3xrlqrmxWnDefEsFEbJFIg0=
-SHA1 (desmume-0.9.7.tar.gz) = GOAPZ10+YhdHSmu/PFVKrems7uU=
-SHA256 (desmume-0.9.7.tar.gz) = Cg9+88x2/wu8bz30fDaJZTYXB06n/8NU6foSQMUzZSM=
-SIZE (desmume-0.9.7.tar.gz) = 1142550
+SHA256 (desmume-0.9.9.tar.gz) = zSrXDN3hI266Wk/4zqg49Ct9xHDjKsk4Jj9J8SpV11Q=
+SIZE (desmume-0.9.9.tar.gz) = 4107513
Index: patches/patch-src_OGLRender_cpp
===================================================================
RCS file: patches/patch-src_OGLRender_cpp
diff -N patches/patch-src_OGLRender_cpp
--- patches/patch-src_OGLRender_cpp     21 Sep 2011 03:58:08 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_OGLRender_cpp,v 1.1.1.1 2011/09/21 03:58:08 bentley Exp $
---- src/OGLRender.cpp.orig     Fri Jul  1 10:17:51 2011
-+++ src/OGLRender.cpp  Fri Jul  1 10:18:09 2011
-@@ -76,7 +76,7 @@ static void ENDGL() {
- #include "shaders.h"
- #include "texcache.h"
- 
--static ALIGN(16) u8  GPU_screen3D                     [256*192*4];
-+static DMALIGN(16) u8  GPU_screen3D                   [256*192*4];
- 
- static const unsigned short map3d_cull[4] = {GL_FRONT_AND_BACK, GL_FRONT, 
GL_BACK, 0};
- static const int texEnv[4] = { GL_MODULATE, GL_DECAL, GL_MODULATE, 
GL_MODULATE };
Index: patches/patch-src_gfx3d_cpp
===================================================================
RCS file: patches/patch-src_gfx3d_cpp
diff -N patches/patch-src_gfx3d_cpp
--- patches/patch-src_gfx3d_cpp 21 Sep 2011 03:58:08 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_gfx3d_cpp,v 1.1.1.1 2011/09/21 03:58:08 bentley Exp $
---- src/gfx3d.cpp.orig Fri Jul  1 10:17:51 2011
-+++ src/gfx3d.cpp      Fri Jul  1 10:18:05 2011
-@@ -606,7 +606,7 @@ static void SetVertex()
-               s16coord[2]
-       };
- 
--      ALIGN(16) s32 coordTransformed[4] = { coord[0], coord[1], coord[2], 
(1<<12) };
-+      DMALIGN(16) s32 coordTransformed[4] = { coord[0], coord[1], coord[2], 
(1<<12) };
- 
-       if (texCoordinateTransform == 3)
-       {
Index: patches/patch-src_types_h
===================================================================
RCS file: patches/patch-src_types_h
diff -N patches/patch-src_types_h
--- patches/patch-src_types_h   21 Sep 2011 03:58:08 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_types_h,v 1.1.1.1 2011/09/21 03:58:08 bentley Exp $
---- src/types.h.orig   Fri Jul  1 10:17:51 2011
-+++ src/types.h        Fri Jul  1 10:18:24 2011
-@@ -90,17 +90,17 @@
- 
- 
- #if defined(_MSC_VER) || defined(__INTEL_COMPILER)
--#define ALIGN(X) __declspec(align(X))
-+#define DMALIGN(X) __declspec(align(X))
- #elif __GNUC__
--#define ALIGN(X) __attribute__ ((aligned (X)))
-+#define DMALIGN(X) __attribute__ ((aligned (X)))
- #else
--#define ALIGN(X)
-+#define DMALIGN(X)
- #endif
- 
--#define CACHE_ALIGN ALIGN(32)
-+#define CACHE_ALIGN DMALIGN(32)
- 
- //use this for example when you want a byte value to be better-aligned
--#define FAST_ALIGN ALIGN(4)
-+#define FAST_ALIGN DMALIGN(4)
- 
- #ifndef FASTCALL
- #ifdef __MINGW32__
Index: patches/patch-src_utils_AsmJit_core_stringbuilder_h
===================================================================
RCS file: patches/patch-src_utils_AsmJit_core_stringbuilder_h
diff -N patches/patch-src_utils_AsmJit_core_stringbuilder_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_utils_AsmJit_core_stringbuilder_h 22 Aug 2013 05:23:17 
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/utils/AsmJit/core/stringbuilder.h.orig Wed Aug 21 22:55:37 2013
++++ src/utils/AsmJit/core/stringbuilder.h      Wed Aug 21 22:55:48 2013
+@@ -8,6 +8,8 @@
+ #ifndef _ASMJIT_CORE_STRINGBUILDER_H
+ #define _ASMJIT_CORE_STRINGBUILDER_H
+ 
++#include <cstdarg>
++
+ // [Dependencies - AsmJit]
+ #include "../core/assert.h"
+ #include "../core/defs.h"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/emulators/desmume/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   21 Sep 2011 03:58:08 -0000      1.1.1.1
+++ pkg/PLIST   22 Aug 2013 05:23:17 -0000
@@ -1,17 +1,9 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2011/09/21 03:58:08 bentley Exp $
 @bin bin/desmume
 @bin bin/desmume-cli
-@bin bin/desmume-glade
 @man man/man1/desmume-cli.1
-@man man/man1/desmume-glade.1
 @man man/man1/desmume.1
-share/applications/desmume-glade.desktop
 share/applications/desmume.desktop
-share/desmume/
-share/desmume/glade/
-share/desmume/glade/DeSmuME.xpm
-share/desmume/glade/DeSmuMe.glade
-share/desmume/glade/DeSmuMe_Dtools.glade
 share/pixmaps/
 share/pixmaps/DeSmuME.xpm
 @exec %D/bin/update-desktop-database

Reply via email to