pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/yabause yabause: Upgrade to 0.9.15
details: https://anonhg.NetBSD.org/pkgsrc/rev/10c21444fdac
branches: trunk
changeset: 342957:10c21444fdac
user: kamil <kamil%pkgsrc.org@localhost>
date: Mon Oct 28 09:33:29 2019 +0000
description:
yabause: Upgrade to 0.9.15
Switch from qt4 to qt5.
CHANGELOG
=========
Yabause 0.9.15
August 24, 2016 - guillaume.duhamel - Release
Following our strict release schedule, here's a new Yabause version.
This new version includes so many new stuff, I cannot list them all.
(If you really want the full list, it's on our repository)
Arguably, the most notable features of this release are:
- Low-level CD Block emulation
- CloneCD file format support
- High resolution for the software renderer
We also included code from other great projects:
- Musashi 68K core (code by Karl Stenerud)
- SSF sound format playing (code by R. Belmont, Richard Bannister, Neil Corlett)
As many of you should already be aware, Yabause was forked into a new project,
uoYabause, by devmiyax. We included some of his fixes back into Yabause.
Due to lack of maintainer, this release will be the last to include a gtk port.
Since our last release, we also improved our tools:
- Automated builds for linux, mac and windows
- Development builds pushed after each commit
- Translations on Transifex
- Compatibility reports on our wiki
And finally, we had to move from Paypal to Patreon
diffstat:
emulators/yabause/Makefile | 7 +-
emulators/yabause/PLIST | 8 ++-
emulators/yabause/distinfo | 22 +++----
emulators/yabause/options.mk | 5 +-
emulators/yabause/patches/patch-CMakeLists.txt | 16 -----
emulators/yabause/patches/patch-l10n_CMakeLists.txt | 13 ----
emulators/yabause/patches/patch-src_CMakeLists.txt | 44 ----------------
emulators/yabause/patches/patch-src_persdljoy.c | 17 ------
emulators/yabause/patches/patch-src_qt_CMakeLists.txt | 21 -------
emulators/yabause/patches/patch-src_qt_YabauseThread.cpp | 14 -----
emulators/yabause/patches/patch-src_qt_ui_UICheatRaw.cpp | 15 +++++
emulators/yabause/patches/patch-src_qt_ui_UICheatRaw.h | 15 +++++
emulators/yabause/patches/patch-src_qt_ui_UICheats.cpp | 15 +++++
emulators/yabause/patches/patch-src_qt_ui_UIHexInput.h | 15 +++++
emulators/yabause/patches/patch-src_sndsdl.c | 13 ----
emulators/yabause/patches/patch-src_yabause.c | 13 ----
16 files changed, 82 insertions(+), 171 deletions(-)
diffs (truncated from 350 to 300 lines):
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/Makefile
--- a/emulators/yabause/Makefile Mon Oct 28 09:27:53 2019 +0000
+++ b/emulators/yabause/Makefile Mon Oct 28 09:33:29 2019 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2019/07/21 22:24:47 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2019/10/28 09:33:29 kamil Exp $
-DISTNAME= yabause-0.9.14
-PKGREVISION= 10
+DISTNAME= yabause-0.9.15
CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yabause/}
+MASTER_SITES= https://download.tuxfamily.org/yabause/releases/${PKGVERSION_NOREV}/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://yabause.sourceforge.net/
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/PLIST
--- a/emulators/yabause/PLIST Mon Oct 28 09:27:53 2019 +0000
+++ b/emulators/yabause/PLIST Mon Oct 28 09:33:29 2019 +0000
@@ -1,18 +1,24 @@
-@comment $NetBSD: PLIST,v 1.6 2015/02/13 05:45:09 snj Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/10/28 09:33:29 kamil Exp $
bin/yabause
man/man1/yabause.1
share/applications/yabause.desktop
share/pixmaps/yabause.png
share/yabause/yts/ar.yts
+share/yabause/yts/da.yts
share/yabause/yts/de.yts
+share/yabause/yts/el.yts
share/yabause/yts/es.yts
share/yabause/yts/fr.yts
share/yabause/yts/it.yts
+share/yabause/yts/ja.yts
+share/yabause/yts/ko.yts
share/yabause/yts/lt.yts
share/yabause/yts/nl.yts
+share/yabause/yts/pl_PL.yts
share/yabause/yts/pt.yts
share/yabause/yts/pt_BR.yts
share/yabause/yts/ru.yts
share/yabause/yts/sv.yts
+share/yabause/yts/tr.yts
share/yabause/yts/zh_CN.yts
share/yabause/yts/zh_TW.yts
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/distinfo
--- a/emulators/yabause/distinfo Mon Oct 28 09:27:53 2019 +0000
+++ b/emulators/yabause/distinfo Mon Oct 28 09:33:29 2019 +0000
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.11 2016/10/16 10:10:02 bsiegert Exp $
+$NetBSD: distinfo,v 1.12 2019/10/28 09:33:29 kamil Exp $
-SHA1 (yabause-0.9.14.tar.gz) = abd7936234f47f9568809b6bf955940c7a3ad447
-RMD160 (yabause-0.9.14.tar.gz) = 545eea2280b881ae4ddcea2b8b189301bea4176d
-SHA512 (yabause-0.9.14.tar.gz) = 8b14d9146cf12d104fcf43369cd949f1f47e7891a54241914f6141facf871bcc158f4e80a8c5b61fdeefe6f1b8d425ff301ba653df134a030c323c9e3ccf3a58
-Size (yabause-0.9.14.tar.gz) = 1662762 bytes
-SHA1 (patch-CMakeLists.txt) = c500a586921a537b021cf83e024865c78c8ef2f8
-SHA1 (patch-l10n_CMakeLists.txt) = ef32472ba02a57f08568ac9d31d6dd6f965db448
-SHA1 (patch-src_CMakeLists.txt) = 382d8004222ff9f5235ddce35fa41e6196469ba0
-SHA1 (patch-src_persdljoy.c) = d64977e79fc41935feeec8bc6dafba3fdd362ffb
-SHA1 (patch-src_qt_CMakeLists.txt) = 0fc3eaf95bcde28158b661303671a10ae56c94d7
-SHA1 (patch-src_qt_YabauseThread.cpp) = 1dc06681cd04b6d5eb26b818120724ccdb89fd25
-SHA1 (patch-src_sndsdl.c) = fe8b4432804ebcf62d3df713cd4fe371deb5c579
-SHA1 (patch-src_yabause.c) = 2780aae8d7f70f12e8691fb3a656beb7eb17ce8f
+SHA1 (yabause-0.9.15.tar.gz) = bc828a2db1275a20f24868ef527029ef5e7c1e1c
+RMD160 (yabause-0.9.15.tar.gz) = 1df9103ca844cae0ab3a7476f8093fac7bb144e4
+SHA512 (yabause-0.9.15.tar.gz) = f7e992e3326e68aca1c0ce6dd0d382eea00cd3e47492c045d17526909356198448c533b00568af3ab311307e6b3d47a28708a8c0ff74e5b6c98d62da8c01a3c7
+Size (yabause-0.9.15.tar.gz) = 2481650 bytes
+SHA1 (patch-src_qt_ui_UICheatRaw.cpp) = 1656ffbf04f3c92f7ac8b065dc6db4902c683aad
+SHA1 (patch-src_qt_ui_UICheatRaw.h) = e93ddcbff583c53e06bec1a1d9d33b7d1b638df8
+SHA1 (patch-src_qt_ui_UICheats.cpp) = 48df9bd8e06d3c1d0d5752d0be4dc5c7f9d9e740
+SHA1 (patch-src_qt_ui_UIHexInput.h) = 5c8e59bd6db984ab97a9ea1bb05436bd51824964
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/options.mk
--- a/emulators/yabause/options.mk Mon Oct 28 09:27:53 2019 +0000
+++ b/emulators/yabause/options.mk Mon Oct 28 09:33:29 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2019/08/30 17:01:32 nia Exp $
+# $NetBSD: options.mk,v 1.8 2019/10/28 09:33:29 kamil Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.yabause
PKG_SUPPORTED_OPTIONS= openal opengl sdl
@@ -17,7 +17,8 @@
.if !empty(PKG_OPTIONS:Mqt)
CONFIGURE_ENV+= YAB_PORTS=qt
CMAKE_ARGS+= -DYAB_PORTS=qt
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
.elif !empty(PKG_OPTIONS:Mgtk)
CONFIGURE_ENV+= YAB_PORTS=gtk
CMAKE_ARGS+= -DYAB_PORTS=gtk
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/patches/patch-CMakeLists.txt
--- a/emulators/yabause/patches/patch-CMakeLists.txt Mon Oct 28 09:27:53 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2016/10/16 10:10:02 bsiegert Exp $
-
---- CMakeLists.txt.orig 2014-11-22 14:23:18.000000000 +0000
-+++ CMakeLists.txt
-@@ -16,11 +16,6 @@ set(CPACK_PACKAGE_VENDOR "Yabause team")
- set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
- set(CPACK_SOURCE_PACKAGE_FILE_NAME "yabause-${YAB_VERSION}")
-
--if (APPLE)
-- set(CPACK_GENERATOR DragNDrop)
-- set(CPACK_PACKAGE_FILE_NAME yabause-${YAB_VERSION}-mac)
--endif ()
--
- if (WIN32)
- SET(CPACK_NSIS_INSTALLED_ICON_NAME yabause.exe)
- set(CPACK_NSIS_MENU_LINKS yabause.exe;Yabause)
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/patches/patch-l10n_CMakeLists.txt
--- a/emulators/yabause/patches/patch-l10n_CMakeLists.txt Mon Oct 28 09:27:53 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-l10n_CMakeLists.txt,v 1.1 2016/10/16 10:10:02 bsiegert Exp $
-
---- l10n/CMakeLists.txt.orig 2014-08-18 14:56:49.000000000 +0000
-+++ l10n/CMakeLists.txt
-@@ -2,7 +2,7 @@ project(yabause-l10n)
-
- set(LANGS ar de es fr it lt nl pt pt_BR ru sv zh_CN zh_TW)
-
--if (UNIX AND NOT APPLE)
-+if (UNIX)
- foreach(LANG ${LANGS})
- install(FILES "yabause_${LANG}.yts" DESTINATION "share/yabause/yts" RENAME "${LANG}.yts")
- endforeach()
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/patches/patch-src_CMakeLists.txt
--- a/emulators/yabause/patches/patch-src_CMakeLists.txt Mon Oct 28 09:27:53 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.1 2015/02/13 05:45:10 snj Exp $
-
-This is needed to keep boneheaded cmake crap from picking up SDL2
-from /usr/pkg/lib if it's installed but not wanted.
-
---- src/CMakeLists.txt.orig 2015-02-12 21:09:30.000000000 -0800
-+++ src/CMakeLists.txt 2015-02-12 21:11:25.000000000 -0800
-@@ -134,23 +134,27 @@ if (YAB_WANT_OPENGL AND (YAB_RGB STREQUA
- endif(OPENGL_FOUND)
- endif ()
-
--# SDL
--option(YAB_WANT_SDL "use SDL cores if available" ON)
--if (YAB_WANT_SDL)
-- include(FindSDL2 OPTIONAL)
-+# SDL2
-+option(YAB_WANT_SDL2 "use SDL2 if available" OFF)
-+if (YAB_WANT_SDL2)
-+ include(FindSDL2)
-
- if (SDL2_FOUND)
- include_directories(${SDL2_INCLUDE_DIR})
- set(YABAUSE_LIBRARIES ${YABAUSE_LIBRARIES} ${SDL2_LIBRARY})
-- else()
-+ add_definitions(-DHAVE_LIBSDL=1)
-+ set(yabause_SOURCES ${yabause_SOURCES} persdljoy.c sndsdl.c)
-+ endif()
-+endif()
-+
-+# SDL
-+option(YAB_WANT_SDL1 "use SDL1 if available" OFF)
-+if (YAB_WANT_SDL1)
- include(FindSDL)
-+
- if (SDL_FOUND)
- include_directories(${SDL_INCLUDE_DIR})
- set(YABAUSE_LIBRARIES ${YABAUSE_LIBRARIES} ${SDL_LIBRARY})
-- endif()
-- endif()
--
-- if (SDL_FOUND OR SDL2_FOUND)
- add_definitions(-DHAVE_LIBSDL=1)
- set(yabause_SOURCES ${yabause_SOURCES} persdljoy.c sndsdl.c)
- endif()
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/patches/patch-src_persdljoy.c
--- a/emulators/yabause/patches/patch-src_persdljoy.c Mon Oct 28 09:27:53 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_persdljoy.c,v 1.1 2016/10/16 10:10:02 bsiegert Exp $
-
---- src/persdljoy.c.orig 2014-11-12 17:48:47.000000000 +0000
-+++ src/persdljoy.c
-@@ -24,11 +24,7 @@
- */
-
- #ifdef HAVE_LIBSDL
--#ifdef __APPLE__
-- #include <SDL/SDL.h>
--#else
-- #include "SDL.h"
--#endif
-+#include "SDL.h"
-
- #include "debug.h"
- #include "persdljoy.h"
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/patches/patch-src_qt_CMakeLists.txt
--- a/emulators/yabause/patches/patch-src_qt_CMakeLists.txt Mon Oct 28 09:27:53 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_qt_CMakeLists.txt,v 1.1 2016/10/16 10:10:02 bsiegert Exp $
-
---- src/qt/CMakeLists.txt.orig 2014-11-12 17:48:47.000000000 +0000
-+++ src/qt/CMakeLists.txt
-@@ -214,16 +214,6 @@ include_directories(
- ${QT_QTOPENGL_INCLUDE_DIR} )
- endif()
-
--# APPLE // not necessary mac os x, but i don't care ;)
--if (APPLE)
-- set_target_properties( yabause-qt PROPERTIES MACOSX_BUNDLE true )
-- set_target_properties( yabause-qt PROPERTIES MACOSX_BUNDLE_ICON_FILE yabause.icns )
-- set_target_properties( yabause-qt PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "${YAB_VERSION}" )
-- set_target_properties( yabause-qt PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME Yabause )
-- set_target_properties( yabause-qt PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${YAB_VERSION}" )
-- set_target_properties( yabause-qt PROPERTIES MACOSX_BUNDLE_COPYRIGHT "(c) Yabause Team" )
--endif (APPLE)
--
- target_link_libraries( yabause-qt yabause )
- target_link_libraries( yabause-qt ${YABAUSE_LIBRARIES} )
- target_link_libraries( yabause-qt ${PORT_LIBRARIES} )
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/patches/patch-src_qt_YabauseThread.cpp
--- a/emulators/yabause/patches/patch-src_qt_YabauseThread.cpp Mon Oct 28 09:27:53 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_qt_YabauseThread.cpp,v 1.2 2015/02/13 05:45:10 snj Exp $
-
-Add missing include for struct tm.
-
---- src/qt/YabauseThread.cpp.orig 2014-11-12 09:48:47.000000000 -0800
-+++ src/qt/YabauseThread.cpp 2015-02-08 22:53:26.000000000 -0800
-@@ -29,6 +29,7 @@
- #include <QDateTime>
- #include <QStringList>
- #include <QDebug>
-+#include <time.h>
-
- YabauseThread::YabauseThread( QObject* o )
- : QObject( o )
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/patches/patch-src_qt_ui_UICheatRaw.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/yabause/patches/patch-src_qt_ui_UICheatRaw.cpp Mon Oct 28 09:33:29 2019 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_qt_ui_UICheatRaw.cpp,v 1.1 2019/10/28 09:33:29 kamil Exp $
+
+Fix Qt 5.11.
+
+--- src/qt/ui/UICheatRaw.cpp.orig 2016-08-19 15:31:13.000000000 +0000
++++ src/qt/ui/UICheatRaw.cpp
+@@ -20,8 +20,6 @@
+ #include "UIHexInput.h"
+ #include "../QtYabause.h"
+
+-#include <QButtonGroup>
+-
+ UICheatRaw::UICheatRaw( QWidget* p )
+ : QDialog( p )
+ {
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/patches/patch-src_qt_ui_UICheatRaw.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/yabause/patches/patch-src_qt_ui_UICheatRaw.h Mon Oct 28 09:33:29 2019 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_qt_ui_UICheatRaw.h,v 1.1 2019/10/28 09:33:29 kamil Exp $
+
+Fix Qt 5.11.
+
+--- src/qt/ui/UICheatRaw.h.orig 2016-08-19 15:31:13.000000000 +0000
++++ src/qt/ui/UICheatRaw.h
+@@ -21,7 +21,7 @@
+
+ #include "ui_UICheatRaw.h"
+
+-class QButtonGroup;
++#include <QButtonGroup>
+
+ class UICheatRaw : public QDialog, public Ui::UICheatRaw
+ {
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/patches/patch-src_qt_ui_UICheats.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/yabause/patches/patch-src_qt_ui_UICheats.cpp Mon Oct 28 09:33:29 2019 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_qt_ui_UICheats.cpp,v 1.1 2019/10/28 09:33:29 kamil Exp $
+
+Fix Qt 5.11.
+
+--- src/qt/ui/UICheats.cpp.orig 2016-08-19 15:31:13.000000000 +0000
++++ src/qt/ui/UICheats.cpp
+@@ -21,6 +21,8 @@
+ #include "UICheatRaw.h"
+ #include "../CommonDialogs.h"
+
++#include <QButtonGroup>
++
+ UICheats::UICheats( QWidget* p )
+ : QDialog( p )
+ {
diff -r d369ae6774fd -r 10c21444fdac emulators/yabause/patches/patch-src_qt_ui_UIHexInput.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/yabause/patches/patch-src_qt_ui_UIHexInput.h Mon Oct 28 09:33:29 2019 +0000
Home |
Main Index |
Thread Index |
Old Index