cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to Ogg Vorbis RC3.

Browse Source 
Note: When encoding, use -q for quality and bitrate control.  -b
has deen deprecated and will not do what you expect.
This commit is contained in:
naddy 2002-01-16 03:10:21 +00:00
parent 542b1e4257
commit 423c853854
36 changed files with 190 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
audio/libao/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2001/10/08 14:57:55 naddy Exp $
# $OpenBSD: Makefile,v 1.15 2002/01/16 03:10:21 naddy Exp $
COMMENT= "portable audio output library"
COMMENT-arts= "aRts module for portable audio output library"
@ -8,7 +8,7 @@ FULLPKGNAME= libao-${VERSION}
FULLPKGNAME-arts= libao-arts-${VERSION}
FULLPKGNAME-esd= libao-esd-${VERSION}
VERSION= 0.8.0
VERSION= 0.8.2
DISTNAME= libao-${VERSION}
CATEGORIES= audio
NEED_VERSION= 1.435
@ -22,11 +22,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}files/rc2/unix/
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
patch-*
MASTER_SITES= http://www.xiph.org/ogg/vorbis/download/ \
http://www.vorbis.com/files/rc2/unix/ \
http://www.oddsock.org/vorbisrc3/files/rc3/unix/
FLAVORS= no_arts no_esd
FLAVOR?= no_arts
@ -52,10 +50,10 @@ CONFIGURE_ARGS+= --disable-esd
.if defined(PACKAGING)
. if ${SUBPACKAGE} == "-arts"
LIB_DEPENDS= ao.2::audio/libao \
LIB_DEPENDS= ao.3::audio/libao \
artsc.0::x11/kde/libs2
. elif ${SUBPACKAGE} == "-esd"
LIB_DEPENDS= ao.2::audio/libao \
LIB_DEPENDS= ao.3::audio/libao \
esd.2::audio/esound
. endif
.else

3
audio/libao/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (libao-0.8.2.tar.gz) = 98b4eca7851a6650e639b9858db89e6e
RMD160 (libao-0.8.2.tar.gz) = df78550a43a564f90f95436ce8e152e69b8e9309
SHA1 (libao-0.8.2.tar.gz) = 8fab336aa453557e59f383c8013d949b67a5fcea

3
audio/libao/files/md5
View File

@ -1,3 +0,0 @@
MD5 (libao-0.8.0.tar.gz) = e387df473b23e3cd15d2d8fbb5b5d236
RMD160 (libao-0.8.0.tar.gz) = a0cd04d423a3b030f03cc611ae452fc097b468bc
SHA1 (libao-0.8.0.tar.gz) = 8685296e82724f70f5069e47a693693a90ccf59f

14
audio/libao/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2001/08/20 21:53:56 naddy Exp $
--- configure.orig Thu Aug 9 16:43:36 2001
+++ configure Thu Aug 9 16:47:48 2001
@@ -1505,7 +1505,7 @@ if test -z "$GCC"; then
$OpenBSD: patch-configure,v 1.3 2002/01/16 03:10:21 naddy Exp $
--- configure.orig Tue Jan 1 02:43:14 2002
+++ configure Tue Jan 1 23:05:53 2002
@@ -5308,7 +5308,7 @@ if test -z "$GCC"; then
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
*)
DEBUG="-g"
@ -10,9 +10,9 @@ $OpenBSD: patch-configure,v 1.2 2001/08/20 21:53:56 naddy Exp $
PROFILE="-g -p" ;;
esac
else
@@ -1520,9 +1520,9 @@ else
CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
@@ -5328,9 +5328,9 @@ else
CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char $SILLY_CARBON_PATH"
PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char $SILLY_CARBON_PATH" ;;
*)
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"

12
audio/libao/patches/patch-doc_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_Makefile_in,v 1.2 2001/08/20 21:53:56 naddy Exp $
--- doc/Makefile.in.orig Thu Aug 9 16:44:27 2001
+++ doc/Makefile.in Thu Aug 9 16:48:16 2001
@@ -88,7 +88,7 @@ plugindir = @plugindir@
$OpenBSD: patch-doc_Makefile_in,v 1.3 2002/01/16 03:10:21 naddy Exp $
--- doc/Makefile.in.orig Tue Jan 1 02:43:57 2002
+++ doc/Makefile.in Tue Jan 1 23:05:53 2002
@@ -93,7 +93,7 @@ plugindir = @plugindir@
AUTOMAKE_OPTIONS = foreign
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
doc_DATA = *.html ao_example.c style.css
# We list all of these as opposed to using a wildcard so that
# building outside the source directory works.

