commit d4508906234023df9515e670cccab7551a7d0f0effcc9c353ed30932c9bd74ca Author: OBS User unknown Date: Mon Jan 15 23:08:12 2007 +0000 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/csound?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/Csound-4.24.1.tar.bz2 b/Csound-4.24.1.tar.bz2 new file mode 100644 index 0000000..084ba68 --- /dev/null +++ b/Csound-4.24.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b20bd5a97bf5ac7584b0fa786a2db1834ceac3b5000e157697c4a4ea1acb7b3 +size 1116589 diff --git a/README.SuSE b/README.SuSE new file mode 100644 index 0000000..0f4798a --- /dev/null +++ b/README.SuSE @@ -0,0 +1,19 @@ +Plugin Directories +================== + +The plugin binaries are installed under /usr/lib/Csound +(/usr/lib64/Csound in x86_64). Please set the environment variable +"OPCDIR" to this direcrory before starting csound. +in bash style, + export OPCDIR=/usr/lib/Csound +in tcsh style, + setenv OPCDIR /usr/lib/Csound + + +Binary Renaming +=============== + +sndinfo is renamed to csndinfo in this package due to the name +confliction with snd package. + +Simiarly, extract was renamed to csound-extract. diff --git a/csound-alsa-fix.dif b/csound-alsa-fix.dif new file mode 100644 index 0000000..86555d5 --- /dev/null +++ b/csound-alsa-fix.dif @@ -0,0 +1,45 @@ +--- plugins/rtaudio/rtalsa.c-dist 2004-06-02 16:56:18.000000000 +0200 ++++ plugins/rtaudio/rtalsa.c 2004-06-02 17:04:30.000000000 +0200 +@@ -141,11 +141,9 @@ static void set_device_params(void *csou + } + dev->sample_size *= devParms->nChannels; /* correct sample size */ + /* sample rate, */ +- dev->srate = +- (int) snd_pcm_hw_params_set_rate_near(dev->handle, dev->hw_params, +- (int) (devParms->sampleRate + 0.5f), +- 0); +- if (dev->srate < 0) { ++ dev->srate = (int) (devParms->sampleRate + 0.5f); ++ if (snd_pcm_hw_params_set_rate_near(dev->handle, dev->hw_params, ++ &dev->srate, 0) < 0) { + ENGINE->Die(csound, Str("unable to set sample rate on soundcard")); + return; + } +@@ -157,10 +155,9 @@ static void set_device_params(void *csou + } + /* buffer size, */ + n = devParms->hwBufSize; +- dev->buffer_smps = (snd_pcm_sframes_t) +- snd_pcm_hw_params_set_buffer_size_near(dev->handle, dev->hw_params, +- (snd_pcm_uframes_t) n); +- if (dev->buffer_smps <= (snd_pcm_sframes_t) 0) { ++ dev->buffer_smps = n; ++ if (snd_pcm_hw_params_set_buffer_size_near(dev->handle, dev->hw_params, ++ &dev->buffer_smps) < 0) { + ENGINE->Die(csound, + Str("failed while trying to set soundcard DMA buffer size")); + return; +@@ -173,10 +170,9 @@ static void set_device_params(void *csou + } + /* and period size */ + n = devParms->swBufSize; +- dev->period_smps = (snd_pcm_sframes_t) +- snd_pcm_hw_params_set_period_size_near(dev->handle, dev->hw_params, +- (snd_pcm_uframes_t) n, &dir); +- if (dev->period_smps <= 0) { ++ dev->period_smps = n; ++ if (snd_pcm_hw_params_set_period_size_near(dev->handle, dev->hw_params, ++ &dev->period_smps, &dir) < 0) { + ENGINE->Die(csound, + Str("error setting period time for real-time audio")); + return; diff --git a/csound-printf-fix.dif b/csound-printf-fix.dif new file mode 100644 index 0000000..d3df27f --- /dev/null +++ b/csound-printf-fix.dif @@ -0,0 +1,11 @@ +--- sread.c ++++ sread.c +@@ -465,7 +465,7 @@ + c = getscochar(1); + continue; + default: +- printf("read %c(%.2x)\n", c); ++ printf("read %c(%.2x)\n", c, c); + printf(Str("Incorrect evaluation\n")); + longjmp(exitjmp,1); + } diff --git a/csound-tmpnam-fix.dif b/csound-tmpnam-fix.dif new file mode 100644 index 0000000..110d228 --- /dev/null +++ b/csound-tmpnam-fix.dif @@ -0,0 +1,151 @@ +--- one_file.c-dist 2003-07-28 13:23:59.878487232 +0200 ++++ one_file.c 2003-07-28 15:31:26.337048840 +0200 +@@ -200,12 +200,16 @@ + static int createOrchestra(FILE *unf) + { + char *p; ++ int fd; + FILE *orcf; + +- tmpnam(orcname); /* Generate orchestra name */ +- if ((p=strchr(orcname, '.')) != NULL) *p='\0'; /* with extention */ +- strcat(orcname, ".orc"); +- orcf = fopen(orcname, "w"); ++ /* Generate orchestra name */ ++ strcpy(orcname, "/tmp/csoundXXXXXX.orc"); ++ if ((fd = mkstemp(orcname)) < 0) { ++ perror(Str("Failed to create\n")); ++ longjmp(exitjmp,1); ++ } ++ orcf = fdopen(fd, "w"); + printf(Str("Creating %s (%p)\n"), orcname, orcf); + if (orcf==NULL){ + perror(Str("Failed to create\n")); +@@ -219,6 +223,7 @@ + } + else fputs(buffer, orcf); + } ++ fclose(orcf); + return FALSE; + } + +@@ -226,13 +231,15 @@ + static int createScore(FILE *unf) + { + char *p; ++ int fd; + FILE *scof; + +- tmpnam(sconame); /* Generate score name */ +- if ((p=strchr(sconame, '.')) != NULL) *p='\0'; /* with extention */ +- strcat(sconame, ".sco"); +- scof = fopen(sconame, "w"); +- /*RWD 3:2000*/ ++ /* Generate score name */ ++ strcpy(sconame, "/tmp/csoundXXXXXX.sco"); ++ if ((fd = mkstemp(orcname)) < 0) ++ return FALSE; ++ scof = fdopen(fd, "w"); ++ /*RWD 3:2000*/ + if (scof==NULL) + return FALSE; + +@@ -244,6 +251,7 @@ + } + else fputs(buffer, scof); + } ++ fclose(scof); + return FALSE; + } + +@@ -251,16 +259,17 @@ + { + int size; + char *p; ++ int fd; + FILE *midf; + int c; + +- if (tmpnam(midname)==NULL) { /* Generate MIDI file name */ ++ /* Generate MIDI file name */ ++ strcpy(midname, "/tmp/csoundXXXXXX.mid"); ++ if ((fd = mkstemp(midname)) < 0) { + printf(Str("Cannot create temporary file for MIDI subfile\n")); + longjmp(exitjmp,1); + } +- if ((p=strchr(midname, '.')) != NULL) *p='\0'; /* with extention */ +- strcat(midname, ".mid"); +- midf = fopen(midname, "wb"); ++ midf = fdopen(fd, "wb"); + if (midf==NULL) { + printf(Str("Cannot open temporary file (%s) for MIDI subfile\n"), midname); + longjmp(exitjmp,1); +@@ -333,15 +342,16 @@ + static int createMIDI2(FILE *unf) + { + char *p; ++ int fd; + FILE *midf; + +- if (tmpnam(midname)==NULL) { /* Generate MIDI file name */ ++ /* Generate MIDI file name */ ++ strcpy(midname, "/tmp/csoundXXXXXX.mid"); ++ if ((fd = mkstemp(midname)) < 0) { + printf(Str("Cannot create temporary file for MIDI subfile\n")); + longjmp(exitjmp,1); + } +- if ((p=strchr(midname, '.')) != NULL) *p='\0'; /* with extention */ +- strcat(midname, ".mid"); +- midf = fopen(midname, "wb"); ++ midf = fdopen(fd, "wb"); + if (midf==NULL) { + printf(Str("Cannot open temporary file (%s) for MIDI subfile\n"), + midname); +--- csmain.c-dist 2003-07-28 13:23:06.867546120 +0200 ++++ csmain.c 2003-07-28 15:15:50.720284208 +0200 +@@ -407,10 +407,13 @@ + FILE *scof; + extern char sconame[]; + void deleteScore(void); +- tmpnam(sconame); /* Generate score name */ +- if ((p=strchr(sconame, '.')) != NULL) *p='\0'; /* with extention */ +- strcat(sconame, ".sco"); +- scof = fopen(sconame, "w"); ++ int fd; ++ /* Generate score name */ ++ strcpy(sconame, "/tmp/csoundXXXXXX.sco"); ++ fd = mkstemp(sconame); ++ if (fd < 0) ++ dieu(Str("cannot create temp file")); ++ scof = fdopen(fd, "w"); + fprintf(scof, "f0 86400\n"); + fclose(scof); + scorename = sconame; +@@ -498,7 +501,12 @@ + scorename = "score.srt"; + } + else { +- scorename = tmpnam(scnm); ++ int fd; ++ strcpy(scnm, "/tmp/csoundXXXXXX"); ++ if ((fd = mkstemp(scnm)) < 0) ++ dieu(Str("cannot create temp file")); ++ close(fd); ++ scorename = scnm; + add_tmpfile(scorename); /* IV - Oct 31 2002 */ + } + } +@@ -531,7 +539,12 @@ + playscore = sortedscore = "score.srt"; + } + else { +- playscore = sortedscore = tmpnam(nme); ++ int fd; ++ strcpy(nme, "/tmp/csoundXXXXXX"); ++ if ((fd = mkstemp(nme)) < 0) ++ dieu(Str("cannot create temp file")); ++ close(fd); ++ playscore = sortedscore = nme; + add_tmpfile(playscore); /* IV - Oct 31 2002 */ + } + if (!(scorin = fopen(scorename, "r"))) /* else sort it */ diff --git a/csound.changes b/csound.changes new file mode 100644 index 0000000..6019b51 --- /dev/null +++ b/csound.changes @@ -0,0 +1,47 @@ +------------------------------------------------------------------- +Mon Mar 27 18:54:23 CEST 2006 - pth@suse.de + +- Add missing parameter in printf call (bug #129676). + +------------------------------------------------------------------- +Wed Jan 25 21:35:15 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Fri Oct 15 10:54:27 CEST 2004 - tiwai@suse.de + +- renamed extract to csound-extract to avoid name confliction + (bug #45347). + +------------------------------------------------------------------- +Wed Jun 2 17:05:41 CEST 2004 - tiwai@suse.de + +- fixed the ALSA RT plugin with the new API. + +------------------------------------------------------------------- +Sat Jan 10 18:11:42 CET 2004 - adrian@suse.de + +- add %run_ldconfig and %defattr + +------------------------------------------------------------------- +Tue Aug 5 12:48:27 CEST 2003 - tiwai@suse.de + +- renamed sndinfo to csndinfo to avoid name confliction with snd. + +------------------------------------------------------------------- +Wed Jul 30 12:48:59 CEST 2003 - tiwai@suse.de + +- fixed the build on x86-64. + +------------------------------------------------------------------- +Mon Jul 28 16:11:55 CEST 2003 - tiwai@suse.de + +- updated to 4.24.1. +- fixed tmpnam with mkstemp. + +------------------------------------------------------------------- +Thu Feb 1 19:18:36 CET 2001 - tiwai@suse.de + +- Initial vesrion: unofficial-4.10.0.0c + diff --git a/csound.dif b/csound.dif new file mode 100644 index 0000000..fc8ae4c --- /dev/null +++ b/csound.dif @@ -0,0 +1,51 @@ +--- Makefile.defs-dist 2003-07-28 12:27:26.000000000 +0200 ++++ Makefile.defs 2003-07-30 12:48:06.000000000 +0200 +@@ -10,7 +10,7 @@ + # ----------------------------------------------------------------------------- + # installation directories + +-INSTDIR = /usr/local ++INSTDIR = /usr + + BINDIR = $(INSTDIR)/bin + LIBDIR = $(INSTDIR)/lib +@@ -62,8 +62,8 @@ + CXX = g++ + LD = gcc + AR = ar rc +-MAKEDLL_L = ld -E -s -shared -O1 +-MAKEDLL_P = ld -E -s -shared -O1 ++MAKEDLL_L = g++ -shared -O1 ++MAKEDLL_P = g++ -shared -O1 + RANLIB = ranlib + + # ----------------------------------------------------------------------------- +@@ -150,7 +150,7 @@ + # C++ compiler flags + + CXXFLAGS = $(CFLAGS) $(C_FLAGS) -fno-exceptions -fno-rtti \ +- -fno-unroll-loops -I/usr/local/FLTK-1.1.0/Linux/include ++ -fno-unroll-loops `fltk-config --cxxflags` + # `fltk-config --cxxflags` try adding this if the compilation of + # FLTK widgets stops with error messages + # related to not finding include files +@@ -164,8 +164,8 @@ + # source and object files for FLTK widgets + + # FLTKLIB = -lfltk -lpthread -lstdc++ +-# FLTKLIB = `fltk-config --libs` +-FLTKLIB = /usr/local/FLTK-1.1.0/Linux/lib/libfltk.a \ ++FLTKLIB = `fltk-config --libs` -lstdc++ ++# FLTKLIB = /usr/local/FLTK-1.1.0/Linux/lib/libfltk.a \ + /usr/local/gcc-3.2.2/lib/libstdc++.a + # libraries required by widgets.cpp + # -lfltk -lpthread -lstdc++ use dynamic libraries +@@ -211,7 +211,7 @@ + # winFLTK.o and FL_graph.o for `improved' X graphics + # otherwise leave empty + +-WINLIBS = -L/usr/X11R6/lib -lX11 ++WINLIBS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 + # ;window system libraries + # -lX11 for X window calls + # -L/usr/lib/X11R4 for HP X11 library, v.4 diff --git a/csound.spec b/csound.spec new file mode 100644 index 0000000..e9c0a0e --- /dev/null +++ b/csound.spec @@ -0,0 +1,98 @@ +# +# spec file for package csound (Version 4.24.1) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: csound +BuildRequires: alsa-devel fltk-devel gcc-c++ tk-devel xorg-x11-devel +Summary: Computer Sound Synthesis and Composition Program +Version: 4.24.1 +Release: 228 +License: LGPL +Group: Productivity/Multimedia/Sound/Utilities +Source: Csound-%{version}.tar.bz2 +Source1: README.SuSE +Patch: csound.dif +Patch1: csound-tmpnam-fix.dif +Patch2: csound-alsa-fix.dif +Patch3: csound-printf-fix.dif +URL: http://www.csounds.com +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Csound is a software synthesis program. It is fully modular and +supports an unlimited amount of oscillators and filters. + +For detailed information, refer to http://www.csounds.com. + + + +%prep +%setup -n Csound-%{version} +cp %{SOURCE1} . +%patch +%patch1 +%patch2 +%patch3 + +%build +make C_FLAGS="$RPM_OPT_FLAGS" LIBDIR='$(INSTDIR)/'%_lib PLGNDIR='$(LIBDIR)/Csound' + +%install +[ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT +make install INSTDIR=$RPM_BUILD_ROOT%{_prefix} LIBDIR='$(INSTDIR)/'%_lib PLGNDIR='$(LIBDIR)/Csound' +# strip setuid bit for security reason +chmod 755 $RPM_BUILD_ROOT%{_bindir}/* +# rename sndinfo to csndinfo +mv $RPM_BUILD_ROOT%{_bindir}/sndinfo $RPM_BUILD_ROOT%{_bindir}/csndinfo +# rename extract to csound-extract +mv $RPM_BUILD_ROOT%{_bindir}/extract $RPM_BUILD_ROOT%{_bindir}/csound-extract +# clean up unused directories +rmdir $RPM_BUILD_ROOT/usr/share +rmdir $RPM_BUILD_ROOT/usr/man + +%clean +[ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT + +%post +%run_ldconfig + +%postun +%run_ldconfig + +%files +%defattr(-,root,root) +%{_bindir}/* +%{_includedir}/* +%{_libdir}/lib* +%{_libdir}/Csound +%doc doc + +%changelog -n csound +* Mon Mar 27 2006 - pth@suse.de +- Add missing parameter in printf call (bug #129676). +* Wed Jan 25 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Fri Oct 15 2004 - tiwai@suse.de +- renamed extract to csound-extract to avoid name confliction + (bug #45347). +* Wed Jun 02 2004 - tiwai@suse.de +- fixed the ALSA RT plugin with the new API. +* Sat Jan 10 2004 - adrian@suse.de +- add %%run_ldconfig and %%defattr +* Tue Aug 05 2003 - tiwai@suse.de +- renamed sndinfo to csndinfo to avoid name confliction with snd. +* Wed Jul 30 2003 - tiwai@suse.de +- fixed the build on x86-64. +* Mon Jul 28 2003 - tiwai@suse.de +- updated to 4.24.1. +- fixed tmpnam with mkstemp. +* Thu Feb 01 2001 - tiwai@suse.de +- Initial vesrion: unofficial-4.10.0.0c diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4