Update to Ogg Vorbis 1.0.1.

oggenc can now encode from FLAC, ogg123 can also play FLAC and speex files.
This commit is contained in:
naddy 2003-12-14 00:52:21 +00:00
parent e3158913d6
commit 37cb16251e
25 changed files with 210 additions and 156 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2003/10/08 16:01:45 naddy Exp $
# $OpenBSD: Makefile,v 1.13 2003/12/14 00:52:21 naddy Exp $
COMMENT= "Ogg bitstream library"
DISTNAME= libogg-1.0
DISTNAME= libogg-1.1
CATEGORIES= audio
HOMEPAGE= http://www.xiph.org/ogg/
@ -14,9 +14,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.vorbis.com/files/1.0/unix/ \
http://www.casterclub.com/vorbis/unix/ \
http://www.math.utoledo.edu/~chaese/Vorbis/unix/
MASTER_SITES= http://www.vorbis.com/files/1.0.1/unix/
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED}

View File

@ -1,3 +1,3 @@
MD5 (libogg-1.0.tar.gz) = 382a7089f42e6f82e7d658c1cb8ee236
RMD160 (libogg-1.0.tar.gz) = f4d85234407632e8140c208326f8d4b7526ffec7
SHA1 (libogg-1.0.tar.gz) = 2929e8867e566e9f7029cfacf0b4ccbe2f1f6cec
MD5 (libogg-1.1.tar.gz) = 461d7097bf47864b872085a94ff94e10
RMD160 (libogg-1.1.tar.gz) = e4a03223f39d2de7bdedc77c48db992ac8ff4742
SHA1 (libogg-1.1.tar.gz) = 1021761d10de079ac86c2dc110fbaf83f60f2fca

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.5 2002/07/20 00:52:45 naddy Exp $
--- configure.orig Fri Jul 19 16:13:10 2002
+++ configure Fri Jul 19 21:49:04 2002
@@ -5388,7 +5388,7 @@ if test -z "$GCC"; then
$OpenBSD: patch-configure,v 1.6 2003/12/14 00:52:22 naddy Exp $
--- configure.orig 2003-11-24 17:21:37.000000000 +0100
+++ configure 2003-11-24 17:26:18.000000000 +0100
@@ -7818,7 +7818,7 @@ if test -z "$GCC"; then
;;
*)
DEBUG="-g"
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.5 2002/07/20 00:52:45 naddy Exp $
PROFILE="-g -p"
;;
esac
@@ -5411,8 +5411,8 @@ else
@@ -7841,8 +7841,8 @@ else
;;
*)
DEBUG="-g -Wall -fsigned-char"

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_Makefile_in,v 1.2 2002/01/16 03:10:21 naddy Exp $
--- doc/Makefile.in.orig Tue Jan 1 02:47:46 2002
+++ doc/Makefile.in Tue Jan 1 21:47:36 2002
@@ -91,7 +91,7 @@ AUTOMAKE_OPTIONS = foreign
$OpenBSD: patch-doc_Makefile_in,v 1.3 2003/12/14 00:52:22 naddy Exp $
--- doc/Makefile.in.orig 2003-11-17 17:33:58.000000000 +0100
+++ doc/Makefile.in 2003-11-24 17:26:40.000000000 +0100
@@ -103,7 +103,7 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = ogg
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
doc_DATA = index.html framing.html oggstream.html white-xifish.png stream.png white-ogg.png
doc_DATA = framing.html index.html oggstream.html rfc3533.txt rfc3534.txt stream.png vorbisword2.png white-ogg.png white-xifish.png

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_ogg_Makefile_in,v 1.3 2002/07/20 00:52:45 naddy Exp $
--- doc/ogg/Makefile.in.orig Fri Jul 19 16:13:22 2002
+++ doc/ogg/Makefile.in Fri Jul 19 21:49:04 2002
@@ -89,7 +89,7 @@ VERSION = @VERSION@
$OpenBSD: patch-doc_ogg_Makefile_in,v 1.4 2003/12/14 00:52:22 naddy Exp $
--- doc/ogg/Makefile.in.orig 2003-11-17 17:33:58.000000000 +0100
+++ doc/ogg/Makefile.in 2003-11-24 17:26:40.000000000 +0100
@@ -101,7 +101,7 @@ install_sh = @install_sh@
AUTOMAKE_OPTIONS = foreign
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/ogg
+docdir = $(datadir)/doc/$(PACKAGE)/ogg
doc_DATA = bitpacking.html datastructures.html decoding.html encoding.html general.html index.html ogg_packet.html ogg_page.html ogg_page_bos.html ogg_page_continued.html ogg_page_eos.html ogg_page_granulepos.html ogg_page_pageno.html ogg_page_serialno.html ogg_page_version.html ogg_stream_clear.html ogg_stream_destroy.html ogg_page_packets.html ogg_stream_eos.html ogg_stream_flush.html ogg_stream_init.html ogg_stream_packetin.html ogg_stream_packetout.html ogg_stream_pagein.html ogg_stream_pageout.html ogg_stream_reset.html ogg_stream_state.html ogg_sync_buffer.html ogg_sync_clear.html ogg_sync_destroy.html ogg_sync_init.html ogg_sync_pageout.html ogg_sync_pageseek.html ogg_sync_reset.html ogg_sync_state.html ogg_sync_wrote.html oggpack_adv.html oggpack_adv1.html oggpack_bits.html oggpack_buffer.html oggpack_bytes.html oggpack_get_buffer.html oggpack_look.html oggpack_look1.html oggpack_read.html oggpack_read1.html oggpack_readinit.html oggpack_reset.html oggpack_write.html oggpack_writeclear.html oggpack_writeinit.html overview.html reference.html style.css vorbis_comment.html vorbis_info.html ogg_packet_clear.html ogg_page_checksum_set.html
doc_DATA = bitpacking.html datastructures.html decoding.html encoding.html\
general.html index.html ogg_packet.html ogg_packet_clear.html\

