- updated to 1.3.5

[packages/crossmingw32-libvorbis.git] / libvorbis-ac_fixes.patch

diff --git a/libvorbis-ac_fixes.patch b/libvorbis-ac_fixes.patch
index 4ee2f82b0faa73a7fed72722e8d97067220515de..40c2f0b6583dc68a4e06f6c54c5d8099e424b63a 100644 (file)
--- a/libvorbis-ac_fixes.patch
+++ b/libvorbis-ac_fixes.patch
@@ -1,34 +1,25 @@
-diff -urN libvorbis-1.2.2/configure.ac libvorbis-1.2.2.new/configure.ac
---- libvorbis-1.2.2/configure.ac       2009-06-24 17:23:47.000000000 +0200
-+++ libvorbis-1.2.2.new/configure.ac   2009-07-01 22:02:18.620749535 +0200
-@@ -109,9 +109,9 @@
+--- libvorbis-1.3.5/configure.ac~      2015-01-12 21:00:37.000000000 +0100
++++ libvorbis-1.3.5/configure.ac       2015-03-03 12:54:34.168894342 +0100
+@@ -128,9 +128,9 @@
        case $host in 
        *86-*-linux*)
                DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
--              CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
-+              CFLAGS="$CFLAGS -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
- #                     PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
--              PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
-+              PROFILE="-Wall -Wextra -pg -g $CFLAGS -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
+-              CFLAGS="-O3 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
++              CFLAGS="${CFLAGS} -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
+ #                     PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
+-              PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
++              PROFILE="-Wall -Wextra -pg -g ${CFLAGS} -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
  
                # glibc < 2.1.3 has a serious FP bug in the math inline header
                # that will cripple Vorbis.  Look to see if the magic FP stack
-@@ -153,13 +153,13 @@
-               PROFILE=${PROFILE}" -D__NO_MATH_INLINES"
-               fi;;
-       powerpc-*-linux*)
--              DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES"
--              CFLAGS="-O3 -Wall -Wextra -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
--              PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";;
-+              DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
-+              CFLAGS="$CFLAGS -Wall -Wextra -mfused-madd -D_REENTRANT -fsigned-char"
-+              PROFILE="-pg -g $CFLAGS -mfused-madd -D_REENTRANT -fsigned-char";;
+@@ -181,8 +181,8 @@
+               PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";;
        *-*-linux*)
                DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
--              CFLAGS="-O20 -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
--              PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
-+              CFLAGS="$CFLAGS -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
-+              PROFILE="-pg -g $CFLAGS -ffast-math -D_REENTRANT -fsigned-char";;
+-              CFLAGS="-O3 -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
+-              PROFILE="-pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char";;
++              CFLAGS="${CFLAGS} -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
++              PROFILE="-pg -g ${CFLAGS} -ffast-math -D_REENTRANT -fsigned-char";;
        sparc-sun-*)
                sparc_cpu=""
                AC_MSG_CHECKING([if gcc supports -mv8])