Commit 1d051d3b authored by Monty's avatar Monty

Incremental update.  Nearing beta 2, four more new descriptions to go...

Monty

svn path=/branches/monty_branch_20000724/vorbis/; revision=585
parent 18352fb7
This diff is collapsed.
# $Id: configure.in,v 1.18.2.1 2000/08/15 08:32:58 xiphmont Exp $
AC_INIT(lib/mdct.c)
#AC_CONFIG_HEADER(config.h)
cp configure.guess config.guess
cp configure.sub config.sub
AC_CANONICAL_HOST
dnl If we're on IRIX, we wanna use cc even if gcc is there (unless the user
dnl has overriden us)...
case $host in
*-*-irix*)
if test -z "$CC"; then
CC=cc
fi
AC_CHECK_LIB(audio, ALwritesamps)
;;
# BeOS does not use -lm
# *-*-beos)
# LIBS=""
# ;;
# added better check below
esac
if test -z "$CC"; then
AC_PROG_CC
fi
AC_PROG_CPP
AC_PROG_RANLIB
AC_CHECK_PROG(AR,ar,ar)
AC_CHECK_PROG(INSTALL,install,install)
#not everyone uses libm (eg, BeOS)
#AC_CHECK_LIB(m, cos, LIBS="-lm"; AC_DEFINE(HAVE_LIBM), LIBS="")
# We no longer use config.h
AC_CHECK_LIB(m, cos, LIBS="-lm", LIBS="")
dnl Set some target options
if test -z "$GCC"; then
case $host in
*-*-irix*)
DEBUG="-g -signed"
OPT="-O2 -w -signed"
PROFILE="-p -g3 -O2 -signed" ;;
sparc-sun-solaris*)
DEBUG="-v -g"
OPT="-xO4 -fast -w -fsimple -native -xcg92"
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
*)
DEBUG="-g"
OPT="-O"
PROFILE="-g -p" ;;
esac
else
case $host in
*86-*-linux*)
DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
OPT="-O20 -ffast-math -D_REENTRANT -fsigned-char"
PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char"
# 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([ ])
OPT=${OPT}" -D__NO_MATH_INLINES"
PROFILE=${PROFILE}" -D__NO_MATH_INLINES"
fi;;
*-*-linux*)
DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
OPT="-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"
OPT="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
*)
DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
OPT="-O20 -D__NO_MATH_INLINES -fsigned-char"
PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
esac
fi
AC_HEADER_STDC
CFLAGS=""
dnl AC_PATH_X
dnl AC_PATH_XTRA
#AC_CHECK_LIB(pthread, pthread_create,
# pthread_lib="-lpthread"; AC_DEFINE(HAVE_LIBPTHREAD), :)
# We no longer use config.h
AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
#dnl Linuxthreads require you to define _REENTRANT in all threaded
#dnl code. Bogus, bogus...
#
#if test -n "$pthread_lib"; then
# case $host in
# i?86-*-linux*)
# AC_DEFINE(_REENTRANT)
# ;;
# esac
#fi
# We no longer use config.h
#if test -n "$x_libraries"; then
# XOGG="yes"
#
# dnl If we find libgtk installed, great; otherwise assume we have
# dnl to build it ourselves.
#
# AC_CHECK_LIB(gtk, gtk_main, :, LIBGTKDIR="libgtk", $X_LIBS -lglib -lgdk -lX11 -lXext -lm)
#
# dnl libpthread is required for xogg.
#
# if test -z "$pthread_lib"; then XOGG=""; fi
#
# dnl If we don't have libgtk installed, and we don't have a libgtk
# dnl subdirectory to build the library ourself, we can't build xogg.
#
# if test -n "$LIBGTKDIR" -a ! -d "$LIBGTKDIR"; then
# XOGG=""
# LIBGTKDIR=""
# fi
#fi
dnl This seems to be the only way to make autoconf only *sometimes* configure
dnl a subdirectory with AC_CONFIG_SUBDIRS. "__noconf" is assumed to not
dnl exist as a directory, so configure won't try to recursively enter it, unless
dnl the shell variable $dummy is reset to an existing directory inside the
dnl if clause.
dummy="__noconf"
#if test -d "$LIBGTKDIR"; then
# enable_shared="no"; export enable_shared
# dummy="libgtk"
# AC_CONFIG_SUBDIRS("$dummy")
# X_LIBS="-L${srcdir}/libgtk/gtk/.libs -L${srcdir}/libgtk/gdk/.libs -L${srcdir}/libgtk/glib/.libs $X_LIBS"
#fi
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(long long)
case 2 in
$ac_cv_sizeof_short) SIZE16="short";;
$ac_cv_sizeof_int) SIZE16="int";;
esac
case 4 in
$ac_cv_sizeof_short) SIZE32="short";;
$ac_cv_sizeof_int) SIZE32="int";;
$ac_cv_sizeof_long) SIZE32="long";;
esac
case 8 in
$ac_cv_sizeof_int) SIZE64="int";;
$ac_cv_sizeof_long) SIZE64="long";;
$ac_cv_sizeof_long_long) SIZE64="long long";;
esac
if test -z "$SIZE16"; then
AC_MSG_ERROR(No 16 bit type found on this platform!)
fi
if test -z "$SIZE32"; then
AC_MSG_ERROR(No 32 bit type found on this platform!)
fi
if test -z "$SIZE64"; then
AC_MSG_WARN(No 64 bit type found on this platform!)
fi
#AC_CHECK_HEADER(alloca.h,AC_DEFINE(USE_ALLOCA_H),:)
#AC_CHECK_HEADER(memory.h,AC_DEFINE(USE_MEMORY_H),:)
# We no longer use config.h
AC_CHECK_HEADER(alloca.h,CFLAGS="$CFLAGS -DUSE_ALLOCA_H",:)
AC_CHECK_HEADER(memory.h,CFLAGS="$CFLAGS -DUSE_MEMORY_H",:)
AC_C_CONST
AC_HEADER_TIME
AC_STRUCT_TM
AC_PROG_MAKE_SET
AC_FUNC_MEMCMP
AC_TYPE_SIGNAL
AC_CHECK_FUNCS(gettimeofday select strcspn strerror strspn sigaction)
AC_SUBST(SIZE16)
AC_SUBST(SIZE32)
AC_SUBST(SIZE64)
AC_SUBST(OPT)
AC_SUBST(LIBS)
AC_SUBST(DEBUG)
AC_SUBST(PROFILE)
AC_SUBST(CC)
AC_SUBST(RANLIB)
#AC_SUBST(XOGG)
#AC_SUBST(LIBGTKDIR)
AC_SUBST(pthread_lib)
AC_CONFIG_SUBDIRS(vorbis-tools/libao)
AC_OUTPUT(Makefile lib/Makefile examples/Makefile vorbis-tools/Makefile\
vq/Makefile huff/Makefile cmdline/Makefile xmms/Makefile kmpg/Makefile)
Ogg Vorbis for Debian
---------------------
Ogg Vorbis currently does not have a shared library. it is a goal for the
future, but presently, any compiling using the codec should be done as
follows:
gcc [flags] -c X.c
gcc [flags] /usr/lib/vorbisfile.a /usr/lib/libvorbis.a \
X.o -o X
Of course, only include the .a's that are required for your program.
-- Michael Beattie <mickyb@es.co.nz>, Mon, 26 Jun 2000 18:59:56 +1200
Example tools using vorbis.
The examples/ directory contains some example source files to build tools
using the vorbis codec. The Makefile is only included to show how they are
compiled. It contains relative references to the libraries in the source
tree, so it will *not* work without being edited first.
The misc.h included in chaining_example and seeking_test just allows the
use of a debugging malloc. (defined in misc.c) It is safe to comment out.
-- Michael Beattie <mickyb@es.co.nz>, Mon, 26 Jun 2000 18:59:56 +1200
vorbis (1.0beta1-1) unstable; urgency=low
* First Beta, Ready for debian release.
-- Michael Beattie <mickyb@es.co.nz> Fri, 30 Jun 2000 19:26:59 +1200
vorbis (0.0-1) unstable; urgency=low
* Initial Release.
* Initial package, not placed in archive.
-- Michael Beattie <mickyb@es.co.nz> Mon, 26 Jun 2000 18:59:56 +1200
Local variables:
mode: debian-changelog
End:
Source: vorbis
Section: sound
Priority: optional
Maintainer: Michael Beattie <mickyb@es.co.nz>
Standards-Version: 3.0.1
Package: libvorbis-dev
Section: devel
Architecture: any
Description: The OGG Vorbis lossy audio compression codec.
This Package contains the development library's and header files for
Ogg Vorbis.
.
Ogg Vorbis is a fully Open, non-proprietary, patent-and-royalty-free,
general-purpose compressed audio format for high quality (44.1-48.0kHz,
16+ bit, polyphonic) audio and music at fixed and variable bitrates
from 16 to 128 kbps/channel. This places Vorbis in the same class as
audio representations including MPEG-1 audio layer 3, MPEG-4
audio (AAC and TwinVQ), and PAC.
Package: xmms-vorbis
Architecture: i386
Depends: ${shlibs:Depends}, xmms
Description: An xmms plugin to play Ogg Vorbis files.
This Package contains a plugin for xmms to play files encoded using the
Ogg Vorbis lossy audio compression codec.
.
Ogg Vorbis is a fully Open, non-proprietary, patent-and-royalty-free,
general-purpose compressed audio format for high quality (44.1-48.0kHz,
16+ bit, polyphonic) audio and music at fixed and variable bitrates
from 16 to 128 kbps/channel. This places Vorbis in the same class as
audio representations including MPEG-1 audio layer 3, MPEG-4
audio (AAC and TwinVQ), and PAC.
Package: ogg123
Architecture: any
Depends: ${shlibs:Depends}
Description: A player for Ogg Vorbis files.
This Package contains a commandline player for files encoded using the
Ogg Vorbis lossy audio compression codec.
.
Ogg Vorbis is a fully Open, non-proprietary, patent-and-royalty-free,
general-purpose compressed audio format for high quality (44.1-48.0kHz,
16+ bit, polyphonic) audio and music at fixed and variable bitrates
from 16 to 128 kbps/channel. This places Vorbis in the same class as
audio representations including MPEG-1 audio layer 3, MPEG-4
audio (AAC and TwinVQ), and PAC.
Package: vorbize
Architecture: any
Depends: ${shlibs:Depends}
Suggests: ogg123 | xmms-vorbis
Description: An encoder for the Ogg Vorbis lossy audio compression codec.
This Package contains an Ogg Vorbis encoder.
NOTE: Currently vorbis only works with 44kHz, 16bit stereo raw PCM or
wav files. Use sox to coax any other formats into line.
.
Ogg Vorbis is a fully Open, non-proprietary, patent-and-royalty-free,
general-purpose compressed audio format for high quality (44.1-48.0kHz,
16+ bit, polyphonic) audio and music at fixed and variable bitrates
from 16 to 128 kbps/channel. This places Vorbis in the same class as
audio representations including MPEG-1 audio layer 3, MPEG-4
audio (AAC and TwinVQ), and PAC.
Package: mp3tovorbis
Architecture: any
Depends: vorbize, mpg123
Description: An encoder for the Ogg Vorbis lossy audio compression codec.
This Package contains an mp3tovorbis script which you can use to
convert your .mp3 files to .ogg
NOTE: this will only work on 44kHz 16bit stereo mp3's
.
Ogg Vorbis is a fully Open, non-proprietary, patent-and-royalty-free,
general-purpose compressed audio format for high quality (44.1-48.0kHz,
16+ bit, polyphonic) audio and music at fixed and variable bitrates
from 16 to 128 kbps/channel. This places Vorbis in the same class as
audio representations including MPEG-1 audio layer 3, MPEG-4
audio (AAC and TwinVQ), and PAC.
This package was debianized by Michael Beattie <mickyb@es.co.nz> on
Mon, 26 Jun 2000 18:59:56 +1200.
It was downloaded from http://www.xiph.org/ogg/vorbis/ (via CVS)
Upstream Author(s): Monty <monty@xiph.org>
Copyright:
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 dated June, 1991.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston,
MA 02111-1307, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in /usr/share/common-licenses/GPL'.
usr/lib
usr/include/vorbis/book
usr/share/doc/libvorbis-dev/html
README
todo.txt
debian/README.examples
examples/Makefile
examples/chaining_example.c
examples/decoder_example.c
examples/encoder_example.c
examples/seeking_test.c
examples/vorbisfile_example.c
vorbis-tools/README
\ No newline at end of file
vorbis-tools/README
xmms-vorbis: shlib-with-non-pic-code
#!/usr/bin/make -f
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 by Joey Hess.
# Modified for Ogg Vorbis, 2000 by Michael Beattie
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
# This is the debhelper compatability version to use.
export DH_COMPAT=1
# This has to be exported to make some magic below work.
export DH_OPTIONS
build: build-stamp
build-stamp:
dh_testdir
./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
# Add here commands to compile the package.
$(MAKE)
cd vorbis-tools && $(MAKE) && $(MAKE) ogg123
cd xmms && $(MAKE)
touch build-stamp
EXTRA_CLEAN= vorbis-tools cmdline xmms vq huff kmpg
clean:
dh_testdir
dh_testroot
rm -f build-stamp
# Add here commands to clean up after the build process.
-$(MAKE) distclean
-@for dir in $(EXTRA_CLEAN); do (cd $$dir && $(MAKE) $(MFLAGS) distclean) || exit 1; done
dh_clean
# Build architecture-independent files here.
binary-arch: libvorbis-dev ogg123 vorbize xmms-vorbis mp3tovorbis
libvorbis-dev: DH_OPTIONS=-plibvorbis-dev
libvorbis-dev: build
# Need this version of debhelper for DH_OPTIONS to work.
dh_testversion 1.1.17
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
-cp -a include/vorbis/*.h `pwd`/debian/tmp/usr/include/vorbis/
-cp -a include/vorbis/book/*.vqh `pwd`/debian/tmp/usr/include/vorbis/book/
-cp lib/*.a `pwd`/debian/tmp/usr/lib/
-cp docs/*.html docs/*.png `pwd`/debian/tmp/usr/share/doc/libvorbis-dev/html/
dh_installdocs
dh_installexamples
dh_installmanpages
# dh_installinfo
# dh_undocumented
dh_installchangelogs
dh_strip
dh_link
dh_compress
dh_fixperms
dh_installdeb
# dh_makeshlibs
# dh_shlibdeps
dh_gencontrol -u -isp
dh_md5sums
dh_builddeb
ogg123: DH_OPTIONS=-pogg123
ogg123: build
# Need this version of debhelper for DH_OPTIONS to work.
dh_testversion 1.1.17
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
install -m 755 vorbis-tools/ogg123 `pwd`/debian/ogg123/usr/bin/
dh_installdocs
# dh_installmenu
dh_installmanpages
# dh_installinfo
dh_undocumented ogg123.1
dh_installchangelogs vorbis-tools/Changelog
dh_strip
dh_link
dh_compress
dh_fixperms
dh_installdeb
# dh_makeshlibs
dh_shlibdeps
dh_gencontrol -u -isp
dh_md5sums
dh_builddeb
vorbize: DH_OPTIONS=-pvorbize
vorbize: build
# Need this version of debhelper for DH_OPTIONS to work.
dh_testversion 1.1.17
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
install -m 755 vorbis-tools/vorbize `pwd`/debian/vorbize/usr/bin/
dh_installdocs
# dh_installmenu
dh_installmanpages
# dh_installinfo
dh_undocumented vorbize.1
dh_installchangelogs vorbis-tools/Changelog
dh_strip
dh_link
dh_compress
dh_fixperms
dh_installdeb
# dh_makeshlibs
dh_shlibdeps
dh_gencontrol -u -isp
dh_md5sums
dh_builddeb
mp3tovorbis: DH_OPTIONS=-pmp3tovorbis
mp3tovorbis: build
# Need this version of debhelper for DH_OPTIONS to work.
dh_testversion 1.1.17
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
install -m 755 vorbis-tools/mp3tovorbis `pwd`/debian/mp3tovorbis/usr/bin/
dh_installdocs
# dh_installmenu
dh_installmanpages
# dh_installinfo
dh_undocumented mp3tovorbis.1
dh_installchangelogs vorbis-tools/Changelog
dh_strip
dh_link
dh_compress
dh_fixperms
dh_installdeb
# dh_makeshlibs
# dh_shlibdeps
dh_gencontrol -u -isp
dh_md5sums
dh_builddeb
xmms-vorbis: DH_OPTIONS=-pxmms-vorbis
xmms-vorbis: build install
# Need this version of debhelper for DH_OPTIONS to work.
dh_testversion 1.1.17
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
install -m 644 xmms/libvorbis.so `pwd`/debian/xmms-vorbis/usr/lib/xmms/Input/
dh_installdocs
dh_installchangelogs
dh_strip
dh_link
dh_compress
dh_fixperms
dh_installdeb
#
dh_shlibdeps
dh_gencontrol -u -isp
dh_md5sums
dh_builddeb
# Build architecture-dependent files here.
binary-indep:
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
vorbis-tools/README
\ No newline at end of file
usr/lib/xmms/Input
xmms/README
debian/override.Lintian