Update to 1.1.0:

* merges tuning improvements from Aoyumi's aoTuV with fixups
 * new managed bitrate (CBR) mode support
 * new vorbis_encoder_ctl() interface
 * extensive documentation updates
 * application/ogg mimetype is now official
 * autotools cleanup from Thomas Vander Stichele
 * various bugfixes
This commit is contained in:
naddy 2004-09-30 19:39:56 +00:00
parent 66f392d6a5
commit cde616426d
9 changed files with 68 additions and 89 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2003/12/14 00:52:22 naddy Exp $
# $OpenBSD: Makefile,v 1.14 2004/09/30 19:39:56 naddy Exp $
COMMENT= "audio compression codec library"
DISTNAME= libvorbis-1.0.1
DISTNAME= libvorbis-1.1.0
CATEGORIES= audio
HOMEPAGE= http://www.xiph.org/ogg/vorbis/
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.vorbis.com/files/1.0.1/unix/
MASTER_SITES= http://downloads.xiph.org/releases/vorbis/
LIB_DEPENDS= ogg.5::audio/libogg

View File

@ -1,3 +1,3 @@
MD5 (libvorbis-1.0.1.tar.gz) = 4d6726fd02ce02f6e24824e594b0949a
RMD160 (libvorbis-1.0.1.tar.gz) = 2015bfb9631076862e577e1cab0a8ca20f88780e
SHA1 (libvorbis-1.0.1.tar.gz) = 49fcf94c51ee2652d19a03377918196bb7e1ce5f
MD5 (libvorbis-1.1.0.tar.gz) = bb764aeabde613d1a424a29b1f15e7e6
RMD160 (libvorbis-1.1.0.tar.gz) = 8819812ee657af556ff9f8f8e7aad35f069c9126
SHA1 (libvorbis-1.1.0.tar.gz) = 52fd3cb3e3876cb890bd8d8867db52663a847418

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.3 2003/12/14 00:52:22 naddy Exp $
--- Makefile.in.orig 2003-11-17 19:44:16.000000000 +0100
+++ Makefile.in 2003-12-13 21:10:02.000000000 +0100
@@ -106,7 +106,7 @@ pthread_lib = @pthread_lib@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = lib include doc examples win32 debian vq
+SUBDIRS = lib include doc
m4datadir = $(datadir)/aclocal
m4data_DATA = vorbis.m4

View File

