Fri Feb 13 05:45:10 2015 UTC ()
Update yabause to 0.9.14.

Changes:
 general:
  - Fixed crash when bin is not found in a bin/cue.
  - Added Traditional Chinese translation.
  - Added Japanese translation.
  - Added Russian translation.
  - Updated German translation.
  - Added inline SH2 assembler function to main emulation code.
  - Fixed miscellaneous memory leak/uninitialized variables.
  - Added Stunner/Virtua Gun emulation
  - Added USB Dev cartridge emulation
  - Added SDL2 support
 emulated bios:
  - Work around fix for games trying to change scu mask from slave sh2
    when using hle bios. Fixes Astal.
 gtk port:
  - Added extra checks to resolution setting to avoid potential leaks
    or crashing.
 qt port:
  - Fixed an issue where coff/elf files weren't selectable when using
    memory transfer function.
  - Fixed a bug where qt volume slider wasn't showing the saved value
    on startup.
  - Mouse will now optionally auto-hide with no movement
  - Added gui for inline assembler.
  - Revised Mouse emulation handling, added sensitivity setting.
  - Other fixes
 video:
  - Fixed a bug where coordinate y increment wasn't being initialized under
    a specific set of circumstances. Should fix hang in Radiant Silvergun
    using OpenGL rendering.
  - Fixed Special Color Calculation mode 2


(snj)
diff -r1.37 -r1.38 pkgsrc/emulators/yabause/Makefile
diff -r1.5 -r1.6 pkgsrc/emulators/yabause/PLIST
diff -r1.8 -r1.9 pkgsrc/emulators/yabause/distinfo
diff -r1.4 -r1.5 pkgsrc/emulators/yabause/options.mk
diff -r0 -r1.1 pkgsrc/emulators/yabause/patches/patch-src_CMakeLists.txt
diff -r1.1 -r1.2 pkgsrc/emulators/yabause/patches/patch-src_qt_YabauseThread.cpp

cvs diff -r1.37 -r1.38 pkgsrc/emulators/yabause/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/yabause/Makefile 2014/05/05 00:47:50 1.37
+++ pkgsrc/emulators/yabause/Makefile 2015/02/13 05:45:09 1.38
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.37 2014/05/05 00:47:50 ryoon Exp $ 1# $NetBSD: Makefile,v 1.38 2015/02/13 05:45:09 snj Exp $
2 2
3DISTNAME= yabause-0.9.13 3DISTNAME= yabause-0.9.14
4PKGREVISION= 2 
5CATEGORIES= emulators 4CATEGORIES= emulators
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yabause/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yabause/}
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://yabause.sourceforge.net/ 8HOMEPAGE= http://yabause.sourceforge.net/
10COMMENT= Sega Saturn system emulator 9COMMENT= Sega Saturn system emulator
11LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
12 11
13USE_CMAKE= yes 12USE_CMAKE= yes
14USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config
15USE_LANGUAGES+= c c++ 14USE_LANGUAGES+= c c++
16 15
17CONFIGURE_ENV+= PKGMANDIR=${PKGMANDIR:Q} 16CONFIGURE_ENV+= PKGMANDIR=${PKGMANDIR:Q}

cvs diff -r1.5 -r1.6 pkgsrc/emulators/yabause/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/yabause/PLIST 2014/01/06 04:44:16 1.5
+++ pkgsrc/emulators/yabause/PLIST 2015/02/13 05:45:09 1.6
@@ -1,14 +1,18 @@ @@ -1,14 +1,18 @@
1@comment $NetBSD: PLIST,v 1.5 2014/01/06 04:44:16 rodent Exp $ 1@comment $NetBSD: PLIST,v 1.6 2015/02/13 05:45:09 snj Exp $
2bin/yabause 2bin/yabause
3man/man1/yabause.1 3man/man1/yabause.1
4share/applications/yabause.desktop 4share/applications/yabause.desktop
5share/pixmaps/yabause.png 5share/pixmaps/yabause.png
 6share/yabause/yts/ar.yts
