From 85208d904b985ba03a0f47ec5db600ee9b8ce57f Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 8 Dec 2003 14:39:39 +0000 Subject: Update to 1.0.1: * Corrects errors in the Vorbis specification documentation. * Specification converted to DocBook format. * Added timebase conversion call to libvorbis. * Fixes ov_time_tell() bug for non-seekable streams. * Various decoding fixes. * Addition of ov_crosslap() which allows smooth transitions between two vorbis segments. * Numerous seeking fixes and optimizations. * Fixed bugs affecting decode of one-audio-page samples. * Added ov_halfrate() which allows a "free" conversion from the source sample rate to half of the source rate. * Improved handling of quiet signals in low bitrate modes --- audio/libvorbis/Makefile | 11 +- audio/libvorbis/PLIST | 218 ++++++++++++++++++++------------------- audio/libvorbis/buildlink2.mk | 4 +- audio/libvorbis/distinfo | 12 +-- audio/libvorbis/patches/patch-ae | 8 +- audio/libvorbis/patches/patch-af | 6 +- audio/libvorbis/patches/patch-ag | 8 +- 7 files changed, 138 insertions(+), 129 deletions(-) (limited to 'audio/libvorbis') diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index f7986ea24cc..50ceceb9b4c 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2003/09/25 13:00:18 grant Exp $ +# $NetBSD: Makefile,v 1.27 2003/12/08 14:39:39 wiz Exp $ -DISTNAME= libvorbis-1.0 -PKGNAME= libvorbis-1.0.0.8 +DISTNAME= libvorbis-1.0.1 CATEGORIES= devel audio -MASTER_SITES= http://www.vorbis.com/files/1.0/unix/ +MASTER_SITES= http://www.vorbis.com/files/1.0.1/unix/ MAINTAINER= lukem@NetBSD.org HOMEPAGE= http://www.xiph.org/ogg/vorbis/ @@ -16,7 +15,9 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GCC_REQD= 2.95.3 -PLIST_SUBST+= DISTNAME=${DISTNAME} +PKGCONFIG_OVERRIDE+= ${WRKSRC}/vorbis.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/vorbisenc.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/vorbisfile.pc.in .include "../../audio/libogg/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libvorbis/PLIST b/audio/libvorbis/PLIST index 69fa3f4342e..3c245fd0046 100644 --- a/audio/libvorbis/PLIST +++ b/audio/libvorbis/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:16 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2003/12/08 14:39:39 wiz Exp $ include/vorbis/codec.h include/vorbis/vorbisenc.h include/vorbis/vorbisfile.h lib/libvorbis.a lib/libvorbis.la lib/libvorbis.so -lib/libvorbis.so.2 -lib/libvorbis.so.2.0 +lib/libvorbis.so.3 +lib/libvorbis.so.3.0 lib/libvorbisenc.a lib/libvorbisenc.la lib/libvorbisenc.so @@ -15,107 +15,115 @@ lib/libvorbisenc.so.2.0 lib/libvorbisfile.a lib/libvorbisfile.la lib/libvorbisfile.so -lib/libvorbisfile.so.3 -lib/libvorbisfile.so.3.0 +lib/libvorbisfile.so.4 +lib/libvorbisfile.so.4.0 +lib/pkgconfig/vorbis.pc +lib/pkgconfig/vorbisenc.pc +lib/pkgconfig/vorbisfile.pc share/aclocal/vorbis.m4 -share/doc/html/${DISTNAME}/components.png -share/doc/html/${DISTNAME}/draft-moffitt-vorbis-rtp-00.txt -share/doc/html/${DISTNAME}/eightphase.png -share/doc/html/${DISTNAME}/evenlsp.png -share/doc/html/${DISTNAME}/floor1-1.png -share/doc/html/${DISTNAME}/floor1-2.png -share/doc/html/${DISTNAME}/floor1-3.png -share/doc/html/${DISTNAME}/floor1-4.png -share/doc/html/${DISTNAME}/floor1_inverse_dB_table.html -share/doc/html/${DISTNAME}/floorval.png -share/doc/html/${DISTNAME}/fourphase.png -share/doc/html/${DISTNAME}/framing.html -share/doc/html/${DISTNAME}/helper.html -share/doc/html/${DISTNAME}/hufftree-under.png -share/doc/html/${DISTNAME}/hufftree.png -share/doc/html/${DISTNAME}/index.html -share/doc/html/${DISTNAME}/lspmap.png -share/doc/html/${DISTNAME}/oddlsp.png -share/doc/html/${DISTNAME}/oggstream.html -share/doc/html/${DISTNAME}/programming.html -share/doc/html/${DISTNAME}/residue-pack.png -share/doc/html/${DISTNAME}/residue2.png -share/doc/html/${DISTNAME}/squarepolar.png -share/doc/html/${DISTNAME}/stereo.html -share/doc/html/${DISTNAME}/stream.png -share/doc/html/${DISTNAME}/v-comment.html -share/doc/html/${DISTNAME}/vorbis-clip.txt -share/doc/html/${DISTNAME}/vorbis-errors.txt -share/doc/html/${DISTNAME}/vorbis-fidelity.html -share/doc/html/${DISTNAME}/vorbis-ogg.html -share/doc/html/${DISTNAME}/vorbis-spec-bitpack.html -share/doc/html/${DISTNAME}/vorbis-spec-codebook.html -share/doc/html/${DISTNAME}/vorbis-spec-floor0.html -share/doc/html/${DISTNAME}/vorbis-spec-floor1.html -share/doc/html/${DISTNAME}/vorbis-spec-intro.html -share/doc/html/${DISTNAME}/vorbis-spec-ref.html -share/doc/html/${DISTNAME}/vorbis-spec-res.html -share/doc/html/${DISTNAME}/vorbis.html -share/doc/html/${DISTNAME}/vorbisenc/index.html -share/doc/html/${DISTNAME}/vorbisenc/overview.html -share/doc/html/${DISTNAME}/vorbisenc/reference.html -share/doc/html/${DISTNAME}/vorbisenc/style.css -share/doc/html/${DISTNAME}/vorbisenc/vorbis_encode_ctl.html -share/doc/html/${DISTNAME}/vorbisenc/vorbis_encode_init.html -share/doc/html/${DISTNAME}/vorbisenc/vorbis_encode_init_vbr.html -share/doc/html/${DISTNAME}/vorbisenc/vorbis_info.html -share/doc/html/${DISTNAME}/vorbisfile/OggVorbis_File.html -share/doc/html/${DISTNAME}/vorbisfile/chaining_example_c.html -share/doc/html/${DISTNAME}/vorbisfile/chainingexample.html -share/doc/html/${DISTNAME}/vorbisfile/datastructures.html -share/doc/html/${DISTNAME}/vorbisfile/decoding.html -share/doc/html/${DISTNAME}/vorbisfile/example.html -share/doc/html/${DISTNAME}/vorbisfile/exampleindex.html -share/doc/html/${DISTNAME}/vorbisfile/fileinfo.html -share/doc/html/${DISTNAME}/vorbisfile/index.html -share/doc/html/${DISTNAME}/vorbisfile/initialization.html -share/doc/html/${DISTNAME}/vorbisfile/ov_bitrate.html -share/doc/html/${DISTNAME}/vorbisfile/ov_bitrate_instant.html -share/doc/html/${DISTNAME}/vorbisfile/ov_callbacks.html -share/doc/html/${DISTNAME}/vorbisfile/ov_clear.html -share/doc/html/${DISTNAME}/vorbisfile/ov_comment.html -share/doc/html/${DISTNAME}/vorbisfile/ov_info.html -share/doc/html/${DISTNAME}/vorbisfile/ov_open.html -share/doc/html/${DISTNAME}/vorbisfile/ov_open_callbacks.html -share/doc/html/${DISTNAME}/vorbisfile/ov_pcm_seek.html -share/doc/html/${DISTNAME}/vorbisfile/ov_pcm_tell.html -share/doc/html/${DISTNAME}/vorbisfile/ov_pcm_total.html -share/doc/html/${DISTNAME}/vorbisfile/ov_raw_seek.html -share/doc/html/${DISTNAME}/vorbisfile/ov_raw_tell.html -share/doc/html/${DISTNAME}/vorbisfile/ov_raw_total.html -share/doc/html/${DISTNAME}/vorbisfile/ov_read.html -share/doc/html/${DISTNAME}/vorbisfile/ov_read_float.html -share/doc/html/${DISTNAME}/vorbisfile/ov_seekable.html -share/doc/html/${DISTNAME}/vorbisfile/ov_serialnumber.html -share/doc/html/${DISTNAME}/vorbisfile/ov_streams.html -share/doc/html/${DISTNAME}/vorbisfile/ov_test.html -share/doc/html/${DISTNAME}/vorbisfile/ov_test_callbacks.html -share/doc/html/${DISTNAME}/vorbisfile/ov_test_open.html -share/doc/html/${DISTNAME}/vorbisfile/ov_time_seek.html -share/doc/html/${DISTNAME}/vorbisfile/ov_time_tell.html -share/doc/html/${DISTNAME}/vorbisfile/ov_time_total.html -share/doc/html/${DISTNAME}/vorbisfile/overview.html -share/doc/html/${DISTNAME}/vorbisfile/reference.html -share/doc/html/${DISTNAME}/vorbisfile/seekexample.html -share/doc/html/${DISTNAME}/vorbisfile/seeking.html -share/doc/html/${DISTNAME}/vorbisfile/seeking_test_c.html -share/doc/html/${DISTNAME}/vorbisfile/seekingexample.html -share/doc/html/${DISTNAME}/vorbisfile/style.css -share/doc/html/${DISTNAME}/vorbisfile/vorbis_comment.html -share/doc/html/${DISTNAME}/vorbisfile/vorbis_info.html -share/doc/html/${DISTNAME}/vorbisfile/vorbisfile_example_c.html -share/doc/html/${DISTNAME}/vorbisword2.png -share/doc/html/${DISTNAME}/wait.png -share/doc/html/${DISTNAME}/white-ogg.png -share/doc/html/${DISTNAME}/white-xifish.png -share/doc/html/${DISTNAME}/window1.png -share/doc/html/${DISTNAME}/window2.png -@dirrm share/doc/html/${DISTNAME}/vorbisfile -@dirrm share/doc/html/${DISTNAME}/vorbisenc -@dirrm share/doc/html/${DISTNAME} +share/doc/html/${PKGNAME}/components.png +share/doc/html/${PKGNAME}/draft-kerr-avt-vorbis-rtp-02.txt +share/doc/html/${PKGNAME}/eightphase.png +share/doc/html/${PKGNAME}/evenlsp.png +share/doc/html/${PKGNAME}/floor1-1.png +share/doc/html/${PKGNAME}/floor1-2.png +share/doc/html/${PKGNAME}/floor1-3.png +share/doc/html/${PKGNAME}/floor1-4.png +share/doc/html/${PKGNAME}/floor1_inverse_dB_table.html +share/doc/html/${PKGNAME}/floorval.png +share/doc/html/${PKGNAME}/fourphase.png +share/doc/html/${PKGNAME}/framing.html +share/doc/html/${PKGNAME}/helper.html +share/doc/html/${PKGNAME}/hufftree-under.png +share/doc/html/${PKGNAME}/hufftree.png +share/doc/html/${PKGNAME}/index.html +share/doc/html/${PKGNAME}/lspmap.png +share/doc/html/${PKGNAME}/oddlsp.png +share/doc/html/${PKGNAME}/oggstream.html +share/doc/html/${PKGNAME}/programming.html +share/doc/html/${PKGNAME}/residue-pack.png +share/doc/html/${PKGNAME}/residue2.png +share/doc/html/${PKGNAME}/squarepolar.png +share/doc/html/${PKGNAME}/stereo.html +share/doc/html/${PKGNAME}/stream.png +share/doc/html/${PKGNAME}/v-comment.html +share/doc/html/${PKGNAME}/vorbis-clip.txt +share/doc/html/${PKGNAME}/vorbis-errors.txt +share/doc/html/${PKGNAME}/vorbis-fidelity.html +share/doc/html/${PKGNAME}/vorbis.html +share/doc/html/${PKGNAME}/vorbisenc/index.html +share/doc/html/${PKGNAME}/vorbisenc/overview.html +share/doc/html/${PKGNAME}/vorbisenc/reference.html +share/doc/html/${PKGNAME}/vorbisenc/style.css +share/doc/html/${PKGNAME}/vorbisenc/vorbis_encode_ctl.html +share/doc/html/${PKGNAME}/vorbisenc/vorbis_encode_init.html +share/doc/html/${PKGNAME}/vorbisenc/vorbis_encode_init_vbr.html +share/doc/html/${PKGNAME}/vorbisenc/vorbis_info.html +share/doc/html/${PKGNAME}/vorbisfile/OggVorbis_File.html +share/doc/html/${PKGNAME}/vorbisfile/callbacks.html +share/doc/html/${PKGNAME}/vorbisfile/chaining_example_c.html +share/doc/html/${PKGNAME}/vorbisfile/chainingexample.html +share/doc/html/${PKGNAME}/vorbisfile/crosslap.html +share/doc/html/${PKGNAME}/vorbisfile/datastructures.html +share/doc/html/${PKGNAME}/vorbisfile/decoding.html +share/doc/html/${PKGNAME}/vorbisfile/example.html +share/doc/html/${PKGNAME}/vorbisfile/exampleindex.html +share/doc/html/${PKGNAME}/vorbisfile/fileinfo.html +share/doc/html/${PKGNAME}/vorbisfile/index.html +share/doc/html/${PKGNAME}/vorbisfile/initialization.html +share/doc/html/${PKGNAME}/vorbisfile/ov_bitrate.html +share/doc/html/${PKGNAME}/vorbisfile/ov_bitrate_instant.html +share/doc/html/${PKGNAME}/vorbisfile/ov_callbacks.html +share/doc/html/${PKGNAME}/vorbisfile/ov_clear.html +share/doc/html/${PKGNAME}/vorbisfile/ov_comment.html +share/doc/html/${PKGNAME}/vorbisfile/ov_crosslap.html +share/doc/html/${PKGNAME}/vorbisfile/ov_info.html +share/doc/html/${PKGNAME}/vorbisfile/ov_open.html +share/doc/html/${PKGNAME}/vorbisfile/ov_open_callbacks.html +share/doc/html/${PKGNAME}/vorbisfile/ov_pcm_seek.html +share/doc/html/${PKGNAME}/vorbisfile/ov_pcm_seek_lap.html +share/doc/html/${PKGNAME}/vorbisfile/ov_pcm_seek_page.html +share/doc/html/${PKGNAME}/vorbisfile/ov_pcm_seek_page_lap.html +share/doc/html/${PKGNAME}/vorbisfile/ov_pcm_tell.html +share/doc/html/${PKGNAME}/vorbisfile/ov_pcm_total.html +share/doc/html/${PKGNAME}/vorbisfile/ov_raw_seek.html +share/doc/html/${PKGNAME}/vorbisfile/ov_raw_seek_lap.html +share/doc/html/${PKGNAME}/vorbisfile/ov_raw_tell.html +share/doc/html/${PKGNAME}/vorbisfile/ov_raw_total.html +share/doc/html/${PKGNAME}/vorbisfile/ov_read.html +share/doc/html/${PKGNAME}/vorbisfile/ov_read_float.html +share/doc/html/${PKGNAME}/vorbisfile/ov_seekable.html +share/doc/html/${PKGNAME}/vorbisfile/ov_serialnumber.html +share/doc/html/${PKGNAME}/vorbisfile/ov_streams.html +share/doc/html/${PKGNAME}/vorbisfile/ov_test.html +share/doc/html/${PKGNAME}/vorbisfile/ov_test_callbacks.html +share/doc/html/${PKGNAME}/vorbisfile/ov_test_open.html +share/doc/html/${PKGNAME}/vorbisfile/ov_time_seek.html +share/doc/html/${PKGNAME}/vorbisfile/ov_time_seek_lap.html +share/doc/html/${PKGNAME}/vorbisfile/ov_time_seek_page.html +share/doc/html/${PKGNAME}/vorbisfile/ov_time_seek_page_lap.html +share/doc/html/${PKGNAME}/vorbisfile/ov_time_tell.html +share/doc/html/${PKGNAME}/vorbisfile/ov_time_total.html +share/doc/html/${PKGNAME}/vorbisfile/overview.html +share/doc/html/${PKGNAME}/vorbisfile/reference.html +share/doc/html/${PKGNAME}/vorbisfile/return.html +share/doc/html/${PKGNAME}/vorbisfile/seekexample.html +share/doc/html/${PKGNAME}/vorbisfile/seeking.html +share/doc/html/${PKGNAME}/vorbisfile/seeking_example_c.html +share/doc/html/${PKGNAME}/vorbisfile/seeking_test_c.html +share/doc/html/${PKGNAME}/vorbisfile/seekingexample.html +share/doc/html/${PKGNAME}/vorbisfile/style.css +share/doc/html/${PKGNAME}/vorbisfile/threads.html +share/doc/html/${PKGNAME}/vorbisfile/vorbis_comment.html +share/doc/html/${PKGNAME}/vorbisfile/vorbis_info.html +share/doc/html/${PKGNAME}/vorbisfile/vorbisfile_example_c.html +share/doc/html/${PKGNAME}/vorbisword2.png +share/doc/html/${PKGNAME}/wait.png +share/doc/html/${PKGNAME}/white-ogg.png +share/doc/html/${PKGNAME}/white-xifish.png +share/doc/html/${PKGNAME}/window1.png +share/doc/html/${PKGNAME}/window2.png +@dirrm share/doc/html/${PKGNAME}/vorbisfile +@dirrm share/doc/html/${PKGNAME}/vorbisenc +@dirrm share/doc/html/${PKGNAME} @dirrm include/vorbis diff --git a/audio/libvorbis/buildlink2.mk b/audio/libvorbis/buildlink2.mk index 66da4cfcfa7..ee4d96043dd 100644 --- a/audio/libvorbis/buildlink2.mk +++ b/audio/libvorbis/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:17 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/12/08 14:39:40 wiz Exp $ .if !defined(LIBVORBIS_BUILDLINK2_MK) LIBVORBIS_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= libvorbis -BUILDLINK_DEPENDS.libvorbis?= libvorbis>=1.0.0.8 +BUILDLINK_DEPENDS.libvorbis?= libvorbis>=1.0.1 BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis EVAL_PREFIX+= BUILDLINK_PREFIX.libvorbis=libvorbis diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo index 73fe88e99af..9d6ba8df95f 100644 --- a/audio/libvorbis/distinfo +++ b/audio/libvorbis/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2002/08/25 18:38:17 jlam Exp $ +$NetBSD: distinfo,v 1.9 2003/12/08 14:39:40 wiz Exp $ -SHA1 (libvorbis-1.0.tar.gz) = 2b414cb4cf7d022d39b7be7049f2c84a287a4fc7 -Size (libvorbis-1.0.tar.gz) = 749064 bytes -SHA1 (patch-ae) = 84979200c46ab2ca801ee43f1cedf9a76fa08219 -SHA1 (patch-af) = 3218bb39d12d542f5ccfe9d4e23ec6f0e627c1d4 -SHA1 (patch-ag) = e2aedef7eba5f7d8146dcaa0bbe0c8ce50cd09f7 +SHA1 (libvorbis-1.0.1.tar.gz) = 49fcf94c51ee2652d19a03377918196bb7e1ce5f +Size (libvorbis-1.0.1.tar.gz) = 1218076 bytes +SHA1 (patch-ae) = fef2e93ca3a72101f04a74a1ec9707466c1f208d +SHA1 (patch-af) = 466332dc09f496909faf719f76ac46236d5c32ce +SHA1 (patch-ag) = 1a3ba0fdfe9e92e838d221f4d88160f6c31bd09e diff --git a/audio/libvorbis/patches/patch-ae b/audio/libvorbis/patches/patch-ae index 7942707baa5..7e322ec63af 100644 --- a/audio/libvorbis/patches/patch-ae +++ b/audio/libvorbis/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.3 2002/08/25 18:38:17 jlam Exp $ +$NetBSD: patch-ae,v 1.4 2003/12/08 14:39:40 wiz Exp $ ---- doc/Makefile.in.orig Sat Jul 20 00:12:33 2002 +--- doc/Makefile.in.orig Mon Nov 17 19:44:21 2003 +++ doc/Makefile.in -@@ -94,7 +94,7 @@ AUTOMAKE_OPTIONS = foreign +@@ -108,7 +108,7 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = vorbisfile vorbisenc -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +docdir = $(datadir)/doc/html/$(PACKAGE)-$(VERSION) - doc_DATA = components.png draft-moffitt-vorbis-rtp-00.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-ogg.html vorbis-spec-bitpack.html vorbis-spec-codebook.html vorbis-spec-floor0.html vorbis-spec-floor1.html vorbis-spec-intro.html vorbis-spec-ref.html vorbis-spec-res.html vorbis.html vorbisword2.png wait.png white-ogg.png white-xifish.png window1.png window2.png + 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 diff --git a/audio/libvorbis/patches/patch-af b/audio/libvorbis/patches/patch-af index 88544cd9471..b4a3a258a68 100644 --- a/audio/libvorbis/patches/patch-af +++ b/audio/libvorbis/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.2 2002/01/02 12:39:37 lukem Exp $ +$NetBSD: patch-af,v 1.3 2003/12/08 14:39:40 wiz Exp $ ---- doc/vorbisenc/Makefile.in.orig Tue Jan 1 12:53:49 2002 +--- doc/vorbisenc/Makefile.in.orig Mon Nov 17 19:44:22 2003 +++ doc/vorbisenc/Makefile.in -@@ -92,7 +92,7 @@ +@@ -106,7 +106,7 @@ pthread_lib = @pthread_lib@ AUTOMAKE_OPTIONS = foreign diff --git a/audio/libvorbis/patches/patch-ag b/audio/libvorbis/patches/patch-ag index 2e008e60aec..c83a5657282 100644 --- a/audio/libvorbis/patches/patch-ag +++ b/audio/libvorbis/patches/patch-ag @@ -1,13 +1,13 @@ -$NetBSD: patch-ag,v 1.2 2002/01/02 12:39:37 lukem Exp $ +$NetBSD: patch-ag,v 1.3 2003/12/08 14:39:40 wiz Exp $ ---- doc/vorbisfile/Makefile.in.orig Tue Jan 1 12:53:48 2002 +--- doc/vorbisfile/Makefile.in.orig Mon Nov 17 19:44:21 2003 +++ doc/vorbisfile/Makefile.in -@@ -92,7 +92,7 @@ +@@ -106,7 +106,7 @@ pthread_lib = @pthread_lib@ AUTOMAKE_OPTIONS = foreign -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile +docdir = $(datadir)/doc/html/$(PACKAGE)-$(VERSION)/vorbisfile - doc_DATA = OggVorbis_File.html chaining_example_c.html chainingexample.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_info.html ov_open.html ov_open_callbacks.html ov_pcm_seek.html ov_pcm_tell.html ov_pcm_total.html ov_raw_seek.html ov_raw_tell.html ov_raw_total.html ov_read.html ov_seekable.html ov_serialnumber.html ov_streams.html ov_time_seek.html ov_time_tell.html ov_time_total.html overview.html reference.html seekexample.html seeking.html seeking_test_c.html seekingexample.html style.css vorbis_comment.html vorbis_info.html vorbisfile_example_c.html ov_read_float.html ov_test.html ov_test_open.html ov_test_callbacks.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 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 -- cgit v1.2.3