diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2006-01-29 20:02:22 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2006-01-29 20:02:22 +0000 |
commit | cd80d45cf4e0f984a4034527264865fbed689ddf (patch) | |
tree | 1c74164dca2685f4acd1ca6970ac0684147e8b8a /package/libvorbis | |
parent | 0b029c16e2e16d6decfebf4953af48f9f5ac0a3a (diff) | |
download | upstream-cd80d45cf4e0f984a4034527264865fbed689ddf.tar.gz upstream-cd80d45cf4e0f984a4034527264865fbed689ddf.tar.bz2 upstream-cd80d45cf4e0f984a4034527264865fbed689ddf.zip |
add gcc4 fixes, remove the NEC FC20X2JA driver patch from lcd4linux temporary
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3066 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libvorbis')
-rw-r--r-- | package/libvorbis/patches/libvorbis-1.1.1-gcc4-1.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/package/libvorbis/patches/libvorbis-1.1.1-gcc4-1.patch b/package/libvorbis/patches/libvorbis-1.1.1-gcc4-1.patch new file mode 100644 index 0000000000..480172fcf9 --- /dev/null +++ b/package/libvorbis/patches/libvorbis-1.1.1-gcc4-1.patch @@ -0,0 +1,60 @@ +Submitted By: Steffen Knollmann <sknolli at astro.physik.uni-goettingen.de> +Date: 2005-11-09 +Initial Package Version: 1.1.1 +Upstream Status: From Upstream +Origin: msmith, courtesy of upstream SVN +Description: Fixes an optimization problem with gcc-4.0.x that results in + dysfunctional library that will produce bigger encoded files + with a poor audio quality. Detailed description at: + http://trac.xiph.org/cgi-bin/trac.cgi/ticket/583 + +$LastChangedBy: randy $ +$Date: 2005-11-18 08:12:42 -0700 (Fri, 18 Nov 2005) $ + + +--- libvorbis-1.1.1/lib/scales.h (revision 9958) ++++ libvorbis-1.1.1/lib/scales.h (revision 9959) +@@ -26,20 +26,24 @@ + #ifdef VORBIS_IEEE_FLOAT32 + + static float unitnorm(float x){ +- ogg_uint32_t *ix=(ogg_uint32_t *)&x; +- *ix=(*ix&0x80000000UL)|(0x3f800000UL); +- return(x); +-} +- +-static float FABS(float *x){ +- ogg_uint32_t *ix=(ogg_uint32_t *)x; +- *ix&=0x7fffffffUL; +- return(*x); ++ union { ++ ogg_uint32_t i; ++ float f; ++ } ix; ++ ix.f = x; ++ ix.i = (ix.i & 0x80000000U) | (0x3f800000U); ++ return ix.f; + } + + /* Segher was off (too high) by ~ .3 decibel. Center the conversion correctly. */ + static float todB(const float *x){ +- return (float)((*(ogg_int32_t *)x)&0x7fffffff) * 7.17711438e-7f -764.6161886f; ++ union { ++ ogg_uint32_t i; ++ float f; ++ } ix; ++ ix.f = *x; ++ ix.i = ix.i&0x7fffffff; ++ return (float)(ix.i * 7.17711438e-7f -764.6161886f); + } + + #define todB_nn(x) todB(x) +@@ -51,8 +55,6 @@ + return(1.f); + } + +-#define FABS(x) fabs(*(x)) +- + #define todB(x) (*(x)==0?-400.f:log(*(x)**(x))*4.34294480f) + #define todB_nn(x) (*(x)==0.f?-400.f:log(*(x))*8.6858896f) + |