diff options
| -rw-r--r-- | audio/tremor-tools/DESCR | 5 | ||||
| -rw-r--r-- | audio/tremor-tools/MESSAGE | 15 | ||||
| -rw-r--r-- | audio/tremor-tools/Makefile | 40 | ||||
| -rw-r--r-- | audio/tremor-tools/PLIST | 2 | ||||
| -rw-r--r-- | audio/tremor-tools/distinfo | 10 | ||||
| -rw-r--r-- | audio/tremor-tools/patches/patch-aa | 15 | ||||
| -rw-r--r-- | audio/tremor-tools/patches/patch-ab | 46 | ||||
| -rw-r--r-- | audio/tremor-tools/patches/patch-ac | 48 | ||||
| -rw-r--r-- | audio/tremor-tools/patches/patch-ad | 21 | ||||
| -rw-r--r-- | audio/tremor-tools/patches/patch-ae | 36 | ||||
| -rw-r--r-- | audio/tremor-tools/patches/patch-af | 14 |
11 files changed, 252 insertions, 0 deletions
diff --git a/audio/tremor-tools/DESCR b/audio/tremor-tools/DESCR new file mode 100644 index 00000000000..3fbc15c29b9 --- /dev/null +++ b/audio/tremor-tools/DESCR @@ -0,0 +1,5 @@ +tremor-tools contains an Ogg Vorbis command-line player, it uses the tremor +library as a backend. + +Note that igg123 is the only installed binary, it is identical in behaviour as +ogg123. diff --git a/audio/tremor-tools/MESSAGE b/audio/tremor-tools/MESSAGE new file mode 100644 index 00000000000..825131455bb --- /dev/null +++ b/audio/tremor-tools/MESSAGE @@ -0,0 +1,15 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1.1.1 2002/09/24 09:35:16 chris Exp $ + +By default, ogg123 will decode to a testing null device. + +If you want to hear the audio and if you have a sound card with a +working /dev/audio device, you can use libao's "sun" (SUN audio/NetBSD +audio) device. To setup your personal libao configuration so it +uses "sun" do: + + echo "default_device=sun" > ~/.libao + +Read the ogg123(1) manual page for further information. + +=========================================================================== diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile new file mode 100644 index 00000000000..c59e5e2e204 --- /dev/null +++ b/audio/tremor-tools/Makefile @@ -0,0 +1,40 @@ +# $NetBSD: Makefile,v 1.1.1.1 2002/09/24 09:35:16 chris Exp $ + +DISTNAME= vorbis-tools-1.0 +PKGNAME= tremor-tools-1.0.0.8 +CATEGORIES= audio +MASTER_SITES= http://www.vorbis.com/files/1.0/unix/ + +MAINTAINER= chris@netbsd.org +HOMEPAGE= http://www.vorbis.com/ +COMMENT= Ogg Vorbis encoder and player + +# list it into IPv6-ready packages +BUILD_DEFS+= USE_INET6 + +CONFLICTS= vorbis-[0-9]* + +USE_BUILDLINK2= yes +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_GMAKE= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \ + --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \ + --with-ao-prefix=${BUILDLINK_PREFIX.libao} + +PLIST_SUBST+= DISTNAME="${DISTNAME}" + +PTHREAD_OPTS+= require + +pre-configure: + cd ${WRKSRC} && automake && autoconf + +.include "../../audio/tremor/buildlink2.mk" +.include "../../audio/libvorbis/buildlink2.mk" +.include "../../audio/libao/buildlink2.mk" +.include "../../audio/libogg/buildlink2.mk" +.include "../../www/curl/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" + +.include "../../mk/bsd.pkg.mk" diff --git a/audio/tremor-tools/PLIST b/audio/tremor-tools/PLIST new file mode 100644 index 00000000000..6c8a942559b --- /dev/null +++ b/audio/tremor-tools/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/24 09:35:15 chris Exp $ +bin/igg123 diff --git a/audio/tremor-tools/distinfo b/audio/tremor-tools/distinfo new file mode 100644 index 00000000000..aa49ce986d3 --- /dev/null +++ b/audio/tremor-tools/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1.1.1 2002/09/24 09:35:16 chris Exp $ + +SHA1 (vorbis-tools-1.0.tar.gz) = 5c2508786cf6a2a270c697d3debe66ee83df376d +Size (vorbis-tools-1.0.tar.gz) = 425404 bytes +SHA1 (patch-aa) = c2104ab110674452a440d3992158627db89b9eba +SHA1 (patch-ab) = 67987002621dd1aedddc39177d3e8267cd8aa930 +SHA1 (patch-ac) = c38abc6647d990c89258e14a959db80cd4656db7 +SHA1 (patch-ad) = 81beeaa3f8ae918fa30df26f06c92a45914ccb99 +SHA1 (patch-ae) = 37b3128b58fd6dcaf303930c64ac7bf6df9fa043 +SHA1 (patch-af) = 4bdf3edbd80ffdeacdc260fe172468ec2b0b3efb diff --git a/audio/tremor-tools/patches/patch-aa b/audio/tremor-tools/patches/patch-aa new file mode 100644 index 00000000000..a5ecee74003 --- /dev/null +++ b/audio/tremor-tools/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $ + +--- Makefile.am.orig Thu Jul 11 04:26:50 2002 ++++ Makefile.am Sat Sep 14 21:12:15 2002 +@@ -2,9 +2,7 @@ + + AUTOMAKE_OPTIONS = foreign dist-zip + +-SUBDIRS = po intl include share oggenc ogg123 vorbiscomment vcut oggdec ogginfo debian win32 +- +-EXTRA_DIST = README AUTHORS COPYING vorbis-tools.spec acinclude.m4 config.h ++SUBDIRS = include share ogg123 + + debug: + $(MAKE) all CFLAGS="@DEBUG@" diff --git a/audio/tremor-tools/patches/patch-ab b/audio/tremor-tools/patches/patch-ab new file mode 100644 index 00000000000..b90359c21a5 --- /dev/null +++ b/audio/tremor-tools/patches/patch-ab @@ -0,0 +1,46 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $ + +--- ogg123/oggvorbis_format.c.orig Sat Sep 14 18:43:49 2002 ++++ ogg123/oggvorbis_format.c Sat Sep 14 18:45:10 2002 +@@ -19,8 +19,8 @@ + #include <string.h> + #include <ctype.h> + #include <ogg/ogg.h> +-#include <vorbis/codec.h> +-#include <vorbis/vorbisfile.h> ++#include <tremor/ivorbiscodec.h> ++#include <tremor/ivorbisfile.h> + #include "transport.h" + #include "format.h" + #include "utf8.h" +@@ -150,8 +150,7 @@ + while (nbytes > 0) { + + old_section = priv->current_section; +- ret = ov_read(&priv->vf, ptr, nbytes, audio_fmt->big_endian, +- audio_fmt->word_size, audio_fmt->signed_sample, ++ ret = ov_read(&priv->vf, ptr, nbytes, + &priv->current_section); + + if (ret == 0) { +@@ -193,15 +192,17 @@ + } + + +-int ovf_seek (decoder_t *decoder, double offset, int whence) ++int ovf_seek (decoder_t *decoder, double aoffset, int whence) + { + ovf_private_t *priv = decoder->private; + int ret; +- double cur; ++ ogg_int64_t cur; ++ ogg_int64_t offset = (aoffset * 1000); ++ + + if (whence == DECODER_SEEK_CUR) { + cur = ov_time_tell(&priv->vf); +- if (cur >= 0.0) ++ if (cur >= 0) + offset += cur; + else + return 0; diff --git a/audio/tremor-tools/patches/patch-ac b/audio/tremor-tools/patches/patch-ac new file mode 100644 index 00000000000..44d2d59f14a --- /dev/null +++ b/audio/tremor-tools/patches/patch-ac @@ -0,0 +1,48 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $ + +--- ogg123/Makefile.am.orig Sat Sep 14 19:28:28 2002 ++++ ogg123/Makefile.am Sat Sep 14 19:29:02 2002 +@@ -2,9 +2,7 @@ + + AUTOMAKE_OPTIONS = foreign + +-mans = ogg123.1 +-docs = ogg123rc-example +-ogg123sources = audio.c buffer.c callbacks.c \ ++igg123sources = audio.c buffer.c callbacks.c \ + cfgfile_options.c cmdline_options.c \ + file_transport.c format.c http_transport.c \ + ogg123.c oggvorbis_format.c playlist.c \ +@@ -21,26 +19,23 @@ + localedir = $(datadir)/locale + DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ + +-bin_PROGRAMS = ogg123 ++bin_PROGRAMS = igg123 + docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) + mandir = @MANDIR@ + + INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@ @CURL_CFLAGS@ \ + @PTHREAD_CFLAGS@ @SHARE_CFLAGS@ @I18N_CFLAGS@ + +-ogg123_LDADD = @SHARE_LIBS@ \ +- @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \ ++igg123_LDADD = @SHARE_LIBS@ \ ++ @IVORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \ + @SOCKET_LIBS@ @LIBICONV@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \ + @PTHREAD_LIBS@ @I18N_LIBS@ +-ogg123_DEPENDENCIES = @SHARE_LIBS@ +-ogg123_SOURCES = $(ogg123sources) +- +-man_MANS = $(mans) +-doc_DATA = $(docs) ++igg123_DEPENDENCIES = @SHARE_LIBS@ ++igg123_SOURCES = $(igg123sources) + + endif + +-EXTRA_DIST = $(ogg123sources) $(mans) $(docs) ++EXTRA_DIST = $(igg123sources) + + + debug: diff --git a/audio/tremor-tools/patches/patch-ad b/audio/tremor-tools/patches/patch-ad new file mode 100644 index 00000000000..3bff9ac41c7 --- /dev/null +++ b/audio/tremor-tools/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $ + +--- ogg123/ogg123.c.orig Sat Jul 6 20:12:18 2002 ++++ ogg123/ogg123.c Sat Sep 14 19:05:37 2002 +@@ -453,6 +453,16 @@ + return; + } + ++ if ((new_audio_fmt.big_endian != (BYTE_ORDER == BIG_ENDIAN)) || ++ new_audio_fmt.signed_sample != 1 || ++ new_audio_fmt.word_size != 2) ++ { ++ /* Tremor can only do big_endian, signed, 16 bit samples */ ++ status_error(_("Error, Tremor can only decode signed 16 bit PCM " ++ "host endian.\n")); ++ return; ++ } ++ + /* Decide which statistics are valid */ + select_stats(stat_format, &options, source, decoder, audio_buffer); + diff --git a/audio/tremor-tools/patches/patch-ae b/audio/tremor-tools/patches/patch-ae new file mode 100644 index 00000000000..02836ac29a1 --- /dev/null +++ b/audio/tremor-tools/patches/patch-ae @@ -0,0 +1,36 @@ +$NetBSD: patch-ae,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $ + +--- aclocal.m4.orig Fri Jul 19 15:18:51 2002 ++++ aclocal.m4 Sat Sep 14 18:28:40 2002 +@@ -139,6 +139,7 @@ + fi + + VORBISFILE_LIBS="$VORBIS_LIBS -lvorbisfile" ++ IVORBISFILE_LIBS="$VORBIS_LIBS -lvorbisidec" + VORBISENC_LIBS="$VORBIS_LIBS -lvorbisenc" + VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm" + +@@ -194,7 +195,7 @@ + LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" + AC_TRY_LINK([ + #include <stdio.h> +-#include <vorbis/codec.h> ++#include <tremor/ivorbiscodec.h> + ], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding Vorbis or finding the wrong" +@@ -214,12 +215,14 @@ + VORBIS_CFLAGS="" + VORBIS_LIBS="" + VORBISFILE_LIBS="" ++ IVORBISFILE_LIBS="" + VORBISENC_LIBS="" + ifelse([$2], , :, [$2]) + fi + AC_SUBST(VORBIS_CFLAGS) + AC_SUBST(VORBIS_LIBS) + AC_SUBST(VORBISFILE_LIBS) ++ AC_SUBST(IVORBISFILE_LIBS) + AC_SUBST(VORBISENC_LIBS) + rm -f conf.vorbistest + ]) diff --git a/audio/tremor-tools/patches/patch-af b/audio/tremor-tools/patches/patch-af new file mode 100644 index 00000000000..d697091f43a --- /dev/null +++ b/audio/tremor-tools/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1.1.1 2002/09/24 09:35:17 chris Exp $ + +--- configure.in.orig Sat Sep 14 20:21:06 2002 ++++ configure.in Sat Sep 14 20:23:40 2002 +@@ -19,9 +19,6 @@ + + AM_PROG_LIBTOOL + +-ALL_LINGUAS="fr nl sv" +-AM_GNU_GETTEXT +- + dnl -------------------------------------------------- + dnl Set build flags based on environment + dnl -------------------------------------------------- |