6954d72386cbf88c613e1ffebb7b4bac libvorbis-1.0beta4.tar.gz

Changed files:
    libvorbis-ac_fixes.patch -> 1.1
    libvorbis-make.patch -> 1.2

diff --git a/libvorbis-ac_fixes.patch b/libvorbis-ac_fixes.patch
new file mode 100644 (file)
index 0000000..d7b9f40
--- /dev/null
+++ b/libvorbis-ac_fixes.patch
@@ -0,0 +1,110 @@
+diff -urN libvorbis-1.0beta4.org/configure.in libvorbis-1.0beta4/configure.in
+--- libvorbis-1.0beta4.org/configure.in        Sun Apr 29 00:04:26 2001
++++ libvorbis-1.0beta4/configure.in    Sun Apr 29 01:03:21 2001
+@@ -47,93 +47,19 @@
+ 
+ AC_CANONICAL_HOST
+ 
+-dnl Set some target options
+-if test -z "$GCC"; then
+-      case $host in 
+-      *-*-irix*)
+-              dnl If we're on IRIX, we wanna use cc even if gcc 
+-              dnl is there (unless the user has overriden us)...
+-              if test -z "$CC"; then
+-                      CC=cc
+-              fi
+-              DEBUG="-g -signed" 
+-              CFLAGS="-O2 -w -signed"
+-              PROFILE="-p -g3 -O2 -signed" ;;
+-      sparc-sun-solaris*)
+-              DEBUG="-v -g"
+-              CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+-              PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
+-      *)
+-              DEBUG="-g"
+-              CFLAGS="-O"
+-              PROFILE="-g -p" ;;
+-        esac
+-else
+-
+-      case $host in 
+-      *86-*-linux*)
+-              DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+-              CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
+-#                     PROFILE="-Wall -W -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
+-              PROFILE="-Wall -W -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline -static"
+-
+-              # 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
+-              # clobber is missing in the mathinline header, thus indicating
+-              # the buggy version
+-
+-              AC_EGREP_CPP(log10.*fldlg2.*fxch,[
+-                              #define __LIBC_INTERNAL_MATH_INLINES 1
+-                              #define __OPTIMIZE__
+-                              #include <math.h>
+-                              ],bad=maybe,bad=no)
+-              if test ${bad} = "maybe" ;then
+-                    AC_EGREP_CPP(log10.*fldlg2.*fxch.*st\([[0123456789]]*\),
+-                                      [
+-                                      #define __LIBC_INTERNAL_MATH_INLINES 1
+-                                      #define __OPTIMIZE__
+-                                      #include <math.h>
+-                                      ],bad=no,bad=yes)
+-              fi
+-              if test ${bad} = "yes" ;then
+- AC_MSG_WARN([                                                        ])
+- AC_MSG_WARN([********************************************************])
+- AC_MSG_WARN([* The glibc headers on this machine have a serious bug *])
+- AC_MSG_WARN([* in /usr/include/bits/mathinline.h  This bug affects  *])
+- AC_MSG_WARN([* all floating point code, not just Ogg, built on this *])
+- AC_MSG_WARN([* machine.  Upgrading to glibc 2.1.3 is strongly urged *])
+- AC_MSG_WARN([* to correct the problem.  Note that upgrading glibc   *])
+- AC_MSG_WARN([* will not fix any previously built programs; this is  *])
+- AC_MSG_WARN([* a compile-time time bug.                             *])
+- AC_MSG_WARN([* To work around the problem for this build of Ogg,    *])
+- AC_MSG_WARN([* autoconf is disabling all math inlining.  This will  *])
+- AC_MSG_WARN([* hurt Ogg performace but is necessary for an Ogg that *])
+- AC_MSG_WARN([* will actually work.  Once glibc is upgraded, rerun   *])
+- AC_MSG_WARN([* configure and make to build with inlining.           *])
+- AC_MSG_WARN([********************************************************])
+- AC_MSG_WARN([                                                        ])
+-
+-              CFLAGS=${OPT}" -D__NO_MATH_INLINES"
+-              PROFILE=${PROFILE}" -D__NO_MATH_INLINES"
+-              fi;;
+-      *-*-linux*)
+-              DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+-              CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
+-              PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
+-      sparc-sun-*)
+-              DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
+-              CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
+-              PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
+-      *-*-darwin*)
+-              DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
+-              CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
+-              PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
+-      *)
+-              DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+-              CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
+-              PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+-        esac
+-fi
++# -mno-ieee-fp causes gcc core dump :-( --misiek
++case $host in
++    *86-*-linux*)
++      DEBUG="$CFLAGS -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
++      CFLAGS="$CFLAGS -ffast-math -D_REENTRANT -fsigned-char"
++      PROFILE="$CFLAGS -Wall -W -pg -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
++      ;;
++      **)
++      DEBUG="$CFLAGS -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
++      CFLAGS="$CFLAGS -ffast-math -D_REENTRANT -fsigned-char"
++      PROFILE="$CFLAGS -pg -ffast-math -D_REENTRANT -fsigned-char"
++      ;;
++esac
+ 
+ dnl --------------------------------------------------
+ dnl Check for headers

