diff options
| author | bsiegert <bsiegert> | 2015-12-29 13:41:58 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2015-12-29 13:41:58 +0000 |
| commit | 54a1a2c89f07e4604cbaccc831188128ea0ff22c (patch) | |
| tree | e575c5b3597a8cd8fa530fe5871dcf4b3abf718d /x11/XaoS | |
| parent | 0d4768a8e0f140f40ef422c42e17c63a58cbc719 (diff) | |
| download | pkgsrc-54a1a2c89f07e4604cbaccc831188128ea0ff22c.tar.gz | |
Fix build on NetBSD-7/i386. From Stefan Schaeckeler in PR pkg/50391.
Diffstat (limited to 'x11/XaoS')
| -rw-r--r-- | x11/XaoS/Makefile | 3 | ||||
| -rw-r--r-- | x11/XaoS/distinfo | 3 | ||||
| -rw-r--r-- | x11/XaoS/patches/patch-src_engine_zoom.c | 25 |
3 files changed, 29 insertions, 2 deletions
diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile index 301dd5f9271..d0000645cbe 100644 --- a/x11/XaoS/Makefile +++ b/x11/XaoS/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2014/10/09 14:07:13 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2015/12/29 13:41:58 bsiegert Exp $ # DISTNAME= xaos-3.6 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xaos/} diff --git a/x11/XaoS/distinfo b/x11/XaoS/distinfo index d14d04f51a9..9d9d35b69f2 100644 --- a/x11/XaoS/distinfo +++ b/x11/XaoS/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.17 2015/11/04 03:28:24 agc Exp $ +$NetBSD: distinfo,v 1.18 2015/12/29 13:41:58 bsiegert Exp $ SHA1 (xaos-3.6.tar.gz) = 0c68d25c4f9c8eaf557e37d9e4586a04ab56d7a0 RMD160 (xaos-3.6.tar.gz) = 4cfe8e7f5b98d28cd320f9ab21a9c2d76d122133 SHA512 (xaos-3.6.tar.gz) = 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1 Size (xaos-3.6.tar.gz) = 2040707 bytes SHA1 (patch-aa) = b7f9bf3bf002cf43808e5cadf95c3418de0aec12 +SHA1 (patch-src_engine_zoom.c) = cb2c71dea4ed1a05d0881a683c848c70f6f36329 diff --git a/x11/XaoS/patches/patch-src_engine_zoom.c b/x11/XaoS/patches/patch-src_engine_zoom.c new file mode 100644 index 00000000000..a47729191a2 --- /dev/null +++ b/x11/XaoS/patches/patch-src_engine_zoom.c @@ -0,0 +1,25 @@ +$NetBSD: patch-src_engine_zoom.c,v 1.1 2015/12/29 13:41:58 bsiegert Exp $ + +Fix compilation on NetBSD 7 on i386. + +--- src/engine/zoom.c.orig 2015-11-01 20:40:43.000000000 -0800 ++++ src/engine/zoom.c 2015-11-01 20:41:31.000000000 -0800 +@@ -138,13 +138,11 @@ + #endif + + #ifndef USE_i386ASM +-static void +-moveoldpoints(void *data1, struct taskinfo *task, int r1, int r2) +-REGISTERS(0); +-static void fillline_8(int line) REGISTERS(0); +-static void fillline_16(int line) REGISTERS(0); +-static void fillline_24(int line) REGISTERS(0); +-static void fillline_32(int line) REGISTERS(0); ++static void moveoldpoints(void *data1, struct taskinfo *task, int r1, int r2); ++static INLINE void fillline_8(int line); ++static INLINE void fillline_16(int line); ++static INLINE void fillline_24(int line); ++static INLINE void fillline_32(int line); + #endif + + /*first of all inline driver section */ |