SHA256
1
0
forked from pool/csound

Accepting request 903054 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/903054
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/csound?expand=0&rev=33
This commit is contained in:
Dominique Leuenberger 2021-06-29 20:43:32 +00:00 committed by Git OBS Bridge
commit 4c52bea7b1
5 changed files with 35 additions and 116 deletions

View File

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

3
csound-6.16.0.tar.gz Normal file
View File

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

View File

@ -1,113 +1,11 @@
Index: csound-6.14.0/util/CMakeLists.txt
===================================================================
--- csound-6.14.0.orig/util/CMakeLists.txt 2020-06-02 12:05:59.179933351 +0200
+++ csound-6.14.0/util/CMakeLists.txt 2020-06-02 12:11:39.845373490 +0200
@@ -1,54 +1,54 @@
-# UTILITY PLUGIN AND PROGRAMS
-
-set(stdutil_SRCS
- atsa.c cvanal.c dnoise.c envext.c
- het_export.c het_import.c hetro.c lpanal.c
- lpc_export.c lpc_import.c mixer.c pvanal.c
- pv_export.c pv_import.c pvlook.c scale.c
- sndinfo.c srconv.c std_util.c xtrct.c
- SDIF/sdif.c)
-
-if(MSVC)
- set(LIBSNDFILE_LIBRARY sndfile-static)
-endif()
-
-make_plugin(stdutil "${stdutil_SRCS}" ${MATH_LIBRARY} ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS})
-add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY})
-
-if(BUILD_UTILITIES)
- make_utility(atsa atsa_main.c)
- make_utility(csanalyze csanalyze.c)
- make_utility(cvanal cvl_main.c)
- make_utility(dnoise dnoise_main.c)
- make_utility(envext env_main.c)
- make_utility(extractor xtrc_main.c)
- make_utility(het_export hetx_main.c)
- make_utility(het_import heti_main.c)
- make_utility(hetro het_main.c)
- make_utility(lpanal lpc_main.c)
- make_utility(lpc_export lpcx_main.c ${MATH_LIBRARY})
- make_utility(lpc_import lpci_main.c ${MATH_LIBRARY})
- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB};${MATH_LIBRARY}" mixer)
- make_utility(pvanal pvc_main.c)
- make_utility(pvlook pvl_main.c)
- make_utility(pv_export pvx_main.c)
- make_utility(pv_import pvi_main.c)
- make_utility(scale scale_main.c)
--- csound-6.16.0/util/CMakeLists.txt.orig 2021-06-10 18:27:41.000000000 +1000
+++ csound-6.16.0/util/CMakeLists.txt 2021-06-29 11:16:01.079617007 +1000
@@ -34,7 +34,7 @@
make_utility(pv_export pvx_main.c)
make_utility(pv_import pvi_main.c)
make_utility(scale scale_main.c)
- make_utility(sndinfo sndinfo_main.c)
- make_utility(srconv srconv_main.c)
-
-
- #find_library(LIBSNDFILE_LIBRARY sndfile libsndfile-1)
- find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-0)
-
- if(LIBSNDFILE_LIBRARY AND LIBSAMPLERATE_LIBRARY)
- make_executable(src_conv new_srconv.c "${LIBSNDFILE_LIBRARY};${LIBSAMPLERATE_LIBRARY}")
- if(MSVC)
- target_link_libraries(src_conv ${LIBSNDFILE_SUPPORT_LIBS})
- endif()
- else()
- message(STATUS "Not building src_conv (libsndfile or libsamplerate not found).")
- endif()
-
-endif()
-add_subdirectory(SDIF)
+# UTILITY PLUGIN AND PROGRAMS
+
+set(stdutil_SRCS
+ atsa.c cvanal.c dnoise.c envext.c
+ het_export.c het_import.c hetro.c lpanal.c
+ lpc_export.c lpc_import.c mixer.c pvanal.c
+ pv_export.c pv_import.c pvlook.c scale.c
+ sndinfo.c srconv.c std_util.c xtrct.c
+ SDIF/sdif.c)
+
+if(MSVC)
+ set(LIBSNDFILE_LIBRARY sndfile-static)
+endif()
+
+make_plugin(stdutil "${stdutil_SRCS}" ${MATH_LIBRARY} ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS})
+add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY})
+
+if(BUILD_UTILITIES)
+ make_utility(atsa atsa_main.c)
+ make_utility(csanalyze csanalyze.c)
+ make_utility(cvanal cvl_main.c)
+ make_utility(dnoise dnoise_main.c)
+ make_utility(envext env_main.c)
+ make_utility(extractor xtrc_main.c)
+ make_utility(het_export hetx_main.c)
+ make_utility(het_import heti_main.c)
+ make_utility(hetro het_main.c)
+ make_utility(lpanal lpc_main.c)
+ make_utility(lpc_export lpcx_main.c ${MATH_LIBRARY})
+ make_utility(lpc_import lpci_main.c ${MATH_LIBRARY})
+ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB};${MATH_LIBRARY}" mixer)
+ make_utility(pvanal pvc_main.c)
+ make_utility(pvlook pvl_main.c)
+ make_utility(pv_export pvx_main.c)
+ make_utility(pv_import pvi_main.c)
+ make_utility(scale scale_main.c)
+ make_utility(csndinfo sndinfo_main.c)
+ make_utility(srconv srconv_main.c)
+
+
+ #find_library(LIBSNDFILE_LIBRARY sndfile libsndfile-1)
+ find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-0)
+
+ if(LIBSNDFILE_LIBRARY AND LIBSAMPLERATE_LIBRARY)
+ make_executable(src_conv new_srconv.c "${LIBSNDFILE_LIBRARY};${LIBSAMPLERATE_LIBRARY}")
+ if(MSVC)
+ target_link_libraries(src_conv ${LIBSNDFILE_SUPPORT_LIBS})
+ endif()
+ else()
+ message(STATUS "Not building src_conv (libsndfile or libsamplerate not found).")
+ endif()
+
+endif()
+add_subdirectory(SDIF)
+ make_utility(csndinfo sndinfo_main.c)
make_utility(srconv srconv_main.c)

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jun 29 01:50:28 UTC 2021 - Konstantin Voinov <kv@kott.no-ip.biz>
- Update to version 6.16.0
- add python3-csound package
- update csound-rename-sndinfo.patch
-------------------------------------------------------------------
Wed May 26 23:30:30 UTC 2021 - Konstantin Voinov <kv@kott.no-ip.biz>

View File

@ -30,7 +30,7 @@
%define min 0
Name: csound
Version: 6.15.0
Version: 6.16.0
Release: 0
Summary: Computer Sound Synthesis and Composition Program
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -120,6 +120,13 @@ Group: Productivity/Multimedia/Other
%description plugins
Plugins for csound
%package -n python3-csound
Summary: Csound opcodes for python
Group: Productivity/Multimedia/Other
%description -n python3-csound
Csound opcodes for python
%package samples
Summary: Data files for csound
License: MIT
@ -215,6 +222,13 @@ cp -v OOps/README.md README.OOps
%files samples
%{_datadir}/samples/
%files -n python3-csound
%if 0%{?suse_version} > 1500
%{python_sitearch}/ctcsound.py
%else
%{_libdir}/python3.6/site-packages/ctcsound.py
%endif
%files devel
%{_includedir}/csound/
%{_libdir}/libcs*.so