[arch-commits] Commit in csound/repos/community-staging-x86_64 (6 files)
David Runge
dvzrv at archlinux.org
Sun Feb 17 13:46:44 UTC 2019
Date: Sunday, February 17, 2019 @ 13:46:42
Author: dvzrv
Revision: 434040
archrelease: copy trunk to community-staging-x86_64
Added:
csound/repos/community-staging-x86_64/PKGBUILD
(from rev 434039, csound/trunk/PKGBUILD)
csound/repos/community-staging-x86_64/csound.sh
(from rev 434039, csound/trunk/csound.sh)
csound/repos/community-staging-x86_64/fluidsynth2.patch
(from rev 434039, csound/trunk/fluidsynth2.patch)
Deleted:
csound/repos/community-staging-x86_64/PKGBUILD
csound/repos/community-staging-x86_64/csound.sh
csound/repos/community-staging-x86_64/fluidsynth2.patch
-------------------+
PKGBUILD | 182 ++++++++++++++++++++++++++--------------------------
csound.sh | 6 -
fluidsynth2.patch | 132 ++++++++++++++++---------------------
3 files changed, 153 insertions(+), 167 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-02-17 13:46:32 UTC (rev 434039)
+++ PKGBUILD 2019-02-17 13:46:42 UTC (rev 434040)
@@ -1,91 +0,0 @@
-# Maintainer: David Runge <dave at sleepmap.de>
-# Contributor: Ainola
-# Contributor: speps
-# Contributor: Bernardo Barros
-
-pkgbase=csound
-pkgname=('csound' 'csound-doc')
-pkgver=6.12.2
-pkgrel=3
-pkgdesc="A programming language for sound rendering and signal processing."
-arch=('x86_64')
-url="http://csound.com"
-license=('LGPL')
-# wiiuse needs release before add: https://github.com/rpavlik/wiiuse/issues/92
-# libpd needs to be packaged: https://github.com/libpd/libpd/releases
-# current gmm doesn't work https://github.com/csound/csound/issues/920
-makedepends=('boost' 'cmake' 'cunit' 'doxygen' 'dssi' 'eigen' 'faust' 'fltk'
-'fluidsynth' 'git' 'hdf5' 'java-environment=8' 'ladspa' 'libmusicxml'
-'libwebsockets' 'llvm' 'luajit' 'portmidi' 'portsmf' 'python2' 'stk' 'swig')
-source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/${pkgbase}/${pkgbase}/archive/${pkgver}.tar.gz"
- "${pkgbase}.sh"
- "https://github.com/${pkgbase}/${pkgbase}/releases/download/${pkgver}/Csound${pkgver}_manual_html.zip"
- "https://github.com/${pkgbase}/${pkgbase}/releases/download/${pkgver}/Csound${pkgver}_manual_pdf.zip"
- "fluidsynth2.patch")
-sha512sums=('e00a1f74e38cc5edadcaa4ea2a38a79a010be21008cad091b46c79ed18242a925ab9279fc049b4e82f6944e4d6e815787b7f847b08ae3bba9bde60570aa96f58'
- '53a8ae1e61db2a3a492930ef0f0881b613ae47108c5e8de0a6e2aa28bcf7a5c93c7fea8b7fc2bbae29ab92e1e68bf94ba406be1255ad8ab5725ea9078c1fd6dc'
- 'eb287b9070c16d6cfbd890532d97eda34d72d8b5e5548a1a55ed7de91b2b913e04426cd50c94d0ac84221396002421077a5d22b3b67ce634c34a9aa1ceb53d9d'
- '881bbdae5ab7fceb28199084173492eb8cc6477e72100739599e9d1448c607062efd1390b5cb19e03aeeae9c58eb608b61f36853dddb4d9141b86da31d00bc45'
- '11e9350a5578dfb294fe90dcfbf9db28d62010dd88cc4b91a4254c3080bd49bf03d0b95d210ad5e3741e45505f0cb2f0081b78131743a8b77d3bca6a3076620c')
-
-prepare() {
- cd "${pkgbase}-${pkgver}"
- # requires out-of-tree build
- mkdir build
-
- # Until Fluidsynth 2 support is included in an official release
- patch -p1 < ../fluidsynth2.patch
-}
-
-build() {
- cd "${pkgbase}-${pkgver}/build"
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DJAVA_AWT_LIBRARY=/usr/lib/jvm/java-8-openjdk/jre/lib/amd64/libawt.so \
- -DJAVA_JVM_LIBRARY=/usr/lib/jvm/java-8-openjdk/jre/lib/amd64 \
- -DLUA_MODULE_INSTALL_DIR=/usr/lib/lua/5.1/ \
- -DLUAJIT_LIBRARY=/usr/lib/libluajit-5.1.so \
- -DLUA_H_PATH=/usr/include/luajit-2.0/ \
- -DPYTHON_MODULE_INSTALL_DIR=/usr/lib/python2.7/site-packages \
- -DBUILD_STATIC_LIBRARY=ON \
- ..
- make
-}
-
-check() {
- cd "${pkgbase}-${pkgver}/build"
- make test
-}
-
-package_csound() {
- groups=('pro-audio')
- depends=('fluidsynth' 'git' 'hdf5' 'liblo' 'libmusicxml' 'libwebsockets'
- 'luajit' 'portmidi' 'portsmf' 'stk' 'tk')
- optdepends=('csound-doc: The canonical Csound Reference Manual'
- 'csoundqt: Qt frontend'
- 'fltk: fltk GUIs'
- 'faust: Embed faust'
- 'java-runtime=8: Use csound with Java'
- 'python2: python opcodes'
- 'vim-csound: Use csound with vim')
- cd "${pkgname}-${pkgver}/build"
- make DESTDIR="${pkgdir}/" install
-
- # export vars in profile.d
- install -vDm 755 "${srcdir}/${pkgname}.sh" -t "${pkgdir}/etc/profile.d/"
- # rename extract executable due to name conflict with libextractor
- # https://github.com/csound/csound/issues/985
- mv -v "${pkgdir}/usr/bin/extract" "${pkgdir}/usr/bin/${pkgname}-extract"
-}
-
-package_csound-doc() {
- license=('LGPL' 'GPL')
- install -vDm 644 "Csound${pkgver}_manual.pdf" \
- "${pkgdir}/usr/share/doc/${pkgname}/${pkgbase}-manual.pdf"
-
- install -dv "${pkgdir}/usr/share/doc/${pkgname}/html"
- cp -av "${srcdir}"/html/* "${pkgdir}/usr/share/doc/${pkgname}/html"
- # fix file permissions
- find "${pkgdir}" -type f -exec chmod -c 644 {} \;
-}
-
-# vim:set ts=2 sw=2 et:
Copied: csound/repos/community-staging-x86_64/PKGBUILD (from rev 434039, csound/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-02-17 13:46:42 UTC (rev 434040)
@@ -0,0 +1,91 @@
+# Maintainer: David Runge <dave at sleepmap.de>
+# Contributor: Ainola
+# Contributor: speps
+# Contributor: Bernardo Barros
+
+pkgbase=csound
+pkgname=('csound' 'csound-doc')
+pkgver=6.12.2
+pkgrel=3
+pkgdesc="A programming language for sound rendering and signal processing."
+arch=('x86_64')
+url="https://csound.com"
+license=('LGPL')
+# wiiuse needs release before add: https://github.com/rpavlik/wiiuse/issues/92
+# libpd needs to be packaged: https://github.com/libpd/libpd/releases
+# current gmm doesn't work https://github.com/csound/csound/issues/920
+makedepends=('boost' 'cmake' 'cunit' 'doxygen' 'dssi' 'eigen' 'faust' 'fltk'
+'fluidsynth' 'git' 'hdf5' 'java-environment=8' 'ladspa' 'libmusicxml'
+'libwebsockets' 'llvm' 'luajit' 'portmidi' 'portsmf' 'python2' 'stk' 'swig')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/${pkgbase}/${pkgbase}/archive/${pkgver}.tar.gz"
+ "${pkgbase}.sh"
+ "fluidsynth2.patch"
+ "https://github.com/${pkgbase}/${pkgbase}/releases/download/${pkgver}/Csound${pkgver}_manual_html.zip"
+ "https://github.com/${pkgbase}/${pkgbase}/releases/download/${pkgver}/Csound${pkgver}_manual_pdf.zip"
+ "fluidsynth2.patch")
+sha512sums=('e00a1f74e38cc5edadcaa4ea2a38a79a010be21008cad091b46c79ed18242a925ab9279fc049b4e82f6944e4d6e815787b7f847b08ae3bba9bde60570aa96f58'
+ '53a8ae1e61db2a3a492930ef0f0881b613ae47108c5e8de0a6e2aa28bcf7a5c93c7fea8b7fc2bbae29ab92e1e68bf94ba406be1255ad8ab5725ea9078c1fd6dc'
+ 'bf762db1079dde5b62f2bfe8ba649ac9e719b6ada535f3d67d048213133aeecb3caa3cb1e5bbf26fe78e4b1882e08be9bbea701bd49c914bfbf8d3ab7d83013b'
+ 'eb287b9070c16d6cfbd890532d97eda34d72d8b5e5548a1a55ed7de91b2b913e04426cd50c94d0ac84221396002421077a5d22b3b67ce634c34a9aa1ceb53d9d'
+ '881bbdae5ab7fceb28199084173492eb8cc6477e72100739599e9d1448c607062efd1390b5cb19e03aeeae9c58eb608b61f36853dddb4d9141b86da31d00bc45'
+ 'bf762db1079dde5b62f2bfe8ba649ac9e719b6ada535f3d67d048213133aeecb3caa3cb1e5bbf26fe78e4b1882e08be9bbea701bd49c914bfbf8d3ab7d83013b')
+
+prepare() {
+ cd "${pkgbase}-${pkgver}"
+ patch -Np1 -i ../fluidsynth2.patch
+ mkdir build
+
+}
+
+build() {
+ cd "${pkgbase}-${pkgver}/build"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DJAVA_AWT_LIBRARY=/usr/lib/jvm/java-8-openjdk/jre/lib/amd64/libawt.so \
+ -DJAVA_JVM_LIBRARY=/usr/lib/jvm/java-8-openjdk/jre/lib/amd64 \
+ -DLUA_MODULE_INSTALL_DIR=/usr/lib/lua/5.1/ \
+ -DLUAJIT_LIBRARY=/usr/lib/libluajit-5.1.so \
+ -DLUA_H_PATH=/usr/include/luajit-2.0/ \
+ -DPYTHON_MODULE_INSTALL_DIR=/usr/lib/python2.7/site-packages \
+ -DBUILD_STATIC_LIBRARY=ON \
+ ..
+ make
+}
+
+check() {
+ cd "${pkgbase}-${pkgver}/build"
+ make test
+}
+
+package_csound() {
+ groups=('pro-audio')
+ depends=('fluidsynth' 'git' 'hdf5' 'liblo' 'libmusicxml' 'libwebsockets'
+ 'luajit' 'portmidi' 'portsmf' 'stk' 'tk')
+ optdepends=('csound-doc: The canonical Csound Reference Manual'
+ 'csoundqt: Qt frontend'
+ 'fltk: fltk GUIs'
+ 'faust: Embed faust'
+ 'java-runtime=8: Use csound with Java'
+ 'python2: python opcodes'
+ 'vim-csound: Use csound with vim')
+ cd "${pkgname}-${pkgver}/build"
+ make DESTDIR="${pkgdir}/" install
+
+ # export vars in profile.d
+ install -vDm 755 "${srcdir}/${pkgname}.sh" -t "${pkgdir}/etc/profile.d/"
+ # rename extract executable due to name conflict with libextractor
+ # https://github.com/csound/csound/issues/985
+ mv -v "${pkgdir}/usr/bin/extract" "${pkgdir}/usr/bin/${pkgname}-extract"
+}
+
+package_csound-doc() {
+ license=('LGPL' 'GPL')
+ install -vDm 644 "Csound${pkgver}_manual.pdf" \
+ "${pkgdir}/usr/share/doc/${pkgname}/${pkgbase}-manual.pdf"
+
+ install -dv "${pkgdir}/usr/share/doc/${pkgname}/html"
+ cp -av "${srcdir}"/html/* "${pkgdir}/usr/share/doc/${pkgname}/html"
+ # fix file permissions
+ find "${pkgdir}" -type f -exec chmod -c 644 {} \;
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: csound.sh
===================================================================
--- csound.sh 2019-02-17 13:46:32 UTC (rev 434039)
+++ csound.sh 2019-02-17 13:46:42 UTC (rev 434040)
@@ -1,3 +0,0 @@
-export OPCODE6DIR=/usr/lib/csound/plugins64-6.0
-export CSSTRNGS=/usr/share/locale
-export RAWWAVE_PATH=/usr/share/stk/rawwaves
Copied: csound/repos/community-staging-x86_64/csound.sh (from rev 434039, csound/trunk/csound.sh)
===================================================================
--- csound.sh (rev 0)
+++ csound.sh 2019-02-17 13:46:42 UTC (rev 434040)
@@ -0,0 +1,3 @@
+export OPCODE6DIR=/usr/lib/csound/plugins64-6.0
+export CSSTRNGS=/usr/share/locale
+export RAWWAVE_PATH=/usr/share/stk/rawwaves
Deleted: fluidsynth2.patch
===================================================================
--- fluidsynth2.patch 2019-02-17 13:46:32 UTC (rev 434039)
+++ fluidsynth2.patch 2019-02-17 13:46:42 UTC (rev 434040)
@@ -1,73 +0,0 @@
-diff --git a/Opcodes/fluidOpcodes/fluidOpcodes.cpp b/Opcodes/fluidOpcodes/fluidOpcodes.cpp
-index d6f4da0fd..735c1021c 100644
---- a/Opcodes/fluidOpcodes/fluidOpcodes.cpp
-+++ b/Opcodes/fluidOpcodes/fluidOpcodes.cpp
-@@ -208,16 +208,31 @@ public:
- } else if (listPresets) {
- fluid_sfont_t *fluidSoundfont =
- fluid_synth_get_sfont_by_id(fluidSynth, soundFontId);
-+#if FLUIDSYNTH_VERSION_MAJOR < 2
- fluid_preset_t fluidPreset;
- fluidSoundfont->iteration_start(fluidSoundfont);
- OPARMS oparms;
- csound->GetOParms(csound, &oparms);
- if (oparms.msglevel & 0x7)
-- while (fluidSoundfont->iteration_next(fluidSoundfont, &fluidPreset)) {
-+ while (fluidSoundfont->iteration_next(fluidSoundfont, &fluidPreset))
-+ {
- log(csound, "SoundFont: %3d Bank: %3d Preset: %3d %s\n",
- soundFontId, fluidPreset.get_banknum(&fluidPreset),
- fluidPreset.get_num(&fluidPreset),
- fluidPreset.get_name(&fluidPreset));
-+#else
-+ fluid_preset_t *fluidPreset;
-+ fluid_sfont_iteration_start(fluidSoundfont);
-+ OPARMS oparms;
-+ csound->GetOParms(csound, &oparms);
-+ if (oparms.msglevel & 0x7)
-+ while (fluidPreset = fluid_sfont_iteration_next(fluidSoundfont))
-+ {
-+ log(csound, "SoundFont: %3d Bank: %3d Preset: %3d %s\n",
-+ soundFontId, fluid_preset_get_banknum(fluidPreset),
-+ fluid_preset_get_num(fluidPreset),
-+ fluid_preset_get_name(fluidPreset));
-+#endif
- }
- }
- return result;
-@@ -277,19 +292,32 @@ public:
- LockGuard guard(csound, mutex);
- int32_t result = OK;
- toa(iFluidSynth, fluidSynth);
-- fluid_sfont_t *fluidSoundfont =
-- fluid_synth_get_sfont(fluidSynth, 0);
-+ fluid_sfont_t *fluidSoundfont = fluid_synth_get_sfont(fluidSynth, 0);
-+#if FLUIDSYNTH_VERSION_MAJOR < 2
- fluid_preset_t fluidPreset;
- fluidSoundfont->iteration_start(fluidSoundfont);
- OPARMS oparms;
- csound->GetOParms(csound, &oparms);
- if (oparms.msglevel & 0x7)
- while (fluidSoundfont->iteration_next(fluidSoundfont, &fluidPreset))
-- {
-+ {
- std::stringstream ss;
- ss << "Bank: " << fluidPreset.get_banknum(&fluidPreset) <<
- " Preset: " << fluidPreset.get_num(&fluidPreset) <<
- " Name: " << fluidPreset.get_name(&fluidPreset);
-+#else
-+ fluid_preset_t *fluidPreset;
-+ fluid_sfont_iteration_start(fluidSoundfont);
-+ OPARMS oparms;
-+ csound->GetOParms(csound, &oparms);
-+ if (oparms.msglevel & 0x7)
-+ while (fluidPreset = fluid_sfont_iteration_next(fluidSoundfont))
-+ {
-+ std::stringstream ss;
-+ ss << "Bank: " << fluid_preset_get_banknum(fluidPreset) <<
-+ " Preset: " << fluid_preset_get_num(fluidPreset) <<
-+ " Name: " << fluid_preset_get_name(fluidPreset);
-+#endif
- programs.push_back(ss.str());
- }
-
Copied: csound/repos/community-staging-x86_64/fluidsynth2.patch (from rev 434039, csound/trunk/fluidsynth2.patch)
===================================================================
--- fluidsynth2.patch (rev 0)
+++ fluidsynth2.patch 2019-02-17 13:46:42 UTC (rev 434040)
@@ -0,0 +1,59 @@
+diff -ruN a/Opcodes/fluidOpcodes/fluidOpcodes.cpp b/Opcodes/fluidOpcodes/fluidOpcodes.cpp
+--- a/Opcodes/fluidOpcodes/fluidOpcodes.cpp 2018-11-07 15:05:23.000000000 +0100
++++ b/Opcodes/fluidOpcodes/fluidOpcodes.cpp 2019-01-25 17:59:40.572147743 +0100
+@@ -208,6 +208,7 @@
+ } else if (listPresets) {
+ fluid_sfont_t *fluidSoundfont =
+ fluid_synth_get_sfont_by_id(fluidSynth, soundFontId);
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ fluid_preset_t fluidPreset;
+ fluidSoundfont->iteration_start(fluidSoundfont);
+ OPARMS oparms;
+@@ -218,6 +219,19 @@
+ soundFontId, fluidPreset.get_banknum(&fluidPreset),
+ fluidPreset.get_num(&fluidPreset),
+ fluidPreset.get_name(&fluidPreset));
++#else
++ fluid_preset_t *fluidPreset;
++ fluid_sfont_iteration_start(fluidSoundfont);
++ OPARMS oparms;
++ csound->GetOParms(csound, &oparms);
++ if (oparms.msglevel & 0x7)
++ while (fluidPreset = fluid_sfont_iteration_next(fluidSoundfont))
++ {
++ log(csound, "SoundFont: %3d Bank: %3d Preset: %3d %s\n",
++ soundFontId, fluid_preset_get_banknum(fluidPreset),
++ fluid_preset_get_num(fluidPreset),
++ fluid_preset_get_name(fluidPreset));
++#endif
+ }
+ }
+ return result;
+@@ -279,6 +293,7 @@
+ toa(iFluidSynth, fluidSynth);
+ fluid_sfont_t *fluidSoundfont =
+ fluid_synth_get_sfont(fluidSynth, 0);
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ fluid_preset_t fluidPreset;
+ fluidSoundfont->iteration_start(fluidSoundfont);
+ OPARMS oparms;
+@@ -290,6 +305,19 @@
+ ss << "Bank: " << fluidPreset.get_banknum(&fluidPreset) <<
+ " Preset: " << fluidPreset.get_num(&fluidPreset) <<
+ " Name: " << fluidPreset.get_name(&fluidPreset);
++#else
++ fluid_preset_t *fluidPreset;
++ fluid_sfont_iteration_start(fluidSoundfont);
++ OPARMS oparms;
++ csound->GetOParms(csound, &oparms);
++ if (oparms.msglevel & 0x7)
++ while (fluidPreset = fluid_sfont_iteration_next(fluidSoundfont))
++ {
++ std::stringstream ss;
++ ss << "Bank: " << fluid_preset_get_banknum(fluidPreset) <<
++ " Preset: " << fluid_preset_get_num(fluidPreset) <<
++ " Name: " << fluid_preset_get_name(fluidPreset);
++#endif
+ programs.push_back(ss.str());
+ }
+
More information about the arch-commits
mailing list