diff options
| author |   Chris White <chriswhite@gentoo.org> | 2004-10-21 19:49:26 +0000 |
|---|---|---|
| committer | Chris White <chriswhite@gentoo.org> | 2004-10-21 19:49:26 +0000 |
| commit | b0909b3a0db2cbf2e305cc50d315583c0150ce30 (patch) | |
| tree | 00033d9468981b9d98cfaf0d5927e4751229252a /media-sound/zynaddsubfx | |
| parent | move 1.8.3 to stable x86 and remove outdated 1.4.2-r1. This is required for ... (diff) | |
| download | gentoo-2-b0909b3a0db2cbf2e305cc50d315583c0150ce30.tar.gz gentoo-2-b0909b3a0db2cbf2e305cc50d315583c0150ce30.tar.bz2 gentoo-2-b0909b3a0db2cbf2e305cc50d315583c0150ce30.zip | |
Added Eric Shattow <shadow@serverart.org>'s modified no sse patch for gcc 3.4 per bug #68334.
Diffstat (limited to 'media-sound/zynaddsubfx')
3 files changed, 19 insertions, 50 deletions
diff --git a/media-sound/zynaddsubfx/ChangeLog b/media-sound/zynaddsubfx/ChangeLog index be4d46062c42..1edffb85849b 100644 --- a/media-sound/zynaddsubfx/ChangeLog +++ b/media-sound/zynaddsubfx/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/zynaddsubfx # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.15 2004/10/20 05:12:57 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/zynaddsubfx/ChangeLog,v 1.16 2004/10/21 19:49:26 chriswhite Exp $ + + 21 Oct 2004; Chris White <chriswhite@gentoo.org> + -files/zynaddsubfx-2.1.1-gcc34_mem_hack.patch, + +files/zynaddsubfx-2.1.1-gcc34_no_sse.patch: + Added Eric Shattow <shadow@serverart.org>'s modified no sse patch for gcc 3.4 + per bug #68334. 19 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> -zynaddsubfx-2.0.0.ebuild: diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_mem_hack.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_mem_hack.patch deleted file mode 100644 index c01058513379..000000000000 --- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_mem_hack.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/DSP/AnalogFilter.C ZynAddSubFX-2.1.1/src/DSP/AnalogFilter.C ---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/DSP/AnalogFilter.C 2004-07-30 19:02:17.000000000 -0500 -+++ ZynAddSubFX-2.1.1/src/DSP/AnalogFilter.C 2004-10-17 02:08:08.819079515 -0500 -@@ -144,7 +144,10 @@ - tmp=1+alpha; - c[0]=alpha/tmp*sqrt(tmpq+1); - c[1]=0; -+ char *gcc34_mem_hack = new char[600]; -+ sprintf(gcc34_mem_hack, "%f", c[2]); - c[2]=-alpha/tmp*sqrt(tmpq+1); -+ delete gcc34_mem_hack; gcc34_mem_hack = NULL; /* new char[600]; */ - d[1]=-2*cs/tmp*(-1); - d[2]=(1-alpha)/tmp*(-1); - } else { -diff -burN /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Synth/OscilGen.C ZynAddSubFX-2.1.1/src/Synth/OscilGen.C ---- /var/tmp/portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Synth/OscilGen.C 2004-08-25 17:12:40.000000000 -0500 -+++ ZynAddSubFX-2.1.1/src/Synth/OscilGen.C 2004-10-17 02:07:51.383828815 -0500 -@@ -674,10 +674,31 @@ - - for (i=0;i<OSCIL_SIZE;i++) oscilFFTfreqs[i]=0.0; - if (Pcurrentbasefunc==0) {//the sine case -+ char *gcc34_mem_hack = new char[600]; - for (i=0;i<MAX_AD_HARMONICS;i++){ -+ sprintf(gcc34_mem_hack, -+ "i=%d " \ -+ "MAX_AD_HARMONICS=%d " \ -+ "oscilFFTfreqs[i+1]=%f " \ -+ "hmag[i]=%f" \ -+ "hphase[i]=%f" \ -+ "oscilFFTfreqs[OSCIL_SIZE-i-1]=%f" \ -+ "OSCIL_SIZE-i-1=%d" \ -+ "OSCIL_SIZE=%d" \ -+ "\n", -+ i, -+ MAX_AD_HARMONICS, -+ oscilFFTfreqs[i+1], -+ hmag[i], -+ hphase[i], -+ oscilFFTfreqs[OSCIL_SIZE-i-1], -+ OSCIL_SIZE-i-1, -+ OSCIL_SIZE -+ ); - oscilFFTfreqs[i+1]=-hmag[i]*sin(hphase[i]*(i+1))/2.0; - oscilFFTfreqs[OSCIL_SIZE-i-1]=hmag[i]*cos(hphase[i]*(i+1))/2.0; - }; -+ delete gcc34_mem_hack; gcc34_mem_hack = NULL; /* new char[600]; */ - } else { - for (j=0;j<MAX_AD_HARMONICS;j++){ - if (Phmag[j]==64) continue; diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_no_sse.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_no_sse.patch new file mode 100644 index 000000000000..834b55ca06bb --- /dev/null +++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.1.1-gcc34_no_sse.patch @@ -0,0 +1,12 @@ +diff -burN portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Makefile ZynAddSubFX-2.1.1/src/Makefile +--- portage/zynaddsubfx-2.1.1/work/ZynAddSubFX-2.1.1/src/Makefile 2004-10-20 18:09:29.786226273 -0500 ++++ ZynAddSubFX-2.1.1/src/Makefile 2004-10-20 19:20:34.940269677 -0500 +@@ -1,7 +1,7 @@ + include Makefile.inc + + ifneq ($(MAKECMDGOALS),debug) +- CXXFLAGS= -O6 -ggdb -Wall ++ CXXFLAGS= -O6 -ggdb -Wall -mno-sse + else + CXXFLAGS= -O0 -ggdb -Wall -Wpointer-arith -Wstrict-prototypes + endif |