CVS commit: pkgsrc/audio/csound6

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/csound6
From: "matthew green" <mrg%netbsd.org@localhost>
Date: Sat, 2 Nov 2019 22:25:46 +0000

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sat Nov  2 22:25:46 UTC 2019

Modified Files:
        pkgsrc/audio/csound6: Makefile PLIST distinfo
        pkgsrc/audio/csound6/patches: patch-CMakeLists.txt
            patch-Engine_linevent.c patch-InOut_widgets.cpp
            patch-InOut_winFLTK.c patch-Opcodes_cpumeter.c
            patch-Opcodes_wavegde.h patch-Top_csmodule.c patch-Top_csound.c
            patch-Top_one_file.c patch-Top_threads.c
Added Files:
        pkgsrc/audio/csound6/patches: patch-Frontends_csound_csound_main.c
Removed Files:
        pkgsrc/audio/csound6/patches: patch-Engine_entry1.c
            patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp
            patch-include_interlocks.h patch-include_text.h

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/audio/csound6/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/csound6/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/csound6/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/csound6/patches/patch-CMakeLists.txt \
    pkgsrc/audio/csound6/patches/patch-Engine_linevent.c \
    pkgsrc/audio/csound6/patches/patch-InOut_widgets.cpp \
    pkgsrc/audio/csound6/patches/patch-Top_csound.c \
    pkgsrc/audio/csound6/patches/patch-Top_threads.c
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/csound6/patches/patch-Engine_entry1.c \
    pkgsrc/audio/csound6/patches/patch-include_interlocks.h \
    pkgsrc/audio/csound6/patches/patch-include_text.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/csound6/patches/patch-Frontends_csound_csound_main.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/csound6/patches/patch-InOut_winFLTK.c \
    pkgsrc/audio/csound6/patches/patch-Opcodes_cpumeter.c \
    pkgsrc/audio/csound6/patches/patch-Top_csmodule.c \
    pkgsrc/audio/csound6/patches/patch-Top_one_file.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/csound6/patches/patch-Opcodes_wavegde.h
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/audio/csound6/patches/patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp

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

Modified files:

Index: pkgsrc/audio/csound6/Makefile
diff -u pkgsrc/audio/csound6/Makefile:1.39 pkgsrc/audio/csound6/Makefile:1.40
--- pkgsrc/audio/csound6/Makefile:1.39  Tue Oct 29 20:13:58 2019
+++ pkgsrc/audio/csound6/Makefile       Sat Nov  2 22:25:46 2019
@@ -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 @@ CHECK_PORTABILITY_SKIP+=     installer/misc/
 .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"

Index: pkgsrc/audio/csound6/PLIST
diff -u pkgsrc/audio/csound6/PLIST:1.5 pkgsrc/audio/csound6/PLIST:1.6
--- pkgsrc/audio/csound6/PLIST:1.5      Tue Oct 29 20:13:58 2019
+++ pkgsrc/audio/csound6/PLIST  Sat Nov  2 22:25:46 2019
@@ -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/csound.hpp
 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_export
 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/pv_import
 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

Index: pkgsrc/audio/csound6/distinfo
diff -u pkgsrc/audio/csound6/distinfo:1.7 pkgsrc/audio/csound6/distinfo:1.8
--- pkgsrc/audio/csound6/distinfo:1.7   Tue Jun 27 20:09:24 2017
+++ pkgsrc/audio/csound6/distinfo       Sat Nov  2 22:25:46 2019
@@ -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

Index: pkgsrc/audio/csound6/patches/patch-CMakeLists.txt
diff -u pkgsrc/audio/csound6/patches/patch-CMakeLists.txt:1.2 pkgsrc/audio/csound6/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/audio/csound6/patches/patch-CMakeLists.txt:1.2       Tue Aug  5 05:12:38 2014
+++ pkgsrc/audio/csound6/patches/patch-CMakeLists.txt   Sat Nov  2 22:25:46 2019
@@ -1,21 +1,52 @@
-$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")
  
