summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/csound6/Makefile9
-rw-r--r--audio/csound6/PLIST3
-rw-r--r--audio/csound6/distinfo26
-rw-r--r--audio/csound6/patches/patch-CMakeLists.txt5
-rw-r--r--audio/csound6/patches/patch-Engine_linevent.c4
-rw-r--r--audio/csound6/patches/patch-InOut_libsnd.c4
-rw-r--r--audio/csound6/patches/patch-InOut_widgets.cpp4
-rw-r--r--audio/csound6/patches/patch-InOut_winEPS.c4
-rw-r--r--audio/csound6/patches/patch-InOut_winFLTK.c4
-rw-r--r--audio/csound6/patches/patch-Opcodes_cpumeter.c4
-rw-r--r--audio/csound6/patches/patch-Top_csmodule.c5
-rw-r--r--audio/csound6/patches/patch-Top_csound.c4
-rw-r--r--audio/csound6/patches/patch-Top_one_file.c4
-rw-r--r--audio/csound6/patches/patch-Top_threads.c4
-rw-r--r--audio/csound6/patches/patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp4
15 files changed, 58 insertions, 30 deletions
diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile
index 5b6b76f21e0..fabbc812cf6 100644
--- a/audio/csound6/Makefile
+++ b/audio/csound6/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2014/05/09 07:36:53 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/08/05 05:12:38 mrg Exp $
DISTNAME= Csound${CSOUND_VERSION}
PKGNAME= csound6-${CSOUND_VERSION}
+PKGREVISION= 1
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=csound/csound6/Csound6.02/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=csound/csound6/Csound${CSOUND_VERSION}/}
WRKSRC= ${WRKDIR}/Csound${CSOUND_VERSION}
MAINTAINER= mrg@eterna.com.au
@@ -16,7 +17,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= bison
CFLAGS+= -g -D__PKGSRC_PREFIX__=\"${PREFIX}/\" -DBETA
USE_CMAKE= yes
-CMAKE_ARGS+= -DUSE_PORTAUDIO:BOOL=OFF
+CMAKE_ARGS+= -DUSE_PORTAUDIO:BOOL=ON
CMAKE_ARGS+= -DBUILD_RELEASE=1 -DCMAKE_BUILD_TYPE=Release
# CMAKE_INSTALL_RPATH doesn't work for some reason, so do it here.
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/csound6
@@ -39,7 +40,7 @@ post-install:
.include "../../audio/fluidsynth/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/portaudio/buildlink3.mk"
+.include "../../audio/portaudio-devel/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/audio/csound6/PLIST b/audio/csound6/PLIST
index 8c2b736e6ec..d9f80f28e90 100644
--- a/audio/csound6/PLIST
+++ b/audio/csound6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/03/06 10:16:53 mrg Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/08/05 05:12:38 mrg Exp $
bin/csound6
include/csound6/CppSound.hpp
include/csound6/CsoundFile.hpp
@@ -65,6 +65,7 @@ lib/csound6/plugins-6.0/libipmidi.so
lib/csound6/plugins-6.0/libmixer.so
lib/csound6/plugins-6.0/libplaterev.so
lib/csound6/plugins-6.0/libpy.so
+lib/csound6/plugins-6.0/librtpa.so
lib/csound6/plugins-6.0/libscansyn.so
lib/csound6/plugins-6.0/libserial.so
lib/csound6/plugins-6.0/libsignalflowgraph.so
diff --git a/audio/csound6/distinfo b/audio/csound6/distinfo
index ac3a24a27dd..1a4902792e8 100644
--- a/audio/csound6/distinfo
+++ b/audio/csound6/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$NetBSD: distinfo,v 1.2 2014/08/05 05:12:38 mrg Exp $
SHA1 (Csound6.02.tar.gz) = 9903dd2825d533d08fa333adb85bb39a2ef3da77
RMD160 (Csound6.02.tar.gz) = a2a6b0436a1988bcfd4b24b4dc2e0e78f56cb7c1
Size (Csound6.02.tar.gz) = 23459796 bytes
-SHA1 (patch-CMakeLists.txt) = dab8132921ea5d0eecea0950d465772e65c04a48
-SHA1 (patch-Engine_linevent.c) = e77671774437438f80a38e3bfe4fa3cb847cbd20
-SHA1 (patch-InOut_libsnd.c) = a944d30531fe85c98368dfdc1c5bf7cab7c8af8c
-SHA1 (patch-InOut_widgets.cpp) = c34237c579f90b093a39d79e11a40cd4edafa81c
-SHA1 (patch-InOut_winEPS.c) = 1f3a7ec113a5185a81fe219d99061afb025bc13b
-SHA1 (patch-InOut_winFLTK.c) = 77e82625a8db39814d5f7e2c36ad16b122eb2754
-SHA1 (patch-Opcodes_cpumeter.c) = d6eca4f22dd6d6d51ae3bb1e65f0a6c5b6faa039
+SHA1 (patch-CMakeLists.txt) = 47e77bb65a091a8925893f4cf7bc76efc5080110
+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) = 92d5c9be1b352c4e3e0de292ffecd2fcb12df5e3
+SHA1 (patch-Opcodes_cpumeter.c) = c107de07dd1d613867e8033e951aba8c91703c4f
SHA1 (patch-Opcodes_wavegde.h) = e1a6d742b28dd9b6b129a993102baf7218efa57c
-SHA1 (patch-Top_csmodule.c) = dae30ae850925a05df0f9e383425ab1e1c42dec1
-SHA1 (patch-Top_csound.c) = b1477eac05aefe6ddd5b94b52246f18ce6148914
-SHA1 (patch-Top_one_file.c) = 24b9b9d51843f2f79336e95e65a2c6011f31b754
-SHA1 (patch-Top_threads.c) = 9ea7a8f1923f25cc7b2192582711cff143386bda
-SHA1 (patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp) = 229fc00e122288ea16ebf07f081869965cab9365
+SHA1 (patch-Top_csmodule.c) = 2791b4a68c4e0260a32e6330f7c464ad5d8cea6d
+SHA1 (patch-Top_csound.c) = 26c03324e0f8f8ccedbfe32bfedbd282d69a93fa
+SHA1 (patch-Top_one_file.c) = 52f4cc414f87b71057948fcf7b3050a42c113f69
+SHA1 (patch-Top_threads.c) = 107cb8605b5b46b70de3adeec0ae8acaafc2a6f2
+SHA1 (patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp) = a16da9c4975d37e56fefb58fd0458e94c3ed4925
diff --git a/audio/csound6/patches/patch-CMakeLists.txt b/audio/csound6/patches/patch-CMakeLists.txt
index d92a3b2157e..6e64a0e1764 100644
--- a/audio/csound6/patches/patch-CMakeLists.txt
+++ b/audio/csound6/patches/patch-CMakeLists.txt
@@ -1,4 +1,7 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2014/08/05 05:12:38 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
diff --git a/audio/csound6/patches/patch-Engine_linevent.c b/audio/csound6/patches/patch-Engine_linevent.c
index 825cfbb44ba..13b291cf02d 100644
--- a/audio/csound6/patches/patch-Engine_linevent.c
+++ b/audio/csound6/patches/patch-Engine_linevent.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-Engine_linevent.c,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$NetBSD: patch-Engine_linevent.c,v 1.2 2014/08/05 05:12:38 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
diff --git a/audio/csound6/patches/patch-InOut_libsnd.c b/audio/csound6/patches/patch-InOut_libsnd.c
index 96d33b93c9c..2ffd04fc9ad 100644
--- a/audio/csound6/patches/patch-InOut_libsnd.c
+++ b/audio/csound6/patches/patch-InOut_libsnd.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-InOut_libsnd.c,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$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 2014-01-07 08:53:47.000000000 -0800
+++ InOut/libsnd.c 2014-02-12 23:47:56.000000000 -0800
diff --git a/audio/csound6/patches/patch-InOut_widgets.cpp b/audio/csound6/patches/patch-InOut_widgets.cpp
index 3b6e4fb442f..93481cc86a0 100644
--- a/audio/csound6/patches/patch-InOut_widgets.cpp
+++ b/audio/csound6/patches/patch-InOut_widgets.cpp
@@ -1,4 +1,6 @@
-$NetBSD: patch-InOut_widgets.cpp,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$NetBSD: patch-InOut_widgets.cpp,v 1.2 2014/08/05 05:12:38 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
diff --git a/audio/csound6/patches/patch-InOut_winEPS.c b/audio/csound6/patches/patch-InOut_winEPS.c
index 6f0919adb25..b16f0eed121 100644
--- a/audio/csound6/patches/patch-InOut_winEPS.c
+++ b/audio/csound6/patches/patch-InOut_winEPS.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-InOut_winEPS.c,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$NetBSD: patch-InOut_winEPS.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+
+Add NetBSD and DragonFlyBSD support.
--- InOut/winEPS.c.orig 2005-12-29 05:49:04.000000000 -0800
+++ InOut/winEPS.c
diff --git a/audio/csound6/patches/patch-InOut_winFLTK.c b/audio/csound6/patches/patch-InOut_winFLTK.c
index 0fd6626c7b5..32ba8017fa8 100644
--- a/audio/csound6/patches/patch-InOut_winFLTK.c
+++ b/audio/csound6/patches/patch-InOut_winFLTK.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-InOut_winFLTK.c,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$NetBSD: patch-InOut_winFLTK.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+
+Add NetBSD and DragonFlyBSD support.
--- InOut/winFLTK.c.orig 2014-01-07 08:53:47.000000000 -0800
+++ InOut/winFLTK.c 2014-02-12 23:47:05.000000000 -0800
diff --git a/audio/csound6/patches/patch-Opcodes_cpumeter.c b/audio/csound6/patches/patch-Opcodes_cpumeter.c
index cd278fba6d8..c4f0dfa4254 100644
--- a/audio/csound6/patches/patch-Opcodes_cpumeter.c
+++ b/audio/csound6/patches/patch-Opcodes_cpumeter.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-Opcodes_cpumeter.c,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$NetBSD: patch-Opcodes_cpumeter.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+
+Add NetBSD and DragonFlyBSD support.
be best to patch this to use eg, getloadavg() or something not /proc.
diff --git a/audio/csound6/patches/patch-Top_csmodule.c b/audio/csound6/patches/patch-Top_csmodule.c
index 646365609e5..6a4e64e18a6 100644
--- a/audio/csound6/patches/patch-Top_csmodule.c
+++ b/audio/csound6/patches/patch-Top_csmodule.c
@@ -1,4 +1,7 @@
-$NetBSD: patch-Top_csmodule.c,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$NetBSD: patch-Top_csmodule.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+
+Fix the installation path for csound6 plugins.
+Add NetBSD and DragonFlyBSD support.
--- Top/csmodule.c.orig 2014-01-07 08:54:20.000000000 -0800
+++ Top/csmodule.c 2014-02-13 02:01:01.000000000 -0800
diff --git a/audio/csound6/patches/patch-Top_csound.c b/audio/csound6/patches/patch-Top_csound.c
index 17ef522915a..883e247a201 100644
--- a/audio/csound6/patches/patch-Top_csound.c
+++ b/audio/csound6/patches/patch-Top_csound.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-Top_csound.c,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$NetBSD: patch-Top_csound.c,v 1.2 2014/08/05 05:12:38 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
diff --git a/audio/csound6/patches/patch-Top_one_file.c b/audio/csound6/patches/patch-Top_one_file.c
index d88ce771614..6c0a417e5b5 100644
--- a/audio/csound6/patches/patch-Top_one_file.c
+++ b/audio/csound6/patches/patch-Top_one_file.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-Top_one_file.c,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$NetBSD: patch-Top_one_file.c,v 1.2 2014/08/05 05:12:38 mrg Exp $
+
+Add NetBSD and DragonFlyBSD support.
--- Top/one_file.c.orig 2014-01-07 08:54:20.000000000 -0800
+++ Top/one_file.c 2014-02-12 23:53:28.000000000 -0800
diff --git a/audio/csound6/patches/patch-Top_threads.c b/audio/csound6/patches/patch-Top_threads.c
index f05ad72320d..4e535103a22 100644
--- a/audio/csound6/patches/patch-Top_threads.c
+++ b/audio/csound6/patches/patch-Top_threads.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-Top_threads.c,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$NetBSD: patch-Top_threads.c,v 1.2 2014/08/05 05:12:38 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
diff --git a/audio/csound6/patches/patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp b/audio/csound6/patches/patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp
index cb0e8874b1d..f82ac95b162 100644
--- a/audio/csound6/patches/patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp
+++ b/audio/csound6/patches/patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp
@@ -1,4 +1,6 @@
-$NetBSD: patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp,v 1.1 2014/03/06 10:16:53 mrg Exp $
+$NetBSD: patch-frontends_CsoundVST_ScoreGeneratorVstMain.cpp,v 1.2 2014/08/05 05:12:38 mrg Exp $
+
+Add NetBSD and DragonFlyBSD support.
+++ frontends/CsoundVST/ScoreGeneratorVstMain.cpp.orig 2013-01-07 04:49:35.000000000 -0800
--- frontends/CsoundVST/ScoreGeneratorVstMain.cpp 2014-02-12 20:42:30.000000000 -0800
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-13 18:52:50 +0000