pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/rplay Add a patch / build fix for NetBSD 8.0:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/45368cf405e7
branches:  trunk
changeset: 374603:45368cf405e7
user:      he <he%pkgsrc.org@localhost>
date:      Fri Jan 26 12:45:27 2018 +0000

description:
Add a patch / build fix for NetBSD 8.0:

Avoid problems resulting from the SIZE macro expanding to "two
arguments", but the argument list already having been scanned,
leading to build failure with SSP on NetBSD 8.0.

Thanks for hint from joerg@
PKGREVISION bumped.

diffstat:

 audio/rplay/Makefile                          |   4 ++--
 audio/rplay/distinfo                          |   3 ++-
 audio/rplay/patches/patch-include_config.h.in |  25 +++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r 669af22c1ac5 -r 45368cf405e7 audio/rplay/Makefile
--- a/audio/rplay/Makefile      Fri Jan 26 12:21:06 2018 +0000
+++ b/audio/rplay/Makefile      Fri Jan 26 12:45:27 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2017/12/24 10:15:53 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2018/01/26 12:45:27 he Exp $
 
 DISTNAME=      rplay-3.3.2
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    audio
 #MASTER_SITES= http://rplay.doit.org/dist/
 
diff -r 669af22c1ac5 -r 45368cf405e7 audio/rplay/distinfo
--- a/audio/rplay/distinfo      Fri Jan 26 12:21:06 2018 +0000
+++ b/audio/rplay/distinfo      Fri Jan 26 12:45:27 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2015/11/03 01:12:49 agc Exp $
+$NetBSD: distinfo,v 1.18 2018/01/26 12:45:27 he Exp $
 
 SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662
 RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861
@@ -37,3 +37,4 @@
 SHA1 (patch-cc) = 824d7c70282d24e489c7c041982018da13ac70ce
 SHA1 (patch-devrplay_Makefile.in) = 0e158606fefa128cfcd798cd7919fe589ba04144
 SHA1 (patch-devrplay_devrplay.c) = b9a5434a8060347217e5a683cfc84d9bf73d9572
+SHA1 (patch-include_config.h.in) = 1b706770619f17517f78eb3cd125263910a7c479
diff -r 669af22c1ac5 -r 45368cf405e7 audio/rplay/patches/patch-include_config.h.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/rplay/patches/patch-include_config.h.in     Fri Jan 26 12:45:27 2018 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-include_config.h.in,v 1.1 2018/01/26 12:45:27 he Exp $
+
+Provide a sneaky way to avoid problems resulting from the SIZE macro
+expanding to two arguments, but the argument list already having been
+scanned, leading to build failure with SSP on NetBSD 8.0.
+Thanks for hint from joerg@
+
+--- include/config.h.in.orig   2018-01-26 10:57:53.228900262 +0000
++++ include/config.h.in
+@@ -287,13 +287,13 @@
+ #endif
+ 
+ #ifdef HAVE_SNPRINTF
+-#define SNPRINTF snprintf
++#define SNPRINTF(str, ...) snprintf(str, __VA_ARGS__)
+ #else
+ #define SNPRINTF sprintf
+ #endif
+ 
+ #ifdef HAVE_VSNPRINTF
+-#define VSNPRINTF vsnprintf
++#define VSNPRINTF(str, ...) vsnprintf(str, __VA_ARGS__)
+ #else
+ #define VSNPRINTF vsprintf
+ #endif



Home | Main Index | Thread Index | Old Index