Fix compilation under macOS. From Jonathan Schleifer in PR pkg/51482.

7 files changed, 100 insertions, 1 deletions

diff --git a/emulators/yabause/distinfo b/emulators/yabause/distinfo
index 9a6c60d9c10..f6de84965f5 100644
--- a/emulators/yabause/distinfo
+++ b/emulators/yabause/distinfo
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 20:31:10 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/10/16 10:10:02 bsiegert 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
diff --git a/emulators/yabause/patches/patch-CMakeLists.txt b/emulators/yabause/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..a03894be3a3
--- /dev/null
+++ b/emulators/yabause/patches/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+$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 --git a/emulators/yabause/patches/patch-l10n_CMakeLists.txt b/emulators/yabause/patches/patch-l10n_CMakeLists.txt
new file mode 100644
index 00000000000..8f1e9fb28dc
--- /dev/null
+++ b/emulators/yabause/patches/patch-l10n_CMakeLists.txt
@@ -0,0 +1,13 @@
+$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 --git a/emulators/yabause/patches/patch-src_persdljoy.c b/emulators/yabause/patches/patch-src_persdljoy.c
new file mode 100644
index 00000000000..1105abcbfa5
--- /dev/null
+++ b/emulators/yabause/patches/patch-src_persdljoy.c
@@ -0,0 +1,17 @@
+$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 --git a/emulators/yabause/patches/patch-src_qt_CMakeLists.txt b/emulators/yabause/patches/patch-src_qt_CMakeLists.txt
new file mode 100644
index 00000000000..c7a70274812
--- /dev/null
+++ b/emulators/yabause/patches/patch-src_qt_CMakeLists.txt
@@ -0,0 +1,21 @@
+$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 --git a/emulators/yabause/patches/patch-src_sndsdl.c b/emulators/yabause/patches/patch-src_sndsdl.c
new file mode 100644
index 00000000000..5b3c651cbea
--- /dev/null
+++ b/emulators/yabause/patches/patch-src_sndsdl.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_sndsdl.c,v 1.1 2016/10/16 10:10:02 bsiegert Exp $
+
+--- src/sndsdl.c.orig	2014-11-12 17:48:48.000000000 +0000
++++ src/sndsdl.c
+@@ -25,7 +25,7 @@
+ 
+ #include <stdlib.h>
+ 
+-#if defined(__APPLE__) || defined(GEKKO)
++#if defined(GEKKO)
+  #include <SDL/SDL.h>
+ #else
+  #include "SDL.h"
diff --git a/emulators/yabause/patches/patch-src_yabause.c b/emulators/yabause/patches/patch-src_yabause.c
new file mode 100644
index 00000000000..2fbaae348a2
--- /dev/null
+++ b/emulators/yabause/patches/patch-src_yabause.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_yabause.c,v 1.1 2016/10/16 10:10:02 bsiegert Exp $
+
+--- src/yabause.c.orig	2014-11-12 17:48:48.000000000 +0000
++++ src/yabause.c
+@@ -48,7 +48,7 @@
+ #include "movie.h"

+ #include "osdcore.h"

+ #ifdef HAVE_LIBSDL

+- #if defined(__APPLE__) || defined(GEKKO)

++ #if defined(GEKKO)

+   #include <SDL/SDL.h>

+  #else

+   #include "SDL.h"