diff --git a/libvorbis-make.patch b/libvorbis-make.patch
index cdba667f81bc2179125ed9d907cce594d88a5511..9ccd7b62619fad62bccf81b17ba8a897dc6bbca3 100644 (file)
--- a/libvorbis-make.patch
+++ b/libvorbis-make.patch
@@ -1,12 +1,43 @@
-diff -Nur vorbis.org/doc/Makefile.am vorbis/doc/Makefile.am
---- vorbis.org/doc/Makefile.am Thu Oct 12 05:12:38 2000
-+++ vorbis/doc/Makefile.am     Wed Oct 25 11:31:21 2000
-@@ -2,7 +2,7 @@
+diff -urN libvorbis-1.0beta4.org/examples/Makefile.am libvorbis-1.0beta4/examples/Makefile.am
+--- libvorbis-1.0beta4.org/examples/Makefile.am        Sun Apr 29 00:04:26 2001
++++ libvorbis-1.0beta4/examples/Makefile.am    Sun Apr 29 01:10:25 2001
+@@ -7,7 +7,7 @@
+ noinst_PROGRAMS = decoder_example encoder_example chaining_example\
+               vorbisfile_example seeking_example
  
- AUTOMAKE_OPTIONS = foreign
+-LDFLAGS = -static
++LDFLAGS =
+ LDADD = ../lib/libvorbis.la
  
--docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+ decoder_example_SOURCES = decoder_example.c
+diff -urN libvorbis-1.0beta4.org/lib/Makefile.am libvorbis-1.0beta4/lib/Makefile.am
+--- libvorbis-1.0beta4.org/lib/Makefile.am     Sun Apr 29 00:04:26 2001
++++ libvorbis-1.0beta4/lib/Makefile.am Sun Apr 29 01:10:55 2001
+@@ -30,7 +30,7 @@
+ barkmel_SOURCES = barkmel.c
+ tone_SOURCES = tone.c
+ psytune_SOURCES = psytune.c
+-psytune_LDFLAGS = -static
++psytune_LDFLAGS = 
+ psytune_LDADD = libvorbis.la
  
- doc_DATA = v-comment.html vorbisword2.png white-ogg.png programming.html\
-        vorbis.html wait.png white-xifish.png
+ EXTRA_DIST = lookups.pl iir.c
+diff -urN libvorbis-1.0beta4.org/vq/Makefile.am libvorbis-1.0beta4/vq/Makefile.am
+--- libvorbis-1.0beta4.org/vq/Makefile.am      Sun Apr 29 00:04:26 2001
++++ libvorbis-1.0beta4/vq/Makefile.am  Sun Apr 29 01:10:38 2001
+@@ -9,7 +9,7 @@
+       latticetune huffbuild residuesplit distribution
+ CLEANFILES = $(EXTRA_PROGRAMS)
+ 
+-LDFLAGS = -static
++LDFLAGS = 
+ LDADD = ../lib/libvorbis.la
+ 
+ lspvqtrain_SOURCES = lspdata.c train.c vqgen.c bookutil.c\
+@@ -48,4 +48,4 @@
+       $(MAKE) vq CFLAGS="@PROFILE@"
+ 
+ vq: 
+-      $(MAKE) $(EXTRA_PROGRAMS) 
+\ No newline at end of file
++      $(MAKE) $(EXTRA_PROGRAMS)