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

Update Ogg Vorbis libs and tools to RC1.

Browse Source
This commit is contained in:
naddy 2001-06-30 13:18:06 +00:00
parent 0f60b900f1
commit 9cb645cf62
20 changed files with 171 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/libogg/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2001/03/25 22:04:08 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2001/06/30 13:18:06 naddy Exp $
COMMENT= "Ogg bitstream library"
DISTNAME= libogg-1.0beta4
DISTNAME= libogg-1.0rc1
CATEGORIES= audio
NEED_VERSION= 1.363
HOMEPAGE= http://www.xiph.org/ogg/
@ -13,7 +13,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.vorbis.com/files/beta4/unix/
MASTER_SITES= http://www.vorbis.com/files/rc1/unix/
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static

6
audio/libogg/files/md5
View File

@ -1,3 +1,3 @@
MD5 (libogg-1.0beta4.tar.gz) = 1ffd9d6c02f824e50345920bd07366e9
RMD160 (libogg-1.0beta4.tar.gz) = 7f4aa4377c169a0401e4fdb35da915e277575ed9
SHA1 (libogg-1.0beta4.tar.gz) = 188135db21f6cc9507e977cc17f9cf7c314e95d8
MD5 (libogg-1.0rc1.tar.gz) = fe25d090de826bc6f364240412cf1998
RMD160 (libogg-1.0rc1.tar.gz) = 932975baf1e27c9537c7bc68636aeb5641b05161
SHA1 (libogg-1.0rc1.tar.gz) = 5254c35adfd4e804f98c1b6d9cc889539cfdf9d9

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2001/03/14 01:55:47 todd Exp $
--- configure.orig Mon Mar 12 23:13:33 2001
+++ configure Mon Mar 12 23:14:20 2001
@@ -1489,9 +1489,9 @@ if test -z "$GCC"; then
$OpenBSD: patch-configure,v 1.2 2001/06/30 13:18:07 naddy Exp $
--- configure.orig Mon Jun 18 18:08:30 2001
+++ configure Sat Jun 30 13:41:39 2001
@@ -1491,9 +1491,9 @@ if test -z "$GCC"; then
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
;;
*)
@ -14,7 +14,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2001/03/14 01:55:47 todd Exp $
;;
esac
else
@@ -1512,9 +1512,9 @@ else
@@ -1514,9 +1514,9 @@ else
PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
;;
*)

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

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2001/03/14 01:55:43 todd Exp $
lib/libogg.so.1.0
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/06/30 13:18:08 naddy Exp $
lib/libogg.so.2.0
DYNLIBDIR(%B)

8
audio/libvorbis/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2001/03/25 22:04:10 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2001/06/30 13:18:08 naddy Exp $
COMMENT= "audio compression codec library"
DISTNAME= libvorbis-1.0beta4
DISTNAME= libvorbis-1.0rc1
CATEGORIES= audio
NEED_VERSION= 1.363
HOMEPAGE= http://www.xiph.org/ogg/
@ -13,9 +13,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www.vorbis.com/files/beta4/unix/
MASTER_SITES= http://www.vorbis.com/files/rc1/unix/
LIB_DEPENDS= ogg.1::audio/libogg
LIB_DEPENDS= ogg.2::audio/libogg
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static \

6
audio/libvorbis/files/md5
View File

