mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
Update libao to 0.8.0, which breaks mpg321. Update libogg, libvorbis,
vorbis-tools and the vorbis meta-port to 1.0rc2. This version supports "channel coupling" for more efficient compression of stereo material. Submitted by: Christian Weisgerber (maintainer)
This commit is contained in:
parent
a1213bc04d
commit
9f49d35673
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=46948
@ -6,9 +6,9 @@
|
||||
#
|
||||
|
||||
PORTNAME= libao
|
||||
PORTVERSION= 0.7.0
|
||||
PORTVERSION= 0.8.0
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://www.vorbis.com/files/rc1/unix/
|
||||
MASTER_SITES= http://www.vorbis.com/files/rc2/unix/
|
||||
|
||||
MAINTAINER= naddy@mips.inka.de
|
||||
|
||||
@ -23,6 +23,8 @@ MAKE_ENV= DOC=""
|
||||
MAKE_ENV= DOC=doc
|
||||
.endif
|
||||
|
||||
MAN5= libao.conf.5
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if defined(HAVE_ESOUND)
|
||||
|
@ -1 +1 @@
|
||||
MD5 (libao-0.7.0.tar.gz) = f4708f76c18cadc781ecbe0b9131d050
|
||||
MD5 (libao-0.8.0.tar.gz) = e387df473b23e3cd15d2d8fbb5b5d236
|
||||
|
@ -1,7 +1,9 @@
|
||||
|
||||
$FreeBSD$
|
||||
--- Makefile.in.orig Tue Jul 17 02:31:20 2001
|
||||
+++ Makefile.in Tue Jul 17 02:31:31 2001
|
||||
@@ -87,7 +87,7 @@ plugindir = @plugindir@
|
||||
|
||||
--- Makefile.in.orig Mon Aug 13 13:39:22 2001
|
||||
+++ Makefile.in Tue Aug 14 17:39:55 2001
|
||||
@@ -87,7 +87,7 @@
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign dist-zip
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
|
||||
$FreeBSD$
|
||||
--- configure.orig Mon Jun 18 18:05:25 2001
|
||||
+++ configure Tue Jul 17 12:38:04 2001
|
||||
@@ -1510,7 +1510,7 @@ if test -z "$GCC"; then
|
||||
|
||||
--- configure.orig Mon Aug 13 13:39:05 2001
|
||||
+++ configure Tue Aug 14 17:40:12 2001
|
||||
@@ -1510,7 +1510,7 @@
|
||||
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
|
||||
*)
|
||||
DEBUG="-g"
|
||||
@ -10,7 +12,7 @@ $FreeBSD$
|
||||
PROFILE="-g -p" ;;
|
||||
esac
|
||||
else
|
||||
@@ -1525,9 +1525,9 @@ else
|
||||
@@ -1525,9 +1525,9 @@
|
||||
CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
|
||||
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
|
||||
*)
|
||||
|
@ -1,12 +1,14 @@
|
||||
|
||||
$FreeBSD$
|
||||
--- doc/Makefile.in.orig Wed Mar 21 16:29:06 2001
|
||||
+++ doc/Makefile.in Wed Mar 21 16:29:15 2001
|
||||
@@ -87,7 +87,7 @@ plugindir = @plugindir@
|
||||
|
||||
--- doc/Makefile.in.orig Mon Aug 13 13:39:39 2001
|
||||
+++ doc/Makefile.in Tue Aug 14 17:39:32 2001
|
||||
@@ -88,7 +88,7 @@
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
|
||||
+docdir = $(datadir)/doc/$(PACKAGE)
|
||||
|
||||
doc_DATA = API USAGE DRIVERS WANTED
|
||||
doc_DATA = *.html ao_example.c style.css
|
||||
|
||||
|
@ -1,26 +0,0 @@
|
||||
$FreeBSD$
|
||||
--- src/plugins/arts/Makefile.in.orig Tue Jul 17 02:29:03 2001
|
||||
+++ src/plugins/arts/Makefile.in Tue Jul 17 02:29:34 2001
|
||||
@@ -93,13 +93,12 @@ AUTOMAKE_OPTIONS = foreign
|
||||
@HAVE_ARTS_TRUE@artssources = ao_arts.c
|
||||
@HAVE_ARTS_FALSE@artssources =
|
||||
|
||||
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
|
||||
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include @ARTS_CFLAGS@
|
||||
|
||||
libdir = $(plugindir)
|
||||
lib_LTLIBRARIES = $(artsltlibs)
|
||||
|
||||
libarts_la_LDFLAGS = $(artsldflags)
|
||||
-CFLAGS = @ARTS_CFLAGS@
|
||||
libarts_la_LIBADD = @ARTS_LIBS@
|
||||
libarts_la_SOURCES = $(artssources)
|
||||
|
||||
@@ -116,6 +115,7 @@ LIBS = @LIBS@
|
||||
libarts_la_DEPENDENCIES =
|
||||
@HAVE_ARTS_FALSE@libarts_la_OBJECTS =
|
||||
@HAVE_ARTS_TRUE@libarts_la_OBJECTS = ao_arts.lo
|
||||
+CFLAGS = @CFLAGS@
|
||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
CCLD = $(CC)
|
@ -1,9 +1,12 @@
|
||||
libao is a cross-platform audio library that allows programs to
|
||||
output audio using a simple API on a wide variety of platforms.
|
||||
On FreeBSD, it currently supports:
|
||||
* Null output
|
||||
* null output
|
||||
* raw output
|
||||
* AU files
|
||||
* WAV files
|
||||
* OSS (Open Sound System)
|
||||
* ESD (ESounD or Enlightened Sound Daemon)
|
||||
* aRts (KDE sound server)
|
||||
|
||||
WWW: http://www.vorbis.com/
|
||||
|
@ -1,16 +1,46 @@
|
||||
@comment $FreeBSD$
|
||||
include/ao/ao.h
|
||||
include/ao/os_types.h
|
||||
include/ao/plugin.h
|
||||
lib/libao.so
|
||||
lib/libao.so.1
|
||||
lib/libao.so.2
|
||||
%%ARTS%%lib/ao/libarts.so
|
||||
lib/ao/liboss.so
|
||||
%%ESOUND%%lib/ao/libesd.so
|
||||
share/aclocal/ao.m4
|
||||
%%PORTDOCS%%share/doc/libao/API
|
||||
%%PORTDOCS%%share/doc/libao/DRIVERS
|
||||
%%PORTDOCS%%share/doc/libao/USAGE
|
||||
%%PORTDOCS%%share/doc/libao/WANTED
|
||||
%%PORTDOCS%%share/doc/libao/ao_append_option.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_close.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_default_driver_id.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_device.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_driver_id.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_driver_info.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_driver_info_list.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_example.c
|
||||
%%PORTDOCS%%share/doc/libao/ao_free_options.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_info.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_initialize.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_open_file.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_open_live.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_option.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_play.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_plugin_close.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_plugin_device_clear.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_plugin_device_init.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_plugin_driver_info.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_plugin_open.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_plugin_play.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_plugin_set_option.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_plugin_test.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_sample_format.html
|
||||
%%PORTDOCS%%share/doc/libao/ao_shutdown.html
|
||||
%%PORTDOCS%%share/doc/libao/config.html
|
||||
%%PORTDOCS%%share/doc/libao/drivers.html
|
||||
%%PORTDOCS%%share/doc/libao/index.html
|
||||
%%PORTDOCS%%share/doc/libao/libao-api.html
|
||||
%%PORTDOCS%%share/doc/libao/overview.html
|
||||
%%PORTDOCS%%share/doc/libao/plugin-api.html
|
||||
%%PORTDOCS%%share/doc/libao/plugin-overview.html
|
||||
%%PORTDOCS%%share/doc/libao/style.css
|
||||
@dirrm include/ao
|
||||
@dirrm lib/ao
|
||||
%%PORTDOCS%%@dirrm share/doc/libao
|
||||
|
@ -6,10 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= libogg
|
||||
PORTVERSION= 1.0.r1
|
||||
PORTVERSION= 1.0.r2
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://www.vorbis.com/files/rc1/unix/
|
||||
MASTER_SITES= http://www.vorbis.com/files/rc2/unix/
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
|
||||
|
||||
MAINTAINER= naddy@mips.inka.de
|
||||
|
@ -1 +1 @@
|
||||
MD5 (libogg-1.0rc1.tar.gz) = fe25d090de826bc6f364240412cf1998
|
||||
MD5 (libogg-1.0rc2.tar.gz) = 327733122fe0fb67da7e6632d23feb30
|
||||
|
@ -8,10 +8,6 @@ lib/libogg.so.2
|
||||
share/aclocal/ogg.m4
|
||||
%%PORTDOCS%%share/doc/libogg/framing.html
|
||||
%%PORTDOCS%%share/doc/libogg/index.html
|
||||
%%PORTDOCS%%share/doc/libogg/oggstream.html
|
||||
%%PORTDOCS%%share/doc/libogg/stream.png
|
||||
%%PORTDOCS%%share/doc/libogg/white-ogg.png
|
||||
%%PORTDOCS%%share/doc/libogg/white-xifish.png
|
||||
%%PORTDOCS%%share/doc/libogg/ogg/bitpacking.html
|
||||
%%PORTDOCS%%share/doc/libogg/ogg/datastructures.html
|
||||
%%PORTDOCS%%share/doc/libogg/ogg/decoding.html
|
||||
@ -70,6 +66,10 @@ share/aclocal/ogg.m4
|
||||
%%PORTDOCS%%share/doc/libogg/ogg/style.css
|
||||
%%PORTDOCS%%share/doc/libogg/ogg/vorbis_comment.html
|
||||
%%PORTDOCS%%share/doc/libogg/ogg/vorbis_info.html
|
||||
%%PORTDOCS%%share/doc/libogg/oggstream.html
|
||||
%%PORTDOCS%%share/doc/libogg/stream.png
|
||||
%%PORTDOCS%%share/doc/libogg/white-ogg.png
|
||||
%%PORTDOCS%%share/doc/libogg/white-xifish.png
|
||||
@dirrm include/ogg
|
||||
%%PORTDOCS%%@dirrm share/doc/libogg/ogg
|
||||
%%PORTDOCS%%@dirrm share/doc/libogg
|
||||
|
@ -6,10 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= libvorbis
|
||||
PORTVERSION= 1.0.r1
|
||||
PORTVERSION= 1.0.r2
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://www.vorbis.com/files/rc1/unix/
|
||||
MASTER_SITES= http://www.vorbis.com/files/rc2/unix/
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
|
||||
|
||||
MAINTAINER= naddy@mips.inka.de
|
||||
@ -18,8 +18,6 @@ LIB_DEPENDS= ogg.2:${PORTSDIR}/audio/libogg
|
||||
|
||||
USE_LIBTOOL= yes
|
||||
CONFIGURE_ARGS= --with-ogg-prefix=${LOCALBASE}
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
.if defined(NOPORTDOCS)
|
||||
MAKE_ENV= DOC=""
|
||||
|
@ -1 +1 @@
|
||||
MD5 (libvorbis-1.0rc1.tar.gz) = 95b34a6a4f2b037fc6cca78a7ebe9758
|
||||
MD5 (libvorbis-1.0rc2.tar.gz) = e5dfe5c71ee451313ec11af1387bd8f7
|
||||
|
14
audio/libvorbis/files/patch-lib_floor1.c
Normal file
14
audio/libvorbis/files/patch-lib_floor1.c
Normal file
@ -0,0 +1,14 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- lib/floor1.c.orig Mon Aug 13 13:33:39 2001
|
||||
+++ lib/floor1.c Fri Aug 17 01:09:12 2001
|
||||
@@ -226,7 +226,7 @@
|
||||
|
||||
/* 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;
|
@ -1,14 +1,21 @@
|
||||
Vorbis is a general-purpose audio and music encoding format contemporary to
|
||||
MPEG-4's AAC and TwinVQ, the next generation beyond MPEG audio layer 3. Unlike
|
||||
the MPEG sponsored formats (and other proprietary formats such as RealAudio G2
|
||||
and Windows' flavor of the month), the Vorbis CODEC specification belongs to
|
||||
the public domain. All the technical details are published and documented, and
|
||||
any software entity may make full use of the format without royalty or patent
|
||||
concerns.
|
||||
Vorbis is a general purpose audio and music encoding format
|
||||
contemporary to MPEG-4's AAC and TwinVQ, the next generation beyond
|
||||
MPEG audio layer 3. Unlike the MPEG sponsored formats (and other
|
||||
proprietary formats such as RealAudio G2 and Windows' flavor of the
|
||||
month), the Vorbis CODEC specification belongs to the public domain.
|
||||
All the technical details are published and documented, and any
|
||||
software entity may make full use of the format without royalty or
|
||||
patent concerns.
|
||||
|
||||
This package contains libvorbis, an LGPLed software implementation of the
|
||||
Vorbis specification by the Xiphophorus company (http://www.xiph.org/), and
|
||||
vorbisfile, an LGPLed convenience library built on Vorbis designed to simplify
|
||||
common uses.
|
||||
This package contains:
|
||||
|
||||
- libvorbis, a BSD-license software implementation of the Vorbis
|
||||
specification by the Xiphophorus company.
|
||||
|
||||
- libvorbisfile, a BSD-license convenience library built on Vorbis
|
||||
designed to simplify common uses.
|
||||
|
||||
- libvorbisenc, a BSD-license library that provides a simple,
|
||||
programmatic encoding setup interface.
|
||||
|
||||
WWW: http://www.xiph.org/ogg/
|
||||
|
@ -16,6 +16,8 @@ MAINTAINER= naddy@mips.inka.de
|
||||
LIB_DEPENDS= ao.1:${PORTSDIR}/audio/libao
|
||||
BUILD_DEPENDS= ${LOCALBASE}/lib/libmad.a:${PORTSDIR}/audio/mad
|
||||
|
||||
BROKEN= "not yet updated for libao.so.2"
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --disable-mpg123-symlink
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
|
@ -6,30 +6,23 @@
|
||||
#
|
||||
|
||||
PORTNAME= vorbis-tools
|
||||
PORTVERSION= 1.0.r1
|
||||
PORTVERSION= 1.0.r2
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://www.vorbis.com/files/rc1/unix/
|
||||
MASTER_SITES= http://www.vorbis.com/files/rc2/unix/
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
|
||||
|
||||
MAINTAINER= naddy@mips.inka.de
|
||||
|
||||
LIB_DEPENDS= ao.1:${PORTSDIR}/audio/libao \
|
||||
LIB_DEPENDS= ao.2:${PORTSDIR}/audio/libao \
|
||||
ogg.2:${PORTSDIR}/audio/libogg \
|
||||
vorbis.0:${PORTSDIR}/audio/libvorbis
|
||||
|
||||
USE_AUTOCONF= yes
|
||||
USE_LIBTOOL= yes
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
|
||||
CONFIGURE_ARGS= --with-ao=${LOCALBASE} \
|
||||
--with-ogg=${LOCALBASE} \
|
||||
--with-vorbis=${LOCALBASE}
|
||||
CONFIGURE_ARGS= --with-ao-prefix=${LOCALBASE} \
|
||||
--with-ogg-prefix=${LOCALBASE} \
|
||||
--with-vorbis-prefix=${LOCALBASE}
|
||||
|
||||
MAN1= ogg123.1 oggenc.1 ogginfo.1
|
||||
|
||||
post-extract:
|
||||
@(cd ${WRKSRC}/ogg123 ;\
|
||||
${MV} ogg123rc-example ogg123rc ;\
|
||||
${PERL} -pi.orig -e 's/
//' ogg123.1)
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1 +1 @@
|
||||
MD5 (vorbis-tools-1.0rc1.tar.gz) = 40f19902e7b31571615952c29fce8389
|
||||
MD5 (vorbis-tools-1.0rc2.tar.gz) = 2c8acbc323c701bed290293cf7928554
|
||||
|
@ -1,72 +0,0 @@
|
||||
$FreeBSD$
|
||||
--- aclocal.m4.orig Mon Jun 18 06:43:11 2001
|
||||
+++ aclocal.m4 Tue Jul 17 01:38:36 2001
|
||||
@@ -313,6 +313,68 @@ int main ()
|
||||
rm -f conf.aotest
|
||||
])
|
||||
|
||||
+dnl Shamelessly stolen from Joerg Schilling's star.
|
||||
+dnl Copyright 1998 J. Schilling
|
||||
+
|
||||
+dnl Checks if mmap() works to get shared memory
|
||||
+dnl Defines HAVE_SMMAP on success.
|
||||
+AC_DEFUN(AC_FUNC_SMMAP,
|
||||
+[AC_CACHE_CHECK([if mmap works to get shared memory], ac_cv_func_smmap,
|
||||
+ [AC_TRY_RUN([
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/mman.h>
|
||||
+
|
||||
+char *
|
||||
+mkshare()
|
||||
+{
|
||||
+ int size = 8192;
|
||||
+ int f;
|
||||
+ char *addr;
|
||||
+
|
||||
+ if ((f = open("/dev/zero", 2)) < 0)
|
||||
+ exit(1);
|
||||
+ addr = mmap(0, size, PROT_READ|PROT_WRITE, MAP_SHARED, f, 0);
|
||||
+ if (addr == (char *)-1)
|
||||
+ exit(1);
|
||||
+ close(f);
|
||||
+
|
||||
+ return (addr);
|
||||
+}
|
||||
+
|
||||
+main()
|
||||
+{
|
||||
+ char *addr;
|
||||
+
|
||||
+ addr = mkshare(8192);
|
||||
+ *addr = 'I';
|
||||
+
|
||||
+ switch (fork()) {
|
||||
+
|
||||
+ case -1:
|
||||
+ printf("help\n"); exit(1);
|
||||
+
|
||||
+ case 0: /* child */
|
||||
+ *addr = 'N';
|
||||
+ _exit(0);
|
||||
+ break;
|
||||
+ default: /* parent */
|
||||
+ wait(0);
|
||||
+ sleep(1);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ if (*addr != 'N')
|
||||
+ exit(1);
|
||||
+ exit(0);
|
||||
+}
|
||||
+],
|
||||
+ [ac_cv_func_smmap=yes],
|
||||
+ [ac_cv_func_smmap=no],
|
||||
+ [ac_cv_func_smmap=no])])
|
||||
+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.
|
@ -1,12 +0,0 @@
|
||||
$FreeBSD$
|
||||
--- configure.in.orig Mon Feb 26 06:51:00 2001
|
||||
+++ configure.in Sun Mar 18 23:21:51 2001
|
||||
@@ -67,7 +68,7 @@ dnl ------------------------------------
|
||||
dnl Check for library functions
|
||||
dnl --------------------------------------------------
|
||||
|
||||
-dnl none
|
||||
+AC_FUNC_SMMAP
|
||||
|
||||
dnl --------------------------------------------------
|
||||
dnl Work around FHS stupidity
|
@ -1,15 +0,0 @@
|
||||
$FreeBSD$
|
||||
--- ogg123/Makefile.am.orig Sun Mar 25 17:59:31 2001
|
||||
+++ ogg123/Makefile.am Tue Jul 17 03:22:47 2001
|
||||
@@ -3,9 +3,8 @@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
bin_PROGRAMS = ogg123
|
||||
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
|
||||
-doc_DATA = ogg123rc-example
|
||||
-mandir = $(datadir)/man
|
||||
+docdir = $(datadir)/examples/$(PACKAGE)
|
||||
+doc_DATA = ogg123rc
|
||||
man_MANS = ogg123.1
|
||||
|
||||
INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@
|
@ -1,23 +1,14 @@
|
||||
|
||||
$FreeBSD$
|
||||
--- ogg123/Makefile.in.orig Mon Jun 18 18:18:19 2001
|
||||
+++ ogg123/Makefile.in Tue Jul 17 03:23:27 2001
|
||||
@@ -28,6 +28,7 @@ sharedstatedir = @sharedstatedir@
|
||||
localstatedir = @localstatedir@
|
||||
libdir = @libdir@
|
||||
infodir = @infodir@
|
||||
+mandir = @mandir@
|
||||
includedir = @includedir@
|
||||
oldincludedir = /usr/include
|
||||
|
||||
--- ogg123/Makefile.in.orig Tue Aug 14 19:42:20 2001
|
||||
+++ ogg123/Makefile.in Tue Aug 14 19:42:31 2001
|
||||
@@ -323,7 +323,7 @@
|
||||
install-exec-am: install-binPROGRAMS
|
||||
install-exec: install-exec-am
|
||||
|
||||
@@ -83,9 +84,8 @@ VORBIS_LIBS = @VORBIS_LIBS@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
-install-data-am: install-man install-docDATA
|
||||
+install-data-am: install-man
|
||||
install-data: install-data-am
|
||||
|
||||
bin_PROGRAMS = ogg123
|
||||
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
|
||||
-doc_DATA = ogg123rc-example
|
||||
-mandir = $(datadir)/man
|
||||
+docdir = $(datadir)/examples/$(PACKAGE)
|
||||
+doc_DATA = ogg123rc
|
||||
man_MANS = ogg123.1
|
||||
|
||||
INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@
|
||||
install-am: all-am
|
||||
|
@ -1,55 +0,0 @@
|
||||
$FreeBSD$
|
||||
--- 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>
|
||||
+#if HAVE_SMMAP
|
||||
+#include <sys/mman.h>
|
||||
+#else
|
||||
#include <sys/ipc.h>
|
||||
#include <sys/shm.h>
|
||||
+#endif
|
||||
#include <sys/time.h>
|
||||
#include <unistd.h> /* for fork and pipe*/
|
||||
#include <fcntl.h>
|
||||
|
||||
-#ifndef DARWIN
|
||||
-#include <malloc.h>
|
||||
-#endif
|
||||
-
|
||||
#include "ogg123.h"
|
||||
#include "buffer.h"
|
||||
|
||||
@@ -72,6 +72,22 @@ buf_t *fork_writer (long size, devices_t
|
||||
int childpid;
|
||||
buf_t *buf;
|
||||
|
||||
+#if HAVE_SMMAP
|
||||
+ int fd;
|
||||
+
|
||||
+ if ((fd = open("/dev/zero", O_RDWR)) < 0)
|
||||
+ {
|
||||
+ perror ("cannot open /dev/zero");
|
||||
+ exit (1);
|
||||
+ }
|
||||
+ if ((buf = (buf_t *) mmap (0, sizeof(buf_t) + sizeof (chunk_t) * (size - 1),
|
||||
+ PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) < 0)
|
||||
+ {
|
||||
+ perror("mmap");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ close(fd);
|
||||
+#else
|
||||
/* Get the shared memory segment. */
|
||||
int shmid = shmget (IPC_PRIVATE,
|
||||
sizeof(buf_t) + sizeof (chunk_t) * (size - 1),
|
||||
@@ -94,6 +110,7 @@ buf_t *fork_writer (long size, devices_t
|
||||
|
||||
/* Remove segment after last process detaches it or terminates. */
|
||||
shmctl(shmid, IPC_RMID, 0);
|
||||
+#endif /* HAVE_SMMAP */
|
||||
|
||||
buffer_init (buf, size);
|
||||
|
@ -1,74 +0,0 @@
|
||||
$FreeBSD$
|
||||
--- 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.
|
@ -1,24 +0,0 @@
|
||||
$FreeBSD$
|
||||
--- ogg123/ogg123.c.orig Mon Jun 18 18:16:50 2001
|
||||
+++ ogg123/ogg123.c Tue Jul 17 01:43:22 2001
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <netdb.h>
|
||||
+#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/socket.h>
|
||||
#include <errno.h>
|
||||
@@ -85,8 +86,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"
|
@ -1,10 +0,0 @@
|
||||
--- ogginfo/Makefile.am.orig Tue Jul 17 01:23:47 2001
|
||||
+++ ogginfo/Makefile.am Tue Jul 17 01:24:00 2001
|
||||
@@ -3,7 +3,6 @@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
bin_PROGRAMS = ogginfo
|
||||
-mandir = $(datadir)/man
|
||||
man_MANS = ogginfo.1
|
||||
|
||||
INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@
|
@ -1,18 +0,0 @@
|
||||
--- ogginfo/Makefile.in.orig Tue Jul 17 01:23:50 2001
|
||||
+++ ogginfo/Makefile.in Tue Jul 17 01:24:14 2001
|
||||
@@ -28,6 +28,7 @@ sharedstatedir = @sharedstatedir@
|
||||
localstatedir = @localstatedir@
|
||||
libdir = @libdir@
|
||||
infodir = @infodir@
|
||||
+mandir = @mandir@
|
||||
includedir = @includedir@
|
||||
oldincludedir = /usr/include
|
||||
|
||||
@@ -83,7 +84,6 @@ VORBIS_LIBS = @VORBIS_LIBS@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
bin_PROGRAMS = ogginfo
|
||||
-mandir = $(datadir)/man
|
||||
man_MANS = ogginfo.1
|
||||
|
||||
INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@
|
@ -1,12 +1,13 @@
|
||||
Vorbis is a general-purpose audio and music encoding format contemporary to
|
||||
MPEG-4's AAC and TwinVQ, the next generation beyond MPEG audio layer 3. Unlike
|
||||
the MPEG sponsored formats (and other proprietary formats such as RealAudio G2
|
||||
and Windows' flavor of the month), the Vorbis CODEC specification belongs to
|
||||
the public domain. All the technical details are published and documented, and
|
||||
any software entity may make full use of the format without royalty or patent
|
||||
concerns.
|
||||
Vorbis is a general-purpose audio and music encoding format
|
||||
contemporary to MPEG-4's AAC and TwinVQ, the next generation beyond
|
||||
MPEG audio layer 3. Unlike the MPEG sponsored formats (and other
|
||||
proprietary formats such as RealAudio G2 and Windows' flavor of the
|
||||
month), the Vorbis CODEC specification belongs to the public domain.
|
||||
All the technical details are published and documented, and any
|
||||
software entity may make full use of the format without royalty or
|
||||
patent concerns.
|
||||
|
||||
This package contains utilities to encode and decode vorbis streams, and to
|
||||
add comments to them.
|
||||
This package contains utilities to encode, decode, and cut vorbis
|
||||
streams, and to add comments to them.
|
||||
|
||||
WWW: http://www.vorbis.com
|
||||
WWW: http://www.vorbis.com/
|
||||
|
@ -2,6 +2,5 @@
|
||||
bin/ogg123
|
||||
bin/oggenc
|
||||
bin/ogginfo
|
||||
bin/vcut
|
||||
bin/vorbiscomment
|
||||
share/examples/vorbis-tools/ogg123rc
|
||||
@dirrm share/examples/vorbis-tools
|
||||
|
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= vorbis
|
||||
PORTVERSION= 1.0.r1
|
||||
PORTVERSION= 1.0.r2
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= # empty
|
||||
@ -15,7 +15,7 @@ EXTRACT_ONLY= # empty
|
||||
|
||||
MAINTAINER= naddy@mips.inka.de
|
||||
|
||||
LIB_DEPENDS= ao.1:${PORTSDIR}/audio/libao \
|
||||
LIB_DEPENDS= ao.2:${PORTSDIR}/audio/libao \
|
||||
ogg.2:${PORTSDIR}/audio/libogg \
|
||||
vorbis.0:${PORTSDIR}/audio/libvorbis
|
||||
RUN_DEPENDS= ogg123:${PORTSDIR}/audio/vorbis-tools
|
||||
|
@ -9,4 +9,4 @@ patent concerns.
|
||||
|
||||
This is a meta-port for all the vorbis-related ports.
|
||||
|
||||
WWW: http://www.vorbis.com
|
||||
WWW: http://www.vorbis.com/
|
||||
|
Loading…
Reference in New Issue
Block a user