7
audio/libao/pkg/PFRAG.shared
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2001/08/20 21:53:56 naddy Exp $
lib/libao.so.2.1
@comment $OpenBSD: PFRAG.shared,v 1.8 2002/01/16 03:10:21 naddy Exp $
lib/libao.so.3.1
DYNLIBDIR(%B)
lib/ao/libsun.so
lib/ao/plugins-2/libsun.so
@dirrm lib/ao/plugins-2
@dirrm lib/ao

4
audio/libao/pkg/PFRAG.shared-arts
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-arts,v 1.1 2001/07/22 00:12:55 naddy Exp $
lib/ao/libarts.so
@comment $OpenBSD: PFRAG.shared-arts,v 1.2 2002/01/16 03:10:21 naddy Exp $
lib/ao/plugins-2/libarts.so

4
audio/libao/pkg/PFRAG.shared-esd
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-esd,v 1.1 2001/07/22 00:12:55 naddy Exp $
lib/ao/libesd.so
@comment $OpenBSD: PFRAG.shared-esd,v 1.2 2002/01/16 03:10:21 naddy Exp $
lib/ao/plugins-2/libesd.so

4
audio/libao/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2001/08/20 21:53:56 naddy Exp $
@comment $OpenBSD: PLIST,v 1.3 2002/01/16 03:10:21 naddy Exp $
include/ao/ao.h
include/ao/os_types.h
include/ao/plugin.h
@ -14,6 +14,7 @@ share/doc/libao/ao_driver_id.html
share/doc/libao/ao_driver_info.html
share/doc/libao/ao_driver_info_list.html
share/doc/libao/ao_example.c
share/doc/libao/ao_file_extension.html
share/doc/libao/ao_free_options.html
share/doc/libao/ao_info.html
share/doc/libao/ao_initialize.html
@ -25,6 +26,7 @@ share/doc/libao/ao_plugin_close.html
share/doc/libao/ao_plugin_device_clear.html
share/doc/libao/ao_plugin_device_init.html
share/doc/libao/ao_plugin_driver_info.html
share/doc/libao/ao_plugin_file_extension.html
share/doc/libao/ao_plugin_open.html
share/doc/libao/ao_plugin_play.html
share/doc/libao/ao_plugin_set_option.html

13
audio/libogg/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.6 2001/10/08 14:57:55 naddy Exp $
# $OpenBSD: Makefile,v 1.7 2002/01/16 03:10:21 naddy Exp $
COMMENT= "Ogg bitstream library"
DISTNAME= libogg-1.0rc2
DISTNAME= libogg-1.0rc3
CATEGORIES= audio
NEED_VERSION= 1.435
HOMEPAGE= http://www.xiph.org/ogg/
@ -14,13 +14,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.vorbis.com/files/rc2/unix/
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
patch-*
MASTER_SITES= http://www.xiph.org/ogg/vorbis/download/ \
http://www.vorbis.com/files/rc3/unix/ \
http://www.oddsock.org/vorbisrc3/files/rc3/unix/
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
.include <bsd.port.mk>

3
audio/libogg/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (libogg-1.0rc3.tar.gz) = 6425cd5659aa7595b30f2c024d1b8eab
RMD160 (libogg-1.0rc3.tar.gz) = 4aaecd7cc4e50c563a1863eae94ae55f8430d122
SHA1 (libogg-1.0rc3.tar.gz) = 309deb62d3b3c0ad0da34292b9d451431f48fd2c

3
audio/libogg/files/md5
View File

@ -1,3 +0,0 @@
MD5 (libogg-1.0rc2.tar.gz) = 327733122fe0fb67da7e6632d23feb30
RMD160 (libogg-1.0rc2.tar.gz) = 7976bf0b1e9775362ad2a58fd02799496799281f
SHA1 (libogg-1.0rc2.tar.gz) = b9073b4a8f3603060ba2abd42387b7957789998f