View File

@ -0,0 +1,41 @@
$OpenBSD: patch-src_bitwise_c,v 1.1 2003/12/14 00:52:22 naddy Exp $
--- src/bitwise.c.orig 2003-12-07 01:48:17.000000000 +0100
+++ src/bitwise.c 2003-12-07 01:52:58.000000000 +0100
@@ -251,7 +251,8 @@ long oggpack_look(oggpack_buffer *b,int
/* Read in bits without advancing the bitptr; bits <= 32 */
long oggpackB_look(oggpack_buffer *b,int bits){
unsigned long ret;
- int m=32-bits;
+ unsigned long m=mask[bits];
+ int s=32-bits;
bits+=b->endbit;
@@ -272,7 +273,7 @@ long oggpackB_look(oggpack_buffer *b,int
}
}
}
- return (ret>>(m>>1))>>((m+1)>>1);
+ return ((ret>>(s>>1))>>((s+1)>>1)&m);
}
long oggpack_look1(oggpack_buffer *b){
@@ -347,7 +348,8 @@ long oggpack_read(oggpack_buffer *b,int
/* bits <= 32 */
long oggpackB_read(oggpack_buffer *b,int bits){
unsigned long ret;
- long m=32-bits;
+ unsigned long m=mask[bits];
+ long s=32-bits;
bits+=b->endbit;
@@ -369,7 +371,7 @@ long oggpackB_read(oggpack_buffer *b,int
}
}
}
- ret=(ret>>(m>>1))>>((m+1)>>1);
+ ret=((ret>>(s>>1))>>((s+1)>>1)&m);
overflow:

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2002/07/20 00:52:45 naddy Exp $
lib/libogg.so.4.0
@comment $OpenBSD: PFRAG.shared,v 1.5 2003/12/14 00:52:22 naddy Exp $
lib/libogg.so.5.0
DYNLIBDIR(%B)

View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST,v 1.3 2002/07/20 00:52:45 naddy Exp $
@comment $OpenBSD: PLIST,v 1.4 2003/12/14 00:52:22 naddy Exp $
include/ogg/config_types.h
include/ogg/ogg.h
include/ogg/os_types.h
lib/libogg.a
lib/libogg.la
lib/pkgconfig/ogg.pc
share/aclocal/ogg.m4
share/doc/libogg/framing.html
share/doc/libogg/index.html
@ -32,9 +33,11 @@ share/doc/libogg/ogg/ogg_stream_flush.html
share/doc/libogg/ogg/ogg_stream_init.html
share/doc/libogg/ogg/ogg_stream_packetin.html
share/doc/libogg/ogg/ogg_stream_packetout.html
share/doc/libogg/ogg/ogg_stream_packetpeek.html
share/doc/libogg/ogg/ogg_stream_pagein.html
share/doc/libogg/ogg/ogg_stream_pageout.html
share/doc/libogg/ogg/ogg_stream_reset.html
share/doc/libogg/ogg/ogg_stream_reset_serialno.html
share/doc/libogg/ogg/ogg_stream_state.html
share/doc/libogg/ogg/ogg_sync_buffer.html
share/doc/libogg/ogg/ogg_sync_clear.html
@ -58,18 +61,26 @@ share/doc/libogg/ogg/oggpack_read1.html
share/doc/libogg/ogg/oggpack_readinit.html
share/doc/libogg/ogg/oggpack_reset.html
share/doc/libogg/ogg/oggpack_write.html
share/doc/libogg/ogg/oggpack_writealign.html
share/doc/libogg/ogg/oggpack_writeclear.html
share/doc/libogg/ogg/oggpack_writecopy.html
share/doc/libogg/ogg/oggpack_writeinit.html
share/doc/libogg/ogg/oggpack_writetrunc.html
share/doc/libogg/ogg/overview.html
share/doc/libogg/ogg/reference.html
share/doc/libogg/ogg/style.css
share/doc/libogg/ogg/vorbis_comment.html
share/doc/libogg/ogg/vorbis_info.html
share/doc/libogg/oggstream.html
share/doc/libogg/rfc3533.txt
share/doc/libogg/rfc3534.txt
share/doc/libogg/stream.png
share/doc/libogg/vorbisword2.png
share/doc/libogg/white-ogg.png
share/doc/libogg/white-xifish.png
%%SHARED%%
@dirrm share/doc/libogg/ogg
@dirrm share/doc/libogg
@dirrm share/aclocal
@dirrm lib/pkgconfig
@dirrm include/ogg

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.12 2003/10/08 16:01:45 naddy Exp $
# $OpenBSD: Makefile,v 1.13 2003/12/14 00:52:22 naddy Exp $
COMMENT= "audio compression codec library"
DISTNAME= libvorbis-1.0
DISTNAME= libvorbis-1.0.1
CATEGORIES= audio
HOMEPAGE= http://www.xiph.org/ogg/
HOMEPAGE= http://www.xiph.org/ogg/vorbis/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
@ -14,15 +14,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.vorbis.com/files/1.0/unix/ \
http://www.casterclub.com/vorbis/unix/ \
http://www.math.utoledo.edu/~chaese/Vorbis/unix/
MASTER_SITES= http://www.vorbis.com/files/1.0.1/unix/
LIB_DEPENDS= ogg.4::audio/libogg
LIB_DEPENDS= ogg.5::audio/libogg
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-ogg=${LOCALBASE}
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --with-ogg=${LOCALBASE}
SEPARATE_BUILD= simple
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (libvorbis-1.0.tar.gz) = d1ad94fe8e240269c790e18992171e53
RMD160 (libvorbis-1.0.tar.gz) = 423529b7e441abaca65b048be0bc96439ab5b4cd
SHA1 (libvorbis-1.0.tar.gz) = 2b414cb4cf7d022d39b7be7049f2c84a287a4fc7
MD5 (libvorbis-1.0.1.tar.gz) = 4d6726fd02ce02f6e24824e594b0949a
RMD160 (libvorbis-1.0.1.tar.gz) = 2015bfb9631076862e577e1cab0a8ca20f88780e
SHA1 (libvorbis-1.0.1.tar.gz) = 49fcf94c51ee2652d19a03377918196bb7e1ce5f

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.2 2002/01/16 03:10:21 naddy Exp $
--- Makefile.in.orig Tue Jan 1 02:53:33 2002
+++ Makefile.in Tue Jan 1 22:20:37 2002
@@ -92,7 +92,7 @@ pthread_lib = @pthread_lib@
$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 win32 debian vq
+SUBDIRS = lib include doc
m4datadir = $(datadir)/aclocal
m4data_DATA = vorbis.m4

View File

@ -1,7 +1,16 @@
$OpenBSD: patch-configure,v 1.5 2002/07/20 00:52:45 naddy Exp $
--- configure.orig Fri Jul 19 16:12:17 2002
+++ configure Fri Jul 19 21:54:52 2002
@@ -5441,7 +5441,7 @@ if test -z "$GCC"; then
$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
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
*)
DEBUG="-g"
@ -10,7 +19,7 @@ $OpenBSD: patch-configure,v 1.5 2002/07/20 00:52:45 naddy Exp $
PROFILE="-g -p" ;;
esac
else
@@ -5536,9 +5536,9 @@ rm -f conftest*
@@ -18905,9 +18905,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.3 2002/07/20 00:52:45 naddy Exp $
--- doc/Makefile.in.orig Fri Jul 19 16:12:33 2002
+++ doc/Makefile.in Fri Jul 19 21:54:52 2002
@@ -94,7 +94,7 @@ AUTOMAKE_OPTIONS = foreign
$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
SUBDIRS = vorbisfile vorbisenc
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
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

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_vorbisenc_Makefile_in,v 1.2 2002/01/16 03:10:21 naddy Exp $
--- doc/vorbisenc/Makefile.in.orig Tue Jan 1 02:53:49 2002
+++ doc/vorbisenc/Makefile.in Tue Jan 1 22:20:37 2002
@@ -92,7 +92,7 @@ pthread_lib = @pthread_lib@
$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

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_vorbisfile_Makefile_in,v 1.2 2002/01/16 03:10:21 naddy Exp $
--- doc/vorbisfile/Makefile.in.orig Tue Jan 1 02:53:48 2002
+++ doc/vorbisfile/Makefile.in Tue Jan 1 22:20:37 2002
@@ -92,7 +92,7 @@ pthread_lib = @pthread_lib@
$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
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
+docdir = $(datadir)/doc/$(PACKAGE)/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

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2002/07/20 00:52:45 naddy Exp $
lib/libvorbis.so.2.0
@comment $OpenBSD: PFRAG.shared,v 1.5 2003/12/14 00:52:22 naddy Exp $
lib/libvorbis.so.3.0
lib/libvorbisenc.so.2.0
lib/libvorbisfile.so.3.0
lib/libvorbisfile.so.4.0
DYNLIBDIR(%B)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2002/07/20 00:52:45 naddy Exp $
@comment $OpenBSD: PLIST,v 1.4 2003/12/14 00:52:22 naddy Exp $
include/vorbis/codec.h
include/vorbis/vorbisenc.h
include/vorbis/vorbisfile.h
@ -8,9 +8,12 @@ lib/libvorbisenc.a
lib/libvorbisenc.la
lib/libvorbisfile.a
lib/libvorbisfile.la
lib/pkgconfig/vorbis.pc
lib/pkgconfig/vorbisenc.pc
lib/pkgconfig/vorbisfile.pc
share/aclocal/vorbis.m4
share/doc/libvorbis/components.png
share/doc/libvorbis/draft-moffitt-vorbis-rtp-00.txt
share/doc/libvorbis/draft-kerr-avt-vorbis-rtp-02.txt
share/doc/libvorbis/eightphase.png
share/doc/libvorbis/evenlsp.png
share/doc/libvorbis/floor1-1.png
@ -38,14 +41,6 @@ share/doc/libvorbis/v-comment.html
share/doc/libvorbis/vorbis-clip.txt
share/doc/libvorbis/vorbis-errors.txt
share/doc/libvorbis/vorbis-fidelity.html
share/doc/libvorbis/vorbis-ogg.html
share/doc/libvorbis/vorbis-spec-bitpack.html
share/doc/libvorbis/vorbis-spec-codebook.html
share/doc/libvorbis/vorbis-spec-floor0.html
share/doc/libvorbis/vorbis-spec-floor1.html
share/doc/libvorbis/vorbis-spec-intro.html
share/doc/libvorbis/vorbis-spec-ref.html
share/doc/libvorbis/vorbis-spec-res.html
share/doc/libvorbis/vorbis.html
share/doc/libvorbis/vorbisenc/index.html
share/doc/libvorbis/vorbisenc/overview.html
@ -56,8 +51,10 @@ share/doc/libvorbis/vorbisenc/vorbis_encode_init.html
share/doc/libvorbis/vorbisenc/vorbis_encode_init_vbr.html
share/doc/libvorbis/vorbisenc/vorbis_info.html
share/doc/libvorbis/vorbisfile/OggVorbis_File.html
share/doc/libvorbis/vorbisfile/callbacks.html
share/doc/libvorbis/vorbisfile/chaining_example_c.html
share/doc/libvorbis/vorbisfile/chainingexample.html
share/doc/libvorbis/vorbisfile/crosslap.html
share/doc/libvorbis/vorbisfile/datastructures.html
share/doc/libvorbis/vorbisfile/decoding.html
share/doc/libvorbis/vorbisfile/example.html
@ -70,13 +67,18 @@ share/doc/libvorbis/vorbisfile/ov_bitrate_instant.html
share/doc/libvorbis/vorbisfile/ov_callbacks.html
share/doc/libvorbis/vorbisfile/ov_clear.html
share/doc/libvorbis/vorbisfile/ov_comment.html
share/doc/libvorbis/vorbisfile/ov_crosslap.html
share/doc/libvorbis/vorbisfile/ov_info.html
share/doc/libvorbis/vorbisfile/ov_open.html
share/doc/libvorbis/vorbisfile/ov_open_callbacks.html
share/doc/libvorbis/vorbisfile/ov_pcm_seek.html
share/doc/libvorbis/vorbisfile/ov_pcm_seek_lap.html
share/doc/libvorbis/vorbisfile/ov_pcm_seek_page.html
share/doc/libvorbis/vorbisfile/ov_pcm_seek_page_lap.html
share/doc/libvorbis/vorbisfile/ov_pcm_tell.html
share/doc/libvorbis/vorbisfile/ov_pcm_total.html
share/doc/libvorbis/vorbisfile/ov_raw_seek.html
share/doc/libvorbis/vorbisfile/ov_raw_seek_lap.html
share/doc/libvorbis/vorbisfile/ov_raw_tell.html
share/doc/libvorbis/vorbisfile/ov_raw_total.html
share/doc/libvorbis/vorbisfile/ov_read.html
@ -88,15 +90,21 @@ share/doc/libvorbis/vorbisfile/ov_test.html
share/doc/libvorbis/vorbisfile/ov_test_callbacks.html
share/doc/libvorbis/vorbisfile/ov_test_open.html
share/doc/libvorbis/vorbisfile/ov_time_seek.html
share/doc/libvorbis/vorbisfile/ov_time_seek_lap.html
share/doc/libvorbis/vorbisfile/ov_time_seek_page.html
share/doc/libvorbis/vorbisfile/ov_time_seek_page_lap.html
share/doc/libvorbis/vorbisfile/ov_time_tell.html
share/doc/libvorbis/vorbisfile/ov_time_total.html
share/doc/libvorbis/vorbisfile/overview.html
share/doc/libvorbis/vorbisfile/reference.html
share/doc/libvorbis/vorbisfile/return.html
share/doc/libvorbis/vorbisfile/seekexample.html
share/doc/libvorbis/vorbisfile/seeking.html
share/doc/libvorbis/vorbisfile/seeking_example_c.html
share/doc/libvorbis/vorbisfile/seeking_test_c.html
share/doc/libvorbis/vorbisfile/seekingexample.html
share/doc/libvorbis/vorbisfile/style.css
share/doc/libvorbis/vorbisfile/threads.html
share/doc/libvorbis/vorbisfile/vorbis_comment.html
share/doc/libvorbis/vorbisfile/vorbis_info.html
share/doc/libvorbis/vorbisfile/vorbisfile_example_c.html
@ -110,4 +118,6 @@ share/doc/libvorbis/window2.png
@dirrm share/doc/libvorbis/vorbisfile
@dirrm share/doc/libvorbis/vorbisenc
@dirrm share/doc/libvorbis
@dirrm share/aclocal
@dirrm lib/pkgconfig
@dirrm include/vorbis

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.20 2003/10/08 16:01:45 naddy Exp $
# $OpenBSD: Makefile,v 1.21 2003/12/14 00:52:22 naddy Exp $
COMMENT= "play, encode, and manage Ogg Vorbis files"
DISTNAME= vorbis-tools-1.0
DISTNAME= vorbis-tools-1.0.1
CATEGORIES= audio
HOMEPAGE= http://www.vorbis.com/
HOMEPAGE= http://www.xiph.org/ogg/vorbis/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
@ -14,13 +14,13 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.vorbis.com/files/1.0/unix/ \
http://www.casterclub.com/vorbis/unix/ \
http://www.math.utoledo.edu/~chaese/Vorbis/unix/
MASTER_SITES= http://www.vorbis.com/files/1.0.1/unix/
MODULES= gettext
LIB_DEPENDS= ao.3::audio/libao \
curl.2::net/curl \
FLAC.5::audio/flac \
speex.2::audio/speex \
vorbis.2,vorbisenc.2,vorbisfile.3::audio/libvorbis
CONFIGURE_STYLE=gnu

View File

@ -1,3 +1,3 @@
MD5 (vorbis-tools-1.0.tar.gz) = c0a9fee54835e9c5b32d1f42c02964c9
RMD160 (vorbis-tools-1.0.tar.gz) = 2f3874699be904fdf64c6edf09e21ccb8f0eee28
SHA1 (vorbis-tools-1.0.tar.gz) = 5c2508786cf6a2a270c697d3debe66ee83df376d
MD5 (vorbis-tools-1.0.1.tar.gz) = 80d3ae3bbae2a488d433d86b8fd64777
RMD160 (vorbis-tools-1.0.1.tar.gz) = 78a53430311c45463369ae6f836ca68ce900d741
SHA1 (vorbis-tools-1.0.1.tar.gz) = 5555a55acd643fcca7020b7de4900aeb706725e5

View File

@ -1,23 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2002/07/20 00:52:45 naddy Exp $
--- configure.orig Fri Jul 19 16:18:55 2002
+++ configure Fri Jul 19 23:12:17 2002
@@ -3590,7 +3590,6 @@ else
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 $linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
case "$host_os" in
@@ -3600,7 +3599,6 @@ else
;;
*)
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
fi
@@ -7244,7 +7242,7 @@ if test -z "$GCC"; then
$OpenBSD: patch-configure,v 1.4 2003/12/14 00:52:22 naddy Exp $
--- configure.orig 2003-12-14 00:29:16.000000000 +0100
+++ configure 2003-12-14 00:30:52.000000000 +0100
@@ -10361,7 +10361,7 @@ if test -z "$GCC"; then
;;
*)
DEBUG="-g"
@ -26,7 +10,7 @@ $OpenBSD: patch-configure,v 1.3 2002/07/20 00:52:45 naddy Exp $
PROFILE="-g -p"
;;
esac
@@ -7267,8 +7265,8 @@ else
@@ -10384,8 +10384,8 @@ else
;;
*)
DEBUG="-g -Wall -fsigned-char"

