pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/csound6 update csound6 to 6.13. changes since 6...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2caa93cd81de
branches: trunk
changeset: 417012:2caa93cd81de
user: mrg <mrg%pkgsrc.org@localhost>
date: Sat Nov 02 22:25:46 2019 +0000
description:
update csound6 to 6.13. changes since 6.03.02 include:
- new opcodes and generators:
pinker, exciter, vactrol, hdf5 family, many new array-operations,
lenarray, getseed, tabifd, websocket, framebuffer, olabuffer,
compress2, directory, ftsamplebank, mvclpf1, mvclpf2, mvclpf3,
mvclpf4, mvchpf, cepsinv, moogladder2, paulstretch, mp3scal,
filescal, dct, getftargs, mfb, quadbezier, select, midiarp,
hilbert2, ableton link, pvstrace, ceil, floor, round, int, frac,
powoftwo, abs, log2, log10, log, exp, sqrt, cos, sin, tan, acos,
asin, atan, sinh, cosh, tanh, cbrt, limit1, atan2, pow,hypot,
fmod, fmax, fmin, limit, tvconv, liveconv, bpf, xyscale, ntom,
mton, OSCsend, OSCraw, sorta, sortd, dot, zdf_1pole_mode,
zdf_2pole_mode, zdf_ladder, zdf_1pole and zdf_2pole.xml,
diode_ladder, z35_hpf, K35_lpf, product, sc_phasor, sc_lag,
sc_lagud, sc_trig, midiout_i, chngetks, chnsetks, squinewave,
gen53, loscilphs, loscil3phs, balance2, fluidinfo, ftaudio,
OSCcount, faustplay, faustdsp, OSCbundle, beosc, beadsyn,
printarray, reshapearray, trim, trim_i, string2array, nstrstr,
ntof, ampmidicurve
- deprecated opcodes:
stackops, sndload
- fixes and feature extensions to many opcodes
- new while loop construct
- ?: now does strings as well as numbers
- better mp3 support
- many, many bugs fixed
- many internal artificial limits removed
- better debugging and instrumentation
- src_conv utility improved
- floating point tempo
- higher precision p2 and p3
- html5 frontend removed
- better server support
diffstat:
audio/csound6/Makefile | 19 +-
audio/csound6/PLIST | 32 +++-
audio/csound6/distinfo | 35 +--
audio/csound6/patches/patch-CMakeLists.txt | 81 ++++++---
audio/csound6/patches/patch-Engine_entry1.c | 13 -
audio/csound6/patches/patch-Engine_linevent.c | 4 +-
audio/csound6/patches/patch-Frontends_csound_csound_main.c | 16 +
audio/csound6/patches/patch-InOut_widgets.cpp | 26 +-
audio/csound6/patches/patch-InOut_winFLTK.c | 8 +-
audio/csound6/patches/patch-Opcodes_cpumeter.c | 16 +-
audio/csound6/patches/patch-Opcodes_wavegde.h | 8 +-
audio/csound6/patches/patch-Top_csmodule.c | 47 +++--
audio/csound6/patches/patch-Top_csound.c | 18 +-
audio/csound6/patches/patch-Top_one_file.c | 26 +--
audio/csound6/patches/patch-Top_threads.c | 17 +-
audio/csound6/patches/patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp | 15 -
audio/csound6/patches/patch-include_interlocks.h | 13 -
audio/csound6/patches/patch-include_text.h | 13 -
18 files changed, 198 insertions(+), 209 deletions(-)
diffs (truncated from 715 to 300 lines):
diff -r 28ac017963fe -r 2caa93cd81de audio/csound6/Makefile
--- a/audio/csound6/Makefile Sat Nov 02 22:24:37 2019 +0000
+++ b/audio/csound6/Makefile Sat Nov 02 22:25:46 2019 +0000
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.39 2019/10/29 20:13:58 mrg Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/02 22:25:46 mrg Exp $
-DISTNAME= Csound${CSOUND_VERSION}
+DISTNAME= csound-${CSOUND_VERSION}
PKGNAME= csound6-${CSOUND_VERSION}
-PKGREVISION= 27
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=csound/csound6/Csound6.03/}
-WRKSRC= ${WRKDIR}/Csound${CSOUND_VERSION}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=csound/}
+GITHUB_PROJECT= csound
+#WRKSRC= ${WRKDIR}/Csound${CSOUND_VERSION}
MAINTAINER= mrg%eterna.com.au@localhost
HOMEPAGE= https://sourceforge.net/projects/csound/
COMMENT= Software synthesizer and sequencer
LICENSE= gnu-lgpl-v2.1 # or later
-CSOUND_VERSION= 6.03.2
+CSOUND_VERSION= 6.13.0
USE_LANGUAGES= c c++
USE_TOOLS+= bison
CFLAGS+= -g -D__PKGSRC_PREFIX__=\"${PREFIX}/\" -DBETA
@@ -37,9 +37,12 @@
.include "../../mk/bsd.prefs.mk"
post-install:
- cd ${DESTDIR}${PREFIX} && ${LN} -s ../lib/csound6/csound bin/csound6
+ cd ${DESTDIR}${PREFIX} && \
+ rm -f bin/csound6 && \
+ ${LN} -s ../lib/csound6/csound bin/csound6
-#.include "../../audio/fluidsynth/buildlink3.mk"
+.include "../../audio/fluidsynth/buildlink3.mk"
+.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/pulseaudio/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
diff -r 28ac017963fe -r 2caa93cd81de audio/csound6/PLIST
--- a/audio/csound6/PLIST Sat Nov 02 22:24:37 2019 +0000
+++ b/audio/csound6/PLIST Sat Nov 02 22:25:46 2019 +0000
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2019/10/29 20:13:58 mrg Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/11/02 22:25:46 mrg Exp $
bin/csound6
include/csound6/CppSound.hpp
include/csound6/CsoundFile.hpp
include/csound6/OpcodeBase.hpp
+include/csound6/arrays.h
include/csound6/cfgvar.h
include/csound6/csPerfThread.hpp
include/csound6/cs_par_structs.h
@@ -14,12 +15,16 @@
include/csound6/csoundCore.h
include/csound6/csound_data_structures.h
include/csound6/csound_standard_types.h
+include/csound6/csound_threaded.hpp
include/csound6/csound_type_system.h
include/csound6/cwindow.h
include/csound6/filebuilding.h
+include/csound6/find_opcode.h
include/csound6/float-version.h
include/csound6/interlocks.h
+include/csound6/modload.h
include/csound6/msg_attr.h
+include/csound6/plugin.h
include/csound6/pools.h
include/csound6/pstream.h
include/csound6/pvfileio.h
@@ -51,26 +56,42 @@
lib/csound6/lpc_import
lib/csound6/makecsd
lib/csound6/mixer
-lib/csound6/plugins-6.0/csladspa.so
lib/csound6/plugins-6.0/libampmidid.so
+lib/csound6/plugins-6.0/libarrayops.so
+lib/csound6/plugins-6.0/libbeosc.so
+lib/csound6/plugins-6.0/libbuchla.so
lib/csound6/plugins-6.0/libcellular.so
-lib/csound6/plugins-6.0/libchua.so
lib/csound6/plugins-6.0/libcontrol.so
lib/csound6/plugins-6.0/libcs_date.so
lib/csound6/plugins-6.0/libdoppler.so
+lib/csound6/plugins-6.0/libemugens.so
+lib/csound6/plugins-6.0/libexciter.so
lib/csound6/plugins-6.0/libfareygen.so
+lib/csound6/plugins-6.0/libfluidOpcodes.so
lib/csound6/plugins-6.0/libfractalnoise.so
+lib/csound6/plugins-6.0/libframebuffer.so
+lib/csound6/plugins-6.0/libftsamplebank.so
+lib/csound6/plugins-6.0/libgetftargs.so
+lib/csound6/plugins-6.0/libgtf.so
lib/csound6/plugins-6.0/libimage.so
lib/csound6/plugins-6.0/libipmidi.so
+lib/csound6/plugins-6.0/libliveconv.so
lib/csound6/plugins-6.0/libmixer.so
+lib/csound6/plugins-6.0/libpadsynth.so
lib/csound6/plugins-6.0/libplaterev.so
+lib/csound6/plugins-6.0/libpvsops.so
lib/csound6/plugins-6.0/libpy.so
+lib/csound6/plugins-6.0/libquadbezier.so
lib/csound6/plugins-6.0/librtpulse.so
lib/csound6/plugins-6.0/libscansyn.so
+lib/csound6/plugins-6.0/libscugens.so
+lib/csound6/plugins-6.0/libselect.so
lib/csound6/plugins-6.0/libserial.so
lib/csound6/plugins-6.0/libsignalflowgraph.so
+lib/csound6/plugins-6.0/libstackops.so
lib/csound6/plugins-6.0/libstdutil.so
lib/csound6/plugins-6.0/libsystem_call.so
+lib/csound6/plugins-6.0/liburandom.so
lib/csound6/plugins-6.0/libvirtual.so
lib/csound6/plugins-6.0/libwidgets.so
lib/csound6/pv_export
@@ -78,16 +99,17 @@
lib/csound6/pvanal
lib/csound6/pvlook
lib/csound6/scale
-lib/csound6/scope
lib/csound6/scot
lib/csound6/scsort
lib/csound6/sdif2ad
lib/csound6/sndinfo
+lib/csound6/src_conv
lib/csound6/srconv
+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/ro/LC_MESSAGES/csound6.mo
share/locale/ru/LC_MESSAGES/csound6.mo
diff -r 28ac017963fe -r 2caa93cd81de audio/csound6/distinfo
--- a/audio/csound6/distinfo Sat Nov 02 22:24:37 2019 +0000
+++ b/audio/csound6/distinfo Sat Nov 02 22:25:46 2019 +0000
@@ -1,22 +1,19 @@
-$NetBSD: distinfo,v 1.7 2017/06/27 20:09:24 joerg Exp $
+$NetBSD: distinfo,v 1.8 2019/11/02 22:25:46 mrg Exp $
-SHA1 (Csound6.03.2.tar.gz) = 2ff8081c887ef98735197c1ff70bb4955c3eb3ff
-RMD160 (Csound6.03.2.tar.gz) = 00d6407feab8f992b8d309ec6701858087569752
-SHA512 (Csound6.03.2.tar.gz) = 01cea31349632ecf3692a23535793c1cd622669e07a9035e1ee80d6ad117e8d0296d2ece78635fee8a73eb5ba53d2b03a8b895f0b2a9a74ae015288243445c1b
-Size (Csound6.03.2.tar.gz) = 24571513 bytes
-SHA1 (patch-CMakeLists.txt) = 47e77bb65a091a8925893f4cf7bc76efc5080110
-SHA1 (patch-Engine_entry1.c) = 915c11cb182ad9375ec0f034f1adfde009131aa4
-SHA1 (patch-Engine_linevent.c) = da606596a1c8d2545dc0a8e948cd04e9188975ad
+SHA1 (csound-6.13.0.tar.gz) = 1775f3bdd273364995ba52a79c32795928cb3ec2
+RMD160 (csound-6.13.0.tar.gz) = 780b93bb5547e5a3807affabfe1c9f0315d5fec3
+SHA512 (csound-6.13.0.tar.gz) = 51a30cb426fc77ac648f6a9fb669b9298e6608b39ae3b12181d16ecf1fb6f2ed3db31471615a60d2ce7906b91fdb911b38c8dfa3f93699768f490f87a2bcbbbd
+Size (csound-6.13.0.tar.gz) = 26328673 bytes
+SHA1 (patch-CMakeLists.txt) = e526ab5157e8b7d636a983418f0d504b0ced6fe5
+SHA1 (patch-Engine_linevent.c) = b141da5b28d775f44f5804a08c22371be0cad3aa
+SHA1 (patch-Frontends_csound_csound_main.c) = 0004c7fedd7b57077587c7a2e6e4ce112b264304
SHA1 (patch-InOut_libsnd.c) = b460ef3ef7117fd9c194eff3f62a64435243ccc4
-SHA1 (patch-InOut_widgets.cpp) = f73a58a636254d27a3aa6b94ace4f72b978ca9ec
+SHA1 (patch-InOut_widgets.cpp) = 4c6addbec8874e6525919b08b3e16d1f74fb525b
SHA1 (patch-InOut_winEPS.c) = 5b3182dc79d819145df73426fead54fc28414ff2
-SHA1 (patch-InOut_winFLTK.c) = 0c9b566ae5acfae5dcf7a9d0795976f103d069a5
-SHA1 (patch-Opcodes_cpumeter.c) = 4f5fdcdd1c0eb600be49e977df5214f52de1437b
-SHA1 (patch-Opcodes_wavegde.h) = e1a6d742b28dd9b6b129a993102baf7218efa57c
-SHA1 (patch-Top_csmodule.c) = 0ce136346dfe19d56dc4e882976aa2e66cd17e92
-SHA1 (patch-Top_csound.c) = 26c03324e0f8f8ccedbfe32bfedbd282d69a93fa
-SHA1 (patch-Top_one_file.c) = c5929f9efcf8c11625fde7a86321f2fd303b55d2
-SHA1 (patch-Top_threads.c) = 107cb8605b5b46b70de3adeec0ae8acaafc2a6f2
-SHA1 (patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp) = a16da9c4975d37e56fefb58fd0458e94c3ed4925
-SHA1 (patch-include_interlocks.h) = 60bbb3a92ccb4d52665db58042de4a7caabfa5f2
-SHA1 (patch-include_text.h) = fc3c164c3740b2c595113dd7811506abb29402d0
+SHA1 (patch-InOut_winFLTK.c) = c8eb6e799095e0a82759fbd9df042fd3dc5c3ae6
+SHA1 (patch-Opcodes_cpumeter.c) = d1b80026b3f0ea203a1055553bb4bd43c7a1dde1
+SHA1 (patch-Opcodes_wavegde.h) = a94da3b1cf6bf5497c6b0ccc15bd9e1e554146d5
+SHA1 (patch-Top_csmodule.c) = 68749a33360c85bb9025d5cb297fcfd757ca6803
+SHA1 (patch-Top_csound.c) = 6f9e216ff6df71fe937866daa21e205469b732e7
+SHA1 (patch-Top_one_file.c) = b93131eb5b4ea89fb1ab13cff3377510060059dc
+SHA1 (patch-Top_threads.c) = 1c296a92b62561428f5dd010834d6858ff83e481
diff -r 28ac017963fe -r 2caa93cd81de audio/csound6/patches/patch-CMakeLists.txt
--- a/audio/csound6/patches/patch-CMakeLists.txt Sat Nov 02 22:24:37 2019 +0000
+++ b/audio/csound6/patches/patch-CMakeLists.txt Sat Nov 02 22:25:46 2019 +0000
@@ -1,45 +1,34 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2014/08/05 05:12:38 mrg Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2019/11/02 22:25:46 mrg Exp $
Install csound in lib/csound6 to avoid conflicts with csound5.
Add NetBSD support.
---- CMakeLists.txt.orig 2014-01-07 08:54:20.000000000 -0800
-+++ CMakeLists.txt 2014-02-14 16:31:43.000000000 -0800
-@@ -13,26 +13,26 @@
+--- CMakeLists.txt.orig 2019-07-12 14:54:19.000000000 -0700
++++ CMakeLists.txt 2019-10-30 12:16:51.495210409 -0700
+@@ -20,10 +20,10 @@
set(APIVERSION "6.0")
# Relative install paths
-set(EXECUTABLE_INSTALL_DIR "bin")
+set(EXECUTABLE_INSTALL_DIR "lib/csound6")
- option(USE_LIB64 "Set to on to set installation directory for libraries to lib64" OFF)
- if(USE_LIB64)
-- set(LIBRARY_INSTALL_DIR "lib64")
-+ set(LIBRARY_INSTALL_DIR "lib64/csound6")
- else()
-- set(LIBRARY_INSTALL_DIR "lib")
-+ set(LIBRARY_INSTALL_DIR "lib/csound6")
- endif()
- message(STATUS "LIBRARY INSTALL DIR: ${LIBRARY_INSTALL_DIR}")
-
- if(USE_DOUBLE)
-- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins64-${APIVERSION}")
-+ set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/plugins-${APIVERSION}")
- else()
-- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
-+ set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/plugins-${APIVERSION}")
- endif()
- set(PYTHON_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
- set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
- set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
set(LOCALE_INSTALL_DIR "share/locale")
-set(HEADER_INSTALL_DIR "include/csound")
+set(HEADER_INSTALL_DIR "include/csound6")
- set(CS_FRAMEWORK_DEST "~/Library/Frameworks")
+ set(CS_FRAMEWORK_DEST "~/Library/Frameworks" CACHE PATH "Csound framework path")
include(TestBigEndian)
-@@ -239,6 +239,12 @@
- set(LINUX NO)
+@@ -36,7 +36,7 @@
+ include(CheckCXXCompilerFlag)
+ include(CMakePushCheckState)
+
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
++set (CMAKE_MODULE_PATH "/var/obj/pkgsrc/audio/csound6/work.the-blessing/.buildlink/cmake-Modules" "/var/obj/pkgsrc/audio/csound6/work.the-blessing/.buildlink/cmake-Modules"
"/var/obj/pkgsrc/audio/csound6/work.the-blessing/.buildlink/cmake-Modules" ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+
+ # Utility to munge with items in a list.
+ #
+@@ -128,6 +128,12 @@
+ set(OSX_VERSION " ")
endif()
+if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
@@ -49,9 +38,33 @@
+endif()
+
## USER OPTIONS ##
-
+ # Optional targets, they should all default to ON (check_deps will disable them if not possible to build)
option(USE_DOUBLE "Set to use double-precision floating point for audio samples." ON)
-@@ -326,6 +332,10 @@
+@@ -188,19 +194,19 @@
+
+ option(USE_LIB64 "Set to on to set installation directory for libraries to lib64" OFF)
+ if(USE_LIB64)
+- set(LIBRARY_INSTALL_DIR "lib64")
++ set(LIBRARY_INSTALL_DIR "lib64/csound6")
+ add_definitions("-DLIB64")
+ else()
+- set(LIBRARY_INSTALL_DIR "lib")
++ set(LIBRARY_INSTALL_DIR "lib/csound6")
+ endif()
+ message(STATUS "LIBRARY INSTALL DIR: ${LIBRARY_INSTALL_DIR}")
+
+ if(USE_DOUBLE)
+ message(STATUS "Building with 64-bit floats")
+- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins64-${APIVERSION}")
++ set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/plugins-${APIVERSION}")
+ else()
+ message(STATUS "Building with 32-bit floats")
+- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
++ set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/plugins-${APIVERSION}")
+ endif()
+
+ execute_process (
+@@ -466,6 +472,10 @@
endif()
@@ -62,3 +75,13 @@
if(BUILD_RELEASE)
add_definitions("-D_CSOUND_RELEASE_")
if(LINUX)
+@@ -1296,7 +1306,9 @@
+ 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 -r 28ac017963fe -r 2caa93cd81de audio/csound6/patches/patch-Engine_entry1.c
--- a/audio/csound6/patches/patch-Engine_entry1.c Sat Nov 02 22:24:37 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
Home |
Main Index |
Thread Index |
Old Index