6share/yabause/yts/de.yts 7share/yabause/yts/de.yts
7share/yabause/yts/es.yts 8share/yabause/yts/es.yts
8share/yabause/yts/fr.yts 9share/yabause/yts/fr.yts
9share/yabause/yts/it.yts 10share/yabause/yts/it.yts
10share/yabause/yts/lt.yts 11share/yabause/yts/lt.yts
11share/yabause/yts/nl.yts 12share/yabause/yts/nl.yts
12share/yabause/yts/pt.yts 13share/yabause/yts/pt.yts
13share/yabause/yts/pt_BR.yts 14share/yabause/yts/pt_BR.yts
 15share/yabause/yts/ru.yts
14share/yabause/yts/sv.yts 16share/yabause/yts/sv.yts
 17share/yabause/yts/zh_CN.yts
 18share/yabause/yts/zh_TW.yts

cvs diff -r1.8 -r1.9 pkgsrc/emulators/yabause/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/yabause/distinfo 2014/01/10 20:02:56 1.8
+++ pkgsrc/emulators/yabause/distinfo 2015/02/13 05:45:09 1.9
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.8 2014/01/10 20:02:56 joerg Exp $ 1$NetBSD: distinfo,v 1.9 2015/02/13 05:45:09 snj Exp $
2 2
3SHA1 (yabause-0.9.13.tar.gz) = ecba2399a1cae8b641b726a828c393655975fcdf 3SHA1 (yabause-0.9.14.tar.gz) = abd7936234f47f9568809b6bf955940c7a3ad447
4RMD160 (yabause-0.9.13.tar.gz) = 73b3fa5a8550012aed7abae3c1ee7825fd7ea23e 4RMD160 (yabause-0.9.14.tar.gz) = 545eea2280b881ae4ddcea2b8b189301bea4176d
5Size (yabause-0.9.13.tar.gz) = 1635104 bytes 5Size (yabause-0.9.14.tar.gz) = 1662762 bytes
6SHA1 (patch-src_qt_YabauseThread.cpp) = 32aa6a27d8379471ee06358bbb65fa68a7d465d3 6SHA1 (patch-src_CMakeLists.txt) = 382d8004222ff9f5235ddce35fa41e6196469ba0
 7SHA1 (patch-src_qt_YabauseThread.cpp) = 1dc06681cd04b6d5eb26b818120724ccdb89fd25

cvs diff -r1.4 -r1.5 pkgsrc/emulators/yabause/options.mk (expand / switch to unified diff)