+ set(LOCALE_INSTALL_DIR "share/locale")
+-set(HEADER_INSTALL_DIR "include/csound")
++set(HEADER_INSTALL_DIR "include/csound6")
+ 
+ set(CS_FRAMEWORK_DEST "~/Library/Frameworks" CACHE PATH "Csound framework path")
+ include(TestBigEndian)
+@@ -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")
++    set(NETBSD YES)
++else()
++    set(NETBSD NO)
++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)
+@@ -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")
@@ -23,35 +54,17 @@ Add NetBSD support.
  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()
- 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")
- include(TestBigEndian)
-@@ -239,6 +239,12 @@
-     set(LINUX NO)
- endif()
  
-+if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-+    set(NETBSD YES)
-+else()
-+    set(NETBSD NO)
-+endif()
-+
- ## USER OPTIONS ##
- 
- option(USE_DOUBLE "Set to use double-precision floating point for audio samples." ON)
-@@ -326,6 +332,10 @@
+ execute_process (
+@@ -466,6 +472,10 @@
  
  endif()
  
@@ -62,3 +75,13 @@ Add NetBSD support.
  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)
Index: pkgsrc/audio/csound6/patches/patch-Engine_linevent.c
diff -u pkgsrc/audio/csound6/patches/patch-Engine_linevent.c:1.2 pkgsrc/audio/csound6/patches/patch-Engine_linevent.c:1.3
--- pkgsrc/audio/csound6/patches/patch-Engine_linevent.c:1.2    Tue Aug  5 05:12:38 2014
+++ pkgsrc/audio/csound6/patches/patch-Engine_linevent.c        Sat Nov  2 22:25:46 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-Engine_linevent.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+$NetBSD: patch-Engine_linevent.c,v 1.3 2019/11/02 22:25:46 mrg Exp $
 
 Add NetBSD and DragonFlyBSD support.
 
@@ -12,4 +12,4 @@ Add NetBSD and DragonFlyBSD support.
 +# if defined(SGI) || defined(LINUX) || defined(NeXT) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
  #  define _popen popen
  #  define _pclose pclose
- # elif defined(__BEOS__) || defined(__MACH__)
+ # elif defined(__BEOS__) ||  defined(__HAIKU__) || defined(__MACH__)
Index: pkgsrc/audio/csound6/patches/patch-InOut_widgets.cpp
diff -u pkgsrc/audio/csound6/patches/patch-InOut_widgets.cpp:1.2 pkgsrc/audio/csound6/patches/patch-InOut_widgets.cpp:1.3
--- pkgsrc/audio/csound6/patches/patch-InOut_widgets.cpp:1.2    Tue Aug  5 05:12:38 2014
+++ pkgsrc/audio/csound6/patches/patch-InOut_widgets.cpp        Sat Nov  2 22:25:46 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-InOut_widgets.cpp,v 1.2 2014/08/05 05:12:38 mrg Exp $
+$NetBSD: patch-InOut_widgets.cpp,v 1.3 2019/11/02 22:25:46 mrg Exp $
 
 Add NetBSD and DragonFlyBSD support.
 
---- InOut/widgets.cpp.orig     2014-01-07 08:53:47.000000000 -0800
-+++ InOut/widgets.cpp  2014-02-12 23:46:20.000000000 -0800
-@@ -2107,7 +2107,7 @@
+--- InOut/widgets.cpp.orig     2019-07-12 14:54:19.000000000 -0700
++++ InOut/widgets.cpp  2019-10-29 13:41:51.455962617 -0700
+@@ -2101,7 +2101,7 @@
          (WIDGET_GLOBALS *)csound->QueryGlobalVariable(csound, "WIDGET_GLOBALS");
        p = (widgetsGlobals_t*) csound->QueryGlobalVariable(csound,
                                                            "_widgets_globals");