@ -1,3 +1,3 @@
MD5 (libvorbis-1.0beta4.tar.gz) = 6954d72386cbf88c613e1ffebb7b4bac
RMD160 (libvorbis-1.0beta4.tar.gz) = 6aa4a3b18d4a00d034e8eceb88036ce111b94ec2
SHA1 (libvorbis-1.0beta4.tar.gz) = c101d89c1064b1e80be65fbef785a22654203e39
MD5 (libvorbis-1.0rc1.tar.gz) = 95b34a6a4f2b037fc6cca78a7ebe9758
RMD160 (libvorbis-1.0rc1.tar.gz) = b852c917bef12ba645c08392629874314b319baf
SHA1 (libvorbis-1.0rc1.tar.gz) = f356c2a2fb459bdc6eb291b637087405f56df94a

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2001/03/14 01:57:11 todd Exp $
--- configure.orig Tue Mar 13 00:19:52 2001
+++ configure Tue Mar 13 00:20:47 2001
@@ -1617,9 +1617,9 @@ if test -z "$GCC"; then
$OpenBSD: patch-configure,v 1.2 2001/06/30 13:18:09 naddy Exp $
--- configure.orig Mon Jun 18 18:12:43 2001
+++ configure Sat Jun 30 13:42:24 2001
@@ -1620,9 +1620,9 @@ if test -z "$GCC"; then
CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
*)
@ -14,7 +14,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2001/03/14 01:57:11 todd Exp $
esac
else
@@ -1709,9 +1709,9 @@ rm -f conftest*
@@ -1712,9 +1712,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";;
*)
@ -26,4 +26,4 @@ $OpenBSD: patch-configure,v 1.1.1.1 2001/03/14 01:57:11 todd Exp $
+ PROFILE="$CFLAGS -g -pg -fsigned-char" ;;
esac
fi
CFLAGS="$CFLAGS $cflags_save"

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

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_psy_c,v 1.1 2001/03/21 15:15:39 naddy Exp $
--- lib/psy.c.orig Wed Mar 21 16:12:32 2001
+++ lib/psy.c Wed Mar 21 16:12:34 2001
@@ -191,7 +191,7 @@ void _vp_psy_init(vorbis_look_psy *p,vor
p->total_octave_lines=maxoc-p->firstoc+1;
p->ath=_ogg_malloc(n*sizeof(float));
- p->octave=_ogg_malloc(n*sizeof(int));
+ p->octave=_ogg_malloc(n*sizeof(long));
p->bark=_ogg_malloc(n*sizeof(float));
p->vi=vi;
p->n=n;

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

@ -1,5 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2001/03/14 01:57:10 todd Exp $
@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.0.1
lib/libvorbisfile.so.1.0
DYNLIBDIR(%B)

8
audio/vorbis-tools/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.5 2001/05/15 16:17:56 naddy Exp $
# $OpenBSD: Makefile,v 1.6 2001/06/30 13:18:10 naddy Exp $
COMMENT= "play, encode, and manage Ogg Vorbis files"
DISTNAME= vorbis-tools-1.0beta4
DISTNAME= vorbis-tools-1.0rc1
CATEGORIES= audio
NEED_VERSION= 1.363
HOMEPAGE= http://www.vorbis.com
@ -13,10 +13,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}/files/beta4/unix/
MASTER_SITES= ${HOMEPAGE}/files/rc1/unix/
LIB_DEPENDS= ao.1::audio/libao \
ogg.1::audio/libogg \
ogg.2::audio/libogg \
vorbis.0::audio/libvorbis
CONFIGURE_STYLE= autoconf

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

@ -1,3 +1,3 @@
MD5 (vorbis-tools-1.0beta4.tar.gz) = 5222a18972276f0bf42256c221453d0e
RMD160 (vorbis-tools-1.0beta4.tar.gz) = f4ee89352f3dfb06258e75ea9fb7f59634c912db
SHA1 (vorbis-tools-1.0beta4.tar.gz) = 58fd74ed0c8c814052e5c713736fb2df99bb89e6
MD5 (vorbis-tools-1.0rc1.tar.gz) = 40f19902e7b31571615952c29fce8389
RMD160 (vorbis-tools-1.0rc1.tar.gz) = 47d9377bfc788dac04bc91b04f92fc462e1e4de7
SHA1 (vorbis-tools-1.0rc1.tar.gz) = fe26867939d06e84fde67bc591200a98f7a964c2

8
audio/vorbis-tools/patches/patch-acinclude_m4
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-acinclude_m4,v 1.1 2001/03/17 17:07:10 naddy Exp $
--- acinclude.m4.orig Sat Mar 17 16:28:41 2001
+++ acinclude.m4 Sat Mar 17 16:36:54 2001
@@ -280,3 +280,65 @@ int main ()
$OpenBSD: patch-acinclude_m4,v 1.2 2001/06/30 13:18:10 naddy Exp $
--- acinclude.m4.orig Tue Mar 27 00:35:47 2001
+++ acinclude.m4 Sat Jun 30 13:55:27 2001
@@ -300,3 +300,65 @@ int main ()
AC_SUBST(AO_LIBS)
rm -f conf.aotest
])

23
audio/vorbis-tools/patches/patch-aclocal_m4
View File

@ -1,20 +1,10 @@
$OpenBSD: patch-aclocal_m4,v 1.2 2001/03/17 17:07:11 naddy Exp $
--- aclocal.m4.orig Mon Feb 26 06:51:03 2001
+++ aclocal.m4 Sat Mar 17 17:06:03 2001
@@ -222,7 +222,7 @@ AC_ARG_ENABLE(aotest, [ --disable-aotes
AO_LIBS="-L$ao_prefix/lib"
fi
- AO_LIBS="$AO_LIBS -lao -ldl"
+ AO_LIBS="$AO_LIBS -lao"
AC_MSG_CHECKING(for ao)
no_ao=""
@@ -292,6 +292,68 @@ int main ()
AC_SUBST(AO_LIBS)
$OpenBSD: patch-aclocal_m4,v 1.3 2001/06/30 13:18:11 naddy Exp $
--- aclocal.m4.orig Mon Jun 18 06:43:11 2001
+++ aclocal.m4 Sat Jun 30 13:55:27 2001
@@ -313,6 +313,68 @@ int main ()
rm -f conf.aotest
])
+
+dnl Shamelessly stolen from Joerg Schilling's star.
+dnl Copyright 1998 J. Schilling
+
@ -76,6 +66,7 @@ $OpenBSD: patch-aclocal_m4,v 1.2 2001/03/17 17:07:11 naddy Exp $
+if test $ac_cv_func_smmap = yes; then
+ AC_DEFINE(HAVE_SMMAP)
+fi])
+
# Do all the work for Automake. This macro actually does too much --
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.