10
audio/libogg/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2001/07/17 15:23:37 naddy Exp $
--- configure.orig Mon Jun 18 18:08:30 2001
+++ configure Tue Jul 17 16:47:35 2001
@@ -1492,7 +1492,7 @@ if test -z "$GCC"; then
$OpenBSD: patch-configure,v 1.4 2002/01/16 03:10:21 naddy Exp $
--- configure.orig Tue Jan 1 02:47:20 2002
+++ configure Tue Jan 1 21:47:36 2002
@@ -5284,7 +5284,7 @@ if test -z "$GCC"; then
;;
*)
DEBUG="-g"
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.3 2001/07/17 15:23:37 naddy Exp $
PROFILE="-g -p"
;;
esac
@@ -1515,8 +1515,8 @@ else
@@ -5307,8 +5307,8 @@ else
;;
*)
DEBUG="-g -Wall -fsigned-char"

8
audio/libogg/patches/patch-doc_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2001/03/14 01:55:47 todd Exp $
--- doc/Makefile.in.orig Mon Mar 12 23:41:38 2001
+++ doc/Makefile.in Mon Mar 12 23:42:14 2001
@@ -87,7 +87,7 @@ AUTOMAKE_OPTIONS = foreign
$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
SUBDIRS = ogg

10
audio/libogg/patches/patch-doc_ogg_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_ogg_Makefile_in,v 1.1.1.1 2001/03/14 01:55:47 todd Exp $
--- doc/ogg/Makefile.in.orig Mon Mar 12 23:57:06 2001
+++ doc/ogg/Makefile.in Mon Mar 12 23:57:21 2001
@@ -85,7 +85,7 @@ VERSION = @VERSION@
$OpenBSD: patch-doc_ogg_Makefile_in,v 1.2 2002/01/16 03:10:21 naddy Exp $
--- doc/ogg/Makefile.in.orig Tue Jan 1 02:47:47 2002
+++ doc/ogg/Makefile.in Tue Jan 1 21:47:36 2002
@@ -89,7 +89,7 @@ VERSION = @VERSION@
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_stream_eof.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_adv_huff.html oggpack_bits.html oggpack_buffer.html oggpack_bytes.html oggpack_get_buffer.html oggpack_look.html oggpack_look1.html oggpack_look_huff.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
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_adv_huff.html oggpack_bits.html oggpack_buffer.html oggpack_bytes.html oggpack_get_buffer.html oggpack_look.html oggpack_look1.html oggpack_look_huff.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

4
audio/libogg/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/06/30 13:18:08 naddy Exp $
lib/libogg.so.2.0
@comment $OpenBSD: PFRAG.shared,v 1.3 2002/01/16 03:10:21 naddy Exp $
lib/libogg.so.3.0
DYNLIBDIR(%B)

8
audio/libogg/pkg/PLIST
View File

@ -1,10 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/03/14 01:55:43 todd Exp $
@comment $OpenBSD: PLIST,v 1.2 2002/01/16 03:10:21 naddy Exp $
include/ogg/config_types.h
include/ogg/ogg.h
include/ogg/os_types.h
lib/libogg.a
lib/libogg.la
%%SHARED%%
share/aclocal/ogg.m4
share/doc/libogg/framing.html
share/doc/libogg/index.html
@ -15,17 +14,19 @@ share/doc/libogg/ogg/encoding.html
share/doc/libogg/ogg/general.html
share/doc/libogg/ogg/index.html
share/doc/libogg/ogg/ogg_packet.html
share/doc/libogg/ogg/ogg_packet_clear.html
share/doc/libogg/ogg/ogg_page.html
share/doc/libogg/ogg/ogg_page_bos.html
share/doc/libogg/ogg/ogg_page_checksum_set.html
share/doc/libogg/ogg/ogg_page_continued.html
share/doc/libogg/ogg/ogg_page_eos.html
share/doc/libogg/ogg/ogg_page_granulepos.html
share/doc/libogg/ogg/ogg_page_packets.html
share/doc/libogg/ogg/ogg_page_pageno.html
share/doc/libogg/ogg/ogg_page_serialno.html
share/doc/libogg/ogg/ogg_page_version.html
share/doc/libogg/ogg/ogg_stream_clear.html
share/doc/libogg/ogg/ogg_stream_destroy.html
share/doc/libogg/ogg/ogg_stream_eof.html
share/doc/libogg/ogg/ogg_stream_eos.html
share/doc/libogg/ogg/ogg_stream_flush.html
share/doc/libogg/ogg/ogg_stream_init.html
@ -70,6 +71,7 @@ share/doc/libogg/oggstream.html
share/doc/libogg/stream.png
share/doc/libogg/white-ogg.png
share/doc/libogg/white-xifish.png
%%SHARED%%
@dirrm share/doc/libogg/ogg
@dirrm share/doc/libogg
@dirrm include/ogg

