diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2016-08-13 15:31:43 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2016-08-13 15:31:43 +0000 |
| commit | 271cb259885684342c57cd3b56da0da4adcddad0 (patch) | |
| tree | 4d03ccf1a8d8f60e0bc08b8400e834704eeb8701 /emulators/visualboyadvance-m | |
| parent | 9bf005c893ead62500af96e72ba07bb7f369f1a1 (diff) | |
| download | ports-271cb259885684342c57cd3b56da0da4adcddad0.tar.gz ports-271cb259885684342c57cd3b56da0da4adcddad0.zip | |
emulators/visualboyadvance-m: 1.8.0 -> 2.0.0b2
- patted portlint
- patches are now makepatch compliant
PR: 210058
Changes: http://vba-m.com/forum/showthread.php?tid=1037&pid=6091#pid6091
http://vba-m.com/forum/showthread.php?tid=1036&pid=6090#pid6090
Submitted by: Piotr Kubaj <pkubaj@anongoth.pl>
Reviewed by: pawel
Approved by: Allison N. Reid <root@cooltrainer.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=420162
Diffstat (limited to 'emulators/visualboyadvance-m')
9 files changed, 65 insertions, 60 deletions
diff --git a/emulators/visualboyadvance-m/Makefile b/emulators/visualboyadvance-m/Makefile index f283ce1a82bc..0d1b4562edfe 100644 --- a/emulators/visualboyadvance-m/Makefile +++ b/emulators/visualboyadvance-m/Makefile @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= visualboyadvance-m -PORTVERSION= 1.8.0r${SVN_REV} -PORTREVISION= 5 +PORTVERSION= 2.0.0b2 CATEGORIES= emulators -MASTER_SITES= https://cooltrainer.org/freebsd-ports/visualboyadvance-m/ MAINTAINER= root@cooltrainer.org COMMENT= Game Boy Advance emulator with GTK frontend @@ -14,6 +12,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png +USE_GITHUB= yes +GH_TAGNAME= VBA-M_Beta_2 + OPTIONS_DEFINE= NLS FFMPEG LINK LIRC DEBUGGER OPTIONS_MULTI= INTERFACE OPTIONS_MULTI_INTERFACE= GVBAM SDL @@ -38,7 +39,6 @@ USE_GL= gl glu USE_SDL= sdl USES= cmake dos2unix pkgconfig tar:bzip2 INSTALLS_ICONS= yes -SVN_REV= 1231 CMAKE_ARGS+= -DVERSION:STRING="${PORTVERSION}" \ -DSYSCONFDIR:STRING="${PREFIX}/etc" \ -DENABLE_WX:BOOL=no @@ -136,4 +136,8 @@ maint-gen-distfile: ${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME} ${RM} -rf ${DISTNAME} +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vbam + ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/vbam.1 ${STAGEDIR}${PREFIX}/man/man1/ + .include <bsd.port.mk> diff --git a/emulators/visualboyadvance-m/distinfo b/emulators/visualboyadvance-m/distinfo index 8269bca10e64..a3c9130c546c 100644 --- a/emulators/visualboyadvance-m/distinfo +++ b/emulators/visualboyadvance-m/distinfo @@ -1,2 +1,3 @@ -SHA256 (visualboyadvance-m-1.8.0r1231.tar.bz2) = 50729f26136fc3847d9f85d26aab0c080846d8df6c9b75e427c90ee117b63979 -SIZE (visualboyadvance-m-1.8.0r1231.tar.bz2) = 1007578 +TIMESTAMP = 1471102270 +SHA256 (visualboyadvance-m-visualboyadvance-m-2.0.0b2-VBA-M_Beta_2_GH0.tar.gz) = 0469684aa8bde5939cff9f928717c8b1b1ccbb7f57132b1752afd1359e9421ce +SIZE (visualboyadvance-m-visualboyadvance-m-2.0.0b2-VBA-M_Beta_2_GH0.tar.gz) = 3023671 diff --git a/emulators/visualboyadvance-m/files/patch-CMakeLists.txt b/emulators/visualboyadvance-m/files/patch-CMakeLists.txt index 3566d59ced78..81bf47f7abc1 100644 --- a/emulators/visualboyadvance-m/files/patch-CMakeLists.txt +++ b/emulators/visualboyadvance-m/files/patch-CMakeLists.txt @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2013-09-24 04:49:26.000000000 -0700 -+++ CMakeLists.txt 2014-04-29 15:02:57.323817303 -0700 +--- CMakeLists.txt.orig 2015-09-19 15:58:26 UTC ++++ CMakeLists.txt @@ -1,5 +1,5 @@ # The project's name is VBA-M it uses C and C++ code -PROJECT(VBA-M C CXX) @@ -7,13 +7,22 @@ cmake_minimum_required( VERSION 2.6.0 ) if( COMMAND cmake_policy ) -@@ -427,8 +427,7 @@ +@@ -354,7 +354,7 @@ IF( ENABLE_SDL ) + ENDIF( WIN32 ) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example -- DESTINATION ${SYSCONFDIR} -- RENAME vbam.cfg) -+ DESTINATION ${SYSCONFDIR}) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/vba-over.ini DESTINATION ${DATA_INSTALL_DIR}) + IF( ENABLE_LIRC ) +- SET( LIRC_CLIENT_LIBRARY lirc_client ) ++ SET( LIRC_CLIENT_LIBRARY /usr/local/lib/liblirc_client.so ) + ENDIF( ENABLE_LIRC ) + + TARGET_LINK_LIBRARIES ( +@@ -369,8 +369,7 @@ IF( ENABLE_SDL ) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam DESTINATION bin) + ENDIF( WIN32 ) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example +- DESTINATION ${SYSCONFDIR} +- RENAME vbam.cfg) ++ DESTINATION ${SYSCONFDIR}) ENDIF( ENABLE_SDL ) + IF( ENABLE_GTK ) diff --git a/emulators/visualboyadvance-m/files/patch-src-common-Patch.cpp b/emulators/visualboyadvance-m/files/patch-src-common-Patch.cpp index 32436d31a30a..761dbae84f6d 100644 --- a/emulators/visualboyadvance-m/files/patch-src-common-Patch.cpp +++ b/emulators/visualboyadvance-m/files/patch-src-common-Patch.cpp @@ -1,11 +1,10 @@ ---- src/common/Patch.cpp.orig 2010-01-02 21:18:59.624899346 -0500 -+++ src/common/Patch.cpp 2010-01-02 21:18:45.448378670 -0500 -@@ -4,7 +4,7 @@ - #include <zlib.h> +--- src/common/Patch.cpp.orig 2016-08-13 15:20:47 UTC ++++ src/common/Patch.cpp +@@ -6,6 +6,7 @@ + #endif #include "Patch.h" -- +#include <sys/param.h> - #ifdef __GNUC__ - #if defined(__APPLE__) || defined (BSD) + #ifndef __LIBRETRO__ + diff --git a/emulators/visualboyadvance-m/files/patch-src-common-ffmpeg.cpp b/emulators/visualboyadvance-m/files/patch-src-common-ffmpeg.cpp deleted file mode 100644 index dc1a2aefa4d0..000000000000 --- a/emulators/visualboyadvance-m/files/patch-src-common-ffmpeg.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- src/common/ffmpeg.cpp.orig 2014-04-29 21:21:05.929639513 -0700 -+++ src/common/ffmpeg.cpp 2014-04-29 21:26:22.513617805 -0700 -@@ -178,17 +178,31 @@ - // make sure RGB is supported (mostly not) - if(codec->pix_fmts) { - const enum PixelFormat *p; -+#if LIBAVCODEC_VERSION_MAJOR < 55 - int64_t mask = 0; -+#endif - for(p = codec->pix_fmts; *p != -1; p++) { - // may get complaints about 1LL; thus the cast -+#if LIBAVCODEC_VERSION_MAJOR < 55 - mask |= ((int64_t)1) << *p; -+#endif - if(*p == pixfmt) - break; - } - if(*p == -1) { - // if not supported, use a converter to the next best format - // this is swscale, the converter used by the output demo -+#if LIBAVCODEC_VERSION_MAJOR < 55 - enum PixelFormat dp = (PixelFormat)avcodec_find_best_pix_fmt(mask, pixfmt, 0, NULL); -+#else -+#if LIBAVCODEC_VERSION_MICRO >= 100 -+// FFmpeg -+ enum AVPixelFormat dp = avcodec_find_best_pix_fmt_of_list(codec->pix_fmts, pixfmt, 0, NULL); -+#else -+// libav -+ enum AVPixelFormat dp = avcodec_find_best_pix_fmt2(codec->pix_fmts, pixfmt, 0, NULL); -+#endif -+#endif - if(dp == -1) - dp = codec->pix_fmts[0]; - if(!(convpic = avcodec_alloc_frame()) || diff --git a/emulators/visualboyadvance-m/files/patch-src-gba-GBALink.cpp b/emulators/visualboyadvance-m/files/patch-src-gba-GBALink.cpp index db6e961da920..206b6a3c050a 100644 --- a/emulators/visualboyadvance-m/files/patch-src-gba-GBALink.cpp +++ b/emulators/visualboyadvance-m/files/patch-src-gba-GBALink.cpp @@ -1,5 +1,5 @@ ---- src/gba/GBALink.cpp.orig 2014-04-29 17:12:28.260667843 -0700 -+++ src/gba/GBALink.cpp 2014-04-29 17:15:31.307655026 -0700 +--- src/gba/GBALink.cpp.orig 2016-08-13 15:20:47 UTC ++++ src/gba/GBALink.cpp @@ -2,9 +2,10 @@ // with major changes by tjm #include <string.h> @@ -12,3 +12,12 @@ #include <stdlib.h> #else #include <malloc.h> +@@ -89,7 +90,7 @@ bool speedhack = true; + #include "GBALink.h" + #include "GBASockClient.h" + +-#include <SFML/Network.hpp> ++#include <SFML1/Network.hpp> + + #ifdef ENABLE_NLS + #include <libintl.h> diff --git a/emulators/visualboyadvance-m/files/patch-src-sdl-expr.cpp b/emulators/visualboyadvance-m/files/patch-src-sdl-expr.cpp index 535299570661..c4ca08be5b84 100644 --- a/emulators/visualboyadvance-m/files/patch-src-sdl-expr.cpp +++ b/emulators/visualboyadvance-m/files/patch-src-sdl-expr.cpp @@ -1,5 +1,5 @@ ---- src/sdl/expr.cpp.orig 2014-05-02 23:55:56.000000000 +0800 -+++ src/sdl/expr.cpp 2014-05-02 23:56:07.000000000 +0800 +--- src/sdl/expr.cpp.orig 2016-08-13 15:20:47 UTC ++++ src/sdl/expr.cpp @@ -90,14 +90,10 @@ /* Copy the first part of user declarations. */ #line 1 "expr.ypp" diff --git a/emulators/visualboyadvance-m/files/patch-src_common_ConfigManager.cpp b/emulators/visualboyadvance-m/files/patch-src_common_ConfigManager.cpp new file mode 100644 index 000000000000..5f08fc693bf2 --- /dev/null +++ b/emulators/visualboyadvance-m/files/patch-src_common_ConfigManager.cpp @@ -0,0 +1,10 @@ +--- src/common/ConfigManager.cpp.orig 2016-08-13 15:20:47 UTC ++++ src/common/ConfigManager.cpp +@@ -10,6 +10,7 @@ extern "C" { + #include <sys/types.h> + #include <sys/stat.h> + #include <cmath> ++#include <unistd.h> + + #include "../AutoBuild.h" + #include "../version.h" diff --git a/emulators/visualboyadvance-m/pkg-plist b/emulators/visualboyadvance-m/pkg-plist index b353fab9387a..a40dbb2e3cda 100644 --- a/emulators/visualboyadvance-m/pkg-plist +++ b/emulators/visualboyadvance-m/pkg-plist @@ -30,3 +30,10 @@ %%GVBAM%%share/vbam/ui/sound.ui %%GVBAM%%share/vbam/ui/vbam.ui %%GVBAM%%share/vbam/vba-over.ini +%%GVBAM%%share/icons/hicolor/128x128/apps/vbam.png +%%GVBAM%%share/icons/hicolor/256x256/apps/vbam.png +%%GVBAM%%share/icons/hicolor/48x48/apps/vbam.png +%%GVBAM%%share/icons/hicolor/64x64/apps/vbam.png +%%GVBAM%%share/icons/hicolor/96x96/apps/vbam.png +@dir share/man/man1 +man/man1/vbam.1.gz |