Hello community, here is the log from the commit of package csound for openSUSE:Factory checked in at 2020-07-10 14:12:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/csound (Old) and /work/SRC/openSUSE:Factory/.csound.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "csound" Fri Jul 10 14:12:35 2020 rev:30 rq:819908 version:6.14.0+git20200601 Changes: -------- --- /work/SRC/openSUSE:Factory/csound/csound.changes 2019-07-02 10:39:50.318713547 +0200 +++ /work/SRC/openSUSE:Factory/.csound.new.3060/csound.changes 2020-07-10 14:12:49.883519597 +0200 @@ -1,0 +2,20 @@ +Fri Jul 10 08:45:28 UTC 2020 - Dave Plater <[email protected]> + +- Removed unused util/new_srconv.c from sources to fix licensing. + +------------------------------------------------------------------- +Wed Jun 03 08:03:33 UTC 2020 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- csound-6.12.2-distibutable.tar.xz fluidsynth2.patch pre_checkin.sh New: ---- _service _servicedata csound-6.14.0+git20200601.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ csound.spec ++++++ --- /var/tmp/diff_new_pack.aBkCwe/_old 2020-07-10 14:12:51.023523341 +0200 +++ /var/tmp/diff_new_pack.aBkCwe/_new 2020-07-10 14:12:51.027523355 +0200 @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -16,12 +16,14 @@ # +%define rev 0dad8304c78efba48b4f405f4757f3e0a7e339c0 + %define py3version %(pkg-config python3 --modversion) %define support_fltk 1 %bcond_with python %if 0%{?suse_version} > 1500 -%bcond_without java +%bcond_with java %else %bcond_with java %endif @@ -30,25 +32,21 @@ %define min 0 Name: csound -Version: 6.12.2 +Version: 6.14.0+git20200601 Release: 0 Summary: Computer Sound Synthesis and Composition Program -License: GPL-2.0-or-later AND BSD-3-Clause AND PostgreSQL +License: LGPL-2.1-or-later AND GPL-2.0-or-later 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 -Source0: %{name}-%{version}-distibutable.tar.xz +Source0: %{name}-%{version}.tar.xz Source1: README.SUSE Source2: COPYING_gpl2+.txt -#Update and remove undistributable files from the sources and repack with this script -#Usage = sh pre_checkin.sh -Source3: pre_checkin.sh # Default to using pulseaudio instead of portaudio Patch2: csound-6.08-default-pulse.patch # Use xdg-open to open a browser to view the manual Patch4: csound-6.08-xdg-open.patch -Patch6: fluidsynth2.patch -Patch7: csound-rename-sndinfo.patch +Patch5: csound-rename-sndinfo.patch BuildRequires: alsa-devel BuildRequires: bison BuildRequires: cmake @@ -173,6 +171,7 @@ %cmake_install #python bindings are wip rm -rf %{buildroot}root +cp -v OOps/README.md README.OOps %fdupes -s %{buildroot} %find_lang %{name}%{maj} @@ -187,8 +186,8 @@ %postun java-bindings -p /sbin/ldconfig %files -%doc AUTHORS README.md README.SUSE Release_Notes -%license COPYING OOps/LICENCE.random COPYING_gpl2+.txt COPYING.PostgreSQL +%doc AUTHORS README.md README.SUSE Release_Notes README.OOps +%license COPYING COPYING_gpl2+.txt COPYING.PostgreSQL %{_bindir}/* %files -n libcsnd6-%{maj}_%{min} ++++++ _service ++++++ <!-- 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="exclude">util/new_srconv.c</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> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/csound/csound.git</param> <param name="changesrevision">0dad8304c78efba48b4f405f4757f3e0a7e339c0</param></service></servicedata>++++++ csound-6.08-default-pulse.patch ++++++ --- /var/tmp/diff_new_pack.aBkCwe/_old 2020-07-10 14:12:51.115523644 +0200 +++ /var/tmp/diff_new_pack.aBkCwe/_new 2020-07-10 14:12:51.115523644 +0200 @@ -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.12.2/Top/csound.c 2019-04-05 15:32:03.893551257 +0200 -@@ -3443,7 +3443,7 @@ PUBLIC void csoundReset(CSOUND *csound) - csoundCreateGlobalVariable(csound, "_RTAUDIO", (size_t) max_len); - s = csoundQueryGlobalVariable(csound, "_RTAUDIO"); - #ifndef LINUX -- strcpy(s, "PortAudio"); -+ strcpy(s, "pulse"); +--- csound-6.14.0.orig/Top/csound.c 2020-06-02 11:58:24.594002125 +0200 ++++ csound-6.14.0/Top/csound.c 2020-06-02 12:02:34.339852882 +0200 +@@ -3456,7 +3456,7 @@ PUBLIC void csoundReset(CSOUND *csound) + #ifdef __HAIKU__ + strcpy(s, "haiku"); + #else +- strcpy(s, "PortAudio"); ++ strcpy(s, "pulse"); + #endif #else strcpy(s, "alsa"); - #endif ++++++ csound-rename-sndinfo.patch ++++++ --- /var/tmp/diff_new_pack.aBkCwe/_old 2020-07-10 14:12:51.127523683 +0200 +++ /var/tmp/diff_new_pack.aBkCwe/_new 2020-07-10 14:12:51.127523683 +0200 @@ -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.12.2/util/CMakeLists.txt 2019-06-26 09:45:26.891391042 +0200 -@@ -1,62 +1,62 @@ +--- 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 @@ -13,16 +13,11 @@ - sndinfo.c srconv.c std_util.c xtrct.c - SDIF/sdif.c) - --if(MSVC) -- make_plugin(stdutil "${stdutil_SRCS}" ) -- 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}) +-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) @@ -36,12 +31,9 @@ - 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) -- make_utility(lpc_import lpci_main.c) -- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer) -- if(LINUX) -- target_link_libraries(mixer-bin m) -- endif() +- 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) @@ -76,15 +68,10 @@ + SDIF/sdif.c) + +if(MSVC) -+ make_plugin(stdutil "${stdutil_SRCS}" ) -+ 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}) ++ 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) @@ -98,12 +85,9 @@ + 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) -+ make_utility(lpc_import lpci_main.c) -+ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer) -+ if(LINUX) -+ target_link_libraries(mixer-bin m) -+ endif() ++ 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)
