[pkgsrc/trunk]: pkgsrc/emulators/PC6001VX Pull upstream fixes.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/emulators/PC6001VX Pull upstream fixes.
From: tsutsui <tsutsui%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 06:45:53 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e820b71f6ef
branches:  trunk
changeset: 358972:5e820b71f6ef
user:      tsutsui <tsutsui%pkgsrc.org@localhost>
date:      Fri Feb 24 17:33:32 2017 +0000

description:
Pull upstream fixes.

- fix a missed comment for FDD access wait in pc6001v.ini file
- make QAudioOutput calls thread safe to suppress warning messages

Bump PKGREVISION.

diffstat:

 emulators/PC6001VX/Makefile                                  |    4 +-
 emulators/PC6001VX/distinfo                                  |    6 +-
 emulators/PC6001VX/patches/patch-PC6001VX.pro                |  753 +++++++++-
 emulators/PC6001VX/patches/patch-src_Qt_audiooutputwrapper.h |   42 +
 emulators/PC6001VX/patches/patch-src_Qt_osdQt.cpp            |   70 +
 5 files changed, 782 insertions(+), 93 deletions(-)

diffs (truncated from 931 to 300 lines):

diff -r 4b2a16d0dc80 -r 5e820b71f6ef emulators/PC6001VX/Makefile
--- a/emulators/PC6001VX/Makefile       Fri Feb 24 17:07:51 2017 +0000
+++ b/emulators/PC6001VX/Makefile       Fri Feb 24 17:33:32 2017 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2017/02/14 21:30:21 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2017/02/24 17:33:32 tsutsui Exp $
 
 VERSION=               2.30.0
 DISTNAME=              PC6001VX_${VERSION}_src
 PKGNAME=               ${DISTNAME:S/_src//:S/_/-/}
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            emulators
 MASTER_SITES=          http://eighttails.up.seesaa.net/bin/
 
diff -r 4b2a16d0dc80 -r 5e820b71f6ef emulators/PC6001VX/distinfo
--- a/emulators/PC6001VX/distinfo       Fri Feb 24 17:07:51 2017 +0000
+++ b/emulators/PC6001VX/distinfo       Fri Feb 24 17:33:32 2017 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.1 2017/01/15 11:11:01 tsutsui Exp $
+$NetBSD: distinfo,v 1.2 2017/02/24 17:33:32 tsutsui Exp $
 
 SHA1 (PC6001VX_2.30.0_src.tar.gz) = e6be8c003b5247ea57502f55974a332bf2ab0588
 RMD160 (PC6001VX_2.30.0_src.tar.gz) = 14ef360a479de18c88e8f2cba30ff9dec88869ed
 SHA512 (PC6001VX_2.30.0_src.tar.gz) = 813a1c0d34263e91ace6c34ba5931e8cd8cc981385990eaece9c32ad8288ca1d4b94acbd62bad76add41f0941ad3410aaab5251977e010cf43403ab528f9d683
 Size (PC6001VX_2.30.0_src.tar.gz) = 1639761 bytes
-SHA1 (patch-PC6001VX.pro) = b2cef4eb1457e2101d780db17ae9cc232180764d
+SHA1 (patch-PC6001VX.pro) = 9746ccdd8d5145829bd50159455c11ba2f187c01
+SHA1 (patch-src_Qt_audiooutputwrapper.h) = c753200af406cb135cca3b9afb507b989f169179
+SHA1 (patch-src_Qt_osdQt.cpp) = 831fd66b46aa661e324bfda96d0735a4ac2f8a73
diff -r 4b2a16d0dc80 -r 5e820b71f6ef emulators/PC6001VX/patches/patch-PC6001VX.pro
--- a/emulators/PC6001VX/patches/patch-PC6001VX.pro     Fri Feb 24 17:07:51 2017 +0000
+++ b/emulators/PC6001VX/patches/patch-PC6001VX.pro     Fri Feb 24 17:33:32 2017 +0000
@@ -1,113 +1,688 @@
-$NetBSD: patch-PC6001VX.pro,v 1.1 2017/01/15 11:11:01 tsutsui Exp $
+$NetBSD: patch-PC6001VX.pro,v 1.2 2017/02/24 17:33:32 tsutsui Exp $
 
 - pull following updates (use pkg-config more properly) from the upstream:
  https://github.com/eighttails/PC6001VX/commit/19367cdbaf4b624a64a962168767ae9fb1aef8c4
  https://github.com/eighttails/PC6001VX/commit/d4a7179f34a6eb454bce898815ab4f5ab767577b
  https://github.com/eighttails/PC6001VX/commit/fd695b875266be21fe6be22a918be6ea7cdc7f53
  https://github.com/eighttails/PC6001VX/commit/179408dc05377ea3c19f504f382436874466efa5
+- also pull upstream changes to make audio thread safe
+ https://github.com/eighttails/PC6001VX/commit/06db53e9d4892e3df429917b91882987b06ca641
 
 --- PC6001VX.pro.orig  2016-08-27 12:19:26.000000000 +0000
 +++ PC6001VX.pro
-@@ -4,7 +4,7 @@
- #
- #-------------------------------------------------
- 
+@@ -1,328 +1,347 @@
+-#-------------------------------------------------
+-#
+-# Project created by QtCreator 2012-01-01T00:17:09
+-#
+-#-------------------------------------------------
+-
 -QT       += core gui widgets network
-+QT += core gui widgets network
- 
- TARGET = PC6001VX
- TEMPLATE = app
-@@ -16,24 +16,30 @@
- #Define for Qt dependent code
- DEFINES += QTP6VX
- 
+-
+-TARGET = PC6001VX
+-TEMPLATE = app
+-
+-TRANSLATIONS = src/Qt/translation/PC6001VX_en.ts
+-
+-CONFIG += link_prl c++11
+-
+-#Define for Qt dependent code
+-DEFINES += QTP6VX
+-
 -#Disable joystick support.If joystick support is disabled, PC6001VX does not depend on SDL2.
-+#Disable joystick support.If uncommented below, PC6001VX does not depend on SDL2.
- #DEFINES += NOJOYSTICK
- 
-+#Disable joystick support.If uncommented below, PC6001VX does not depend on ffmpeg.
-+#DEFINES += NOAVI
-+
-+#Disable debug features.For low performance machine.
-+#DEFINES += NOMONITOR
-+
- #Other feature control flags.
- #DEFINES += NOSINGLEAPP
- #DEFINES += NOOPENGL
- #DEFINES += NOSOUND
+-#DEFINES += NOJOYSTICK
+-
+-#Other feature control flags.
+-#DEFINES += NOSINGLEAPP
+-#DEFINES += NOOPENGL
+-#DEFINES += NOSOUND
 -#DEFINES += NOAVI
- #DEFINES += REPLAYDEBUG
- #DEFINES += AUTOSUSPEND
- 
- debug:DEFINES += DEBUG
- INCLUDEPATH += src/Qt src/Qt/qtsingleapplication
- 
+-#DEFINES += REPLAYDEBUG
+-#DEFINES += AUTOSUSPEND
+-
+-debug:DEFINES += DEBUG
+-INCLUDEPATH += src/Qt src/Qt/qtsingleapplication
+-
 -linux{
-+#Configuration for UNIX variants
-+unix {
- #Configuration for Android
+-#Configuration for Android
 -android{
 -DEFINES += NOSINGLEAPP NOJOYSTICK NOMONITOR NOAVI ALWAYSFULLSCREEN AUTOSUSPEND USE_QGLWIDGET
-+android {
-+DEFINES += NOSINGLEAPP NOJOYSTICK NOMONITOR NOAVI ALWAYSFULLSCREEN AUTOSUSPEND
- #Set "ROM Path in target device" to "CUSTOM_ROM_PATH environment variable on build host"
- debug:DEFINES += CUSTOMROMPATH=\\\"$$(CUSTOM_ROM_PATH)\\\"
- }
-@@ -56,24 +62,24 @@
- #Configuration for X11(XCB)
- DEFINES += USE_X11
- QT += x11extras
+-#Set "ROM Path in target device" to "CUSTOM_ROM_PATH environment variable on build host"
+-debug:DEFINES += CUSTOMROMPATH=\\\"$$(CUSTOM_ROM_PATH)\\\"
+-}
+-pandora {
+-#Configuration for OpenPandora
+-QT += x11extras
+-
+-DEPLOY_PATH = /media/sddev/pc6001vx
+-target.path = $${DEPLOY_PATH}
+-sharedlibs.path = $${DEPLOY_PATH}
+-sharedlibs.files += $${PANDORA_SDK}/usr/lib/libX11.so.6* \
+-                    $${PANDORA_SDK}/usr/lib/libX11-xcb.so.1* \
+-                    $${PANDORA_SDK}/usr/lib/libxcb.so.1*
+-QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${DEPLOY_PATH}
+-INSTALLS += target sharedlibs
+-DEFINES += NOJOYSTICK NOOPENGL NOMONITOR NOAVI
+-#QTPLUGIN += qxcb qeglfs
+-}
+-!android:!pandora {
+-#Configuration for X11(XCB)
+-DEFINES += USE_X11
+-QT += x11extras
 -LIBS += -lX11
-+QMAKE_CXXFLAGS += $$system(pkg-config --cflags x11)
-+LIBS += $$system(pkg-config --libs x11)
- }
- }
- 
- #Configuration for Windows
+-}
+-}
+-
+-#Configuration for Windows
 -win32:{
-+win32 {
- DEFINES += WIN32
- #On Windows, links libraries statically as long as possible.
- QMAKE_LFLAGS += -static -lpthread
- RC_ICONS += src/win32/PC6001VX.ico
-+}
- 
- !contains(DEFINES, NOJOYSTICK) {
+-DEFINES += WIN32
+-#On Windows, links libraries statically as long as possible.
+-QMAKE_LFLAGS += -static -lpthread
+-RC_ICONS += src/win32/PC6001VX.ico
+-
+-!contains(DEFINES, NOJOYSTICK) {
 -#On Windows, referes SDL_DIR environment variable to search SDL2
 -QMAKE_CXXFLAGS += -I$$(SDL_DIR)/include -Dmain=SDL_main
 -LIBS += -L$$(SDL_DIR)/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid
-+win32 {
-+LIBS += -lmingw32 -lSDL2main -lSDL2 -lversion -mwindows
- }
+-}
 -} else {
 -!contains(DEFINES, NOJOYSTICK) {
-+unix {
- QMAKE_CXXFLAGS += $$system(sdl2-config --cflags)
- LIBS += $$system(sdl2-config --libs)
- }
-@@ -82,16 +88,23 @@
- !contains(DEFINES, NOOPENGL) {
- QT += opengl
- }
-+
- !contains(DEFINES, NOSOUND) {
- QT += multimedia
- SOURCES += \
-     src/Qt/wavfile.cpp \
-     src/Qt/utils.cpp
- }
-+
- !contains(DEFINES, NOAVI) {
- DEFINES += __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS
+-QMAKE_CXXFLAGS += $$system(sdl2-config --cflags)
+-LIBS += $$system(sdl2-config --libs)
+-}
+-}
+-
+-!contains(DEFINES, NOOPENGL) {
+-QT += opengl
+-}
+-!contains(DEFINES, NOSOUND) {
+-QT += multimedia
+-SOURCES += \
+-    src/Qt/wavfile.cpp \
+-    src/Qt/utils.cpp
+-}
+-!contains(DEFINES, NOAVI) {
+-DEFINES += __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS
 -LIBS += -lavformat -lavcodec -lswscale -lavutil -lswresample
 -win32:LIBS += -lvorbisenc -lvorbis -logg -lvpx
-+win32 {
-+LIBS += -lavformat -lavcodec -lswscale -lavutil -lswresample -lvorbisenc -lvorbis -logg -lvpx
-+}
-+unix {
-+QMAKE_CXXFLAGS += $$system(pkg-config --cflags libavformat libavcodec libswscale libavutil libswresample)
-+LIBS += $$system(pkg-config --libs libavformat libavcodec libswscale libavutil libswresample)
-+}
- }
- 
- SOURCES += \
+-}
+-
+-SOURCES += \
+-    src/Qt/aboutdialog.cpp \
+-    src/Qt/colorbutton.cpp \
+-    src/Qt/configdialog.cpp \
+-    src/Qt/emulationadaptor.cpp \
+-    src/Qt/osdQt.cpp \
+-    src/Qt/pc6001v.cpp \
+-    src/Qt/qtel6.cpp \
+-    src/Qt/qtsingleapplication/qtlocalpeer.cpp \
+-    src/Qt/qtsingleapplication/qtlockedfile.cpp \
+-    src/Qt/qtsingleapplication/qtlockedfile_unix.cpp \
+-    src/Qt/qtsingleapplication/qtlockedfile_win.cpp \
+-    src/Qt/qtsingleapplication/qtsingleapplication.cpp \
+-    src/Qt/qtsingleapplication/qtsinglecoreapplication.cpp \
+-    src/Qt/renderview.cpp \
+-    src/Qt/semaphore.cpp \
+-    src/Qt/thread.cpp \
+-    src/breakpoint.cpp \
+-    src/common.cpp \
+-    src/config.cpp \
+-    src/console.cpp \
+-    src/cpum.cpp \
+-    src/cpus.cpp \
+-    src/d88.cpp \
+-    src/debug.cpp \
+-    src/device.cpp \
+-    src/device/ay8910.cpp \
+-    src/device/fmgen/fmgen.cpp \
+-    src/device/fmgen/fmtimer.cpp \
+-    src/device/fmgen/opm.cpp \
+-    src/device/fmgen/opna.cpp \
+-    src/device/mc6847.cpp \
+-    src/device/pd7752.cpp \
+-    src/device/pd8255.cpp \
+-    src/device/ym2203.cpp \
+-    src/device/z80-dbg.cpp \
+-    src/device/z80.cpp \
+-    src/disk.cpp \
+-    src/error.cpp \
+-    src/graph.cpp \
+-    src/ini.cpp \
+-    src/intr.cpp \
+-    src/io.cpp \
+-    src/joystick.cpp \
+-    src/keyboard.cpp \
+-    src/memory.cpp \
+-    src/movie.cpp \
+-    src/p6el.cpp \
+-    src/p6t2.cpp \
+-    src/p6vm.cpp \
+-    src/pio.cpp \
+-    src/replay.cpp \
+-    src/schedule.cpp \
+-    src/sound.cpp \
+-    src/status.cpp \
+-    src/tape.cpp \
+-    src/vdg.cpp \
+-    src/voice.cpp \
+-    src/vsurface.cpp \ 
+-    src/Qt/keypanelbutton.cpp \
+-    src/Qt/keypanel.cpp \
+-    src/Qt/p6vxapp.cpp \
+-    src/psgfm.cpp \
+-    src/device/fmgen/psg.cpp
+-
+-
+-HEADERS  += \
+-    openpandora/pandora_develop_environment/linux-pandora-g++/qplatformdefs.h \
Prev by Date: [pkgsrc/trunk]: pkgsrc/multimedia +adobe-flash-player24
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Added multimedia/adobe-flash-player24 version 24.0...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/multimedia +adobe-flash-player24
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Added multimedia/adobe-flash-player24 version 24.0...
Indexes:
Home | Main Index | Thread Index | Old Index