@ -1,16 +1,7 @@
$OpenBSD: patch-configure,v 1.6 2003/12/14 00:52:22 naddy Exp $
--- configure.orig 2003-11-17 19:12:03.000000000 +0100
+++ configure 2003-12-13 23:17:22.000000000 +0100
@@ -6873,7 +6873,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
openbsd*)
- hardcode_direct=yes
+ hardcode_direct=no
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
@@ -18792,7 +18792,7 @@ if test -z "$GCC"; then
$OpenBSD: patch-configure,v 1.7 2004/09/30 19:39:56 naddy Exp $
--- configure.orig Tue Sep 21 01:22:05 2004
+++ configure Thu Sep 23 20:23:14 2004
@@ -19245,7 +19245,7 @@ if test -z "$GCC"; then
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
*)
DEBUG="-g"
@ -19,7 +10,7 @@ $OpenBSD: patch-configure,v 1.6 2003/12/14 00:52:22 naddy Exp $
PROFILE="-g -p" ;;
esac
else
@@ -18905,9 +18905,9 @@ echo "$as_me: WARNING:
@@ -19358,9 +19358,9 @@ echo "$as_me: WARNING:
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";;
*)

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_Makefile_in,v 1.4 2003/12/14 00:52:22 naddy Exp $
--- doc/Makefile.in.orig 2003-11-17 19:44:21.000000000 +0100
+++ doc/Makefile.in 2003-11-21 13:40:57.000000000 +0100
@@ -108,7 +108,7 @@ AUTOMAKE_OPTIONS = foreign
$OpenBSD: patch-doc_Makefile_in,v 1.5 2004/09/30 19:39:56 naddy Exp $
--- doc/Makefile.in.orig Thu Sep 23 20:23:40 2004
+++ doc/Makefile.in Thu Sep 23 20:24:39 2004
@@ -184,7 +184,7 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
SUBDIRS = vorbisfile vorbisenc
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
static_docs = components.png draft-kerr-avt-vorbis-rtp-02.txt eightphase.png evenlsp.png floor1-1.png floor1-2.png floor1-3.png floor1-4.png floor1_inverse_dB_table.html floorval.png fourphase.png framing.html helper.html hufftree-under.png hufftree.png index.html lspmap.png oddlsp.png oggstream.html programming.html residue-pack.png residue2.png squarepolar.png stereo.html stream.png v-comment.html vorbis-clip.txt vorbis-errors.txt vorbis-fidelity.html vorbis.html vorbisword2.png wait.png white-ogg.png white-xifish.png window1.png window2.png
### all of the static docs, commited to SVN and included as is
static_docs = \

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_vorbisenc_Makefile_in,v 1.3 2003/12/14 00:52:22 naddy Exp $
--- doc/vorbisenc/Makefile.in.orig 2003-11-17 19:44:22.000000000 +0100
+++ doc/vorbisenc/Makefile.in 2003-11-21 13:40:57.000000000 +0100
@@ -106,7 +106,7 @@ pthread_lib = @pthread_lib@
AUTOMAKE_OPTIONS = foreign
$OpenBSD: patch-doc_vorbisenc_Makefile_in,v 1.4 2004/09/30 19:39:56 naddy Exp $
--- doc/vorbisenc/Makefile.in.orig Thu Sep 23 20:25:03 2004
+++ doc/vorbisenc/Makefile.in Thu Sep 23 20:25:28 2004
@@ -174,7 +174,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
+docdir = $(datadir)/doc/$(PACKAGE)/vorbisenc
doc_DATA = index.html overview.html reference.html style.css vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html vorbis_encode_init_vbr.html
doc_DATA = index.html overview.html reference.html style.css\
vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html\
vorbis_encode_init_vbr.html

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_vorbisfile_Makefile_in,v 1.3 2003/12/14 00:52:22 naddy Exp $
--- doc/vorbisfile/Makefile.in.orig 2003-11-17 19:44:21.000000000 +0100
+++ doc/vorbisfile/Makefile.in 2003-11-21 13:40:57.000000000 +0100
@@ -106,7 +106,7 @@ pthread_lib = @pthread_lib@
AUTOMAKE_OPTIONS = foreign
$OpenBSD: patch-doc_vorbisfile_Makefile_in,v 1.4 2004/09/30 19:39:57 naddy Exp $
--- doc/vorbisfile/Makefile.in.orig Thu Sep 23 20:25:10 2004
+++ doc/vorbisfile/Makefile.in Thu Sep 23 20:25:35 2004
@@ -174,7 +174,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
+docdir = $(datadir)/doc/$(PACKAGE)/vorbisfile
doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html chainingexample.html crosslap.html datastructures.html decoding.html example.html exampleindex.html fileinfo.html index.html initialization.html ov_bitrate.html ov_bitrate_instant.html ov_callbacks.html ov_clear.html ov_comment.html ov_crosslap.html ov_info.html ov_open.html ov_open_callbacks.html ov_pcm_seek.html ov_pcm_seek_lap.html ov_pcm_seek_page.html ov_pcm_seek_page_lap.html ov_pcm_tell.html ov_pcm_total.html ov_raw_seek.html ov_raw_seek_lap.html ov_raw_tell.html ov_raw_total.html ov_read.html ov_read_float.html ov_seekable.html ov_serialnumber.html ov_streams.html ov_test.html ov_test_callbacks.html ov_test_open.html ov_time_seek.html ov_time_seek_lap.html ov_time_seek_page.html ov_time_seek_page_lap.html ov_time_tell.html ov_time_total.html overview.html reference.html return.html seekexample.html seeking.html seeking_example_c.html seeking_test_c.html seekingexample.html style.css threads.html vorbis_comment.html vorbis_info.html vorbisfile_example_c.html
doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\
chainingexample.html crosslap.html datastructures.html decoding.html\
example.html exampleindex.html fileinfo.html index.html\

View File