@@ -13,15 +13,15 @@ Add NetBSD and DragonFlyBSD support.
        {
          struct sched_param  sp;
          // IV - Aug 27 2002: widget thread is always run with normal priority
-@@ -2127,7 +2127,7 @@
- #ifdef WIN32
-         HWND xid = fl_xid(ST(fl_windows)[panelNum].panel);
-         ST(VSTplugEditors)[k]->SetEditWindow(xid);
--#elif defined (LINUX) || defined(MACOSX)
-+#elif defined (LINUX) || defined(MACOSX) || defined(__NetBSD__) || defined(__DragonFly__)
-         // put some appropriate alternative code here
-         Fl_Window * xid = fl_find(fl_xid(ST(fl_windows)[panelNum].panel));
-         ST(VSTplugEditors)[k]->SetEditWindow(xid);
+@@ -2121,7 +2121,7 @@
+ // #ifdef WIN32
+ //         HWND xid = fl_xid(widgetGlobals->fl_windows[panelNum].panel);
+ //         widgetGlobals->VSTplugEditors[k]->SetEditWindow(xid);
+-// #elif defined (LINUX) || defined(MACOSX)
++// #elif defined (LINUX) || defined(MACOSX) || defined(__NetBSD__) || defined(__DragonFly__)
+ //         // put some appropriate alternative code here
+ //         Fl_Window * xid =
+ //           fl_find(fl_xid(widgetGlobals->fl_windows[panelNum].panel));
 @@ -2258,8 +2258,7 @@
      CSOUND *csound = p->csound;
      char *command = (char *)csound->Malloc(csound, strlen(p->commandString) + 1);
Index: pkgsrc/audio/csound6/patches/patch-Top_csound.c
diff -u pkgsrc/audio/csound6/patches/patch-Top_csound.c:1.2 pkgsrc/audio/csound6/patches/patch-Top_csound.c:1.3
--- pkgsrc/audio/csound6/patches/patch-Top_csound.c:1.2 Tue Aug  5 05:12:38 2014
+++ pkgsrc/audio/csound6/patches/patch-Top_csound.c     Sat Nov  2 22:25:46 2019
@@ -1,20 +1,20 @@
-$NetBSD: patch-Top_csound.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+$NetBSD: patch-Top_csound.c,v 1.3 2019/11/02 22:25:46 mrg Exp $
 
 Add NetBSD and DragonFlyBSD support.
 
---- Top/csound.c.orig  2014-01-07 08:54:20.000000000 -0800
-+++ Top/csound.c       2014-02-12 23:44:07.000000000 -0800
-@@ -900,7 +900,8 @@
+--- Top/csound.c.orig  2019-07-12 14:54:19.000000000 -0700
++++ Top/csound.c       2019-10-29 13:50:02.540610805 -0700
+@@ -1027,7 +1027,8 @@
  
  #if defined(ANDROID) || (!defined(LINUX) && !defined(SGI) && \
                           !defined(__HAIKU__) && !defined(__BEOS__) && \
--                         !defined(__MACH__))
-+                         !defined(__MACH__) && !defined(__NetBSD__) && \
-+                       !defined(__DragonFly__))
+-                         !defined(__MACH__) && !defined(__EMSCRIPTEN__))
++                         !defined(__MACH__) && !defined(__EMSCRIPTEN__) && \
++                         !defined(__NetBSD__) && defined(__DragonFly__))
+ 
  static char *signal_to_string(int sig)
  {
-     switch(sig) {
-@@ -1053,7 +1054,7 @@
+@@ -1226,7 +1227,7 @@
  }
  
  static const int sigs[] = {
Index: pkgsrc/audio/csound6/patches/patch-Top_threads.c
diff -u pkgsrc/audio/csound6/patches/patch-Top_threads.c:1.2 pkgsrc/audio/csound6/patches/patch-Top_threads.c:1.3
--- pkgsrc/audio/csound6/patches/patch-Top_threads.c:1.2        Tue Aug  5 05:12:38 2014
+++ pkgsrc/audio/csound6/patches/patch-Top_threads.c    Sat Nov  2 22:25:46 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-Top_threads.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+$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 2014-01-07 08:54:20.000000000 -0800
-+++ Top/threads.c      2014-02-12 23:55:26.000000000 -0800
-@@ -26,7 +26,7 @@
+--- 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__) || \
@@ -13,12 +13,3 @@ Add NetBSD and DragonFlyBSD support.
  #define HAVE_GETTIMEOFDAY 1
  #endif
  #endif
-@@ -152,7 +152,7 @@
- 
- 
- #if defined(LINUX) || defined(__MACH__) || defined(__HAIKU__) || \
--    defined(ANDROID) || defined(WIN32)
-+    defined(ANDROID) || defined(WIN32) || defined(__NetBSD__) || defined(__DragonFly__)
- 
- #include <errno.h>
- #include <pthread.h>

Index: pkgsrc/audio/csound6/patches/patch-InOut_winFLTK.c
diff -u pkgsrc/audio/csound6/patches/patch-InOut_winFLTK.c:1.3 pkgsrc/audio/csound6/patches/patch-InOut_winFLTK.c:1.4
--- pkgsrc/audio/csound6/patches/patch-InOut_winFLTK.c:1.3      Wed Aug  6 06:17:07 2014
+++ pkgsrc/audio/csound6/patches/patch-InOut_winFLTK.c  Sat Nov  2 22:25:46 2019
@@ -1,9 +1,9 @@
-$NetBSD: patch-InOut_winFLTK.c,v 1.3 2014/08/06 06:17:07 mrg Exp $
+$NetBSD: patch-InOut_winFLTK.c,v 1.4 2019/11/02 22:25:46 mrg Exp $
 
 Add NetBSD and DragonFlyBSD support.
 
---- InOut/winFLTK.c.orig       2014-05-04 04:49:41.000000000 -0700
-+++ InOut/winFLTK.c    2014-08-04 22:18:13.000000000 -0700
+--- InOut/winFLTK.c.orig       2019-07-12 14:54:19.000000000 -0700
++++ InOut/winFLTK.c    2019-10-29 13:43:18.530007153 -0700
 @@ -29,7 +29,7 @@
  #include <stdio.h>
  #include "cwindow.h"
@@ -23,7 +23,7 @@ Add NetBSD and DragonFlyBSD support.
        if (dpy != NULL) {
          XCloseDisplay(dpy);
 @@ -104,7 +104,7 @@
-           csound->Message(csound, "graph init... \n");
+           csound->Message(csound, "graph init...\n");
  
          }
 -#ifdef LINUX
Index: pkgsrc/audio/csound6/patches/patch-Opcodes_cpumeter.c
diff -u pkgsrc/audio/csound6/patches/patch-Opcodes_cpumeter.c:1.3 pkgsrc/audio/csound6/patches/patch-Opcodes_cpumeter.c:1.4
--- pkgsrc/audio/csound6/patches/patch-Opcodes_cpumeter.c:1.3   Wed Aug  6 06:17:07 2014
+++ pkgsrc/audio/csound6/patches/patch-Opcodes_cpumeter.c       Sat Nov  2 22:25:46 2019
@@ -1,17 +1,17 @@
-$NetBSD: patch-Opcodes_cpumeter.c,v 1.3 2014/08/06 06:17:07 mrg Exp $
+$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    2014-05-04 04:49:41.000000000 -0700
-+++ Opcodes/cpumeter.c 2014-08-04 22:19:34.000000000 -0700
-@@ -17,7 +17,7 @@
-  */
+--- 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__)
- 
- #include "csoundCore.h"
- #include <sys/resource.h>
+ /*######  Miscellaneous global stuff  ####################################*/
+ #define SMLBUFSIZ (512)
+ #define TEST (0)
Index: pkgsrc/audio/csound6/patches/patch-Top_csmodule.c
diff -u pkgsrc/audio/csound6/patches/patch-Top_csmodule.c:1.3 pkgsrc/audio/csound6/patches/patch-Top_csmodule.c:1.4
--- pkgsrc/audio/csound6/patches/patch-Top_csmodule.c:1.3       Wed Aug  6 06:17:07 2014
+++ pkgsrc/audio/csound6/patches/patch-Top_csmodule.c   Sat Nov  2 22:25:46 2019
@@ -1,29 +1,29 @@
-$NetBSD: patch-Top_csmodule.c,v 1.3 2014/08/06 06:17:07 mrg Exp $
+$NetBSD: patch-Top_csmodule.c,v 1.4 2019/11/02 22:25:46 mrg Exp $
 
 Fix the installation path for csound6 plugins.
 Add NetBSD and DragonFlyBSD support.
 
