NetBSD Problem Report #51482

From www@NetBSD.org  Sat Sep 17 17:20:22 2016
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
	by mollari.NetBSD.org (Postfix) with ESMTPS id F14A37A2BD
	for <gnats-bugs@gnats.NetBSD.org>; Sat, 17 Sep 2016 17:20:21 +0000 (UTC)
Message-Id: <20160917172020.6B99A7A2C1@mollari.NetBSD.org>
Date: Sat, 17 Sep 2016 17:20:20 +0000 (UTC)
From: js-pkgsrc@heap.zone
Reply-To: js-pkgsrc@heap.zone
To: gnats-bugs@NetBSD.org
Subject: Compilation fix for emulators/yabause for macOS
X-Send-Pr-Version: www-1.0

>Number:         51482
>Category:       pkg
>Synopsis:       Compilation fix for emulators/yabause for macOS
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    bsiegert
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Sep 17 17:25:00 +0000 2016
>Closed-Date:    Sun Oct 16 10:11:44 +0000 2016
>Last-Modified:  Sun Oct 16 10:15:01 +0000 2016
>Originator:     Jonathan Schleifer
>Release:        HEAD
>Organization:
>Environment:
Darwin obuolys.local 16.0.0 Darwin Kernel Version 16.0.0: Mon Aug 29 17:56:20 PDT 2016; root:xnu-3789.1.32~3/RELEASE_X86_64 x86_64
>Description:
emulators/yabause does not build on macOS
>How-To-Repeat:
Try to build emulators/yabause on macOS
>Fix:
diff --git a/emulators/yabause/distinfo b/emulators/yabause/distinfo
index 9a6c60d..2268130 100644
--- a/emulators/yabause/distinfo
+++ b/emulators/yabause/distinfo
@@ -4,5 +4,11 @@ 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 0000000..3eb5425
--- /dev/null
+++ b/emulators/yabause/patches/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- 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 0000000..e8e6fe7
--- /dev/null
+++ b/emulators/yabause/patches/patch-l10n_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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 0000000..c03cfd9
--- /dev/null
+++ b/emulators/yabause/patches/patch-src_persdljoy.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- 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 0000000..00b7b4e
--- /dev/null
+++ b/emulators/yabause/patches/patch-src_qt_CMakeLists.txt
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- 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 0000000..283b6e8
--- /dev/null
+++ b/emulators/yabause/patches/patch-src_sndsdl.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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 0000000..ce44f4e
--- /dev/null
+++ b/emulators/yabause/patches/patch-src_yabause.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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"

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->macos-pkg-people
Responsible-Changed-By: leot@NetBSD.org
Responsible-Changed-When: Sat, 17 Sep 2016 17:52:41 +0000
Responsible-Changed-Why:
Mac OS X problem


Responsible-Changed-From-To: macos-pkg-people->bsiegert
Responsible-Changed-By: bsiegert@NetBSD.org
Responsible-Changed-When: Wed, 05 Oct 2016 09:21:04 +0000
Responsible-Changed-Why:
I like bug reports that have patches :)


State-Changed-From-To: open->closed
State-Changed-By: bsiegert@NetBSD.org
State-Changed-When: Sun, 16 Oct 2016 10:11:44 +0000
State-Changed-Why:
Committed, thanks!


From: "Benny Siegert" <bsiegert@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/51482 CVS commit: pkgsrc/emulators/yabause
Date: Sun, 16 Oct 2016 10:10:02 +0000

 Module Name:	pkgsrc
 Committed By:	bsiegert
 Date:		Sun Oct 16 10:10:02 UTC 2016

 Modified Files:
 	pkgsrc/emulators/yabause: distinfo
 Added Files:
 	pkgsrc/emulators/yabause/patches: patch-CMakeLists.txt
 	    patch-l10n_CMakeLists.txt patch-src_persdljoy.c
 	    patch-src_qt_CMakeLists.txt patch-src_sndsdl.c patch-src_yabause.c

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


 To generate a diff of this commit:
 cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/yabause/distinfo
 cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/yabause/patches/patch-CMakeLists.txt \
     pkgsrc/emulators/yabause/patches/patch-l10n_CMakeLists.txt \
     pkgsrc/emulators/yabause/patches/patch-src_persdljoy.c \
     pkgsrc/emulators/yabause/patches/patch-src_qt_CMakeLists.txt \
     pkgsrc/emulators/yabause/patches/patch-src_sndsdl.c \
     pkgsrc/emulators/yabause/patches/patch-src_yabause.c

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

>Unformatted:

Home	PR Database Search