cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to vbam-2.0.2

Browse Source
This commit is contained in:
jasper 2018-04-24 12:04:00 +00:00
parent f2b6b0cf61
commit d0741fb468
7 changed files with 58 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
emulators/vbam/Makefile
View File

@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.22 2017/11/21 00:13:00 naddy Exp $
# XXX check if still needed at next update
CXXFLAGS += -std=c++11 -fpermissive
# $OpenBSD: Makefile,v 1.23 2018/04/24 12:04:00 jasper Exp $
COMMENT = emulator for Nintendo Game Boy (Color/Advance)
BROKEN-alpha = ICE or OOM on hq_implementation.cpp
BROKEN-hppa = ICE or OOM on src/filters/hq/c/hq_base.h:421
DISTNAME = vbam-1.8.0.1054-src
PKGNAME = ${DISTNAME:S/-src//}
REVISION = 11
GH_ACCOUNT = visualboyadvance-m
GH_PROJECT = ${GH_ACCOUNT}
GH_TAGNAME = v2.0.2
PKGNAME = vbam-${GH_TAGNAME:S/v//}
CATEGORIES = emulators
@ -19,16 +17,8 @@ HOMEPAGE = http://www.vba-m.com
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += GL GLU ICE SDL SM X11 Xcomposite Xcursor Xdamage Xext
WANTLIB += Xfixes Xi Xinerama Xmu Xrandr Xrender Xt atk-1.0 atkmm-1.6
WANTLIB += c cairo cairomm-1.0 fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gdkglext-x11-1.0 gdkglextmm-x11-1.2
WANTLIB += gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0
WANTLIB += gobject-2.0 gtk-x11-2.0 gtkglext-x11-1.0 gtkglextmm-x11-1.2
WANTLIB += gtkmm-2.4 iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pangomm-1.4 pangox-1.0 png pthread sigc-2.0 z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=vbam/}
WANTLIB += GL GLU SDL2 c iconv intl m png sfml-network sfml-system
WANTLIB += z
MODULES = devel/cmake
@ -37,21 +27,21 @@ COMPILER = base-clang ports-gcc
BUILD_DEPENDS = devel/gettext-tools
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
LIB_DEPENDS = devel/gettext \
devel/sdl2 \
graphics/png \
multimedia/sfml
LIB_DEPENDS = devel/sdl \
x11/gtkglextmm
CONFIGURE_ARGS += -DENABLE_FFMPEG=OFF \
-DENABLE_SDL=ON
# Creates unlinkable files ('data' according to file(1))
CONFIGURE_ARGS += -DENABLE_LTO=OFF
CXXFLAGS += -Wno-c++11-narrowing -I${X11BASE}/include
NO_TEST = Yes
WRKDIST = ${WRKDIR}/${DISTNAME:S/-src//}
# requires posix_openpt
CONFIGURE_ARGS += -DENABLE_WX=OFF -DENABLE_FFMPEG=OFF
CXXFLAGS += -Wno-c++11-narrowing
pre-fake:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vbam
post-install:
mv ${PREFIX}/etc/ ${PREFIX}/share/examples/vbam/
.include <bsd.port.mk>

4
emulators/vbam/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (vbam-1.8.0.1054-src.tar.gz) = ez+hDhRnLXgolvZMv4kQqmeAEPnd93CxAA8+VWw7jeQ=
SIZE (vbam-1.8.0.1054-src.tar.gz) = 1163135
SHA256 (visualboyadvance-m-2.0.2.tar.gz) = 93Rh+qZgtf2VUkkIfkXcHfqHq4r4IIrXkJtCSvCHllc=
SIZE (visualboyadvance-m-2.0.2.tar.gz) = 2959204

12
emulators/vbam/patches/patch-CMakeLists_txt
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2012/05/28 09:18:56 bentley Exp $
--- CMakeLists.txt.orig Tue Dec 27 14:02:22 2011
+++ CMakeLists.txt Mon May 28 01:52:43 2012
@@ -414,7 +414,7 @@ IF( ENABLE_SDL )
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
- DESTINATION ${SYSCONFDIR}
+ DESTINATION share/examples/vbam
RENAME vbam.cfg)
ENDIF( ENABLE_SDL )

15
emulators/vbam/patches/patch-fex_fex_blargg_common_h
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-fex_fex_blargg_common_h,v 1.1 2017/05/13 20:59:05 espie Exp $
an int is not a const char *!
Index: fex/fex/blargg_common.h
--- fex/fex/blargg_common.h.orig
+++ fex/fex/blargg_common.h
@@ -12,7 +12,7 @@
typedef const char* blargg_err_t; // 0 on success, otherwise error string
// Success; no error
-int const blargg_ok = 0;
+const char *const blargg_ok = nullptr;
// BLARGG_RESTRICT: equivalent to C99's restrict, where supported
#if __GNUC__ >= 3 || _MSC_VER >= 1100

30
emulators/vbam/patches/patch-src_common_Patch_cpp
View File

@ -1,19 +1,13 @@
$OpenBSD: patch-src_common_Patch_cpp,v 1.1.1.1 2012/05/28 09:18:56 bentley Exp $
--- src/common/Patch.cpp.orig Mon May 14 00:26:35 2012
+++ src/common/Patch.cpp Mon May 14 00:26:59 2012
@@ -7,13 +7,13 @@
#ifdef __GNUC__
-#if defined(__APPLE__) || defined (BSD) || defined (__NetBSD__)
+#if defined(__APPLE__) || defined (BSD) || defined (__NetBSD__) || defined(__OpenBSD__)
$OpenBSD: patch-src_common_Patch_cpp,v 1.2 2018/04/24 12:04:00 jasper Exp $
Index: src/common/Patch.cpp
--- src/common/Patch.cpp.orig
+++ src/common/Patch.cpp
@@ -13,7 +13,7 @@
#if defined(BSD) || defined(__NetBSD__)
#include <sys/param.h>
#endif
-#if defined(__APPLE__) || defined(BSD) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(BSD) || defined(__NetBSD__) || defined(__OpenBSD__)
typedef off_t __off64_t; /* off_t is 64 bits on BSD. */
#define fseeko64 fseeko
#define ftello64 ftello
#else
typedef off64_t __off64_t;
-#endif /* __APPLE__ || BSD */
+#endif /* __APPLE__ || BSD || __NetBSD__ || __OpenBSD__ */
#endif /* __GNUC__ */
#ifndef _MSC_VER
#define fseeko64 fseeko
#define ftello64 ftello

48
emulators/vbam/patches/patch-src_common_Port_h
View File

@ -1,37 +1,35 @@
$OpenBSD: patch-src_common_Port_h,v 1.1.1.1 2012/05/28 09:18:56 bentley Exp $
--- src/common/Port.h.orig Mon May 14 00:25:45 2012
+++ src/common/Port.h Mon May 14 00:26:01 2012
@@ -4,13 +4,13 @@
#include "Types.h"
$OpenBSD: patch-src_common_Port_h,v 1.2 2018/04/24 12:04:00 jasper Exp $
Index: src/common/Port.h
--- src/common/Port.h.orig
+++ src/common/Port.h
@@ -14,13 +14,13 @@
#endif
// swaps a 16-bit value
-static inline u16 swap16(u16 v)
+static inline u16 vswap16(u16 v)
-static inline uint16_t swap16(uint16_t v)
+static inline uint16_t vswap16(uint16_t v)
{
return (v<<8)|(v>>8);
return (v << 8) | (v >> 8);
}
// swaps a 32-bit value
-static inline u32 swap32(u32 v)
+static inline u32 vswap32(u32 v)
-static inline uint32_t swap32(uint32_t v)
+static inline uint32_t vswap32(uint32_t v)
{
return (v<<24)|((v<<8)&0xff0000)|((v>>8)&0xff00)|(v>>24);
return (v << 24) | ((v << 8) & 0xff0000) | ((v >> 8) & 0xff00) | (v >> 24);
}
@@ -36,13 +36,13 @@ static inline u32 swap32(u32 v)
@@ -47,10 +47,10 @@ static inline uint32_t swap32(uint32_t v)
#define WRITE32LE(base, value) __asm__("stwbrx %0, 0, %1" : : "r"(value), "r"(base) : "memory")
#else
#define READ16LE(x) \
- swap16(*((u16 *)(x)))
+ vswap16(*((u16 *)(x)))
#define READ32LE(x) \
- swap32(*((u32 *)(x)))
+ vswap32(*((u32 *)(x)))
#define WRITE16LE(x,v) \
- *((u16 *)x) = swap16((v))
+ *((u16 *)x) = vswap16((v))
#define WRITE32LE(x,v) \
- *((u32 *)x) = swap32((v))
+ *((u32 *)x) = vswap32((v))
-#define READ16LE(x) swap16(*((uint16_t *)(x)))
-#define READ32LE(x) swap32(*((uint32_t *)(x)))
-#define WRITE16LE(x, v) *((uint16_t *)x) = swap16((v))
-#define WRITE32LE(x, v) *((uint32_t *)x) = swap32((v))
+#define READ16LE(x) vswap16(*((uint16_t *)(x)))
+#define READ32LE(x) vswap32(*((uint32_t *)(x)))
+#define WRITE16LE(x, v) *((uint16_t *)x) = vswap16((v))
+#define WRITE32LE(x, v) *((uint32_t *)x) = vswap32((v))
#endif
#else
#define READ16LE(x) \
#define READ16LE(x) *((uint16_t *)x)

43
emulators/vbam/pkg/PLIST
View File

@ -1,46 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2012/06/15 08:32:15 ajacoutot Exp $
@bin bin/gvbam
@comment $OpenBSD: PLIST,v 1.3 2018/04/24 12:04:00 jasper Exp $
@bin bin/vbam
share/applications/gvbam.desktop
@man man/man6/vbam.6
share/examples/vbam/
share/examples/vbam/vbam.cfg
@sample ${SYSCONFDIR}/vbam.cfg
share/icons/hicolor/16x16/apps/vbam.png
share/icons/hicolor/22x22/apps/vbam.png
share/icons/hicolor/24x24/apps/vbam.png
share/icons/hicolor/32x32/apps/vbam.png
share/icons/hicolor/scalable/apps/vbam.svg
share/locale/ca_ES/
share/locale/ca_ES/LC_MESSAGES/
share/locale/ca_ES/LC_MESSAGES/gvbam.mo
share/locale/cs/LC_MESSAGES/gvbam.mo
share/locale/de/LC_MESSAGES/gvbam.mo
share/locale/en/LC_MESSAGES/gvbam.mo
share/locale/es_ES/
share/locale/es_ES/LC_MESSAGES/
share/locale/es_ES/LC_MESSAGES/gvbam.mo
share/locale/fr/LC_MESSAGES/gvbam.mo
share/locale/it_IT/
share/locale/it_IT/LC_MESSAGES/
share/locale/it_IT/LC_MESSAGES/gvbam.mo
share/locale/nb/LC_MESSAGES/gvbam.mo
share/locale/nl/LC_MESSAGES/gvbam.mo
share/locale/pl/LC_MESSAGES/gvbam.mo
share/locale/pt_BR/LC_MESSAGES/gvbam.mo
share/locale/sv/LC_MESSAGES/gvbam.mo
share/locale/zh_CN/LC_MESSAGES/gvbam.mo
share/vbam/
share/vbam/ui/
share/vbam/ui/cheatedit.ui
share/vbam/ui/cheatlist.ui
share/vbam/ui/display.ui
share/vbam/ui/gameboy.ui
share/vbam/ui/gameboyadvance.ui
share/vbam/ui/preferences.ui
share/vbam/ui/sound.ui
share/vbam/ui/vbam.ui
share/vbam/vba-over.ini
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor