diff options
| author | naddy <naddy@FreeBSD.org> | 2003-12-20 23:22:56 +0800 |
|---|---|---|
| committer | naddy <naddy@FreeBSD.org> | 2003-12-20 23:22:56 +0800 |
| commit | e64af3bd9c6ee7bef0ac283907ab153e12eeb660 (patch) | |
| tree | 9fc35cfd2300e0634911be6bd305b45f28a85660 /audio/libogg/files | |
| parent | edb5c1fbe85a979551e5e51384a9ff8f7435ab16 (diff) | |
| download | freebsd-ports-graphics-e64af3bd9c6ee7bef0ac283907ab153e12eeb660.tar.gz freebsd-ports-graphics-e64af3bd9c6ee7bef0ac283907ab153e12eeb660.tar.zst freebsd-ports-graphics-e64af3bd9c6ee7bef0ac283907ab153e12eeb660.zip | |
Update to Ogg Vorbis 1.0.1.
Major user-visible change: vorbis-tools now integrates some support for
flac and speex files.
Diffstat (limited to 'audio/libogg/files')
| -rw-r--r-- | audio/libogg/files/patch-configure | 22 | ||||
| -rw-r--r-- | audio/libogg/files/patch-src_bitwise.c | 43 |
2 files changed, 53 insertions, 12 deletions
diff --git a/audio/libogg/files/patch-configure b/audio/libogg/files/patch-configure index 93237bff479..3d1608d5560 100644 --- a/audio/libogg/files/patch-configure +++ b/audio/libogg/files/patch-configure @@ -1,9 +1,9 @@ $FreeBSD$ ---- configure.orig Fri Jul 19 16:13:10 2002 -+++ configure Sat Oct 5 17:51:53 2002 -@@ -5363,6 +5363,7 @@ +--- configure.orig Mon Nov 17 17:34:08 2003 ++++ configure Mon Nov 24 18:26:28 2003 +@@ -7793,6 +7793,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -11,25 +11,23 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -5388,7 +5389,7 @@ +@@ -7818,7 +7819,7 @@ ;; *) DEBUG="-g" - CFLAGS="-O" + CFLAGS="" - PROFILE="-g -p" + PROFILE="-g -p" ;; esac -@@ -5410,9 +5411,9 @@ - PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math" +@@ -7841,8 +7842,8 @@ ;; *) -- DEBUG="-g -Wall -fsigned-char" + DEBUG="-g -Wall -fsigned-char" - CFLAGS="-O20 -fsigned-char" -- PROFILE="-O20 -g -pg -fsigned-char" -+ DEBUG="-g -Wall" -+ CFLAGS="" -+ PROFILE="-g -pg" +- PROFILE="-O20 -g -pg -fsigned-char" ++ CFLAGS="-fsigned-char" ++ PROFILE="-g -pg -fsigned-char" ;; esac fi diff --git a/audio/libogg/files/patch-src_bitwise.c b/audio/libogg/files/patch-src_bitwise.c new file mode 100644 index 00000000000..22cd75dc448 --- /dev/null +++ b/audio/libogg/files/patch-src_bitwise.c @@ -0,0 +1,43 @@ + +$FreeBSD$ + +--- src/bitwise.c.orig Mon Nov 10 14:06:08 2003 ++++ src/bitwise.c Sun Dec 7 02:36:26 2003 +@@ -251,7 +251,8 @@ + /* 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 @@ + } + } + } +- 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 @@ + /* 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 @@ + } + } + } +- ret=(ret>>(m>>1))>>((m+1)>>1); ++ ret=((ret>>(s>>1))>>((s+1)>>1)&m); + + overflow: + |