pool/csound
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 811063 from home:plater

Browse Source 
- Update to version 6.14.0+git20200601 and fix factory build
- Use service file instead of pre_checkin.sh to create tarball.
- Remove incorporated patche fluidsynth2.patch.

OBS-URL: https://build.opensuse.org/request/show/811063
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=40
This commit is contained in:
Dave Plater 2020-06-03 09:22:09 +00:00 committed by Git OBS Bridge
parent af17401f62
commit 9111e56d1d
10 changed files with 80 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
_service Normal file
View File

@ -0,0 +1,21 @@
<!-- Downloads csound git git master -->
<services>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/csound/csound.git</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="package-meta">no</param>
<param name="changesgenerate">enable</param>
<param name="exclude">.git</param>
<param name="exclude">Opcodes/scansyn*</param>
<param name="exclude">Android</param>
<param name="versionformat">6.14.0+git%cd</param>
<param name="filename">csound</param>
<param name="revision">0dad8304c78efba48b4f405f4757f3e0a7e339c0</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/csound/csound.git</param>
<param name="changesrevision">0dad8304c78efba48b4f405f4757f3e0a7e339c0</param></service></servicedata>

20
csound-6.08-default-pulse.patch
View File

@ -1,13 +1,13 @@
Index: csound-6.12.2/Top/csound.c Index: csound-6.14.0/Top/csound.c
=================================================================== ===================================================================
--- csound-6.12.2.orig/Top/csound.c 2018-11-07 16:05:23.000000000 +0200 --- csound-6.14.0.orig/Top/csound.c 2020-06-02 11:58:24.594002125 +0200
+++ csound-6.12.2/Top/csound.c 2019-04-05 15:32:03.893551257 +0200 +++ csound-6.14.0/Top/csound.c 2020-06-02 12:02:34.339852882 +0200
@@ -3443,7 +3443,7 @@ PUBLIC void csoundReset(CSOUND *csound) @@ -3456,7 +3456,7 @@ PUBLIC void csoundReset(CSOUND *csound)
csoundCreateGlobalVariable(csound, "_RTAUDIO", (size_t) max_len); #ifdef __HAIKU__
s = csoundQueryGlobalVariable(csound, "_RTAUDIO"); strcpy(s, "haiku");
#ifndef LINUX #else
- strcpy(s, "PortAudio"); - strcpy(s, "PortAudio");
+ strcpy(s, "pulse"); + strcpy(s, "pulse");
#endif
#else #else
strcpy(s, "alsa"); strcpy(s, "alsa");
#endif

3
csound-6.12.2-distibutable.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b8ec07b486decbd3edcc442554b73befe7972c81e1723047f5c02a2ff9215d30
size 20890172

3
csound-6.14.0+git20200601.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3174ab51133348298b217365826f5a86aece4a77130a3663e51fd2626244eca2
size 22247752

46
csound-rename-sndinfo.patch
View File