---- Top/csmodule.c.orig        2014-05-04 04:49:41.000000000 -0700
-+++ Top/csmodule.c     2014-08-04 22:20:35.000000000 -0700
+--- Top/csmodule.c.orig        2019-07-12 14:54:19.000000000 -0700
++++ Top/csmodule.c     2019-10-29 13:48:52.707598788 -0700
 @@ -89,7 +89,7 @@
  #endif
  
  #if !(defined (NACL))
--#if defined(LINUX) || defined(NEW_MACH_CODE)
-+#if defined(LINUX) || defined(NEW_MACH_CODE) || defined(__NetBSD__) || defined(__DragonFly__)
+-#if defined(LINUX) || defined(NEW_MACH_CODE) || defined(__HAIKU__)
++#if defined(LINUX) || defined(NEW_MACH_CODE) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__)
  #include <dlfcn.h>
  #elif defined(WIN32)
  #include <windows.h>
-@@ -132,7 +132,7 @@
- 
- /* default directory to load plugins from if environment variable is not set */
- #if !(defined (NACL))
--#if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__)))
-+#if !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)))
+@@ -149,7 +149,7 @@
+         "/boot/home/config/non-packaged/lib/csound6/plugins64";
+ # endif
+ # define CS_DEFAULT_PLUGINDIR  haikudirs
+-#elif !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__)))
++#elif !(defined(_CSOUND_RELEASE_) && (defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)))
  #  define ENABLE_OPCODEDIR_WARNINGS 1
  #  ifdef CS_DEFAULT_PLUGINDIR
  #    undef CS_DEFAULT_PLUGINDIR
