pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
updated audio/csound to 6.18.1 - can be re-imported into main
- To: pkgsrc-wip-changes%NetBSD.org@localhost
- Subject: updated audio/csound to 6.18.1 - can be re-imported into main
- From: Manuel Kuklinski <mk@Mac-mini-von-Manuel.local>
- Date: Sat, 21 Oct 2023 12:53:35 +0000
Module Name: pkgsrc-wip
Committed By: Manuel Kuklinski <mk@Mac-mini-von-Manuel.local>
Pushed By: mk
Date: Sat Oct 21 14:53:35 2023 +0200
Changeset: 7dd8d7afbdd63cd5363141576a510f28dd2eae23
Added Files:
csound6181/DESCR
csound6181/Makefile
csound6181/PLIST
csound6181/distinfo
csound6181/options.mk
csound6181/patches/patch-CMakeLists.txt
csound6181/patches/patch-Engine_linevent.c
csound6181/patches/patch-Frontends_csound_csound_main.c
csound6181/patches/patch-InOut_libsnd.c
csound6181/patches/patch-InOut_winEPS.c
csound6181/patches/patch-Opcodes_cpumeter.c
csound6181/patches/patch-Opcodes_wavegde.h
csound6181/patches/patch-Top_threads.c
csound6181/patches/patch-installer_macosx_release-build-azure.sh
Log Message:
updated audio/csound to 6.18.1 - can be re-imported into main
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7dd8d7afbdd63cd5363141576a510f28dd2eae23
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
csound6181/DESCR | 8 +++
csound6181/Makefile | 60 ++++++++++++++++++++++
csound6181/PLIST | 39 ++++++++++++++
csound6181/distinfo | 6 +++
csound6181/options.mk | 53 +++++++++++++++++++
csound6181/patches/patch-CMakeLists.txt | 29 +++++++++++
csound6181/patches/patch-Engine_linevent.c | 15 ++++++
.../patches/patch-Frontends_csound_csound_main.c | 16 ++++++
csound6181/patches/patch-InOut_libsnd.c | 15 ++++++
csound6181/patches/patch-InOut_winEPS.c | 15 ++++++
csound6181/patches/patch-Opcodes_cpumeter.c | 17 ++++++
csound6181/patches/patch-Opcodes_wavegde.h | 16 ++++++
csound6181/patches/patch-Top_threads.c | 15 ++++++
.../patch-installer_macosx_release-build-azure.sh | 15 ++++++
14 files changed, 319 insertions(+)
diffs:
diff --git a/csound6181/DESCR b/csound6181/DESCR
new file mode 100644
index 0000000000..909beaee38
--- /dev/null
+++ b/csound6181/DESCR
@@ -0,0 +1,8 @@
+Csound is a software synthesis package in the tradition of so-called
+music-N languages, among which the best-known is Music V. It consists
+of an orchestra- and score-driven executable, written in C for
+portability. Since Csound is a computational language, it is highly
+flexible and efficient; complexity is gained only at the expense of
+computation time. Basically Csound reads some files and creates the
+result as a file on disk or, on faster machines, through a DAC in real
+time.
diff --git a/csound6181/Makefile b/csound6181/Makefile
new file mode 100644
index 0000000000..5286b69f7f
--- /dev/null
+++ b/csound6181/Makefile
@@ -0,0 +1,60 @@
+# $NetBSD: Makefile,v 1.79 2023/08/14 05:23:46 wiz Exp $
+
+DISTNAME= csound-${CSOUND_VERSION}
+PKGNAME= csound6-${CSOUND_VERSION}
+PKGREVISION= 26
+CATEGORIES= audio
+MASTER_SITES= ${MASTER_SITE_GITHUB:=csound/}
+GITHUB_PROJECT= csound
+
+MAINTAINER= mrg%eterna.com.au@localhost
+HOMEPAGE= https://github.com/csound
+COMMENT= Software synthesizer and sequencer
+LICENSE= gnu-lgpl-v2.1 # or later
+
+CSOUND_VERSION= 6.18.1
+USE_LANGUAGES= c c++
+USE_TOOLS+= bison flex
+CFLAGS+= -g -DBETA
+#CFLAGS+= -DCS_DEFAULT_PLUGINDIR=\"${PREFIX}/lib/csound/plugins64-6.0\"
+USE_CMAKE= yes
+CMAKE_ARGS+= -DBUILD_RELEASE=1
+CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+= -DBUILD_HDF5_OPCODES=OFF
+# CMAKE_INSTALL_RPATH doesn't work for some reason, so do it here.
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/csound6
+
+INSTALLATION_DIRS= bin
+
+CHECK_PORTABILITY_SKIP+= \
+ Android/build-all.sh \
+ installer/misc/makedeb.sh \
+ installer/macosx/beta-build.sh \
+ installer/macosx/release-build.sh \
+ installer/macosx/release-build-10.8.sh \
+ installer/macosx/release-build-10.10.sh \
+ frontends/max_csound_tilde/installer/build-installer.sh \
+ frontends/max_csound_tilde/installer/build-installer-windows.sh
+
+.include "../../mk/bsd.prefs.mk"
+
+post-install:
+ cd ${DESTDIR}${PREFIX} && \
+ rm -f bin/csound6 && \
+ ${LN} -s csound bin/csound6
+
+.include "options.mk"
+
+.include "../../audio/fluidsynth/buildlink3.mk"
+.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/liblo/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../math/eigen3/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../x11/fltk13/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/csound6181/PLIST b/csound6181/PLIST
new file mode 100644
index 0000000000..711edf3a89
--- /dev/null
+++ b/csound6181/PLIST
@@ -0,0 +1,39 @@
+@comment $NetBSD$
+bin/atsa
+bin/csanalyze
+bin/csbeats
+bin/csdebugger
+bin/csound
+bin/csound6
+bin/cvanal
+bin/dnoise
+bin/envext
+bin/extract
+bin/extractor
+bin/het_export
+bin/het_import
+bin/hetro
+bin/lpanal
+bin/lpc_export
+bin/lpc_import
+bin/mixer
+bin/pv_export
+bin/pv_import
+bin/pvanal
+bin/pvlook
+bin/scale
+bin/scsort
+bin/sdif2ad
+bin/sndinfo
+bin/src_conv
+bin/srconv
+lib/libcsnd6.6.0.dylib
+lib/libcsnd6.dylib
+share/cmake/Csound/FindCsound.cmake
+share/locale/de/LC_MESSAGES/csound6.mo
+share/locale/en_US/LC_MESSAGES/csound6.mo
+share/locale/es/LC_MESSAGES/csound6.mo
+share/locale/es_CO/LC_MESSAGES/csound6.mo
+share/locale/fr/LC_MESSAGES/csound6.mo
+share/locale/it/LC_MESSAGES/csound6.mo
+share/locale/ru/LC_MESSAGES/csound6.mo
diff --git a/csound6181/distinfo b/csound6181/distinfo
new file mode 100644
index 0000000000..0011677950
--- /dev/null
+++ b/csound6181/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.13 2021/10/26 09:58:51 nia Exp $
+
+BLAKE2s (csound-6.18.1.tar.gz) = 2ac0b7c3bb2d00befb27ef8f6fef5eab0f6408f4839bd29082b369aa07fae828
+SHA512 (csound-6.18.1.tar.gz) = 4ea4dccb36017c96482389a8d139f6f55c79c5ceb9cc34e6d2bfabcb930b4833d0301be4a4b21929db27b2d8ce30754b5c5867acd2ea5a849135e1b8d1506acf
+Size (csound-6.18.1.tar.gz) = 31925161 bytes
+SHA1 (patch-installer_macosx_release-build-azure.sh) = 23f21df0fca0fa38129b2940c6c91b8d6c279784
diff --git a/csound6181/options.mk b/csound6181/options.mk
new file mode 100644
index 0000000000..bfadb51abc
--- /dev/null
+++ b/csound6181/options.mk
@@ -0,0 +1,53 @@
+# $NetBSD: options.mk,v 1.3 2020/10/06 00:26:51 mrg Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.csound6
+PKG_SUPPORTED_OPTIONS= jack portaudio pulseaudio
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+PKG_SUPPORTED_OPTIONS+= alsa
+PKG_SUGGESTED_OPTIONS+= alsa
+.elif ${OPSYS} != "Darwin" && ${OPSYS} != "Haiku"
+PKG_SUGGESTED_OPTIONS+= portaudio
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= alsa
+.if !empty(PKG_OPTIONS:Malsa)
+.include "../../audio/alsa-lib/buildlink3.mk"
+CMAKE_ARGS+= -DUSE_ALSA=ON
+PLIST.alsa= yes
+.else
+CMAKE_ARGS+= -DUSE_ALSA=OFF
+.endif
+
+PLIST_VARS+= jack
+.if !empty(PKG_OPTIONS:Mjack)
+.include "../../audio/jack/buildlink3.mk"
+CMAKE_ARGS+= -DUSE_JACK=ON
+PLIST.jack= yes
+.else
+CMAKE_ARGS+= -DUSE_JACK=OFF
+.endif
+
+PLIST_VARS+= portaudio
+.if !empty(PKG_OPTIONS:Mportaudio)
+.include "../../audio/portaudio/buildlink3.mk"
+CMAKE_ARGS+= -DUSE_PORTAUDIO=ON
+CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH=${BUILDLINK_PREFIX.portaudio}/include/portaudio2
+CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH=${BUILDLINK_PREFIX.portaudio}/lib/portaudio2
+PLIST.portaudio= yes
+.else
+CMAKE_ARGS+= -DUSE_PORTAUDIO=OFF
+.endif
+
+PLIST_VARS+= pulseaudio
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+.include "../../audio/pulseaudio/buildlink3.mk"
+CMAKE_ARGS+= -DUSE_PULSEAUDIO=ON
+PLIST.pulseaudio= yes
+.else
+CMAKE_ARGS+= -DUSE_PULSEAUDIO=OFF
+.endif
diff --git a/csound6181/patches/patch-CMakeLists.txt b/csound6181/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..c9d4d577e4
--- /dev/null
+++ b/csound6181/patches/patch-CMakeLists.txt
@@ -0,0 +1,29 @@
+$NetBSD$
+
+Add NetBSD support.
+
+--- CMakeLists.txt.orig 2022-11-23 19:53:55.000000000 +0000
++++ CMakeLists.txt
+@@ -395,6 +395,12 @@ if(APPLE)
+ add_definitions("-DCS_DEFAULT_USER_PLUGINDIR=\"${DEFAULT_USER_PLUGINDIR}\"")
+ endif()
+
++if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
++ set(NETBSD YES)
++else()
++ set(NETBSD NO)
++endif()
++
+ # LINUX definition
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ set(LINUX YES)
+@@ -1230,7 +1236,9 @@ if(LINUX)
+ list(APPEND libcsound_LIBS ${LIBRT_LIBRARY})
+ message(STATUS " ADDING LIBRT LIBRARY: ${LIBRT_LIBRARY}.")
+ endif()
++endif()
+
++if(LINUX OR NETBSD)
+ find_library(LIBEXECINFO_LIBRARY execinfo)
+
+ if(LIBEXECINFO_LIBRARY)
diff --git a/csound6181/patches/patch-Engine_linevent.c b/csound6181/patches/patch-Engine_linevent.c
new file mode 100644
index 0000000000..6a64fa7ce3
--- /dev/null
+++ b/csound6181/patches/patch-Engine_linevent.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-Engine_linevent.c,v 1.3 2019/11/02 22:25:46 mrg Exp $
+
+Add NetBSD and DragonFlyBSD support.
+
+--- Engine/linevent.c.orig 2014-01-07 08:54:20.000000000 -0800
++++ Engine/linevent.c 2014-02-12 23:45:21.000000000 -0800
+@@ -27,7 +27,7 @@
+ #include "linevent.h"
+
+ #ifdef PIPES
+-# if defined(SGI) || defined(LINUX) || defined(NeXT) || defined(__MACH__)
++# if defined(SGI) || defined(LINUX) || defined(NeXT) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
+ # define _popen popen
+ # define _pclose pclose
+ # elif defined(__BEOS__) || defined(__HAIKU__) || defined(__MACH__)
diff --git a/csound6181/patches/patch-Frontends_csound_csound_main.c b/csound6181/patches/patch-Frontends_csound_csound_main.c
new file mode 100644
index 0000000000..96b89f16bf
--- /dev/null
+++ b/csound6181/patches/patch-Frontends_csound_csound_main.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Port to NetBSD and DragonFly.
+
+--- Frontends/csound/csound_main.c.orig 2022-11-23 19:53:55.000000000 +0000
++++ Frontends/csound/csound_main.c
+@@ -76,6 +76,8 @@ static void nomsg_callback(CSOUND *csoun
+ #if defined(ANDROID) || (!defined(LINUX) && !defined(SGI) && \
+ !defined(__HAIKU__) && !defined(__BEOS__) && \
+ !defined(__MACH__) && !defined(__EMSCRIPTEN__))
++·························!defined(__MACH__)·&&·!defined(__EMSCRIPTEN__)·&&·\
++·························!defined(__NetBSD__)·&&·!defined(__DragonFly__))
+ static char *signal_to_string(int sig)
+ {
+ switch(sig) {
+
diff --git a/csound6181/patches/patch-InOut_libsnd.c b/csound6181/patches/patch-InOut_libsnd.c
new file mode 100644
index 0000000000..9f1d832d4a
--- /dev/null
+++ b/csound6181/patches/patch-InOut_libsnd.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-InOut_libsnd.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+
+Add NetBSD and DragonFlyBSD support.
+
+--- InOut/libsnd.c.orig 2023-10-21 12:16:36.670142255 +0000
++++ InOut/libsnd.c
+@@ -33,7 +33,7 @@
+
+ #ifdef PIPES
+ # if defined(SGI) || defined(LINUX) || defined(__BEOS__) || defined(NeXT) || \
+- defined(__MACH__)
++ defined(__MACH__) ||·defined(__NetBSD__)·||·defined(__DragonFly__)
+ # define _popen popen
+ # define _pclose pclose
+ # endif
diff --git a/csound6181/patches/patch-InOut_winEPS.c b/csound6181/patches/patch-InOut_winEPS.c
new file mode 100644
index 0000000000..a83fef90a9
--- /dev/null
+++ b/csound6181/patches/patch-InOut_winEPS.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add NetBSD and DragonFlyBSD support.
+
+--- InOut/winEPS.c.orig 2022-11-23 19:53:55.000000000 +0000
++++ InOut/winEPS.c
+@@ -144,7 +144,7 @@ void PS_MakeGraph(CSOUND *csound, WINDAT
+ * Get the current time and date
+ */
+ lt = time(NULL);
+-#ifndef LINUX
++#if·!defined(LINUX)·&&·!defined(__NetBSD__)·&&·!defined(__DragonFly__)
+ {
+ struct tm *date_ptr;
+ char *date;
diff --git a/csound6181/patches/patch-Opcodes_cpumeter.c b/csound6181/patches/patch-Opcodes_cpumeter.c
new file mode 100644
index 0000000000..b9c13747ba
--- /dev/null
+++ b/csound6181/patches/patch-Opcodes_cpumeter.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-Opcodes_cpumeter.c,v 1.4 2019/11/02 22:25:46 mrg Exp $
+
+Add NetBSD and DragonFlyBSD support.
+
+be best to patch this to use eg, getloadavg() or something not /proc.
+
+--- Opcodes/cpumeter.c.orig 2019-07-12 14:54:19.000000000 -0700
++++ Opcodes/cpumeter.c 2019-10-29 13:44:20.487656938 -0700
+@@ -36,7 +36,7 @@
+ #include <float.h>
+
+ // only available on Linux (no /proc/stat on OSX)
+-#if defined(LINUX)
++#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
+ /*###### Miscellaneous global stuff ####################################*/
+ #define SMLBUFSIZ (512)
+ #define TEST (0)
diff --git a/csound6181/patches/patch-Opcodes_wavegde.h b/csound6181/patches/patch-Opcodes_wavegde.h
new file mode 100644
index 0000000000..902c30ef85
--- /dev/null
+++ b/csound6181/patches/patch-Opcodes_wavegde.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-Opcodes_wavegde.h,v 1.2 2019/11/02 22:25:46 mrg Exp $
+
+Use native len_t on SunOS.
+
+--- Opcodes/wavegde.h.orig 2019-07-12 14:54:19.000000000 -0700
++++ Opcodes/wavegde.h 2019-10-29 13:45:37.120974231 -0700
+@@ -43,7 +43,9 @@
+ #endif
+
+ /* TYPEDEFS */
++#ifndef __sun
+ typedef int64_t len_t; /* length type */
++#endif
+
+ /* CLASS DEFINITIONS */
+
diff --git a/csound6181/patches/patch-Top_threads.c b/csound6181/patches/patch-Top_threads.c
new file mode 100644
index 0000000000..1d3107fd93
--- /dev/null
+++ b/csound6181/patches/patch-Top_threads.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-Top_threads.c,v 1.3 2019/11/02 22:25:46 mrg Exp $
+
+Add NetBSD and DragonFlyBSD support.
+
+--- Top/threads.c.orig 2019-07-12 14:54:19.000000000 -0700
++++ Top/threads.c 2019-10-29 13:37:43.363970338 -0700
+@@ -28,7 +28,7 @@
+
+ #ifndef HAVE_GETTIMEOFDAY
+ #if defined(LINUX) || defined(__unix) || defined(__unix__) || \
+- defined(__MACH__) || defined(__HAIKU__)
++ defined(__MACH__) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #define HAVE_GETTIMEOFDAY 1
+ #endif
+ #endif
diff --git a/csound6181/patches/patch-installer_macosx_release-build-azure.sh b/csound6181/patches/patch-installer_macosx_release-build-azure.sh
new file mode 100644
index 0000000000..5eefc9c0c5
--- /dev/null
+++ b/csound6181/patches/patch-installer_macosx_release-build-azure.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-installer_macosx_release-build-azure.sh,v 1.1 2020/10/10 14:02:37 mef Exp $
+
+ERROR: [check-portability.awk]
+
+--- installer/macosx/release-build-azure.sh.orig 2020-08-13 23:03:03.000000000 +0000
++++ installer/macosx/release-build-azure.sh
+@@ -35,7 +35,7 @@ ls /usr/local/lib
+
+ # sudo cp -a /Library/Frameworks/CsoundLib64.framework/libs/. $SYSTEM_DEFAULTWORKINGDIRECTORY/csoundLibs
+
+-if [ $# == 0 ]; then
++if [ $# = 0 ]; then
+ echo "Must give branch name to build from"
+ exit
+ else
Home |
Main Index |
Thread Index |
Old Index