Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators emulators: remove vba, replaced by visualboy...
details: https://anonhg.NetBSD.org/pkgsrc/rev/cab1805b2dfc
branches: trunk
changeset: 434311:cab1805b2dfc
user: nia <nia%pkgsrc.org@localhost>
date: Sun Jun 14 11:45:06 2020 +0000
description:
emulators: remove vba, replaced by visualboyadvance-m etc
diffstat:
emulators/Makefile | 3 +-
emulators/vba/DESCR | 1 -
emulators/vba/Makefile | 39 ----
emulators/vba/PLIST | 4 -
emulators/vba/distinfo | 18 -
emulators/vba/patches/patch-aa | 20 --
emulators/vba/patches/patch-ab | 15 -
emulators/vba/patches/patch-ac | 271 ------------------------------
emulators/vba/patches/patch-ad | 13 -
emulators/vba/patches/patch-ae | 22 --
emulators/vba/patches/patch-af | 43 ----
emulators/vba/patches/patch-ag | 72 -------
emulators/vba/patches/patch-src_GBA.cpp | 40 ----
emulators/vba/patches/patch-src_expr.cpp | 17 -
emulators/vba/patches/patch-src_expr.y | 15 -
emulators/vba/patches/patch-src_memgzio.c | 15 -
emulators/vba/patches/patch-src_memgzio.h | 14 -
17 files changed, 1 insertions(+), 621 deletions(-)
diffs (truncated from 700 to 300 lines):
diff -r b9b13ce63a8b -r cab1805b2dfc emulators/Makefile
--- a/emulators/Makefile Sun Jun 14 11:44:23 2020 +0000
+++ b/emulators/Makefile Sun Jun 14 11:45:06 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.328 2020/06/14 07:46:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.329 2020/06/14 11:45:06 nia Exp $
#
COMMENT= Emulators for other operating systems
@@ -390,7 +390,6 @@
SUBDIR+= uae
SUBDIR+= ucon64
SUBDIR+= unicorn
-SUBDIR+= vba
SUBDIR+= vice
SUBDIR+= visualboyadvance-m
SUBDIR+= vmips
diff -r b9b13ce63a8b -r cab1805b2dfc emulators/vba/DESCR
--- a/emulators/vba/DESCR Sun Jun 14 11:44:23 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Visual Boy Advance is a Gameboy Advance emulator.
diff -r b9b13ce63a8b -r cab1805b2dfc emulators/vba/Makefile
--- a/emulators/vba/Makefile Sun Jun 14 11:44:23 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2018/07/18 00:06:15 joerg Exp $
-
-DISTNAME= VisualBoyAdvance-src-1.7.2
-PKGNAME= vba-1.7.2
-PKGREVISION= 7
-CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vba/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://vba.ngemu.com/
-COMMENT= Gameboy advance emulator
-
-WRKSRC= ${WRKDIR}/VisualBoyAdvance-1.7.2
-USE_TOOLS+= gmake
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-#CONFIGURE_ARGS+= --enable-c-core
-#CONFIGURE_ARGS+= --without-mmx
-USE_LANGUAGES= c c++03
-UNLIMIT_RESOURCES= datasize
-
-GCC_REQD+= 3.0.0
-INSTALLATION_DIRS= bin
-
-.if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
-.endif
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/sdl/TestEmu ${DESTDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/src/sdl/VisualBoyAdvance \
- ${DESTDIR}${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/vba
- ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/vba
-
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff -r b9b13ce63a8b -r cab1805b2dfc emulators/vba/PLIST
--- a/emulators/vba/PLIST Sun Jun 14 11:44:23 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:51:09 joerg Exp $
-bin/TestEmu
-bin/VisualBoyAdvance
-share/doc/vba/README
diff -r b9b13ce63a8b -r cab1805b2dfc emulators/vba/distinfo
--- a/emulators/vba/distinfo Sun Jun 14 11:44:23 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.10 2020/03/26 02:35:31 joerg Exp $
-
-SHA1 (VisualBoyAdvance-src-1.7.2.tar.gz) = 04d82406079563fd17cda07f72488185e9152f51
-RMD160 (VisualBoyAdvance-src-1.7.2.tar.gz) = 44f94a4f270f2cda25879681c52892f6978caf99
-SHA512 (VisualBoyAdvance-src-1.7.2.tar.gz) = 58066cb438683c342c292c620cc87d9f2dff2b96849c46ff4c720146de5c7fb743588e42cd8de73e57866d4a191ccdadeab16da5e51da5a138199cc93ec4c932
-Size (VisualBoyAdvance-src-1.7.2.tar.gz) = 1410762 bytes
-SHA1 (patch-aa) = 2871ea4cf2451d489d1afe72af4abb86f1a58ca0
-SHA1 (patch-ab) = 55e1084d1cc48cff28b98a7fa68213d97f1f3d7e
-SHA1 (patch-ac) = 33158335dc12f335471d10962b4552082b589d25
-SHA1 (patch-ad) = b61c4053bbed582db5df2039c20b436e1d9e1ff1
-SHA1 (patch-ae) = b7e08365abd77b5c0f3473b4ce091b747298dfc8
-SHA1 (patch-af) = a3db22d606c34388f20ee29d9e8a1259346d105a
-SHA1 (patch-ag) = 851294d294c625badcdb6a0c9e7dcd6edd834620
-SHA1 (patch-src_GBA.cpp) = 8845f79e9b33469bc5eac0cc186038edb9bb8925
-SHA1 (patch-src_expr.cpp) = 7d43a3b77d7de9dc225f03e695891977c3dd50b8
-SHA1 (patch-src_expr.y) = 41ac1c39250c763157bdc3b64a83d4178f9ba0fa
-SHA1 (patch-src_memgzio.c) = bae20f8c724a489f36b48c62b81dc7d9a505fe0c
-SHA1 (patch-src_memgzio.h) = dae47bb6fb77f2d28b5317d140fb7c32a6db3573
diff -r b9b13ce63a8b -r cab1805b2dfc emulators/vba/patches/patch-aa
--- a/emulators/vba/patches/patch-aa Sun Jun 14 11:44:23 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/04/17 14:50:47 wiz Exp $
-
---- src/unzip.h.orig Sun Oct 20 06:03:12 2002
-+++ src/unzip.h Mon Jun 30 23:45:30 2003
-@@ -68,6 +68,15 @@
- #include "zlib.h"
- #endif
-
-+// nasty stuff taken from win32/include/zlib/zconf.h to make this compile
-+#ifndef OF /* function prototypes */
-+# ifdef STDC
-+# define OF(args) args
-+# else
-+# define OF(args) ()
-+# endif
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
- from (void*) without cast */
diff -r b9b13ce63a8b -r cab1805b2dfc emulators/vba/patches/patch-ab
--- a/emulators/vba/patches/patch-ab Sun Jun 14 11:44:23 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/04/17 14:50:47 wiz Exp $
-
---- win32/include/zlib/zutil.h.orig 2004-01-18 00:07:32.000000000 +0100
-+++ win32/include/zlib/zutil.h
-@@ -26,6 +26,10 @@
- # include <errno.h>
- #endif
-
-+#ifndef OF
-+#define OF(X) X
-+#endif
-+
- #ifndef local
- # define local static
- #endif
diff -r b9b13ce63a8b -r cab1805b2dfc emulators/vba/patches/patch-ac
--- a/emulators/vba/patches/patch-ac Sun Jun 14 11:44:23 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,271 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/04/17 14:50:47 wiz Exp $
-
---- src/sdl/SDL.cpp.orig 2004-05-21 22:16:58.000000000 +0200
-+++ src/sdl/SDL.cpp
-@@ -98,6 +98,7 @@ extern void MotionBlurIB32(u8*,u32,int,i
- 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
- {
- 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
- 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)
Home |
Main Index |
Thread Index |
Old Index