-@@ -142,9 +142,9 @@
+@@ -159,9 +159,9 @@
  #  define ENABLE_OPCODEDIR_WARNINGS 0
  #  ifndef CS_DEFAULT_PLUGINDIR
  #    ifndef USE_DOUBLE
@@ -35,21 +35,30 @@ Add NetBSD and DragonFlyBSD support.
  #    endif
  #  endif
  #endif
-@@ -247,7 +247,7 @@
+@@ -264,7 +264,7 @@
      err = csoundOpenLibrary(&h, libraryPath);
      if (UNLIKELY(err)) {
        char ERRSTR[256];
--#if !(defined(NACL)) && defined(LINUX)
-+#if !(defined(NACL)) && (defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__))
+- #if !(defined(NACL)) && (defined(LINUX) || defined(__HAIKU__))
++ #if !(defined(NACL)) && (defined(LINUX) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__))
        snprintf(ERRSTR, 256, Str("could not open library '%s' (%s)"),
-                       libraryPath, dlerror());
+                libraryPath, dlerror());
   #else
-@@ -684,7 +684,7 @@
+@@ -751,7 +751,7 @@
      return (void*) GetProcAddress((HMODULE) library, procedureName);
  }
  
--#elif !(defined(NACL)) && (defined(LINUX) || defined (NEW_MACH_CODE))
-+#elif !(defined(NACL)) && (defined(LINUX) || defined (NEW_MACH_CODE) || defined(__NetBSD__) || defined(__DragonFly__))
+-#elif !(defined(NACL)) && (defined(LINUX) || defined(NEW_MACH_CODE) || defined(__HAIKU__))
++#elif !(defined(NACL)) && (defined(LINUX) || defined(NEW_MACH_CODE) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__))
  
  PUBLIC int csoundOpenLibrary(void **library, const char *libraryPath)
  {
+@@ -906,7 +906,7 @@
+                                  hrtfreverb_localops_init, minmax_localops_init,
+                                  vaops_localops_init, paulstretch_localops_init,
+                                  squinewave_localops_init, tabaudio_localops_init,
+-#ifdef LINUX
++#if defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)
+                                  cpumeter_localops_init,
+ #endif
+ #ifndef NACL
Index: pkgsrc/audio/csound6/patches/patch-Top_one_file.c
diff -u pkgsrc/audio/csound6/patches/patch-Top_one_file.c:1.3 pkgsrc/audio/csound6/patches/patch-Top_one_file.c:1.4
--- pkgsrc/audio/csound6/patches/patch-Top_one_file.c:1.3       Wed Aug  6 06:17:07 2014
+++ pkgsrc/audio/csound6/patches/patch-Top_one_file.c   Sat Nov  2 22:25:46 2019
@@ -1,9 +1,9 @@
-$NetBSD: patch-Top_one_file.c,v 1.3 2014/08/06 06:17:07 mrg Exp $
+$NetBSD: patch-Top_one_file.c,v 1.4 2019/11/02 22:25:46 mrg Exp $
 
 Add NetBSD and DragonFlyBSD support.
 
---- Top/one_file.c.orig        2014-05-04 04:49:41.000000000 -0700
-+++ Top/one_file.c     2014-08-04 22:21:26.000000000 -0700
+--- Top/one_file.c.orig        2019-07-12 14:54:19.000000000 -0700
++++ Top/one_file.c     2019-10-29 13:56:09.162659487 -0700
 @@ -29,7 +29,7 @@
  #include <stdlib.h>
  #include "corfile.h"
@@ -13,16 +13,7 @@ Add NetBSD and DragonFlyBSD support.
  #  include <sys/types.h>
  #  include <sys/stat.h>
  #endif
-@@ -62,7 +62,7 @@
- {
- #define   nBytes (256)
-     char lbuf[256];
--#if defined(LINUX) || defined(__MACH__)
-+#if defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
-     struct stat tmp;
- #elif defined(WIN32)
-     struct _stat tmp;
-@@ -94,7 +94,7 @@
+@@ -96,7 +96,7 @@
        }
  #endif
        if (ext != NULL && ext[0] != (char) 0) {
@@ -31,12 +22,3 @@ Add NetBSD and DragonFlyBSD support.
          char  *p;
          /* remove original extension (does not work on OS X */
          /* and may be a bad idea) */
-@@ -114,7 +114,7 @@
-           } while (lbuf[i] != '\0');
-       }
- #endif
--#if defined(LINUX) || defined(__MACH__)
-+#if defined(LINUX) || defined(__MACH__) || defined(__NetBSD__) || defined(__DragonFly__)
-       /* if the file already exists, try again */
-     } while (stat(lbuf, &tmp) == 0);
- #elif defined(WIN32)