--- pkgsrc/emulators/yabause/options.mk 2014/01/06 15:28:35 1.4
+++ pkgsrc/emulators/yabause/options.mk 2015/02/13 05:45:09 1.5
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: options.mk,v 1.4 2014/01/06 15:28:35 rodent Exp $ 1# $NetBSD: options.mk,v 1.5 2015/02/13 05:45:09 snj Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.yabause 3PKG_OPTIONS_VAR= PKG_OPTIONS.yabause
4PKG_SUPPORTED_OPTIONS= openal opengl sdl 4PKG_SUPPORTED_OPTIONS= openal opengl sdl
5PKG_OPTIONS_OPTIONAL_GROUPS= GUI #SDL 5PKG_OPTIONS_OPTIONAL_GROUPS= GUI SDL
6PKG_OPTIONS_GROUP.GUI= gtk qt 6PKG_OPTIONS_GROUP.GUI= gtk qt
7#PKG_OPTIONS_GROUP.SDL= sdl sdl2 7PKG_OPTIONS_GROUP.SDL= sdl sdl2
8 8
9PKG_SUGGESTED_OPTIONS= qt sdl 9PKG_SUGGESTED_OPTIONS= qt sdl2
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13#.if !empty(PKG_OPTIONS:Mdoxygen) 13#.if !empty(PKG_OPTIONS:Mdoxygen)
14#BUILD_DEPENDS+= doxygen>=1.6.3:../../devel/doxygen 14#BUILD_DEPENDS+= doxygen>=1.6.3:../../devel/doxygen
15#.endif 15#.endif
16 16
17.if !empty(PKG_OPTIONS:Mqt) 17.if !empty(PKG_OPTIONS:Mqt)
18CONFIGURE_ENV+= YAB_PORTS=qt 18CONFIGURE_ENV+= YAB_PORTS=qt
19CMAKE_ARGS+= -DYAB_PORTS=qt 19CMAKE_ARGS+= -DYAB_PORTS=qt
20.include "../../x11/qt4-tools/buildlink3.mk" 20.include "../../x11/qt4-tools/buildlink3.mk"
21.elif !empty(PKG_OPTIONS:Mgtk) 21.elif !empty(PKG_OPTIONS:Mgtk)
22CONFIGURE_ENV+= YAB_PORTS=gtk 22CONFIGURE_ENV+= YAB_PORTS=gtk
@@ -34,21 +34,18 @@ CMAKE_ARGS+= -DYAB_WANT_OPENAL=ON @@ -34,21 +34,18 @@ CMAKE_ARGS+= -DYAB_WANT_OPENAL=ON
34.else 34.else
35CMAKE_ARGS+= -DYAB_WANT_OPENAL=OFF 35CMAKE_ARGS+= -DYAB_WANT_OPENAL=OFF
36.endif 36.endif
37 37
38.if !empty(PKG_OPTIONS:Mopengl) 38.if !empty(PKG_OPTIONS:Mopengl)
39.include "../../graphics/glut/buildlink3.mk" 39.include "../../graphics/glut/buildlink3.mk"
40CMAKE_ARGS+= -DYAB_WANT_OPENGL=ON 40CMAKE_ARGS+= -DYAB_WANT_OPENGL=ON
41.else 41.else
42CMAKE_ARGS+= -DYAB_WANT_OPENGL=OFF 42CMAKE_ARGS+= -DYAB_WANT_OPENGL=OFF
43.endif 43.endif
44 44
45.if !empty(PKG_OPTIONS:Msdl) 45.if !empty(PKG_OPTIONS:Msdl)
46.include "../../devel/SDL/buildlink3.mk" 46.include "../../devel/SDL/buildlink3.mk"
47CMAKE_ARGS+= -DYAB_WANT_SDL=ON 47CMAKE_ARGS+= -DYAB_WANT_SDL1=ON
48#.elif !empty(PKG_OPTIONS:Msdl2) 48.elif !empty(PKG_OPTIONS:Msdl2)
49#.include "../../devel/SDL2/buildlink3.mk" 49.include "../../devel/SDL2/buildlink3.mk"
50#CMAKE_ARGS+= -DYAB_WANT_SDL=ON 50CMAKE_ARGS+= -DYAB_WANT_SDL2=ON
51#BUILDLINK_TRANSFORM+= l:SDL:SDL2 
52.else 
53CMAKE_ARGS+= -DYAB_WANT_SDL=OFF 
54.endif 51.endif

File Added: pkgsrc/emulators/yabause/patches/Attic/patch-src_CMakeLists.txt
$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()

cvs diff -r1.1 -r1.2 pkgsrc/emulators/yabause/patches/Attic/patch-src_qt_YabauseThread.cpp (expand / switch to unified diff)

--- pkgsrc/emulators/yabause/patches/Attic/patch-src_qt_YabauseThread.cpp 2014/01/10 20:02:56 1.1
+++ pkgsrc/emulators/yabause/patches/Attic/patch-src_qt_YabauseThread.cpp 2015/02/13 05:45:10 1.2
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-src_qt_YabauseThread.cpp,v 1.1 2014/01/10 20:02:56 joerg Exp $ 1$NetBSD: patch-src_qt_YabauseThread.cpp,v 1.2 2015/02/13 05:45:10 snj Exp $
2 2
3--- src/qt/YabauseThread.cpp.orig 2014-01-10 11:41:07.000000000 +0000 3Add missing include for struct tm.
4+++ src/qt/YabauseThread.cpp 4
 5--- src/qt/YabauseThread.cpp.orig 2014-11-12 09:48:47.000000000 -0800
 6+++ src/qt/YabauseThread.cpp 2015-02-08 22:53:26.000000000 -0800
5@@ -29,6 +29,7 @@ 7@@ -29,6 +29,7 @@
6 #include <QDateTime> 8 #include <QDateTime>
7 #include <QStringList> 9 #include <QStringList>
8 #include <QDebug> 10 #include <QDebug>
9+#include <time.h> 11+#include <time.h>
10  12
11 YabauseThread::YabauseThread( QObject* o ) 13 YabauseThread::YabauseThread( QObject* o )
12 : QObject( o ) 14 : QObject( o )