@ -1,43 +1,43 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2004/01/25 17:20:18 naddy Exp $
--- lib/Makefile.in.orig 2003-11-17 19:44:17.000000000 +0100
+++ lib/Makefile.in 2004-01-25 16:28:41.000000000 +0100
@@ -75,7 +75,7 @@ GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
HAVE_LIB = @HAVE_LIB@
LIB = @LIB@
$OpenBSD: patch-lib_Makefile_in,v 1.2 2004/09/30 19:39:57 naddy Exp $
--- lib/Makefile.in.orig Thu Sep 23 21:36:43 2004
+++ lib/Makefile.in Thu Sep 23 21:40:02 2004
@@ -57,10 +57,10 @@ am_libvorbis_la_OBJECTS = mdct.lo smallf
info.lo floor1.lo floor0.lo res0.lo mapping0.lo registry.lo \
codebook.lo sharedbook.lo lookup.lo bitrate.lo
libvorbis_la_OBJECTS = $(am_libvorbis_la_OBJECTS)
-libvorbisenc_la_DEPENDENCIES = libvorbis.la
+libvorbisenc_la_DEPENDENCIES =
am_libvorbisenc_la_OBJECTS = vorbisenc.lo
libvorbisenc_la_OBJECTS = $(am_libvorbisenc_la_OBJECTS)
-libvorbisfile_la_DEPENDENCIES = libvorbis.la
+libvorbisfile_la_DEPENDENCIES =
am_libvorbisfile_la_OBJECTS = vorbisfile.lo
libvorbisfile_la_OBJECTS = $(am_libvorbisfile_la_OBJECTS)
am_barkmel_OBJECTS = barkmel.$(OBJEXT)
@@ -152,7 +152,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS =
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIB = @LTLIB@
@@ -114,15 +114,13 @@ lib_LTLIBRARIES = libvorbis.la libvorbis
libvorbis_la_SOURCES = mdct.c smallft.c block.c envelope.c window.c lsp.c lpc.c analysis.c synthesis.c psy.c info.c floor1.c floor0.c res0.c mapping0.c registry.c codebook.c sharedbook.c lookup.c bitrate.c envelope.h lpc.h lsp.h codebook.h misc.h psy.h masking.h os.h mdct.h smallft.h highlevel.h registry.h scales.h window.h lookup.h lookup_data.h codec_internal.h backends.h bitrate.h
LTLIBOBJS = @LTLIBOBJS@
@@ -248,14 +248,12 @@ libvorbis_la_SOURCES = mdct.c smallft.c
registry.h scales.h window.h lookup.h lookup_data.h\
codec_internal.h backends.h bitrate.h
-libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
+libvorbis_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
libvorbis_la_LIBADD = @OGG_LIBS@ @VORBIS_LIBS@
libvorbisfile_la_SOURCES = vorbisfile.c
-libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
-libvorbisfile_la_LIBADD = libvorbis.la
+libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
libvorbisenc_la_SOURCES = vorbisenc.c
-libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
-libvorbisenc_la_LIBADD = libvorbis.la
+libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
EXTRA_PROGRAMS = barkmel tone psytune
CLEANFILES = $(EXTRA_PROGRAMS)
@@ -147,9 +145,9 @@ libvorbis_la_OBJECTS = mdct.lo smallft.
window.lo lsp.lo lpc.lo analysis.lo synthesis.lo psy.lo info.lo \
floor1.lo floor0.lo res0.lo mapping0.lo registry.lo codebook.lo \
sharedbook.lo lookup.lo bitrate.lo
-libvorbisfile_la_DEPENDENCIES = libvorbis.la
+libvorbisfile_la_LIBADD =
libvorbisfile_la_OBJECTS = vorbisfile.lo
-libvorbisenc_la_DEPENDENCIES = libvorbis.la
+libvorbisenc_la_LIBADD =
libvorbisenc_la_OBJECTS = vorbisenc.lo
barkmel_OBJECTS = barkmel.$(OBJEXT)
barkmel_LDADD = $(LDADD)
barkmel_SOURCES = barkmel.c
tone_SOURCES = tone.c

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2004/08/06 14:37:27 espie Exp $
@comment $OpenBSD: PLIST,v 1.6 2004/09/30 19:39:57 naddy Exp $
include/vorbis/
include/vorbis/codec.h
include/vorbis/vorbisenc.h
@ -17,7 +17,7 @@ share/aclocal/
share/aclocal/vorbis.m4
share/doc/libvorbis/
share/doc/libvorbis/components.png
share/doc/libvorbis/draft-kerr-avt-vorbis-rtp-02.txt
share/doc/libvorbis/draft-kerr-avt-vorbis-rtp-03.txt
share/doc/libvorbis/eightphase.png
share/doc/libvorbis/evenlsp.png
share/doc/libvorbis/floor1-1.png