@ -1,8 +1,8 @@
Index: csound-6.12.2/util/CMakeLists.txt Index: csound-6.14.0/util/CMakeLists.txt
=================================================================== ===================================================================
--- csound-6.12.2.orig/util/CMakeLists.txt 2018-11-07 16:05:23.000000000 +0200 --- csound-6.14.0.orig/util/CMakeLists.txt 2020-06-02 12:05:59.179933351 +0200
+++ csound-6.12.2/util/CMakeLists.txt 2019-06-26 09:45:26.891391042 +0200 +++ csound-6.14.0/util/CMakeLists.txt 2020-06-02 12:11:39.845373490 +0200
@@ -1,62 +1,62 @@ @@ -1,54 +1,54 @@
-# UTILITY PLUGIN AND PROGRAMS -# UTILITY PLUGIN AND PROGRAMS
- -
-set(stdutil_SRCS -set(stdutil_SRCS
@ -13,16 +13,11 @@ Index: csound-6.12.2/util/CMakeLists.txt
- sndinfo.c srconv.c std_util.c xtrct.c - sndinfo.c srconv.c std_util.c xtrct.c
- SDIF/sdif.c) - SDIF/sdif.c)
- -
-if(MSVC) -if(MSVC)
- make_plugin(stdutil "${stdutil_SRCS}" ) - set(LIBSNDFILE_LIBRARY sndfile-static)
- target_link_libraries(stdutil ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS})
-elseif(WIN32)
- make_plugin(stdutil "${stdutil_SRCS}" m
- ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS})
-else()
- make_plugin(stdutil "${stdutil_SRCS}" m ${LIBSNDFILE_LIBRARY})
-endif() -endif()
- -
-make_plugin(stdutil "${stdutil_SRCS}" ${MATH_LIBRARY} ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS})
-add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY}) -add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY})
- -
-if(BUILD_UTILITIES) -if(BUILD_UTILITIES)
@ -36,12 +31,9 @@ Index: csound-6.12.2/util/CMakeLists.txt
- make_utility(het_import heti_main.c) - make_utility(het_import heti_main.c)
- make_utility(hetro het_main.c) - make_utility(hetro het_main.c)
- make_utility(lpanal lpc_main.c) - make_utility(lpanal lpc_main.c)
- make_utility(lpc_export lpcx_main.c) - make_utility(lpc_export lpcx_main.c ${MATH_LIBRARY})
- make_utility(lpc_import lpci_main.c) - make_utility(lpc_import lpci_main.c ${MATH_LIBRARY})
- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer) - make_executable(mixer-bin mixer_main.c "${CSOUNDLIB};${MATH_LIBRARY}" mixer)
- if(LINUX)
- target_link_libraries(mixer-bin m)
- endif()
- make_utility(pvanal pvc_main.c) - make_utility(pvanal pvc_main.c)
- make_utility(pvlook pvl_main.c) - make_utility(pvlook pvl_main.c)
- make_utility(pv_export pvx_main.c) - make_utility(pv_export pvx_main.c)
@ -76,15 +68,10 @@ Index: csound-6.12.2/util/CMakeLists.txt
+ SDIF/sdif.c) + SDIF/sdif.c)
+ +
+if(MSVC) +if(MSVC)
+ make_plugin(stdutil "${stdutil_SRCS}" ) + set(LIBSNDFILE_LIBRARY sndfile-static)
+ target_link_libraries(stdutil ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS})
+elseif(WIN32)
+ make_plugin(stdutil "${stdutil_SRCS}" m
+ ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS})
+else()
+ make_plugin(stdutil "${stdutil_SRCS}" m ${LIBSNDFILE_LIBRARY})
+endif() +endif()
+ +
+make_plugin(stdutil "${stdutil_SRCS}" ${MATH_LIBRARY} ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS})
+add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY}) +add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY})
+ +
+if(BUILD_UTILITIES) +if(BUILD_UTILITIES)
@ -98,12 +85,9 @@ Index: csound-6.12.2/util/CMakeLists.txt
+ make_utility(het_import heti_main.c) + make_utility(het_import heti_main.c)
+ make_utility(hetro het_main.c) + make_utility(hetro het_main.c)
+ make_utility(lpanal lpc_main.c) + make_utility(lpanal lpc_main.c)
+ make_utility(lpc_export lpcx_main.c) + make_utility(lpc_export lpcx_main.c ${MATH_LIBRARY})
+ make_utility(lpc_import lpci_main.c) + make_utility(lpc_import lpci_main.c ${MATH_LIBRARY})
+ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer) + make_executable(mixer-bin mixer_main.c "${CSOUNDLIB};${MATH_LIBRARY}" mixer)
+ if(LINUX)
+ target_link_libraries(mixer-bin m)
+ endif()
+ make_utility(pvanal pvc_main.c) + make_utility(pvanal pvc_main.c)
+ make_utility(pvlook pvl_main.c) + make_utility(pvlook pvl_main.c)
+ make_utility(pv_export pvx_main.c) + make_utility(pv_export pvx_main.c)

15
csound.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Jun 03 08:03:33 UTC 2020 - davejplater@gmail.com
- Update to version 6.14.0+git20200601 and fix factory build
- Use service file instead of pre_checkin.sh to create tarball.
- Remove incorporated patche fluidsynth2.patch.
* init
* resonbnk and apoleparams
* fix to multicore + etter code
* resonator bank
* fix prepiano meory issue
* allpoleb opcode
* Nearly there
* coeffs to params fix
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 26 08:00:12 UTC 2019 - Dave Plater <davejplater@gmail.com> Wed Jun 26 08:00:12 UTC 2019 - Dave Plater <davejplater@gmail.com>

