From a8e8dd31e049629592e1c4d50b083203413c4f798e93b8e720470a2c1814d6ad Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 11 Jun 2007 21:17:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/csound?expand=0&rev=4 --- Csound5.05_src.tar.bz2 | 3 --- Csound5.06.0.tar.bz2 | 3 +++ csound-gcc-warning-fix.diff | 14 ++++++++++++++ csound.changes | 7 +++++++ csound.spec | 25 ++++++++++++++++++------- 5 files changed, 42 insertions(+), 10 deletions(-) delete mode 100644 Csound5.05_src.tar.bz2 create mode 100644 Csound5.06.0.tar.bz2 create mode 100644 csound-gcc-warning-fix.diff diff --git a/Csound5.05_src.tar.bz2 b/Csound5.05_src.tar.bz2 deleted file mode 100644 index a322e53..0000000 --- a/Csound5.05_src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8078f446cf3c75b3839c23001660e231ea9602916af389aa7bc0aeb6f93af68b -size 18810841 diff --git a/Csound5.06.0.tar.bz2 b/Csound5.06.0.tar.bz2 new file mode 100644 index 0000000..3c193f8 --- /dev/null +++ b/Csound5.06.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85557740bfc321bfd553ba082b18055ce76fd7b2d9eccd706ffb60801f423c32 +size 11105246 diff --git a/csound-gcc-warning-fix.diff b/csound-gcc-warning-fix.diff new file mode 100644 index 0000000..50fbef0 --- /dev/null +++ b/csound-gcc-warning-fix.diff @@ -0,0 +1,14 @@ +--- Opcodes/gab/sliderTable.c-dist 2007-06-11 18:20:22.000000000 +0200 ++++ Opcodes/gab/sliderTable.c 2007-06-11 18:29:35.000000000 +0200 +@@ -364,9 +364,9 @@ static int sliderTable64(CSOUND *csound, + break; \ + } \ + *outTable++ = \ +- *yt1++ = *c1++ * value + *c2++ * *yt1; /* filters the output */ \ ++ *yt1 = *c1++ * value + *c2++ * *yt1; /* filters the output */ \ + \ +- min++; max++; j++; ftp++; \ ++ yt1++; min++; max++; j++; ftp++; \ + } \ + } \ + return OK; diff --git a/csound.changes b/csound.changes index cf9dfa3..57ba391 100644 --- a/csound.changes +++ b/csound.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 11 17:57:22 CEST 2007 - tiwai@suse.de + +- updated to version 5.06: + * fix k-rate, vrandh and vrandi scaling problems, mod fix + * new opcodes: partikkel, partikkelsync + ------------------------------------------------------------------- Tue Mar 27 18:08:43 CEST 2007 - tiwai@suse.de diff --git a/csound.spec b/csound.spec index d1b7fca..2418038 100644 --- a/csound.spec +++ b/csound.spec @@ -1,5 +1,5 @@ # -# spec file for package csound (Version 5.05) +# spec file for package csound (Version 5.06.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,19 +12,20 @@ Name: csound %define support_fltk 0 -BuildRequires: alsa-devel fluidsynth-devel gcc-c++ jack-devel liblo-devel libsndfile-devel portaudio-devel python-devel scons swig +BuildRequires: alsa-devel fdupes fluidsynth-devel gcc-c++ jack-devel liblo-devel libsndfile-devel portaudio-devel python-devel scons swig %if %support_fltk BuildRequires: fltk-devel libjpeg-devel libpng-devel xorg-x11-devel %endif Summary: Computer Sound Synthesis and Composition Program -Version: 5.05 +Version: 5.06.0 Release: 1 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Productivity/Multimedia/Sound/Utilities -Source: Csound%{version}_src.tar.bz2 +Source: Csound%{version}.tar.bz2 Source1: README.SuSE Patch: csound-alsa-fix.diff Patch1: csound-tmpnam-fix.diff +Patch2: csound-gcc-warning-fix.diff URL: http://www.csounds.com Autoreq: on Autoprov: off @@ -39,13 +40,15 @@ For detailed information, refer to http://www.csounds.com. %prep -%setup -n Csound5.05.0 +%setup -q -n Csound%{version} %patch %patch1 +%patch2 cp %{SOURCE1} . # fix encoding iconv -f latin1 -t utf8 readme-csound5.txt > readme-csound5.txt.utf8 mv readme-csound5.txt.utf8 readme-csound5.txt +test -f custom.py || cp custom.py.mkg custom.py %build %if %_lib == "lib64" @@ -69,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/csound # rename conflicting binary names mv $RPM_BUILD_ROOT%{_bindir}/sndinfo $RPM_BUILD_ROOT%{_bindir}/csndinfo mv $RPM_BUILD_ROOT%{_bindir}/extract $RPM_BUILD_ROOT%{_bindir}/csound-extract +# remove devel files +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +rm -rf $RPM_BUILD_ROOT%{_includedir} +fdupes $RPM_BUILD_ROOT %clean [ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT @@ -83,12 +90,16 @@ mv $RPM_BUILD_ROOT%{_bindir}/extract $RPM_BUILD_ROOT%{_bindir}/csound-extract %defattr(-,root,root) %doc COPYING ChangeLog INSTALL readme-csound5.txt README.SuSE %{_bindir}/* -%{_includedir}/* -%{_libdir}/lib* %{_libdir}/csound %{_datadir}/csound +# %{_includedir}/* +# %{_libdir}/lib* %changelog +* Mon Jun 11 2007 - tiwai@suse.de +- updated to version 5.06: + * fix k-rate, vrandh and vrandi scaling problems, mod fix + * new opcodes: partikkel, partikkelsync * Tue Mar 27 2007 - tiwai@suse.de - update to version 5.05: * fixes/improvements on FLTK support