Index: Makefile =================================================================== RCS file: /cvsroot/pkgsrc/audio/csound6/Makefile,v retrieving revision 1.13 diff -p -u -r1.13 Makefile --- Makefile 5 Mar 2016 11:28:03 -0000 1.13 +++ Makefile 2 Apr 2016 22:03:08 -0000 @@ -2,23 +2,25 @@ DISTNAME= Csound${CSOUND_VERSION} PKGNAME= csound6-${CSOUND_VERSION} -PKGREVISION= 8 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 -HOMEPAGE= http://sourceforge.net/projects/csound/ +HOMEPAGE= https://github.com/csound/csound COMMENT= Software synthesizer and sequencer LICENSE= gnu-lgpl-v2.1 # or later -CSOUND_VERSION= 6.03.2 +CSOUND_VERSION= 6.06.0 USE_LANGUAGES= c c++ USE_TOOLS+= bison CFLAGS+= -g -D__PKGSRC_PREFIX__=\"${PREFIX}/\" -DBETA USE_CMAKE= yes CMAKE_ARGS+= -DUSE_PULSEAUDIO:BOOL=ON CMAKE_ARGS+= -DBUILD_RELEASE=1 -DCMAKE_BUILD_TYPE=Release +# XXX does not build yet +CMAKE_ARGS+= -DBUILD_CSOUND_AC_PYTHON_INTERFACE=NO # CMAKE_INSTALL_RPATH doesn't work for some reason, so do it here. LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/csound6 @@ -40,13 +42,15 @@ post-install: cd ${DESTDIR}${PREFIX} && ${LN} -s ../lib/csound6/csound bin/csound6 .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" .include "../../devel/boost-libs/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -PYTHON_FOR_BUILD_ONLY= yes .include "../../lang/python/application.mk" +.include "../../lang/python/tool.mk" +.include "../../math/eigen3/buildlink3.mk" .include "../../x11/fltk/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" Index: PLIST =================================================================== RCS file: /cvsroot/pkgsrc/audio/csound6/PLIST,v retrieving revision 1.4 diff -p -u -r1.4 PLIST --- PLIST 19 Aug 2014 13:47:06 -0000 1.4 +++ PLIST 2 Apr 2016 22:03:08 -0000 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2014/08/19 13:47:06 joerg Exp $ +@comment $NetBSD$ bin/csound6 include/csound6/CppSound.hpp include/csound6/CsoundFile.hpp @@ -42,6 +42,8 @@ lib/csound6/extractor lib/csound6/het_export lib/csound6/het_import lib/csound6/hetro +lib/csound6/libCsoundAC.so +lib/csound6/libCsoundAC.so.6.0 lib/csound6/libcsnd6.so lib/csound6/libcsnd6.so.6.0 lib/csound6/libcsound64.so @@ -53,17 +55,21 @@ 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/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/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/libimage.so lib/csound6/plugins-6.0/libipmidi.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/libpy.so lib/csound6/plugins-6.0/librtpulse.so @@ -72,6 +78,7 @@ lib/csound6/plugins-6.0/libserial.so lib/csound6/plugins-6.0/libsignalflowgraph.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 @@ -79,11 +86,11 @@ 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/locale/de/LC_MESSAGES/csound6.mo share/locale/en_US/LC_MESSAGES/csound6.mo Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/audio/csound6/distinfo,v retrieving revision 1.5 diff -p -u -r1.5 distinfo --- distinfo 29 Mar 2016 22:06:48 -0000 1.5 +++ distinfo 2 Apr 2016 22:03:08 -0000 @@ -1,22 +1,24 @@ $NetBSD: distinfo,v 1.5 2016/03/29 22:06:48 joerg 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 (Csound6.06.0.tar.gz) = 01d9d240e5c7bbbd04b3156c5556e58a7ada57c8 +RMD160 (Csound6.06.0.tar.gz) = 7b105bdb5694a325c98ab948daabd32eb6335b47 +SHA512 (Csound6.06.0.tar.gz) = 6a8c2afec4ccaf27a5af37f8f847a1fa32d1800724fd0c80139ad7487288a49d19779d0ee505dc35bc7847bac34bb6c3a184da3600ddc7343531884845e6393b +Size (Csound6.06.0.tar.gz) = 33113094 bytes +SHA1 (patch-CMakeLists.txt) = 01bd421e94926b44431a3b7fe8a7e58816e2bfdc SHA1 (patch-Engine_entry1.c) = 915c11cb182ad9375ec0f034f1adfde009131aa4 SHA1 (patch-Engine_linevent.c) = da606596a1c8d2545dc0a8e948cd04e9188975ad SHA1 (patch-InOut_libsnd.c) = b460ef3ef7117fd9c194eff3f62a64435243ccc4 SHA1 (patch-InOut_widgets.cpp) = f73a58a636254d27a3aa6b94ace4f72b978ca9ec SHA1 (patch-InOut_winEPS.c) = 5b3182dc79d819145df73426fead54fc28414ff2 SHA1 (patch-InOut_winFLTK.c) = 0c9b566ae5acfae5dcf7a9d0795976f103d069a5 +SHA1 (patch-Opcodes_CMakeLists.txt) = 0afe080ebecd1431af175f916315e88e4a32d904 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_csmodule.c) = 02f71efe10b22979692b27dc03788fa2625b0573 +SHA1 (patch-Top_csound.c) = 809a7ead8bf805098a838785fdc0d11d1a26e297 +SHA1 (patch-Top_one_file.c) = 2ee37ee76e9266bc16586449b57f2862293b322e SHA1 (patch-Top_threads.c) = 107cb8605b5b46b70de3adeec0ae8acaafc2a6f2 SHA1 (patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp) = a16da9c4975d37e56fefb58fd0458e94c3ed4925 +SHA1 (patch-frontends_csound_csound_main.c) = 3380682486156e23daba6309c3750d1de3da1da8 SHA1 (patch-include_interlocks.h) = 60bbb3a92ccb4d52665db58042de4a7caabfa5f2 -SHA1 (patch-include_text.h) = fc3c164c3740b2c595113dd7811506abb29402d0 +SHA1 (patch-include_text.h) = c4937eea0a9d5aad6256da61302c2b689948e647 Index: patches/patch-CMakeLists.txt =================================================================== RCS file: /cvsroot/pkgsrc/audio/csound6/patches/patch-CMakeLists.txt,v retrieving revision 1.2 diff -p -u -r1.2 patch-CMakeLists.txt --- patches/patch-CMakeLists.txt 5 Aug 2014 05:12:38 -0000 1.2 +++ patches/patch-CMakeLists.txt 2 Apr 2016 22:03:08 -0000 @@ -3,15 +3,17 @@ $NetBSD: patch-CMakeLists.txt,v 1.2 2014 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 2015-11-09 19:50:21.000000000 +0000 ++++ CMakeLists.txt 2016-04-02 00:42:50.901322694 +0000 +@@ -23,22 +23,22 @@ 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") @@ -24,12 +26,14 @@ Add NetBSD support. if(USE_DOUBLE) - set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins64-${APIVERSION}") -+ set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/plugins-${APIVERSION}") ++ set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/plugins64-${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}) + + +@@ -51,7 +51,7 @@ set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR}) set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR}) set(LOCALE_INSTALL_DIR "share/locale") @@ -38,20 +42,20 @@ Add NetBSD support. set(CS_FRAMEWORK_DEST "~/Library/Frameworks") include(TestBigEndian) -@@ -239,6 +239,12 @@ +@@ -280,6 +280,12 @@ + else() 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 @@ +@@ -363,6 +369,10 @@ endif() Index: patches/patch-Opcodes_CMakeLists.txt =================================================================== RCS file: patches/patch-Opcodes_CMakeLists.txt diff -N patches/patch-Opcodes_CMakeLists.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Opcodes_CMakeLists.txt 2 Apr 2016 22:03:08 -0000 @@ -0,0 +1,11 @@ +--- Opcodes/CMakeLists.txt.orig 2015-11-09 19:50:21.000000000 +0000 ++++ Opcodes/CMakeLists.txt 2016-04-02 21:03:06.109447835 +0000 +@@ -73,7 +73,7 @@ + make_plugin(padsynth padsynth_gen.cpp) + set_target_properties(padsynth PROPERTIES COMPILE_FLAGS "-std=gnu++11 -stdlib=libc++" + LINK_FLAGS "-std=gnu++11 -stdlib=libc++") +-elseif(LINUX) ++elseif(LINUX OR NETBSD) + include(CheckCXXCompilerFlag) + CHECK_CXX_COMPILER_FLAG("-std=gnu++11" COMPILER_SUPPORTS_CXX11) + CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" COMPILER_SUPPORTS_CXX0X) Index: patches/patch-Top_csmodule.c =================================================================== RCS file: /cvsroot/pkgsrc/audio/csound6/patches/patch-Top_csmodule.c,v retrieving revision 1.3 diff -p -u -r1.3 patch-Top_csmodule.c --- patches/patch-Top_csmodule.c 6 Aug 2014 06:17:07 -0000 1.3 +++ patches/patch-Top_csmodule.c 2 Apr 2016 22:03:08 -0000 @@ -3,8 +3,8 @@ $NetBSD: patch-Top_csmodule.c,v 1.3 2014 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 2015-11-09 19:50:21.000000000 +0000 ++++ Top/csmodule.c 2016-04-02 00:37:15.019497910 +0000 @@ -89,7 +89,7 @@ #endif @@ -39,10 +39,10 @@ Add NetBSD and DragonFlyBSD support. err = csoundOpenLibrary(&h, libraryPath); if (UNLIKELY(err)) { char ERRSTR[256]; --#if !(defined(NACL)) && defined(LINUX) +- #if !(defined(NACL)) && defined(LINUX) +#if !(defined(NACL)) && (defined(LINUX) || defined(__NetBSD__) || defined(__DragonFly__)) snprintf(ERRSTR, 256, Str("could not open library '%s' (%s)"), - libraryPath, dlerror()); + libraryPath, dlerror()); #else @@ -684,7 +684,7 @@ return (void*) GetProcAddress((HMODULE) library, procedureName); Index: patches/patch-Top_csound.c =================================================================== RCS file: /cvsroot/pkgsrc/audio/csound6/patches/patch-Top_csound.c,v retrieving revision 1.2 diff -p -u -r1.2 patch-Top_csound.c --- patches/patch-Top_csound.c 5 Aug 2014 05:12:38 -0000 1.2 +++ patches/patch-Top_csound.c 2 Apr 2016 22:03:08 -0000 @@ -2,19 +2,17 @@ $NetBSD: patch-Top_csound.c,v 1.2 2014/0 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 2015-11-09 19:50:21.000000000 +0000 ++++ Top/csound.c 2016-04-02 00:37:43.224945622 +0000 +@@ -919,6 +919,7 @@ #if defined(ANDROID) || (!defined(LINUX) && !defined(SGI) && \ !defined(__HAIKU__) && !defined(__BEOS__) && \ -- !defined(__MACH__)) -+ !defined(__MACH__) && !defined(__NetBSD__) && \ -+ !defined(__DragonFly__)) ++ !defined(__NetBSD__) && !defined(__NetBSD__) && \ + !defined(__MACH__) && !defined(__EMSCRIPTEN__)) static char *signal_to_string(int sig) { - switch(sig) { -@@ -1053,7 +1054,7 @@ +@@ -1087,7 +1088,7 @@ } static const int sigs[] = { Index: patches/patch-Top_one_file.c =================================================================== RCS file: /cvsroot/pkgsrc/audio/csound6/patches/patch-Top_one_file.c,v retrieving revision 1.3 diff -p -u -r1.3 patch-Top_one_file.c --- patches/patch-Top_one_file.c 6 Aug 2014 06:17:07 -0000 1.3 +++ patches/patch-Top_one_file.c 2 Apr 2016 22:03:08 -0000 @@ -2,8 +2,8 @@ $NetBSD: patch-Top_one_file.c,v 1.3 2014 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 2015-11-09 19:50:21.000000000 +0000 ++++ Top/one_file.c 2016-04-02 00:35:20.511214809 +0000 @@ -29,7 +29,7 @@ #include #include "corfile.h" @@ -13,15 +13,6 @@ Add NetBSD and DragonFlyBSD support. # include # include #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 @@ } #endif @@ -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: patches/patch-frontends_csound_csound_main.c =================================================================== RCS file: patches/patch-frontends_csound_csound_main.c diff -N patches/patch-frontends_csound_csound_main.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-frontends_csound_csound_main.c 2 Apr 2016 22:03:08 -0000 @@ -0,0 +1,10 @@ +--- frontends/csound/csound_main.c.orig 2015-11-09 19:50:21.000000000 +0000 ++++ frontends/csound/csound_main.c 2016-04-02 21:14:30.883511380 +0000 +@@ -70,6 +70,7 @@ + + #if defined(ANDROID) || (!defined(LINUX) && !defined(SGI) && \ + !defined(__HAIKU__) && !defined(__BEOS__) && \ ++ !defined(__NetBSD__) && !defined(__DragonFly__) && \ + !defined(__MACH__) && !defined(__EMSCRIPTEN__)) + static char *signal_to_string(int sig) + { Index: patches/patch-include_text.h =================================================================== RCS file: /cvsroot/pkgsrc/audio/csound6/patches/patch-include_text.h,v retrieving revision 1.1 diff -p -u -r1.1 patch-include_text.h --- patches/patch-include_text.h 29 Mar 2016 22:06:48 -0000 1.1 +++ patches/patch-include_text.h 2 Apr 2016 22:03:08 -0000 @@ -1,13 +1,13 @@ $NetBSD: patch-include_text.h,v 1.1 2016/03/29 22:06:48 joerg Exp $ ---- include/text.h.orig 2016-03-28 17:47:57.518957272 +0000 -+++ include/text.h -@@ -111,7 +111,7 @@ extern "C" { +--- include/text.h.orig 2015-11-09 19:50:21.000000000 +0000 ++++ include/text.h 2016-04-02 00:40:43.422643508 +0000 +@@ -113,7 +113,7 @@ #endif - #include + void init_getstring(void*); char *csoundLocalizeString(const char *s) - __attribute__ ((format (printf, 1,0))); + __attribute__ ((format_arg (1))); - /* This could be gettext but this indirection helps debugging */ - #define Str(x) csoundLocalizeString(x) - void init_getstring(void*); + PUBLIC char* cs_strtok_r(char* str, char* sep, char** lasts); + PUBLIC double cs_strtod(char* nptr, char** endptr); + PUBLIC int cs_sprintf(char *str, const char *format, ...);