[pkgsrc/trunk]: pkgsrc/emulators/shoebill Since we depend on devel/libuuid, u...

[hauke <hauke%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ff727d7bec39
branches:  trunk
changeset: 340228:ff727d7bec39
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Fri Sep 27 15:52:12 2019 +0000

description:
Since we depend on devel/libuuid, use its header instead of a native
one. Should unbreak builds on Linuxen.

Declare type of function parameter, or it will default to int.

diffstat:

 emulators/shoebill/Makefile                    |   4 ++--
 emulators/shoebill/distinfo                    |   4 ++--
 emulators/shoebill/patches/patch-core_fpu.c    |  15 +++++++++++++++
 emulators/shoebill/patches/patch-sdl-gui_sdl.c |  15 ---------------
 4 files changed, 19 insertions(+), 19 deletions(-)

diffs (65 lines):

diff -r 9161f0f15ae5 -r ff727d7bec39 emulators/shoebill/Makefile
--- a/emulators/shoebill/Makefile       Fri Sep 27 09:29:59 2019 +0000
+++ b/emulators/shoebill/Makefile       Fri Sep 27 15:52:12 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 13:20:58 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/09/27 15:52:12 hauke Exp $
 
 DISTNAME=      shoebill-0.0.5
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=pruten/}
 
diff -r 9161f0f15ae5 -r ff727d7bec39 emulators/shoebill/distinfo
--- a/emulators/shoebill/distinfo       Fri Sep 27 09:29:59 2019 +0000
+++ b/emulators/shoebill/distinfo       Fri Sep 27 15:52:12 2019 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2016/07/10 06:36:40 wiz Exp $
+$NetBSD: distinfo,v 1.5 2019/09/27 15:52:12 hauke Exp $
 
 SHA1 (shoebill-0.0.5.tar.gz) = 40b9ae839bbb9d065ca7d36363b1b4660d780010
 RMD160 (shoebill-0.0.5.tar.gz) = 20143081d2418d6961f86626e3d994b2feda8a4b
 SHA512 (shoebill-0.0.5.tar.gz) = cf8d7945943d6d7a505c233b5c99371f5d37d5d60dd5beeeadbe442ef43b9980e96d51f193d69a03eb58a0a2b13103b4dba311a53c939b633b20753a8c19a772
 Size (shoebill-0.0.5.tar.gz) = 253877 bytes
+SHA1 (patch-core_fpu.c) = a2fe3d42c8a61d580b966fe6c3909e9c61640b92
 SHA1 (patch-sdl-gui_lin_build.sh) = 8eb8bf622bc7b83f06a0d4dcdb8b77b25001163b
-SHA1 (patch-sdl-gui_sdl.c) = ee433b37104dcccc700d1d08b97807689ed8da67
diff -r 9161f0f15ae5 -r ff727d7bec39 emulators/shoebill/patches/patch-core_fpu.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/shoebill/patches/patch-core_fpu.c       Fri Sep 27 15:52:12 2019 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-core_fpu.c,v 1.1 2019/09/27 15:52:12 hauke Exp $
+
+Declare type of function parameter, or it will default to int...
+
+--- core/fpu.c.orig    2015-09-14 02:11:18.000000000 +0000
++++ core/fpu.c
+@@ -814,7 +814,7 @@ float128 _from_native(double n)
+ #define _native_log2(a) (log(a) / log(2.0)) /* or log2() */
+ #define _native_log(a) log(a)
+ #define _native_log1p(a) log((a) + 1.0) /* or log1p() */
+-double  _native_tentox(a) {
++double  _native_tentox(double a) {
+     /*
+      * This is a dumb workaround for a clang bug on OS X 10.10
+      * Clang wants to optimize pow(10.0, a) to __exp(a), but
diff -r 9161f0f15ae5 -r ff727d7bec39 emulators/shoebill/patches/patch-sdl-gui_sdl.c
--- a/emulators/shoebill/patches/patch-sdl-gui_sdl.c    Fri Sep 27 09:29:59 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-sdl-gui_sdl.c,v 1.1 2016/03/23 14:21:03 hauke Exp $
-
-Fix #include path
-
---- sdl-gui/sdl.c.orig 2015-09-14 02:11:18.000000000 +0000
-+++ sdl-gui/sdl.c
-@@ -220,7 +220,7 @@ struct {
- #if !((defined WIN32) || (defined _WIN64))
- #include <sys/types.h>
- #include <pwd.h>
--#include <uuid/uuid.h>
-+#include <uuid.h>
- #endif
- 
- static char* _get_home_dir (const char *terminal_element)