summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2019-12-19 23:59:56 +0000
committerjoerg <joerg@pkgsrc.org>2019-12-19 23:59:56 +0000
commitd0615553af026a9f3e3afe4b68d96f0bc9fad39b (patch)
treea3936a28b37cb4fc7d597b0c2874045d3c3e4fb5
parentb3030da9a3264151c42838baa5ef23c6314ed9ac (diff)
downloadpkgsrc-d0615553af026a9f3e3afe4b68d96f0bc9fad39b.tar.gz
Use protected names in attributes, avoids overlap with SSP. Bump
revision.
-rw-r--r--audio/fluidsynth/Makefile3
-rw-r--r--audio/fluidsynth/distinfo3
-rw-r--r--audio/fluidsynth/patches/patch-include_fluidsynth_log.h15
3 files changed, 19 insertions, 2 deletions
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index da4d836866a..049ac303061 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2019/12/01 12:51:57 nia Exp $
+# $NetBSD: Makefile,v 1.33 2019/12/19 23:59:56 joerg Exp $
DISTNAME= fluidsynth-2.1.0
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=FluidSynth/}
GITHUB_TAG= v${PKGVERSION_NOREV}
diff --git a/audio/fluidsynth/distinfo b/audio/fluidsynth/distinfo
index a2d4ad324bc..5906a0a7970 100644
--- a/audio/fluidsynth/distinfo
+++ b/audio/fluidsynth/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.19 2019/12/01 12:51:57 nia Exp $
+$NetBSD: distinfo,v 1.20 2019/12/19 23:59:56 joerg Exp $
SHA1 (fluidsynth-2.1.0.tar.gz) = 3822f1406cbf6c810928277a3695b5e38a5dbde4
RMD160 (fluidsynth-2.1.0.tar.gz) = 205e8d5d7f7645637c22db291da91356a02939da
SHA512 (fluidsynth-2.1.0.tar.gz) = d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d
Size (fluidsynth-2.1.0.tar.gz) = 1356096 bytes
SHA1 (patch-CMakeLists.txt) = 79804b84964e9557180c0f86e36d465fac7126fe
+SHA1 (patch-include_fluidsynth_log.h) = 35378120546ca4619e232707de6a0025c6c45ad8
SHA1 (patch-src_drivers_fluid__alsa.c) = a482764f0bbc15b5cf04e6920374b2f4811760aa
diff --git a/audio/fluidsynth/patches/patch-include_fluidsynth_log.h b/audio/fluidsynth/patches/patch-include_fluidsynth_log.h
new file mode 100644
index 00000000000..7980bc82b29
--- /dev/null
+++ b/audio/fluidsynth/patches/patch-include_fluidsynth_log.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_fluidsynth_log.h,v 1.1 2019/12/19 23:59:56 joerg Exp $
+
+Use the protected form to avoid conflicts with printf macros.
+
+--- include/fluidsynth/log.h.orig 2019-12-19 23:29:25.082934836 +0000
++++ include/fluidsynth/log.h
+@@ -79,7 +79,7 @@ FLUIDSYNTH_API void fluid_default_log_fu
+
+ FLUIDSYNTH_API int fluid_log(int level, const char *fmt, ...)
+ #if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+-__attribute__ ((format (printf, 2, 3)))
++__attribute__ ((__format__ (__printf__, 2, 3)))
+ #endif
+ ;
+