18
audio/libvorbis/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.6 2001/10/08 14:57:55 naddy Exp $
# $OpenBSD: Makefile,v 1.7 2002/01/16 03:10:21 naddy Exp $
COMMENT= "audio compression codec library"
DISTNAME= libvorbis-1.0rc2
DISTNAME= libvorbis-1.0rc3
CATEGORIES= audio
NEED_VERSION= 1.435
HOMEPAGE= http://www.xiph.org/ogg/
@ -14,16 +14,14 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.vorbis.com/files/rc2/unix/
MASTER_SITES= http://www.xiph.org/ogg/vorbis/download/ \
http://www.vorbis.com/files/rc2/unix/ \
http://www.oddsock.org/vorbisrc3/files/rc3/unix/
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
patch-*
LIB_DEPENDS= ogg.2::audio/libogg
LIB_DEPENDS= ogg.3::audio/libogg
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static \
--with-ogg-prefix=${LOCALBASE}
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-ogg=${LOCALBASE}
.include <bsd.port.mk>

3
audio/libvorbis/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (libvorbis-1.0rc3.tar.gz) = e3a0ce7718f698326504c76562315df2
RMD160 (libvorbis-1.0rc3.tar.gz) = ce12c4114a113fe31feecaf0a15b25263357e3fc
SHA1 (libvorbis-1.0rc3.tar.gz) = 4addbca3427daa1fd600ac9b0b5c407c2b87a04d

3
audio/libvorbis/files/md5
View File

@ -1,3 +0,0 @@
MD5 (libvorbis-1.0rc2.tar.gz) = e5dfe5c71ee451313ec11af1387bd8f7
RMD160 (libvorbis-1.0rc2.tar.gz) = 771e0cc7bcc25ca979d3b373c5e2b9463d7e18c3
SHA1 (libvorbis-1.0rc2.tar.gz) = 6ac247880e9f4f51045c1f0eba6b7bf08ee25b73

8
audio/libvorbis/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2001/03/14 01:57:11 todd Exp $
--- Makefile.in.orig Tue Mar 13 01:28:21 2001
+++ Makefile.in Tue Mar 13 01:28:29 2001
@@ -87,7 +87,7 @@ pthread_lib = @pthread_lib@
$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@
AUTOMAKE_OPTIONS = foreign dist-zip

14
audio/libvorbis/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2001/07/17 15:23:37 naddy Exp $
--- configure.orig Mon Jun 18 18:12:43 2001
+++ configure Tue Jul 17 16:50:28 2001
@@ -1621,7 +1621,7 @@ if test -z "$GCC"; then
$OpenBSD: patch-configure,v 1.4 2002/01/16 03:10:21 naddy Exp $
--- configure.orig Tue Jan 1 22:17:46 2002
+++ configure Tue Jan 1 22:20:13 2002
@@ -5337,7 +5337,7 @@ if test -z "$GCC"; then
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
*)
DEBUG="-g"
@ -10,14 +10,14 @@ $OpenBSD: patch-configure,v 1.3 2001/07/17 15:23:37 naddy Exp $
PROFILE="-g -p" ;;
esac
else
@@ -1712,9 +1712,9 @@ rm -f conftest*
@@ -5428,9 +5428,9 @@ rm -f conftest*
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";;
*)
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
- DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
- PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+ DEBUG="-g -Wall -fsigned-char"
+ DEBUG="-g -Wall -W -fsigned-char"
+ CFLAGS="-fsigned-char"
+ PROFILE="-g -pg -fsigned-char" ;;
esac

