CVS commit: pkgsrc/audio/fluidsynth

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Oct 16 19:25:45 UTC 2019

Modified Files:
        pkgsrc/audio/fluidsynth: Makefile distinfo
Added Files:
        pkgsrc/audio/fluidsynth: options.mk
        pkgsrc/audio/fluidsynth/patches: patch-CMakeLists.txt
            patch-src_drivers_fluid__alsa.c

Log Message:
fluidsynth: Optionally support more audio backends.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/audio/fluidsynth/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/fluidsynth/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/fluidsynth/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/fluidsynth/patches/patch-CMakeLists.txt \
    pkgsrc/audio/fluidsynth/patches/patch-src_drivers_fluid__alsa.c

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

Modified files:

Index: pkgsrc/audio/fluidsynth/Makefile
diff -u pkgsrc/audio/fluidsynth/Makefile:1.28 pkgsrc/audio/fluidsynth/Makefile:1.29
--- pkgsrc/audio/fluidsynth/Makefile:1.28       Mon Oct 14 15:20:18 2019
+++ pkgsrc/audio/fluidsynth/Makefile    Wed Oct 16 19:25:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/10/14 15:20:18 adam Exp $
+# $NetBSD: Makefile,v 1.29 2019/10/16 19:25:44 nia Exp $
 
 DISTNAME=      fluidsynth-2.0.7
 CATEGORIES=    audio
@@ -39,6 +39,7 @@ SUBST_SED.oss+=               -e "s,/dev/midi,/dev/rm
 .  endif
 .endif
 
+.include "options.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/audio/fluidsynth/distinfo
diff -u pkgsrc/audio/fluidsynth/distinfo:1.15 pkgsrc/audio/fluidsynth/distinfo:1.16
--- pkgsrc/audio/fluidsynth/distinfo:1.15       Sun Oct  6 17:29:33 2019
+++ pkgsrc/audio/fluidsynth/distinfo    Wed Oct 16 19:25:44 2019
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.15 2019/10/06 17:29:33 nia Exp $
+$NetBSD: distinfo,v 1.16 2019/10/16 19:25:44 nia Exp $
 
 SHA1 (fluidsynth-2.0.7.tar.gz) = fd92957fbb915598361cb16249f190ce0f01416c
 RMD160 (fluidsynth-2.0.7.tar.gz) = 3f71d90e4f46609cd3eae32ae7916be098b7b161
 SHA512 (fluidsynth-2.0.7.tar.gz) = c939c77277767541b90ae8bc24687cd9cd11b375264e6b5017658f5fd9c5637a3ce09bc4ad837a349e4a63883fe5ecbe80e65dd91d2cbf71072bcbcfc068614e
 Size (fluidsynth-2.0.7.tar.gz) = 1315250 bytes
+SHA1 (patch-CMakeLists.txt) = 79804b84964e9557180c0f86e36d465fac7126fe
+SHA1 (patch-src_drivers_fluid__alsa.c) = a482764f0bbc15b5cf04e6920374b2f4811760aa

Added files:

Index: pkgsrc/audio/fluidsynth/options.mk
diff -u /dev/null pkgsrc/audio/fluidsynth/options.mk:1.1
--- /dev/null   Wed Oct 16 19:25:45 2019
+++ pkgsrc/audio/fluidsynth/options.mk  Wed Oct 16 19:25:44 2019
@@ -0,0 +1,35 @@
+# $NetBSD: options.mk,v 1.1 2019/10/16 19:25:44 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.fluidsynth
+PKG_SUPPORTED_OPTIONS=         alsa jack portaudio pulseaudio
+PKG_SUGGESTED_OPTIONS.Linux=   alsa
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Malsa)
+CMAKE_ARGS+=   -Denable-alsa=ON
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -Denable-alsa=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mjack)
+CMAKE_ARGS+=   -Denable-jack=ON
+.include "../../audio/jack/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -Denable-jack=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mportaudio)
+CMAKE_ARGS+=   -Denable-portaudio=ON
+.include "../../audio/portaudio-devel/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -Denable-portaudio=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CMAKE_ARGS+=   -Denable-pulseaudio=ON
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -Denable-pulseaudio=OFF
+.endif

Index: pkgsrc/audio/fluidsynth/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/audio/fluidsynth/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Wed Oct 16 19:25:45 2019
+++ pkgsrc/audio/fluidsynth/patches/patch-CMakeLists.txt        Wed Oct 16 19:25:44 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2019/10/16 19:25:44 nia Exp $
+
+Allow building ALSA support on more systems.
+
+--- CMakeLists.txt.orig        2019-09-27 14:53:27.000000000 +0000
++++ CMakeLists.txt
+@@ -75,10 +75,10 @@ option ( enable-readline "compile readli
+ option ( enable-threads "enable multi-threading support (such as parallel voice synthesis)" on )
+ 
+ # Platform specific options
+-if ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" )
++if ( TRUE )
+     option ( enable-lash "compile LASH support (if it is available)" on )
+     option ( enable-alsa "compile ALSA support (if it is available)" on )
+-endif ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" )
++endif ( TRUE )
+ 
+ if ( CMAKE_SYSTEM MATCHES "Linux" )
+     option ( enable-systemd "compile systemd support (if it is available)" on )
Index: pkgsrc/audio/fluidsynth/patches/patch-src_drivers_fluid__alsa.c
diff -u /dev/null pkgsrc/audio/fluidsynth/patches/patch-src_drivers_fluid__alsa.c:1.1
--- /dev/null   Wed Oct 16 19:25:45 2019
+++ pkgsrc/audio/fluidsynth/patches/patch-src_drivers_fluid__alsa.c     Wed Oct 16 19:25:44 2019
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_drivers_fluid__alsa.c,v 1.1 2019/10/16 19:25:44 nia Exp $
+
+Support building on non-Linux.
+
+--- src/drivers/fluid_alsa.c.orig      2019-09-27 14:53:27.000000000 +0000
++++ src/drivers/fluid_alsa.c
+@@ -43,6 +43,14 @@
+ 
+ #define BUFFER_LENGTH 512
+ 
++#ifndef ESTRPIPE
++#define ESTRPIPE EPIPE
++#endif
++
++#ifndef EBADFD
++#define EBADFD EBADF
++#endif
++
+ /** fluid_alsa_audio_driver_t
+  *
+  * This structure should not be accessed directly. Use audio port