From owner-svn-ports-all@FreeBSD.ORG Fri Jun 20 10:20:19 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A23A9EBF; Fri, 20 Jun 2014 10:20:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 828A62D77; Fri, 20 Jun 2014 10:20:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5KAKJUI022941; Fri, 20 Jun 2014 10:20:19 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5KAKIOo022934; Fri, 20 Jun 2014 10:20:18 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201406201020.s5KAKIOo022934@svn.freebsd.org> From: John Marino Date: Fri, 20 Jun 2014 10:20:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358546 - in head/emulators/visualboyadvance-m: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2014 10:20:19 -0000 Author: marino Date: Fri Jun 20 10:20:17 2014 New Revision: 358546 URL: http://svnweb.freebsd.org/changeset/ports/358546 QAT: https://qat.redports.org/buildarchive/r358546/ Log: emulators/visualboyadvance-m: Upgrade version r1001 => r1231 Improvements: * Add Link support * Add Lirc support * Patch SDL interface (thanks dennylin93) * Several new translations * Many small fixes to various titles PR: 189647 Submitted by: maintainer (Nicole Reid) Added: head/emulators/visualboyadvance-m/files/patch-src-common-ffmpeg.cpp (contents, props changed) head/emulators/visualboyadvance-m/files/patch-src-gba-GBALink.cpp (contents, props changed) head/emulators/visualboyadvance-m/files/patch-src-sdl-expr.cpp (contents, props changed) Deleted: head/emulators/visualboyadvance-m/files/patch-fex-fex-Data_Reader.cpp head/emulators/visualboyadvance-m/files/patch-src-Util.cpp head/emulators/visualboyadvance-m/files/patch-src-gtk-filters.cpp head/emulators/visualboyadvance-m/files/patch-src-gtk-filters.h head/emulators/visualboyadvance-m/files/patch-src-gtk-gvbam.desktop Modified: head/emulators/visualboyadvance-m/Makefile head/emulators/visualboyadvance-m/distinfo head/emulators/visualboyadvance-m/files/patch-CMakeLists.txt head/emulators/visualboyadvance-m/pkg-plist Modified: head/emulators/visualboyadvance-m/Makefile ============================================================================== --- head/emulators/visualboyadvance-m/Makefile Fri Jun 20 10:16:53 2014 (r358545) +++ head/emulators/visualboyadvance-m/Makefile Fri Jun 20 10:20:17 2014 (r358546) @@ -3,39 +3,60 @@ PORTNAME= visualboyadvance-m PORTVERSION= 1.8.0r${SVN_REV} -PORTREVISION= 3 CATEGORIES= emulators -MASTER_SITES= http://update.cooltrainer.org/emulators/visualboyadvance-m/ +MASTER_SITES= https://cooltrainer.org/freebsd-ports/visualboyadvance-m/ MAINTAINER= root@cooltrainer.org COMMENT= Game Boy Advance emulator with GTK frontend +LICENSE= GPLv2 + LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ - libcairomm-1.0.so:${PORTSDIR}/graphics/cairomm \ libsfml-system.so:${PORTSDIR}/devel/sfml -OPTIONS_DEFINE= GVBAM NLS -OPTIONS_DEFAULT= GVBAM -OPTIONS_DEFINE_i386= ASM +OPTIONS_DEFINE= NLS FFMPEG LINK LIRC DEBUGGER +OPTIONS_MULTI= INTERFACE +OPTIONS_MULTI_INTERFACE= GVBAM SDL +OPTIONS_DEFINE_i386= ASMCORE ASMSCALERS +OPTIONS_DEFAULT= DEBUGGER SDL OPTIONS_SUB= yes -GVBAM_DESC= Build gvbam (GTK2 frontend) -NLS_USES= gettext +GVBAM_DESC= Enable GTK interface +SDL_DESC= Enable SDL interface +FFMPEG_DESC= Enable FFmpeg A/V recording +LINK_DESC= Enable GBA linking functionality +LIRC_DESC= Enable LIRC infrared support +DEBUGGER_DESC= Enable the debugger +ASMCORE_DESC= Enable x86 ASM CPU cores (i386 only) +ASMSCALERS_DESC= Enable x86 ASM graphic filters (i386 only) +NLS_USES= gettext WANT_GNOME= yes -DOS2UNIX_REGEX= .*\.(c|cpp|h) +DOS2UNIX_REGEX= .*\.(c|cpp|h|ypp) USE_XORG= x11 xext USE_GL= gl glu USE_SDL= sdl -USES= cmake desktop-file-utils dos2unix pkgconfig tar:bzip2 -CMAKE_ARGS+= -DVERSION:STRING="${PORTVERSION}" -DSYSCONFDIR:STRING="${PREFIX}/etc" -SVN_REV= 1001 +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 .include -.if ${PORT_OPTIONS:MASM} +.if ${PORT_OPTIONS:MASMCORE} || ${PORT_OPTIONS:MASMSCALERS} BUILD_DEPENDS+= as:${PORTSDIR}/devel/binutils -CMAKE_ARGS+= -DENABLE_ASM_CORE:BOOL=yes -DENABLE_ASM_SCALERS:BOOL=yes +.if ${PORT_OPTIONS:MASMCORE} +CMAKE_ARGS+= -DENABLE_ASM_CORE:BOOL=yes +.else +CMAKE_ARGS+= -DENABLE_ASM_CORE:BOOL=no +.endif +.if ${PORT_OPTIONS:MASMSCALERS} +CMAKE_ARGS+= -DENABLE_ASM_SCALERS:BOOL=yes +.else +CMAKE_ARGS+= -DENABLE_ASM_SCALERS:BOOL=no +.endif .endif .if ${PORT_OPTIONS:MGVBAM} @@ -43,18 +64,57 @@ USE_GNOME= gtk20 LIB_DEPENDS+= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \ libglibmm-2.4.so:${PORTSDIR}/devel/glibmm \ libgiomm-2.4.so:${PORTSDIR}/devel/glibmm \ + libcairomm-1.0.so:${PORTSDIR}/graphics/cairomm \ libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \ libgdkglextmm-x11-1.2.so:${PORTSDIR}/x11-toolkits/gtkglextmm +CMAKE_ARGS+= -DENABLE_GTK:BOOL=yes +USES+= desktop-file-utils .else CMAKE_ARGS+= -DENABLE_GTK:BOOL=no .endif +.if ${PORT_OPTIONS:MSDL} +.if !${PORT_OPTIONS:MDEBUGGER} +BROKEN= SDL requires DEBUGGER +.endif +CMAKE_ARGS+= -DENABLE_SDL:BOOL=yes +.else +CMAKE_ARGS+= -DENABLE_SDL:BOOL=no +.endif + +.if ${PORT_OPTIONS:MDEBUGGER} +CMAKE_ARGS+= -DENABLE_DEBUGGER:BOOL=yes +.else +CMAKE_ARGS+= -DENABLE_DEBUGGER:BOOL=no +.endif + +.if ${PORT_OPTIONS:MFFMPEG} +LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg +CMAKE_ARGS+= -DENABLE_FFMPEG:BOOL=yes +.else +CMAKE_ARGS+= -DENABLE_FFMPEG:BOOL=no +.endif + .if ${PORT_OPTIONS:MNLS} CMAKE_ARGS+= -DENABLE_NLS:BOOL=yes .else CMAKE_ARGS+= -DENABLE_NLS:BOOL=no .endif +.if ${PORT_OPTIONS:MLINK} +CMAKE_ARGS+= -DENABLE_LINK:BOOL=yes +.else +CMAKE_ARGS+= -DENABLE_LINK:BOOL=no +.endif + +.if ${PORT_OPTIONS:MLIRC} +LIB_DEPENDS+= liblirc_client.so:${PORTSDIR}/comms/lirc +RUN_DEPENDS+= lircd:${PORTSDIR}/comms/lirc +CMAKE_ARGS+= -DENABLE_LIRC:BOOL=yes +.else +CMAKE_ARGS+= -DENABLE_LIRC:BOOL=no +.endif + post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/CMakeScripts/FindSFML.cmake @@ -64,7 +124,7 @@ maint-gen-distfile: ${FALSE}; \ fi svn export -r${SVN_REV} \ - https://vbam.svn.sourceforge.net/svnroot/vbam/trunk ${DISTNAME} + https://svn.code.sf.net/p/vbam/code/trunk/ ${DISTNAME} ${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME} ${RM} -rf ${DISTNAME} Modified: head/emulators/visualboyadvance-m/distinfo ============================================================================== --- head/emulators/visualboyadvance-m/distinfo Fri Jun 20 10:16:53 2014 (r358545) +++ head/emulators/visualboyadvance-m/distinfo Fri Jun 20 10:20:17 2014 (r358546) @@ -1,2 +1,2 @@ -SHA256 (visualboyadvance-m-1.8.0r1001.tar.bz2) = 8668c8b556826681c8e848d999ff3ba1383daf78e3410a20bcfc0e8f2eeed4c2 -SIZE (visualboyadvance-m-1.8.0r1001.tar.bz2) = 766938 +SHA256 (visualboyadvance-m-1.8.0r1231.tar.bz2) = 50729f26136fc3847d9f85d26aab0c080846d8df6c9b75e427c90ee117b63979 +SIZE (visualboyadvance-m-1.8.0r1231.tar.bz2) = 1007578 Modified: head/emulators/visualboyadvance-m/files/patch-CMakeLists.txt ============================================================================== --- head/emulators/visualboyadvance-m/files/patch-CMakeLists.txt Fri Jun 20 10:16:53 2014 (r358545) +++ head/emulators/visualboyadvance-m/files/patch-CMakeLists.txt Fri Jun 20 10:20:17 2014 (r358546) @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2010-03-14 23:36:45.000000000 -0400 -+++ CMakeLists.txt 2010-11-26 03:08:11.543538713 -0500 +--- CMakeLists.txt.orig 2013-09-24 04:49:26.000000000 -0700 ++++ CMakeLists.txt 2014-04-29 15:02:57.323817303 -0700 @@ -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,13 @@ cmake_minimum_required( VERSION 2.6.0 ) if( COMMAND cmake_policy ) -@@ -344,8 +344,7 @@ +@@ -427,8 +427,7 @@ 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}) ENDIF( ENABLE_SDL ) - IF( ENABLE_GTK ) Added: head/emulators/visualboyadvance-m/files/patch-src-common-ffmpeg.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/visualboyadvance-m/files/patch-src-common-ffmpeg.cpp Fri Jun 20 10:20:17 2014 (r358546) @@ -0,0 +1,34 @@ +--- 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()) || Added: head/emulators/visualboyadvance-m/files/patch-src-gba-GBALink.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/visualboyadvance-m/files/patch-src-gba-GBALink.cpp Fri Jun 20 10:20:17 2014 (r358546) @@ -0,0 +1,14 @@ +--- 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 +@@ -2,9 +2,10 @@ + // with major changes by tjm + #include + #include ++#include + + // malloc.h does not seem to exist on Mac OS 10.7 +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + #include + #else + #include Added: head/emulators/visualboyadvance-m/files/patch-src-sdl-expr.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/visualboyadvance-m/files/patch-src-sdl-expr.cpp Fri Jun 20 10:20:17 2014 (r358546) @@ -0,0 +1,17 @@ +--- 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 +@@ -90,14 +90,10 @@ + /* Copy the first part of user declarations. */ + #line 1 "expr.ypp" + +-namespace std { + #include + #include + #include + #include +-} +- +-using namespace std; + + #include "../System.h" + #include "../gba/elf.h" Modified: head/emulators/visualboyadvance-m/pkg-plist ============================================================================== --- head/emulators/visualboyadvance-m/pkg-plist Fri Jun 20 10:16:53 2014 (r358545) +++ head/emulators/visualboyadvance-m/pkg-plist Fri Jun 20 10:20:17 2014 (r358546) @@ -1,16 +1,28 @@ -bin/vbam +%%GVBAM%%bin/gvbam +%%SDL%%bin/vbam @unexec if cmp -s %D/etc/vbam.cfg-example %D/etc/vbam.cfg; then rm -f %D/etc/vbam.cfg; fi etc/vbam.cfg-example @exec if [ ! -f %D/etc/vbam.cfg ] ; then cp -p %D/%F %B/vbam.cfg; fi -%%GVBAM%%bin/gvbam %%GVBAM%%share/applications/gvbam.desktop %%GVBAM%%share/icons/hicolor/16x16/apps/vbam.png %%GVBAM%%share/icons/hicolor/22x22/apps/vbam.png %%GVBAM%%share/icons/hicolor/24x24/apps/vbam.png %%GVBAM%%share/icons/hicolor/32x32/apps/vbam.png %%GVBAM%%share/icons/hicolor/scalable/apps/vbam.svg +%%GVBAM%%%%NLS%%share/locale/ca_ES/LC_MESSAGES/gvbam.mo +%%GVBAM%%%%NLS%%share/locale/cs/LC_MESSAGES/gvbam.mo +%%GVBAM%%%%NLS%%share/locale/de/LC_MESSAGES/gvbam.mo %%GVBAM%%%%NLS%%share/locale/en/LC_MESSAGES/gvbam.mo +%%GVBAM%%%%NLS%%share/locale/es_ES/LC_MESSAGES/gvbam.mo %%GVBAM%%%%NLS%%share/locale/fr/LC_MESSAGES/gvbam.mo +%%GVBAM%%%%NLS%%share/locale/it_IT/LC_MESSAGES/gvbam.mo +%%GVBAM%%%%NLS%%share/locale/nb/LC_MESSAGES/gvbam.mo +%%GVBAM%%%%NLS%%share/locale/nl/LC_MESSAGES/gvbam.mo +%%GVBAM%%%%NLS%%share/locale/pl/LC_MESSAGES/gvbam.mo +%%GVBAM%%%%NLS%%share/locale/pt_BR/LC_MESSAGES/gvbam.mo +%%GVBAM%%%%NLS%%share/locale/sv/LC_MESSAGES/gvbam.mo +%%GVBAM%%%%NLS%%share/locale/zh_CN/LC_MESSAGES/gvbam.mo +%%GVBAM%%%%NLS%%share/locale/zh_TW/LC_MESSAGES/gvbam.mo %%GVBAM%%share/vbam/ui/cheatedit.ui %%GVBAM%%share/vbam/ui/cheatlist.ui %%GVBAM%%share/vbam/ui/display.ui @@ -20,17 +32,9 @@ etc/vbam.cfg-example %%GVBAM%%share/vbam/ui/sound.ui %%GVBAM%%share/vbam/ui/vbam.ui %%GVBAM%%share/vbam/vba-over.ini -%%GVBAM%%@dirrm share/vbam/ui -%%GVBAM%%@dirrm share/vbam -%%GVBAM%%@dirrm share/icons/hicolor/scalable/apps -%%GVBAM%%@dirrm share/icons/hicolor/scalable -%%GVBAM%%@dirrm share/icons/hicolor/32x32/apps -%%GVBAM%%@dirrm share/icons/hicolor/32x32 -%%GVBAM%%@dirrm share/icons/hicolor/24x24/apps -%%GVBAM%%@dirrm share/icons/hicolor/24x24 -%%GVBAM%%@dirrm share/icons/hicolor/22x22/apps -%%GVBAM%%@dirrm share/icons/hicolor/22x22 -%%GVBAM%%@dirrm share/icons/hicolor/16x16/apps -%%GVBAM%%@dirrm share/icons/hicolor/16x16 -%%GVBAM%%@dirrm share/icons/hicolor -%%GVBAM%%@dirrm share/icons +%%GVBAM%%%%NLS%%@dirrmtry share/locale/ca_ES/LC_MESSAGES +%%GVBAM%%%%NLS%%@dirrmtry share/locale/ca_ES +%%GVBAM%%%%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES +%%GVBAM%%%%NLS%%@dirrmtry share/locale/it_IT +%%GVBAM%%@dirrmtry share/vbam/ui +@dirrmtry share/vbam