8
audio/libvorbis/patches/patch-doc_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2001/03/14 01:57:11 todd Exp $
--- doc/Makefile.in.orig Tue Mar 13 00:17:00 2001
+++ doc/Makefile.in Tue Mar 13 00:17:11 2001
@@ -89,7 +89,7 @@ AUTOMAKE_OPTIONS = foreign
$OpenBSD: patch-doc_Makefile_in,v 1.2 2002/01/16 03:10:21 naddy Exp $
--- doc/Makefile.in.orig Tue Jan 1 02:53:47 2002
+++ doc/Makefile.in Tue Jan 1 22:20:37 2002
@@ -94,7 +94,7 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = vorbisfile vorbisenc

10
audio/libvorbis/patches/patch-doc_vorbisenc_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_vorbisenc_Makefile_in,v 1.1.1.1 2001/03/14 01:57:10 todd Exp $
--- doc/vorbisenc/Makefile.in.orig Mon Feb 26 14:36:10 2001
+++ doc/vorbisenc/Makefile.in Tue Mar 13 01:07:48 2001
@@ -87,7 +87,7 @@ pthread_lib = @pthread_lib@
$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@
AUTOMAKE_OPTIONS = foreign
-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
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

10
audio/libvorbis/patches/patch-doc_vorbisfile_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-doc_vorbisfile_Makefile_in,v 1.1.1.1 2001/03/14 01:57:10 todd Exp $
--- doc/vorbisfile/Makefile.in.orig Tue Mar 13 00:18:06 2001
+++ doc/vorbisfile/Makefile.in Tue Mar 13 00:18:23 2001
@@ -87,7 +87,7 @@ pthread_lib = @pthread_lib@
$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@
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
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