13
audio/vorbis-tools/patches/patch-ogg123_Makefile_am
View File

@ -1,9 +1,12 @@
$OpenBSD: patch-ogg123_Makefile_am,v 1.1 2001/03/17 17:07:11 naddy Exp $
--- ogg123/Makefile.am.orig Sat Mar 17 15:55:09 2001
+++ ogg123/Makefile.am Sat Mar 17 15:55:13 2001
@@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign
$OpenBSD: patch-ogg123_Makefile_am,v 1.2 2001/06/30 13:18:11 naddy Exp $
--- ogg123/Makefile.am.orig Sun Mar 25 17:59:31 2001
+++ ogg123/Makefile.am Sat Jun 30 14:07:30 2001
@@ -3,9 +3,8 @@
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = ogg123
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/$(PACKAGE)
doc_DATA = ogg123rc-example
-mandir = $(datadir)/man
man_MANS = ogg123.1

29
audio/vorbis-tools/patches/patch-ogg123_buffer_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ogg123_buffer_c,v 1.2 2001/03/17 17:07:11 naddy Exp $
--- ogg123/buffer.c.orig Tue Jan 30 11:42:48 2001
+++ ogg123/buffer.c Sat Mar 17 17:12:02 2001
@@ -6,17 +6,16 @@
$OpenBSD: patch-ogg123_buffer_c,v 1.3 2001/06/30 13:18:11 naddy Exp $
--- ogg123/buffer.c.orig Sat Jun 30 13:57:20 2001
+++ ogg123/buffer.c Sat Jun 30 14:01:55 2001
@@ -6,16 +6,16 @@
*/
#include <sys/types.h>
@ -10,7 +10,6 @@ $OpenBSD: patch-ogg123_buffer_c,v 1.2 2001/03/17 17:07:11 naddy Exp $
+#else
#include <sys/ipc.h>
#include <sys/shm.h>
-#include <sys/stat.h>
+#endif
#include <sys/time.h>
#include <unistd.h> /* for fork and pipe*/
@ -23,7 +22,7 @@ $OpenBSD: patch-ogg123_buffer_c,v 1.2 2001/03/17 17:07:11 naddy Exp $
#include "ogg123.h"
#include "buffer.h"
@@ -73,10 +72,26 @@ buf_t *fork_writer (long size, devices_t
@@ -72,6 +72,22 @@ buf_t *fork_writer (long size, devices_t
int childpid;
buf_t *buf;
@ -46,21 +45,11 @@ $OpenBSD: patch-ogg123_buffer_c,v 1.2 2001/03/17 17:07:11 naddy Exp $
/* Get the shared memory segment. */
int shmid = shmget (IPC_PRIVATE,
sizeof(buf_t) + sizeof (chunk_t) * (size - 1),
- IPC_CREAT|S_IREAD|S_IWRITE);
+ IPC_CREAT|SHM_R|SHM_W);
@@ -94,6 +110,7 @@ buf_t *fork_writer (long size, devices_t
if (shmid == -1)
{
@@ -92,7 +107,11 @@ buf_t *fork_writer (long size, devices_t
perror ("shmat");
exit (1);
}
-
+
+ /* Remove segment after last process detaches it or terminates. */
+ shmctl(shmid, IPC_RMID, 0);
/* Remove segment after last process detaches it or terminates. */
shmctl(shmid, IPC_RMID, 0);
+#endif /* HAVE_SMMAP */
+
buffer_init (buf, size);
/* Create a pipe for communication between the two processes. Unlike

74
audio/vorbis-tools/patches/patch-ogg123_ogg123_1 Normal file
View File

@ -0,0 +1,74 @@
$OpenBSD: patch-ogg123_ogg123_1,v 1.1 2001/06/30 13:18:11 naddy Exp $
--- ogg123/ogg123.1.orig Sat Jun 30 14:48:43 2001
+++ ogg123/ogg123.1 Sat Jun 30 15:02:46 2001
@@ -76,7 +76,7 @@ written to
output overhead.
.IP oss
-Open Sound System driver for Linux and {Net,Free,Open}BSD.
+Open Sound System driver for Linux and FreeBSD.
.RS
Options:
.RS
@@ -86,6 +86,17 @@ DSP device for soundcard. Defaults to
.RE
.RE
+.IP sun
+Sun Audio driver for NetBSD, OpenBSD, and Solaris.
+.RS
+Options:
+.RS
+.IP dev
+Audio device for soundcard. Defaults to
+.B /dev/audio.
+.RE
+.RE
+
.IP alsa
Advanced Linux Sound Architecture.
.RS
@@ -100,6 +111,14 @@ Override the default buffer size (in byt
.RE
.RE
+.IP irix
+IRIX audio driver. Note that this driver has
+.B not
+been tested!
+
+.IP arts
+aRts Sound Daemon.
+
.IP esd
Enlightened Sound Daemon.
.RS
@@ -111,15 +130,19 @@ after a colon, as in "whizbang.com:555".
.RE
.RE
-.IP solaris
-Solaris audio driver. Note that this driver has
-.B not
-been tested!
-
-.IP irix
-IRIX audio driver. Note that this driver has
-.B not
-been tested!
+.IP raw
+Raw sample output. Writes raw audio samples to a file.
+.RS
+Options:
+.RS
+.IP file
+Sets the output file. (Default = "output.raw")
+.RE
+.RS
+.IP byteorder
+Choose big endian, little endian, or native byte order. (Default = "native")
+.RE
+.RE
.IP wav
WAV file output. Writes the sound data to disk in uncompressed form.

16
audio/vorbis-tools/patches/patch-ogg123_ogg123_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-ogg123_ogg123_c,v 1.1 2001/06/30 13:18:11 naddy Exp $
--- ogg123/ogg123.c.orig Sat Jun 30 15:04:57 2001
+++ ogg123/ogg123.c Sat Jun 30 15:09:10 2001
@@ -85,8 +85,10 @@ void usage(void)
" -V, --version display Ogg123 version\n"
" -d, --device=d uses 'd' as an output device\n"
" Possible devices are (some may not be compiled):\n"
- " null (output nothing), oss (for Linux and *BSD),\n"
- " irix, solaris, wav (write to a .WAV file)\n"
+ " null (output nothing), oss (for Linux and FreeBSD),\n"
+ " alsa (for Linux), sun (for NetBSD, OpenBSD, Solaris),\n"
+ " irix, arts (aRts sound daemon), esd (ESounD daemon),\n"
+ " raw (write to a file), wav (write to a .WAV file)\n"
" -k n, --skip n Skip the first 'n' seconds\n"
" -o, --device-option=k:v passes special option k with value\n"
" v to previously specified device (with -d). See\n"

8
audio/vorbis-tools/patches/patch-ogg123_ogg123rc-example
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-ogg123_ogg123rc-example,v 1.1 2001/03/19 00:19:44 naddy Exp $
--- ogg123/ogg123rc-example.orig Mon Mar 19 01:09:42 2001
+++ ogg123/ogg123rc-example Mon Mar 19 01:09:59 2001
$OpenBSD: patch-ogg123_ogg123rc-example,v 1.2 2001/06/30 13:18:11 naddy Exp $
--- ogg123/ogg123rc-example.orig Mon Jun 18 18:16:50 2001
+++ ogg123/ogg123rc-example Sat Jun 30 13:55:27 2001
@@ -1,3 +1,3 @@
# Copy this to ~/.ogg123rc and edit as necessary. The current
# parser cannot handle comments, so remove these lines also.
# parser appears to handle comments.
-default_device=oss
+default_device=sun

11
audio/vorbis-tools/patches/patch-ogginfo_Makefile_am Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-ogginfo_Makefile_am,v 1.1 2001/06/30 13:18:11 naddy Exp $
--- ogginfo/Makefile.am.orig Sat Jun 30 14:08:14 2001
+++ ogginfo/Makefile.am Sat Jun 30 14:08:32 2001
@@ -3,7 +3,6 @@
AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = ogginfo
-mandir = $(datadir)/man
man_MANS = ogginfo.1
INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@

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

@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/03/14 01:58:25 todd Exp $
@comment $OpenBSD: PLIST,v 1.2 2001/06/30 13:18:12 naddy Exp $
bin/ogg123
bin/oggenc
bin/ogginfo
bin/vorbiscomment
man/man1/ogg123.1
man/man1/oggenc.1
man/man1/ogginfo.1
share/examples/vorbis-tools/dot.ogg123rc
@dirrm share/examples/vorbis-tools