Index: pkgsrc/audio/csound6/patches/patch-Opcodes_wavegde.h
diff -u pkgsrc/audio/csound6/patches/patch-Opcodes_wavegde.h:1.1 pkgsrc/audio/csound6/patches/patch-Opcodes_wavegde.h:1.2
--- pkgsrc/audio/csound6/patches/patch-Opcodes_wavegde.h:1.1    Thu Mar  6 10:16:53 2014
+++ pkgsrc/audio/csound6/patches/patch-Opcodes_wavegde.h        Sat Nov  2 22:25:46 2019
@@ -1,15 +1,15 @@
-$NetBSD: patch-Opcodes_wavegde.h,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$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     2005-09-05 17:27:44.000000000 +0000
-+++ Opcodes/wavegde.h
+--- 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 long    len_t;    /* length type */
+ typedef int64_t    len_t;    /* length type */
 +#endif
  
  /* CLASS DEFINITIONS */

Added files:

Index: pkgsrc/audio/csound6/patches/patch-Frontends_csound_csound_main.c
diff -u /dev/null pkgsrc/audio/csound6/patches/patch-Frontends_csound_csound_main.c:1.1
--- /dev/null   Sat Nov  2 22:25:46 2019
+++ pkgsrc/audio/csound6/patches/patch-Frontends_csound_csound_main.c   Sat Nov  2 22:25:46 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-Frontends_csound_csound_main.c,v 1.1 2019/11/02 22:25:46 mrg Exp $
+
+Port to NetBSD and DragonFly.
+
+--- Frontends/csound/csound_main.c.orig        2019-07-12 14:54:19.000000000 -0700
++++ Frontends/csound/csound_main.c     2019-10-29 15:16:17.231498474 -0700
+@@ -73,7 +73,8 @@
+ 
+ #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) {

Prev by Date: CVS commit: pkgsrc/fonts
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/fonts
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index