12
audio/libvorbis/patches/patch-lib_floor1_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_floor1_c,v 1.1 2001/08/20 21:53:56 naddy Exp $
--- lib/floor1.c.orig Fri Aug 17 01:00:31 2001
+++ lib/floor1.c Fri Aug 17 01:00:54 2001
@@ -226,7 +226,7 @@ static vorbis_look_floor *floor1_look(vo
/* also store a sorted position index */
for(i=0;i<n;i++)sortpointer[i]=info->postlist+i;
- qsort(sortpointer,n,sizeof(int),icomp);
+ qsort(sortpointer,n,sizeof(int *),icomp);
/* points from sort order back to range number */
for(i=0;i<n;i++)look->forward_index[i]=sortpointer[i]-info->postlist;

165
audio/libvorbis/patches/patch-lib_psy_c
View File

@ -1,165 +0,0 @@
$OpenBSD: patch-lib_psy_c,v 1.3 2001/08/28 01:02:17 naddy Exp $
--- lib/psy.c.orig Mon Aug 13 03:36:57 2001
+++ lib/psy.c Tue Aug 28 01:52:57 2001
@@ -594,95 +594,11 @@ static void max_seeds(vorbis_look_psy *p
}
-static void bark_noise_pointmp(int n,const long *b,
- const float *f,
- float *noise,
- const int fixed){
- long i,hi=0,lo=0,hif=0,lof=0;
- double xa=0,xb=0;
- double ya=0,yb=0;
- double x2a=0,x2b=0;
- double y2a=0,y2b=0;
- double xya=0,xyb=0;
- double na=0,nb=0;
-
- for(i=0;i<n;i++){
- if(hi<n){
- /* find new lo/hi */
- int bi=b[i]>>16;
- for(;hi<bi;hi++){
- double bin=(f[hi]<-140.f?0.:f[hi]+140.);
- double nn= bin*bin;
- na += nn;
- xa += hi*nn;
- ya += bin*nn;
- x2a += hi*hi*nn;
- y2a += bin*bin*nn;
- xya += hi*bin*nn;
- }
- bi=b[i]&0xffff;
- for(;lo<bi;lo++){
- double bin=(f[lo]<-140.f?0.:f[lo]+140.);
- double nn= bin*bin;
- na -= nn;
- xa -= lo*nn;
- ya -= bin*nn;
- x2a -= lo*lo*nn;
- y2a -= bin*bin*nn;
- xya -= lo*bin*nn;
- }
- }
-
- if(hif<n && fixed>0){
- int bi=i+fixed/2;
- if(bi>n)bi=n;
- for(;hif<bi;hif++){
- double bin=(f[hif]<-140.f?0.:f[hif]+140.);
- double nn= bin*bin;
- nb += nn;
- xb += hif*nn;
- yb += bin*nn;
- x2b += hif*hif*nn;
- y2b += bin*bin*nn;
- xyb += hif*bin*nn;
- }
- bi=i-(fixed+1)/2;
- if(bi<0)bi=0;
- for(;lof<bi;lof++){
- double bin=(f[lof]<-140.f?0.:f[lof]+140.);
- double nn= bin*bin;
- nb -= nn;
- xb -= lof*nn;
- yb -= bin*nn;
- x2b -= lof*lof*nn;
- y2b -= bin*bin*nn;
- xyb -= lof*bin*nn;
- }
- }
-
- {
- double denom=1./(na*x2a-xa*xa);
- double a=(ya*x2a-xya*xa)*denom;
- double b=(na*xya-xa*ya)*denom;
- double va=a+b*i;
-
- if(fixed>0){
- double denomf=1./(nb*x2b-xb*xb);
- double af=(yb*x2b-xyb*xb)*denomf;
- double bf=(nb*xyb-xb*yb)*denomf;
- double vb=af+bf*i;
- if(va>vb)va=vb;
- }
-
- noise[i]=va-140.f;
- }
- }
-}
-
static void bark_noise_hybridmp(int n,const long *b,
- const float *f,
- float *noise,
- const int fixed){
+ const float *f,
+ float *noise,
+ const float offset,
+ const int fixed){
long i,hi=0,lo=0,hif=0,lof=0;
double xa=0,xb=0;
double ya=0,yb=0;
@@ -699,7 +615,7 @@ static void bark_noise_hybridmp(int n,co
/* find new lo/hi */
int bi=b[i]>>16;
for(;hi<bi;hi++){
- double bin=f[hi];
+ double bin=(f[hi]<-offset?0.:f[hi]+offset);
if(bin>0.f){
double nn= bin*bin;
nn*=nn;
@@ -716,7 +632,7 @@ static void bark_noise_hybridmp(int n,co
}
bi=b[i]&0xffff;
for(;lo<bi;lo++){
- double bin=f[lo];
+ double bin=(f[lo]<-offset?0.:f[lo]+offset);
if(bin>0.f){
double nn= bin*bin;
nn*=nn;
@@ -744,7 +660,7 @@ static void bark_noise_hybridmp(int n,co
if(bi>n)bi=n;
for(;hif<bi;hif++){
- double bin=f[hif];
+ double bin=(f[hif]<-offset?0.:f[hif]+offset);
if(bin>0.f){
double nn= bin*bin;
nn*=nn;
@@ -762,7 +678,7 @@ static void bark_noise_hybridmp(int n,co
bi=i-(fixed+1)/2;
if(bi<0)bi=0;
for(;lof<bi;lof++){
- double bin=f[lof];
+ double bin=(f[lof]<-offset?0.:f[lof]+offset);
if(bin>0.f){
double nn= bin*bin;
nn*=nn;
@@ -817,7 +733,7 @@ static void bark_noise_hybridmp(int n,co
}
- noise[i]=va;
+ noise[i]=va-offset;
}
}
}
@@ -859,13 +775,13 @@ void _vp_compute_mask(vorbis_look_psy *p
if(p->vi->noisemaskp){
float *work=alloca(n*sizeof(float));
- bark_noise_pointmp(n,p->bark,logmdct,logmask,
- -1);
+ bark_noise_hybridmp(n,p->bark,logmdct,logmask,
+ 140.,-1);
for(i=0;i<n;i++)work[i]=logmdct[i]-logmask[i];
_analysis_output("medianmdct",seq,work,n,1,0);
- bark_noise_hybridmp(n,p->bark,work,logmask,
+ bark_noise_hybridmp(n,p->bark,work,logmask,0.,
p->vi->noisewindowfixed);
for(i=0;i<n;i++)work[i]=logmdct[i]-work[i];

8
audio/libvorbis/pkg/PFRAG.shared
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/06/30 13:18:09 naddy Exp $
lib/libvorbis.so.0.1
lib/libvorbisenc.so.0.1
lib/libvorbisfile.so.1.0
@comment $OpenBSD: PFRAG.shared,v 1.3 2002/01/16 03:10:21 naddy Exp $
lib/libvorbis.so.1.0
lib/libvorbisenc.so.1.0
lib/libvorbisfile.so.2.0
DYNLIBDIR(%B)

9
audio/libvorbis/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/03/14 01:57:10 todd Exp $
@comment $OpenBSD: PLIST,v 1.2 2002/01/16 03:10:21 naddy Exp $
include/vorbis/codec.h
include/vorbis/vorbisenc.h
include/vorbis/vorbisfile.h
@ -8,7 +8,6 @@ lib/libvorbisenc.a
lib/libvorbisenc.la
lib/libvorbisfile.a
lib/libvorbisfile.la
%%SHARED%%
share/aclocal/vorbis.m4
share/doc/libvorbis/programming.html
share/doc/libvorbis/v-comment.html
@ -21,6 +20,7 @@ share/doc/libvorbis/vorbisenc/reference.html
share/doc/libvorbis/vorbisenc/style.css
share/doc/libvorbis/vorbisenc/vorbis_encode_ctl.html
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/chaining_example_c.html
@ -47,9 +47,13 @@ share/doc/libvorbis/vorbisfile/ov_raw_seek.html
share/doc/libvorbis/vorbisfile/ov_raw_tell.html
share/doc/libvorbis/vorbisfile/ov_raw_total.html
share/doc/libvorbis/vorbisfile/ov_read.html
share/doc/libvorbis/vorbisfile/ov_read_float.html
share/doc/libvorbis/vorbisfile/ov_seekable.html
share/doc/libvorbis/vorbisfile/ov_serialnumber.html
share/doc/libvorbis/vorbisfile/ov_streams.html
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_tell.html
share/doc/libvorbis/vorbisfile/ov_time_total.html
@ -67,6 +71,7 @@ share/doc/libvorbis/vorbisword2.png
share/doc/libvorbis/wait.png
share/doc/libvorbis/white-ogg.png
share/doc/libvorbis/white-xifish.png
%%SHARED%%
@dirrm share/doc/libvorbis/vorbisfile
@dirrm share/doc/libvorbis/vorbisenc
@dirrm share/doc/libvorbis

25
audio/vorbis-tools/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.10 2001/10/08 14:57:55 naddy Exp $
# $OpenBSD: Makefile,v 1.11 2002/01/16 03:10:21 naddy Exp $
COMMENT= "play, encode, and manage Ogg Vorbis files"
DISTNAME= vorbis-tools-1.0rc2
DISTNAME= vorbis-tools-1.0rc3
CATEGORIES= audio
NEED_VERSION= 1.457
HOMEPAGE= http://www.vorbis.com/
@ -14,18 +14,19 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}files/rc2/unix/
MASTER_SITES= http://www.xiph.org/ogg/vorbis/download/ \
http://www.vorbis.com/files/rc2/unix/ \
http://www.oddsock.org/vorbisrc3/files/rc3/unix/
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh
LIB_DEPENDS= ao.2::audio/libao \
ogg.2::audio/libogg \
vorbis.0,vorbisenc.0,vorbisfile.1::audio/libvorbis
LIB_DEPENDS= ao.3::audio/libao \
ogg.3::audio/libogg \
vorbis.1,vorbisenc.1,vorbisfile.2::audio/libvorbis \
curl.2::net/curl
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-ogg-prefix=${LOCALBASE} \
--with-vorbis-prefix=${LOCALBASE} \
--with-ao-prefix=${LOCALBASE}
CONFIGURE_ARGS= --with-ao=${LOCALBASE} \
--with-ogg=${LOCALBASE} \
--with-vorbis=${LOCALBASE} \
--with-curl=${LOCALBASE}
.include <bsd.port.mk>

3
audio/vorbis-tools/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (vorbis-tools-1.0rc3.tar.gz) = c28c6b28cddb1d7027afd9a47a0d7b9c
RMD160 (vorbis-tools-1.0rc3.tar.gz) = 9027987f0747453fc7cab4f0f101f37bddac82a1
SHA1 (vorbis-tools-1.0rc3.tar.gz) = e5c08f24eb143f0790b37b4cf49a4905a37c6e44

3
audio/vorbis-tools/files/md5
View File

@ -1,3 +0,0 @@
MD5 (vorbis-tools-1.0rc2.tar.gz) = 2c8acbc323c701bed290293cf7928554
RMD160 (vorbis-tools-1.0rc2.tar.gz) = 410346a8c6428472b2b862cb45eaa8553e4f19b0
SHA1 (vorbis-tools-1.0rc2.tar.gz) = 06b7744b6285507304cade21b2d9a5eeeb123584

23
audio/vorbis-tools/patches/patch-configure Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-configure,v 1.1 2002/01/16 03:10:21 naddy Exp $
--- configure.orig Wed Jan 2 00:14:51 2002
+++ configure Wed Jan 2 00:15:46 2002
@@ -5342,7 +5342,7 @@ if test -z "$GCC"; then
;;
*)
DEBUG="-g"
- CFLAGS="-O"
+ CFLAGS=""
PROFILE="-g -p"
;;
esac
@@ -5365,8 +5365,8 @@ else
;;
*)
DEBUG="-g -Wall -fsigned-char"
- CFLAGS="-O20 -fsigned-char"
- PROFILE="-O20 -g -pg -fsigned-char"
+ CFLAGS="-fsigned-char"
+ PROFILE="-g -pg -fsigned-char"
;;
esac
fi

15
audio/vorbis-tools/patches/patch-ogg123_buffer_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-ogg123_buffer_c,v 1.5 2002/01/16 03:10:21 naddy Exp $
--- ogg123/buffer.c.orig Tue Jan 15 19:20:06 2002
+++ ogg123/buffer.c Tue Jan 15 19:21:17 2002
@@ -88,9 +88,11 @@ void buffer_thread_cleanup (void *arg)
/* Cleanup thread data structures */
pthread_mutex_unlock(&buf->mutex);
+#if 0 /* KLUDGE: disabling this keeps ogg123 from crashing */
pthread_mutex_destroy(&buf->mutex);
pthread_cond_destroy(&buf->playback_cond);
pthread_cond_destroy(&buf->write_cond);
+#endif
}

23
audio/vorbis-tools/patches/patch-oggenc_man_oggenc_1 Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-oggenc_man_oggenc_1,v 1.1 2002/01/16 03:10:21 naddy Exp $
--- oggenc/man/oggenc.1.orig Wed Jan 16 03:22:38 2002
+++ oggenc/man/oggenc.1 Wed Jan 16 03:23:34 2002
@@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii oggenc.1
.\"
-.TH oggenc 1 "2001 August 13" "" "Vorbis Tools release candidate 2"
+.TH oggenc 1 "2001 August 13" "" "Vorbis Tools"
.SH NAME
oggenc \- encode audio into the Ogg Vorbis format
@@ -231,10 +231,6 @@ Michael Smith <msmith@labyrinth.net.au>
Manpage Author:
.br
Stan Seibert <indigo@aztec.asu.edu>
-
-.SH BUGS
-Options -m, -M, and -q for for flexible bitrate/quality selection exist, but are not
-implemented in the vorbis encoder, and so are not documented here yet.
.SH SEE ALSO

4
audio/vorbis-tools/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2001/08/20 21:53:57 naddy Exp $
@comment $OpenBSD: PLIST,v 1.4 2002/01/16 03:10:21 naddy Exp $
bin/ogg123
bin/oggenc
bin/ogginfo
@ -7,3 +7,5 @@ bin/vorbiscomment
man/man1/ogg123.1
man/man1/oggenc.1
man/man1/ogginfo.1
man/man1/vcut.1
man/man1/vorbiscomment.1