CVS commit: pkgsrc/emulators/PC6001VX

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Dec 22 16:06:30 UTC 2018

Modified Files:
        pkgsrc/emulators/PC6001VX: Makefile distinfo
Added Files:
        pkgsrc/emulators/PC6001VX: options.mk
        pkgsrc/emulators/PC6001VX/patches: patch-src_Qt_qtel6.cpp

Log Message:
PC6001VX: update to 3.1.0.

pkgsrc changes:

* make debug monitor, ffmpeg4 for video capture, and SDL2 for joystick
  support optional (for low performance machines; enabled by default)
* fix a URL for online help (already fixed in upstream)

Upstream changelog:

 * Better virtual keyboard display size.
 * Virtual Keyboard is now mouse operable.
 * Assigned "reset emulation speed" to middle mouse button.
 * Added "Convert replay to movie" menu.
 * Now audio is muted during encoding movie.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/emulators/PC6001VX/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/emulators/PC6001VX/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/PC6001VX/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/PC6001VX/patches/patch-src_Qt_qtel6.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/PC6001VX/Makefile
diff -u pkgsrc/emulators/PC6001VX/Makefile:1.28 pkgsrc/emulators/PC6001VX/Makefile:1.29
--- pkgsrc/emulators/PC6001VX/Makefile:1.28     Sun Dec  9 18:52:27 2018
+++ pkgsrc/emulators/PC6001VX/Makefile  Sat Dec 22 16:06:30 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2018/12/09 18:52:27 adam Exp $
+# $NetBSD: Makefile,v 1.29 2018/12/22 16:06:30 tsutsui Exp $
 
-VERSION=               3.0.0
+VERSION=               3.1.0
 DISTNAME=              PC6001VX_${VERSION}_src
 PKGNAME=               ${DISTNAME:S/_src//:S/_/-/}
-PKGREVISION=           3
+#PKGREVISION=          
 CATEGORIES=            emulators
 MASTER_SITES=          http://eighttails.up.seesaa.net/bin/
 
@@ -18,8 +18,11 @@ USE_LANGUAGES=               c c++
 
 INSTALLATION_DIRS+=    bin share/doc/PC6001VX
 
+.include "options.mk"
+
 do-configure:
-       cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} ${QTDIR}/bin/qmake -o Makefile PC6001VX.pro
+       cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} \
+               ${QTDIR}/bin/qmake -o Makefile ${QMAKE_ARGS} PC6001VX.pro
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/PC6001VX \
@@ -27,9 +30,7 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/README.html \
            ${DESTDIR}${PREFIX}/share/doc/PC6001VX
 
-.include "../../devel/SDL2/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/PC6001VX/distinfo
diff -u pkgsrc/emulators/PC6001VX/distinfo:1.9 pkgsrc/emulators/PC6001VX/distinfo:1.10
--- pkgsrc/emulators/PC6001VX/distinfo:1.9      Wed Aug 15 16:26:11 2018
+++ pkgsrc/emulators/PC6001VX/distinfo  Sat Dec 22 16:06:30 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2018/08/15 16:26:11 tsutsui Exp $
+$NetBSD: distinfo,v 1.10 2018/12/22 16:06:30 tsutsui Exp $
 
-SHA1 (PC6001VX_3.0.0_src.tar.gz) = 4f30f1f40de613173b4954954f015589586dd71d
-RMD160 (PC6001VX_3.0.0_src.tar.gz) = c777cbe3072cb2144177efa9c133911396e11cb0
-SHA512 (PC6001VX_3.0.0_src.tar.gz) = 6f292871269918f34b19438907b607092417068fc91321861b8119090e56340692d54e83e25df0614b5d28949f30283188e7f62c875ff5a091b080a2f94bba19
-Size (PC6001VX_3.0.0_src.tar.gz) = 4074671 bytes
+SHA1 (PC6001VX_3.1.0_src.tar.gz) = b5566c3ac744410d69228ede80ac50734e257415
+RMD160 (PC6001VX_3.1.0_src.tar.gz) = 03f65d247e07906844dc733e06e70e699a10bf5f
+SHA512 (PC6001VX_3.1.0_src.tar.gz) = 4afaaf9f506a2c483b9f159ef0738b93874eddcbbc575844889da86f66dc69fdb919dba7d4081aacb2c713afe091b95241cd7d9b3dee14eca98355a36873a3cd
+Size (PC6001VX_3.1.0_src.tar.gz) = 4077098 bytes
+SHA1 (patch-src_Qt_qtel6.cpp) = 4cfa4c70834dbec5f8def8e93b980f0287950eca

Added files:

Index: pkgsrc/emulators/PC6001VX/options.mk
diff -u /dev/null pkgsrc/emulators/PC6001VX/options.mk:1.1
--- /dev/null   Sat Dec 22 16:06:30 2018
+++ pkgsrc/emulators/PC6001VX/options.mk        Sat Dec 22 16:06:30 2018
@@ -0,0 +1,30 @@
+# $NetBSD: options.mk,v 1.1 2018/12/22 16:06:30 tsutsui Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.PC6001VX
+PKG_SUPPORTED_OPTIONS= debug ffmpeg sdl2
+
+# debug enables for debug monitor support, which can be disabled
+# for low performance machines.
+PKG_SUGGESTED_OPTIONS+=        debug
+# ffmpeg is required for video capture support.
+PKG_SUGGESTED_OPTIONS+=        ffmpeg
+# SDL2 is required for joystick support.
+PKG_SUGGESTED_OPTIONS+=        sdl2
+
+.include "../../mk/bsd.options.mk"
+
+.if empty(PKG_OPTIONS:Mdebug)
+QMAKE_ARGS+=   "DEFINES+=NOMONITOR"
+.endif
+
+.if !empty(PKG_OPTIONS:Mffmpeg)
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.else
+QMAKE_ARGS+=   "DEFINES+=NOAVI"
+.endif
+
+.if !empty(PKG_OPTIONS:Msdl2)
+.include "../../devel/SDL2/buildlink3.mk"
+.else
+QMAKE_ARGS+=   "DEFINES+=NOJOYSTICK"
+.endif

Index: pkgsrc/emulators/PC6001VX/patches/patch-src_Qt_qtel6.cpp
diff -u /dev/null pkgsrc/emulators/PC6001VX/patches/patch-src_Qt_qtel6.cpp:1.1
--- /dev/null   Sat Dec 22 16:06:30 2018
+++ pkgsrc/emulators/PC6001VX/patches/patch-src_Qt_qtel6.cpp    Sat Dec 22 16:06:30 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Qt_qtel6.cpp,v 1.1 2018/12/22 16:06:30 tsutsui Exp $
+
+- Fix URL for "online help" menu. (already fixed in upstream)
+
+--- src/Qt/qtel6.cpp.orig      2018-12-15 09:06:43.000000000 +0000
++++ src/Qt/qtel6.cpp
+@@ -143,7 +143,7 @@ void EL6::ExecMenu( int id )
+               QDesktopServices::openUrl(QUrl::fromLocalFile(QString("file://") + OSD_GetModulePath() + "/README.html"));
+               break;
+ #else
+-              QDesktopServices::openUrl(QUrl("https://github.com/eighttails/PC6001VX/blob/master/README.mkd";));
++              QDesktopServices::openUrl(QUrl("https://github.com/eighttails/PC6001VX/blob/master/README.adoc";));
+               break;
+ #endif
+       case ID_VERSION:                OSD_VersionDialog( graph->GetWindowHandle(), cfg->GetModel() ); break;  // バージョン情報