Remove emulators/vba, it's been superseded by emulators/vbam.

prodded by Brad
ok jasper@
This commit is contained in:
ajacoutot 2012-07-07 07:50:22 +00:00
parent c467c47f2e
commit e6af2b1a90
14 changed files with 0 additions and 518 deletions

View File

@ -1,66 +0,0 @@
# $OpenBSD: Makefile,v 1.19 2011/12/26 08:53:11 ajacoutot Exp $
BROKEN-powerpc= cc1plus: out of memory allocating 421022144 bytes after a total of 0 bytes
COMMENT= Gameboy Advance emulator
VERSION= 1.7.2
DISTNAME= VisualBoyAdvance-src-${VERSION}
PKGNAME= vba-${VERSION}
REVISION= 9
CATEGORIES= emulators
HOMEPAGE= http://vba.ngemu.com/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 atkmm-1.6 c cairomm-1.0 \
expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
gdkmm-2.4 gio-2.0 giomm-2.4 glade-2.0 glib-2.0 glibmm-2.4 \
gmodule-2.0 gobject-2.0 gtk-x11-2.0 gtkmm-2.4 \
m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 \
pixman-1 pthread pthread-stubs sigc-2.0 stdc++ xml2 xcb z \
glademm-2.4 SDL cairo png GL Xxf86vm drm gthread-2.0 \
xcb-render xcb-shm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vba/}
VMEM_WARNING= Yes
MODULES+= devel/gettext
USE_LIBTOOL= Yes
USE_GMAKE= Yes
LIB_DEPENDS= devel/libglademm \
devel/sdl
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng \
-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lm" \
LIBS+="-lintl"
CONFIGURE_ARGS= --disable-profiling \
--with-x \
--enable-gtk=2.4
.if ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= devel/nasm
CONFIGURE_ARGS+= --enable-c-core
.endif
WRKDIST= ${WRKDIR}/${DISTNAME:S/-src//}
pre-configure:
perl -pi -e 's|# include "sigccompat.h"||g ; \
s|SigC::Connection|sigc::connection|g ; \
s|SigC::bind|sigc::bind|g ; \
s|SigC::slot|sigc::mem_fun|g' ${WRKSRC}/src/gtk/*.*
.include <bsd.port.mk>

View File

@ -1,5 +0,0 @@
MD5 (VisualBoyAdvance-src-1.7.2.tar.gz) = zAIznj/Y79nyMSGwovgf2A==
RMD160 (VisualBoyAdvance-src-1.7.2.tar.gz) = RPlKTycPLNolh5aBxSiS9peMr5k=
SHA1 (VisualBoyAdvance-src-1.7.2.tar.gz) = BNgkBgeVY/0XzaB/ckiBhekVL1E=
SHA256 (VisualBoyAdvance-src-1.7.2.tar.gz) = 9BFPkhpP1L8sz8aKRrnFqpxxzZRRn76ewL6ZJGLhKbc=
SIZE (VisualBoyAdvance-src-1.7.2.tar.gz) = 1410762

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-configure_in,v 1.1 2010/05/24 08:48:58 espie Exp $
--- configure.in.orig Mon May 24 10:35:00 2010
+++ configure.in Mon May 24 10:36:15 2010
@@ -77,26 +77,6 @@ AC_C_CONST
AC_C_INLINE
AC_TYPE_SIZE_T
AC_STRUCT_TM
-AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE([
-#include <sys/socket.h>
-socklen_t x;
-],[
-],[
-AC_MSG_RESULT(yes)
-],[
-AC_TRY_COMPILE([
-#include <sys/socket.h>
-int accept (int, struct sockaddr *, size_t *);
-],[
-],[
-AC_MSG_RESULT(size_t)
-AC_DEFINE(socklen_t,size_t)
-],[
-AC_MSG_RESULT(int)
-AC_DEFINE(socklen_t,int)
-])
-])
AC_C_BIGENDIAN

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2007/09/28 14:18:17 jasper Exp $
--- src/Makefile.in.orig Thu May 20 20:17:48 2004
+++ src/Makefile.in Wed Sep 19 18:34:14 2007
@@ -46,7 +46,7 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
+CFLAGS += @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -160,7 +160,7 @@ SUBDIRS = $(CORE_SUBDIRS) @VBA_SRC_EXTRA@
DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS)
-dist_sysconf_DATA = VisualBoyAdvance.cfg
+dist_sysconf_DATA =
EXTRA_DIST = \
win32 \

View File

@ -1,22 +0,0 @@
$OpenBSD: patch-src_Port_h,v 1.1.1.1 2007/09/28 14:18:17 jasper Exp $
--- src/Port.h.orig Tue Sep 18 21:26:36 2007
+++ src/Port.h Tue Sep 18 21:56:04 2007
@@ -20,18 +20,6 @@
#ifndef VBA_PORT_H
#define VBA_PORT_H
-// swaps a 16-bit value
-static inline u16 swap16(u16 v)
-{
- return (v<<8)|(v>>8);
-}
-
-// swaps a 32-bit value
-static inline u32 swap32(u32 v)
-{
- return (v<<24)|((v<<8)&0xff0000)|((v>>8)&0xff00)|(v>>24);
-}
-
#ifdef WORDS_BIGENDIAN
#if defined(__GNUC__) && defined(__ppc__)

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_Util_cpp,v 1.1 2011/07/08 20:38:01 naddy Exp $
Fix build with png-1.5.
--- src/Util.cpp.orig Tue Jul 5 21:18:42 2011
+++ src/Util.cpp Tue Jul 5 21:19:02 2011
@@ -79,7 +79,7 @@ bool utilWritePNGFile(const char *fileName, int w, int
return false;
}
- if(setjmp(png_ptr->jmpbuf)) {
+ if(setjmp(png_jmpbuf(png_ptr))) {
png_destroy_write_struct(&png_ptr,NULL);
fclose(fp);
return false;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_getopt_h,v 1.1.1.1 2007/09/28 14:18:17 jasper Exp $
--- src/getopt.h.orig Tue Sep 18 22:50:13 2007
+++ src/getopt.h Tue Sep 18 22:50:45 2007
@@ -112,7 +112,7 @@ struct option
extern int getopt (int argc, char *const *argv, const char *shortopts);
#else /* not __GNU_LIBRARY__ */
# if !defined (HAVE_DECL_GETOPT)
-extern int getopt ();
+/* extern int getopt (); */
# endif
#endif /* __GNU_LIBRARY__ */
extern int getopt_long (int argc, char *const *argv, const char *shortopts,

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_gtk_Makefile_in,v 1.1.1.1 2007/09/28 14:18:17 jasper Exp $
--- src/gtk/Makefile.in.orig Wed Sep 19 18:27:36 2007
+++ src/gtk/Makefile.in Wed Sep 19 18:27:46 2007
@@ -264,7 +264,7 @@ libgba_a_CPPFLAGS = -DSDL
libgba_a_CXXFLAGS = -fno-exceptions
-dist_pkgdata_DATA = vba.glade
+dist_pkgdata_DATA = vba.glade ../VisualBoyAdvance.cfg
subdir = src/gtk
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_remote_cpp,v 1.1.1.1 2007/09/28 14:18:17 jasper Exp $
--- src/remote.cpp.orig Wed Sep 19 17:22:26 2007
+++ src/remote.cpp Wed Sep 19 17:22:42 2007
@@ -22,6 +22,7 @@
#ifndef WIN32
# include <unistd.h>
+# undef _BSD_SOCKLEN_T_
# include <sys/socket.h>
# include <netdb.h>
# ifdef HAVE_NETINET_IN_H

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_sdl_Makefile_in,v 1.1.1.1 2007/09/28 14:18:17 jasper Exp $
--- src/sdl/Makefile.in.orig Wed Sep 19 17:26:31 2007
+++ src/sdl/Makefile.in Wed Sep 19 17:26:45 2007
@@ -70,7 +70,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lintl -liconv
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@

View File

@ -1,271 +0,0 @@
$OpenBSD: patch-src_sdl_SDL_cpp,v 1.1.1.1 2007/09/28 14:18:17 jasper Exp $
--- src/sdl/SDL.cpp.orig Fri May 21 22:16:58 2004
+++ src/sdl/SDL.cpp Wed Sep 19 17:14:09 2007
@@ -98,6 +98,7 @@ extern void MotionBlurIB32(u8*,u32,int,int);
void Init_Overlay(SDL_Surface *surface, int overlaytype);
void Quit_Overlay(void);
void Draw_Overlay(SDL_Surface *surface, int size);
+SDL_Surface *Set_Video(bool first);
extern void remoteInit();
extern void remoteCleanUp();
@@ -248,8 +249,12 @@ bool screenMessage = false;
char screenMessageBuffer[21];
u32 screenMessageTime = 0;
+#if 0
SDL_cond *cond = NULL;
SDL_mutex *mutex = NULL;
+#else
+SDL_sem *rsem, *wsem;
+#endif
u8 sdlBuffer[4096];
int sdlSoundLen = 0;
@@ -886,8 +891,8 @@ FILE *sdlFindFile(const char *name)
char *home = getenv("HOME");
if(home != NULL) {
- fprintf(stderr, "Searching home directory: %s\n", home);
- sprintf(path, "%s%c%s", home, FILE_SEP, name);
+ fprintf(stderr, "Searching home directory: %s%c.vba\n", home, FILE_SEP);
+ sprintf(path, "%s%c.vba%c%s", home, FILE_SEP, FILE_SEP, name);
f = fopen(path, "r");
if(f != NULL)
return f;
@@ -1744,11 +1749,8 @@ void sdlPollEvents()
case SDLK_f:
if(!(event.key.keysym.mod & MOD_NOCTRL) &&
(event.key.keysym.mod & KMOD_CTRL)) {
- int flags = 0;
fullscreen = !fullscreen;
- if(fullscreen)
- flags |= SDL_FULLSCREEN;
- SDL_SetVideoMode(destWidth, destHeight, systemColorDepth, flags);
+ Set_Video(false);
// if(SDL_WM_ToggleFullScreen(surface))
// fullscreen = !fullscreen;
}
@@ -2320,9 +2322,7 @@ int main(int argc, char **argv)
destWidth = (sizeOption+1)*srcWidth;
destHeight = (sizeOption+1)*srcHeight;
- surface = SDL_SetVideoMode(destWidth, destHeight, 16,
- SDL_ANYFORMAT|SDL_HWSURFACE|SDL_DOUBLEBUF|
- (fullscreen ? SDL_FULLSCREEN : 0));
+ surface = Set_Video(true);
if(surface == NULL) {
systemMessage(0, "Failed to set video mode");
@@ -2916,6 +2916,7 @@ void soundCallback(void *,u8 *stream,int len)
{
if(!emulating)
return;
+#if 0
SDL_mutexP(mutex);
// printf("Locked mutex\n");
if(!speedup && !throttle) {
@@ -2926,19 +2927,27 @@ void soundCallback(void *,u8 *stream,int len)
break;
}
}
+#else
+ SDL_SemWait(rsem);
+#endif
if(emulating) {
// printf("Copying data\n");
memcpy(stream, sdlBuffer, len);
}
sdlSoundLen = 0;
+#if 0
if(mutex)
SDL_mutexV(mutex);
+#else
+ SDL_SemPost(wsem);
+#endif
}
void systemWriteDataToSoundBuffer()
{
if(SDL_GetAudioStatus() != SDL_AUDIO_PLAYING)
SDL_PauseAudio(0);
+#if 0
bool cont = true;
while(cont && !speedup && !throttle) {
SDL_mutexP(mutex);
@@ -2976,6 +2985,11 @@ soundBufferLen);
memcpy(&sdlBuffer[sdlSoundLen], soundFinalWave, soundBufferLen);
sdlSoundLen += soundBufferLen;
}
+#else
+ memcpy(sdlBuffer, soundFinalWave, soundBufferLen);
+ SDL_SemPost(rsem);
+ SDL_SemWait(wsem);
+#endif
}
bool systemSoundInit()
@@ -2998,7 +3012,7 @@ bool systemSoundInit()
}
audio.format=AUDIO_S16SYS;
audio.channels = 2;
- audio.samples = 1024;
+ audio.samples = soundBufferLen/4;
audio.callback = soundCallback;
audio.userdata = NULL;
if(SDL_OpenAudio(&audio, NULL)) {
@@ -3006,8 +3020,13 @@ bool systemSoundInit()
return false;
}
soundBufferTotalLen = soundBufferLen*10;
+#if 0
cond = SDL_CreateCond();
mutex = SDL_CreateMutex();
+#else
+ rsem = SDL_CreateSemaphore(0);
+ wsem = SDL_CreateSemaphore(0);
+#endif
sdlSoundLen = 0;
systemSoundOn = true;
return true;
@@ -3015,6 +3034,7 @@ bool systemSoundInit()
void systemSoundShutdown()
{
+#if 0
SDL_mutexP(mutex);
SDL_CondSignal(cond);
SDL_mutexV(mutex);
@@ -3022,7 +3042,15 @@ void systemSoundShutdown()
cond = NULL;
SDL_DestroyMutex(mutex);
mutex = NULL;
+#else
+ SDL_SemPost(rsem);
+#endif
SDL_CloseAudio();
+#if 0
+#else
+ SDL_DestroySemaphore(rsem);
+ SDL_DestroySemaphore(wsem);
+#endif
}
void systemSoundPause()
@@ -3139,9 +3167,15 @@ bool systemPauseOnFrame()
void Init_Overlay(SDL_Surface *gbascreen, int overlaytype)
{
-
- overlay = SDL_CreateYUVOverlay( GBA_WIDTH,
- GBA_HEIGHT,
+ int width;
+
+ if (overlaytype == SDL_YUY2_OVERLAY)
+ width = srcWidth *2;
+ else
+ width = srcWidth;
+
+ overlay = SDL_CreateYUVOverlay( width,
+ srcHeight,
overlaytype, gbascreen);
fprintf(stderr, "Created %dx%dx%d %s %s overlay\n",
overlay->w,overlay->h,overlay->planes,
@@ -3304,19 +3338,15 @@ inline void ConvertRGBtoYUY2(SDL_Overlay *o)
SDL_LockYUVOverlay(o);
- for(y=0; y<160 && y<o->h; y++) {
+ for(y=0; y<srcHeight && y<o->h; y++) {
p=(Uint8 *)pix+srcPitch*y;
op=o->pixels[0]+o->pitches[0]*y;
- for(x=0; x<240 && x<o->w; x++) {
+ for(x=0; x<srcWidth && x<o->w; x++) {
RGBtoYUV(p,yuv);
- if(x%2==0) {
- *(op++)=yuv[0];
- *(op++)=yuv[1];
- op[1]=yuv[2];
- } else {
- *op=yuv[0];
- op+=2;
- }
+ *(op++)=yuv[0];
+ *(op++)=yuv[1];
+ *(op++)=yuv[0];
+ *(op++)=yuv[2];
p+=4; //s->format->BytesPerPixel;
}
@@ -3358,11 +3388,6 @@ inline void Draw_Overlay(SDL_Surface *display, int siz
Convert32bit(display);
- overlay_rect.x = 0;
- overlay_rect.y = 0;
- overlay_rect.w = GBA_WIDTH * size;
- overlay_rect.h = GBA_HEIGHT * size;
-
SDL_DisplayYUVOverlay(overlay, &overlay_rect);
SDL_UnlockYUVOverlay(overlay);
}
@@ -3378,9 +3403,8 @@ void systemGbBorderOn()
destWidth = (sizeOption+1)*srcWidth;
destHeight = (sizeOption+1)*srcHeight;
- surface = SDL_SetVideoMode(destWidth, destHeight, 16,
- SDL_ANYFORMAT|SDL_HWSURFACE|SDL_DOUBLEBUF|
- (fullscreen ? SDL_FULLSCREEN : 0));
+ surface = Set_Video(true);
+
#ifndef C_CORE
sdlMakeStretcher(srcWidth);
#else
@@ -3439,4 +3463,47 @@ void systemGbBorderOn()
else
srcPitch = srcWidth*3;
}
+}
+
+SDL_Surface *
+Set_Video(bool first)
+{
+ int flags;
+
+ flags = SDL_HWSURFACE|SDL_DOUBLEBUF;
+ if (first) {
+ flags |= SDL_ANYFORMAT;
+ systemColorDepth = 16;
+ }
+
+ if(fullscreen)
+ flags |= SDL_FULLSCREEN;
+
+ destWidth = srcWidth*(sizeOption+1);
+ destHeight = srcHeight*(sizeOption+1);
+
+ if (yuv) {
+ double mul, mul2;
+
+ if (fullscreen) {
+ SDL_Rect **mode;
+ if ((mode=SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE))
+ != NULL) {
+ destWidth = mode[0]->w;
+ destHeight = mode[0]->h;
+ }
+ }
+
+ mul = (double)destWidth/srcWidth;
+ mul2 = (double)destHeight/srcHeight;
+ if (mul2 < mul)
+ mul = mul2;
+
+ overlay_rect.w = (Uint16)(srcWidth*mul);
+ overlay_rect.h = (Uint16)(srcHeight*mul);
+ overlay_rect.x = (destWidth-overlay_rect.w)/2;
+ overlay_rect.y = (destHeight-overlay_rect.h)/2;
+ }
+
+ return SDL_SetVideoMode(destWidth, destHeight, systemColorDepth, flags);
}

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_sdl_debugger_cpp,v 1.1 2010/06/07 15:44:58 espie Exp $
--- src/sdl/debugger.cpp.orig Mon Jun 7 17:25:39 2010
+++ src/sdl/debugger.cpp Mon Jun 7 17:40:21 2010
@@ -950,9 +950,9 @@ void debuggerBreakOnWrite(u32 *mem, u32 oldvalue, u32
{
u32 address = 0;
if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
- address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
+ address = 0x2000000 + ((u64)mem - (u64)&workRAM[0]);
else
- address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
+ address = 0x3000000 + ((u64)mem - (u64)&internalRAM[0]);
if(size == 2)
printf("Breakpoint (on write) address %08x old:%08x new:%08x\n",

View File

@ -1,17 +0,0 @@
VisualBoyAdvance is an emulator for Nintendo's Gameboy Advance. It also
supports emulation of the Gameboy (classic), Gameboy Pocket, Gameboy
Color and Gameboy Advance SP.
Some of the main features are:
- option to use BIOS file
- zip/gzip file support
- graphic filters Normal, TV Mode, 2xSaI, Super 2xSaI and more
- interframe blending support
- built-in ARM/THUMB assembly debugger
- 10 save states accesible through keyboard
- automatic battery file load/save
- auto-fire support
- 16, 24 and 32 bit desktop support
- GDB remote debugging
- AGBPrint support for development
- RTC support

View File

@ -1,9 +0,0 @@
@comment $OpenBSD: PLIST,v 1.2 2009/01/14 10:45:41 jasper Exp $
@bin bin/VisualBoyAdvance
@bin bin/gvba
share/VisualBoyAdvance/
share/VisualBoyAdvance/VisualBoyAdvance.cfg
@sample ${SYSCONFDIR}/VisualBoyAdvance.cfg
share/VisualBoyAdvance/vba-64.png
share/VisualBoyAdvance/vba.glade
share/locale/fr/LC_MESSAGES/vba-1.7.2.mo