View File

@ -1,12 +1,21 @@
$OpenBSD: patch-ogg123_Makefile_in,v 1.5 2003/09/30 00:21:42 naddy Exp $
--- ogg123/Makefile.in.orig 2003-09-30 02:13:45.000000000 +0200
+++ ogg123/Makefile.in 2003-09-30 02:14:39.000000000 +0200
@@ -122,7 +122,7 @@ ogg123sources = audio.c buffer.c callbac
$OpenBSD: patch-ogg123_Makefile_in,v 1.6 2003/12/14 00:52:22 naddy Exp $
--- ogg123/Makefile.in.orig 2003-11-17 17:50:56.000000000 +0100
+++ ogg123/Makefile.in 2003-12-14 00:51:43.000000000 +0100
@@ -135,7 +135,7 @@ install_sh = @install_sh@
@BUILD_OGG123_TRUE@datadir = @datadir@
@BUILD_OGG123_TRUE@localedir = $(datadir)/locale
-@BUILD_OGG123_TRUE@DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+@BUILD_OGG123_TRUE@DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
AUTOMAKE_OPTIONS = foreign
localedir = $(datadir)/locale
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
@@ -486,7 +486,7 @@ info: info-am
info-am:
-install-data-am: install-docDATA install-man
+install-data-am: install-man
install-exec-am: install-binPROGRAMS
@BUILD_OGG123_TRUE@bin_PROGRAMS = ogg123
@BUILD_OGG123_TRUE@docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-oggdec_oggdec_c,v 1.1 2002/09/23 11:17:26 naddy Exp $
--- oggdec/oggdec.c.orig Mon Sep 23 13:17:18 2002
+++ oggdec/oggdec.c Mon Sep 23 13:17:31 2002
@@ -99,6 +99,7 @@ static void parse_options(int argc, char
break;
case 'o':
outfilename = strdup(optarg);
+ break;
case 'R':
raw = atoi(optarg);
break;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ogginfo_ogginfo2_c,v 1.1 2003/06/16 23:37:13 naddy Exp $
--- ogginfo/ogginfo2.c.orig Tue Jun 17 01:33:04 2003
+++ ogginfo/ogginfo2.c Tue Jun 17 01:33:24 2003
@@ -27,7 +27,7 @@
#ifdef _WIN32
#define INT64FORMAT "%I64d"
#else
-#define INT64FORMAT "%Ld"
+#define INT64FORMAT "%lld"
#endif
struct vorbis_release {

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-vcut_vcut_c,v 1.1 2003/06/16 23:37:13 naddy Exp $
--- vcut/vcut.c.orig Tue Jun 17 01:32:56 2003
+++ vcut/vcut.c Tue Jun 17 01:33:16 2003
@@ -26,7 +26,7 @@
#ifdef _WIN32
#define FORMAT_INT64 "%I64d"
#else
-#define FORMAT_INT64 "%Ld"
+#define FORMAT_INT64 "%lld"
#endif
static vcut_packet *save_packet(ogg_packet *packet)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2003/09/30 00:21:42 naddy Exp $
@comment $OpenBSD: PLIST,v 1.7 2003/12/14 00:52:22 naddy Exp $
bin/ogg123
bin/oggdec
bin/oggenc
@ -11,11 +11,41 @@ man/man1/oggenc.1
man/man1/ogginfo.1
man/man1/vcut.1
man/man1/vorbiscomment.1
@comment share/doc/vorbis-tools-1.0/ogg123rc-example
share/examples/vorbis-tools/ogg123rc
share/locale/be/LC_MESSAGES/vorbis-tools.mo
share/locale/cs/LC_MESSAGES/vorbis-tools.mo
share/locale/da/LC_MESSAGES/vorbis-tools.mo
share/locale/es/LC_MESSAGES/vorbis-tools.mo
share/locale/fr/LC_MESSAGES/vorbis-tools.mo
share/locale/hr/LC_MESSAGES/vorbis-tools.mo
share/locale/hu/LC_MESSAGES/vorbis-tools.mo
share/locale/nl/LC_MESSAGES/vorbis-tools.mo
share/locale/ro/LC_MESSAGES/vorbis-tools.mo
share/locale/ru/LC_MESSAGES/vorbis-tools.mo
share/locale/sv/LC_MESSAGES/vorbis-tools.mo
@dirrm share/locale/sv/LC_MESSAGES
@dirrm share/locale/sv
@dirrm share/locale/ru/LC_MESSAGES
@dirrm share/locale/ru
@dirrm share/locale/ro/LC_MESSAGES
@dirrm share/locale/ro
@dirrm share/locale/nl/LC_MESSAGES
@dirrm share/locale/nl
@dirrm share/locale/hu/LC_MESSAGES
@dirrm share/locale/hu
@dirrm share/locale/hr/LC_MESSAGES
@dirrm share/locale/hr
@dirrm share/locale/fr/LC_MESSAGES
@dirrm share/locale/fr
@dirrm share/locale/es/LC_MESSAGES
@dirrm share/locale/es
@dirrm share/locale/da/LC_MESSAGES
@dirrm share/locale/da
@dirrm share/locale/cs/LC_MESSAGES
@dirrm share/locale/cs
@dirrm share/locale/be/LC_MESSAGES
@dirrm share/locale/be
@dirrm share/locale
@dirrm share/examples/vorbis-tools
@cwd ${SYSCONFDIR}
@extra ogg123rc