24
csound.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package csound # spec file for package csound
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,12 +16,14 @@
# #
%define rev 0dad8304c78efba48b4f405f4757f3e0a7e339c0
%define py3version %(pkg-config python3 --modversion) %define py3version %(pkg-config python3 --modversion)
%define support_fltk 1 %define support_fltk 1
%bcond_with python %bcond_with python
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1500
%bcond_without java %bcond_with java
%else %else
%bcond_with java %bcond_with java
%endif %endif
@ -30,25 +32,22 @@
%define min 0 %define min 0
Name: csound Name: csound
Version: 6.12.2 Version: 6.14.0+git20200601
Release: 0 Release: 0
Summary: Computer Sound Synthesis and Composition Program Summary: Computer Sound Synthesis and Composition Program
License: GPL-2.0-or-later AND BSD-3-Clause AND PostgreSQL License: GPL-2.0-or-later AND BSD-3-Clause AND PostgreSQL
Group: Productivity/Multimedia/Sound/Utilities Group: Productivity/Multimedia/Sound/Utilities
Url: http://www.csounds.com URL: http://www.csounds.com
#Source: https://github.com/%%{name}/%%{name}/archive/%%{version}.tar.gz#/%%{name}-%%{version}.tar.gz #Source: https://github.com/%%{name}/%%{name}/archive/%%{version}.tar.gz#/%%{name}-%%{version}.tar.gz
Source0: %{name}-%{version}-distibutable.tar.xz Source0: %{name}-%{version}.tar.xz
Source1: README.SUSE Source1: README.SUSE
Source2: COPYING_gpl2+.txt Source2: COPYING_gpl2+.txt
#Update and remove undistributable files from the sources and repack with this script Source3: _service
#Usage = sh pre_checkin.sh
Source3: pre_checkin.sh
# Default to using pulseaudio instead of portaudio # Default to using pulseaudio instead of portaudio
Patch2: csound-6.08-default-pulse.patch Patch2: csound-6.08-default-pulse.patch
# Use xdg-open to open a browser to view the manual # Use xdg-open to open a browser to view the manual
Patch4: csound-6.08-xdg-open.patch Patch4: csound-6.08-xdg-open.patch
Patch6: fluidsynth2.patch Patch5: csound-rename-sndinfo.patch
Patch7: csound-rename-sndinfo.patch
BuildRequires: alsa-devel BuildRequires: alsa-devel
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake BuildRequires: cmake
@ -173,6 +172,7 @@ make %{_smp_mflags}
%cmake_install %cmake_install
#python bindings are wip #python bindings are wip
rm -rf %{buildroot}root rm -rf %{buildroot}root
cp -v OOps/README.md README.OOps
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
%find_lang %{name}%{maj} %find_lang %{name}%{maj}
@ -187,8 +187,8 @@ rm -rf %{buildroot}root
%postun java-bindings -p /sbin/ldconfig %postun java-bindings -p /sbin/ldconfig
%files %files
%doc AUTHORS README.md README.SUSE Release_Notes %doc AUTHORS README.md README.SUSE Release_Notes README.OOps
%license COPYING OOps/LICENCE.random COPYING_gpl2+.txt COPYING.PostgreSQL %license COPYING COPYING_gpl2+.txt COPYING.PostgreSQL
%{_bindir}/* %{_bindir}/*
%files -n libcsnd6-%{maj}_%{min} %files -n libcsnd6-%{maj}_%{min}

60
fluidsynth2.patch
View File

@ -1,60 +0,0 @@
Index: csound-6.12.2/Opcodes/fluidOpcodes/fluidOpcodes.cpp
===================================================================
--- csound-6.12.2.orig/Opcodes/fluidOpcodes/fluidOpcodes.cpp 2018-11-07 16:05:23.000000000 +0200
+++ csound-6.12.2/Opcodes/fluidOpcodes/fluidOpcodes.cpp 2019-04-05 15:33:21.652528196 +0200
@@ -208,6 +208,7 @@ 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;
@@ -218,6 +219,19 @@ public:
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 @@ public:
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 @@ public:
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());
}

22
pre_checkin.sh
View File

@ -1,22 +0,0 @@
#! /bin/bash
vers=$(cat csound.spec|grep "Version: "|cut -b 17-23)
rm -f *.tar.*
wget https://github.com/csound/csound/archive/${vers}.tar.gz || exit 1
echo "\n\nUnpacking tarball\n"
tar -xf ${vers}.tar.gz
echo "Removing undistibutable files\n"
rm -f csound-${vers}/Opcodes/scansyn*
echo "Creating distributable tarball\n"
tar -acf csound-${vers}-distibutable.tar.xz csound-${vers}
echo "Cleaning up\n"
rm -rf csound-${vers} ${vers}.tar.gz
if ! test -e ${vers}.tar.gz;
then
echo "success"
osc ar
exit 0
else
echo "error"
exit 1
fi