Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
+6
View File
@@ -0,0 +1,6 @@
MuSE is an application for the mixing, encoding, and network streaming of
sound. MuSE can simultaneously mix up to 6 encoded audio bitstreams (from
files or network) plus a soundcard input signal. The resulting stream can
be played locally on the sound card and/or encoded as an mp3 bitstream sent
to a broadcast server. MuSE offers an intuitive interface to be operated
realtime and can run in "slick" mode from command line.
+43
View File
@@ -0,0 +1,43 @@
# $NetBSD: Makefile,v 1.48 2013/06/06 12:54:04 wiz Exp $
#
DISTNAME= MuSE-0.9
PKGNAME= ${DISTNAME:S/MuSE/muse/}
PKGREVISION= 26
CATEGORIES= audio
MASTER_SITES= ftp://ftp.dyne.org/muse/releases/ \
http://www.ljudmila.org/~jaromil/mirror/muse/releases/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://muse.dyne.org/
COMMENT= Multiple Streaming Engine
LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= gmake pkg-config msgfmt
USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --disable-ncurses
CONFIGURE_ARGS+= --disable-lubrify
CONFIGURE_ARGS+= --enable-gtk2
LIBS+= ${LIBOSSAUDIO}
MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
MAKE_FLAGS+= docsdir=${PREFIX:Q}/share/doc/MuSE
LIBS.SunOS+= -lsocket -lnsl
SUBST_CLASSES+= dsp
SUBST_STAGE.dsp= post-patch
SUBST_FILES.dsp= src/jmixer.cpp src/libmpeg/fileplayer.cc
SUBST_SED.dsp= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
SUBST_MESSAGE.dsp= Fixing hardcoded audio device.
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
+13
View File
@@ -0,0 +1,13 @@
@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:32:19 joerg Exp $
bin/muse
man/man1/muse.1
share/doc/MuSE/AUTHORS
share/doc/MuSE/COPYING
share/doc/MuSE/ChangeLog
share/doc/MuSE/KNOWN-BUGS
share/doc/MuSE/NEWS
share/doc/MuSE/README
share/doc/MuSE/TODO
share/doc/MuSE/USAGE
share/locale/es/LC_MESSAGES/muse.mo
share/locale/it/LC_MESSAGES/muse.mo
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: distinfo,v 1.12 2012/01/11 19:59:35 hans Exp $
SHA1 (MuSE-0.9.tar.gz) = c73dfe6cf5a8da3430864a76d0bc8d9f2cb7d118
RMD160 (MuSE-0.9.tar.gz) = 53eb653a0488ae3a5ef9486d8b2a9006fdba619d
Size (MuSE-0.9.tar.gz) = 1363091 bytes
SHA1 (patch-aa) = 5020bece9b44c5006efe0c90b23f3c54f9313b57
SHA1 (patch-ab) = e283bc69d90c330ecc2b06ebed70b574ef0f31c5
SHA1 (patch-ac) = fcf1efbbd99d70e055c903c41431a1630ca381fa
SHA1 (patch-ad) = 5f2322a1c9c3c9ee4e4dbe3aa810c0f2c5d999fd
SHA1 (patch-ae) = 7b176763091b03671ec7455ecea11fb5d31536c6
SHA1 (patch-af) = 20b68a9758ec109b3dec37b5898076a0cff5bfcc
SHA1 (patch-ag) = 65515e3a2e8947a1ac1b01e5585a1ca04513bd70
SHA1 (patch-ah) = 458d747f30e7767f53bc5dd890da1dd9e94cabfa
SHA1 (patch-src_libmpeg_fileplayer.cc) = 2100250fb8c0dd7ee1d0a1a4549888d30b47334d
SHA1 (patch-src_libmpeg_mpegtoraw.cc) = 9b9eaf8006f78855454af9baa03726e3352b2e9d
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-aa,v 1.2 2009/03/11 14:42:35 hasso Exp $
--- src/shout/sock.h.orig 2004-04-30 01:49:50.000000000 +0200
+++ src/shout/sock.h 2004-04-30 01:50:10.000000000 +0200
@@ -31,7 +31,7 @@
#include <unistd.h>
#endif
-#ifdef HAVE_SYS_UIO_H
+#if defined(HAVE_SYS_UIO_H) || defined(__NetBSD__) || defined(__DragonFly__)
#include <sys/uio.h>
#else
#ifndef _SYS_UIO_H
+25
View File
@@ -0,0 +1,25 @@
$NetBSD: patch-ab,v 1.3 2011/11/22 16:38:28 marino Exp $
--- src/jmixer.cpp.orig 2004-04-09 17:50:43.000000000 +0000
+++ src/jmixer.cpp
@@ -98,7 +98,7 @@ Stream_mixer::Stream_mixer() {
error("error initializing POSIX thread mutex");
if(pthread_cond_init (&_cond, NULL) == -1)
error("error initializing POSIX thread condtition");
- unlock();
+ //unlock();
}
Stream_mixer::~Stream_mixer() {
@@ -627,7 +627,11 @@ bool Stream_mixer::set_playmode(int ch,
/* this is the function selecting files for the scandir
on freebsd systems you should change the following line to:
int selector(struct dirent *dir) { */
+#if defined(__FreeBSD__)
+int selector(struct dirent *dir) {
+#else
int selector(const struct dirent *dir) {
+#endif
if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0
#ifdef HAVE_VORBIS
|| strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0
+136
View File
@@ -0,0 +1,136 @@
$NetBSD: patch-ac,v 1.3 2005/12/11 23:44:40 joerg Exp $
--- src/pipe.cpp.orig 2003-12-08 12:20:33.000000000 +0000
+++ src/pipe.cpp
@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA.
#include <iostream>
#include <stdlib.h>
+#include <errno.h>
#include <audioproc.h>
#include <pipe.h>
#include <jutils.h>
@@ -61,7 +62,7 @@ Pipe::Pipe(int size) {
end=start=buffer;
blocking = true;
_thread_init();
- unlock();
+ //unlock();
}
Pipe::~Pipe() {
@@ -118,9 +119,9 @@ int Pipe::read_float_intl(int samples, f
}
/* --- */
- (char*)start += currentBlockSize;
+ start = (char*)start + currentBlockSize;
len -= currentBlockSize;
- (char*)pp += currentBlockSize;
+ pp = (float *)((char*)pp + currentBlockSize);
length -= currentBlockSize;
if ((end!=buffer) && (start==bufferEnd))
start = buffer;
@@ -146,8 +147,8 @@ int Pipe::read_float_intl(int samples, f
}
/* --- */
- (char*)pp += len;
- (char*)start += len;
+ pp = (float *)((char*)pp + len);
+ start = (char*)start + len;
length -= len;
if ((end!=buffer) && (start==bufferEnd))
start = buffer;
@@ -224,9 +225,9 @@ int Pipe::read_float_bidi(int samples, f
}
/* --- */
- (char*)start += currentBlockSize;
+ start = (char*)start + currentBlockSize;
len -= currentBlockSize;
- (char*)pp += currentBlockSize;
+ pp = (float **)((char*)pp + currentBlockSize);
length -= currentBlockSize;
if ((end!=buffer) && (start==bufferEnd))
start = buffer;
@@ -253,8 +254,8 @@ int Pipe::read_float_bidi(int samples, f
}
/* --- */
- (char*)pp += len;
- (char*)start += len;
+ pp = (float **)((char*)pp + len);
+ start = (char*)start + len;
length -= len;
if ((end!=buffer) && (start==bufferEnd))
start = buffer;
@@ -309,9 +310,9 @@ int Pipe::mix16stereo(int samples, int32
pp[c] += (int32_t) ((IN_DATATYPE*)start)[c];
/* --- */
- (char*)start += currentBlockSize;
+ start = (char*)start + currentBlockSize;
len -= currentBlockSize;
- (char*)pp += currentBlockSize;
+ pp = (int32_t *)((char*)pp + currentBlockSize);
length -= currentBlockSize;
if ((end!=buffer) && (start==bufferEnd))
start = buffer;
@@ -324,8 +325,8 @@ int Pipe::mix16stereo(int samples, int32
pp[c] += (int) ((IN_DATATYPE*)start)[c];
/* --- */
- (char*)pp += len;
- (char*)start += len;
+ pp = (int32_t *)((char*)pp + len);
+ start = (char*)start + len;
length -= len;
if ((end!=buffer) && (start==bufferEnd))
start = buffer;
@@ -372,17 +373,17 @@ int Pipe::read(int length, void *data) {
/* fill */
memcpy(data, start, currentBlockSize);
- (char*)start += currentBlockSize;
+ start = (char*)start + currentBlockSize;
len -= currentBlockSize;
- (char*)data += currentBlockSize;
+ data = (char*)data + currentBlockSize;
length -= currentBlockSize;
if ((end!=buffer) && (start==bufferEnd))
start = buffer;
if (len) { /* short circuit */
memcpy(data, start, len);
- (char*)data += len;
- (char*)start += len;
+ data = (char*)data + len;
+ start = (char*)start + len;
length -= len;
if ((end!=buffer) && (start==bufferEnd))
start = buffer;
@@ -418,19 +419,19 @@ int Pipe::write(int length, void *data)
currentBlockSize=MIN(currentBlockSize, len);
::memcpy(end, data, currentBlockSize);
- (char*)end += currentBlockSize;
+ end = (char*)end + currentBlockSize;
len -= currentBlockSize;
- (char*)data += currentBlockSize;
+ data = (char*)data + currentBlockSize;
length -= currentBlockSize;
if ((start!=buffer) && (end==bufferEnd))
end = buffer;
if (len) { // short circuit
::memcpy(end, data, len);
- (char*)data += len;
- (char*)end += len;
+ data = (char*)data + len;
+ end = (char*)end + len;
length -= len;
if ((start!=buffer) && (end==bufferEnd))
+12
View File
@@ -0,0 +1,12 @@
$NetBSD: patch-ad,v 1.1.1.1 2004/05/02 22:59:16 xtraeme Exp $
--- src/gtkgui2/gtk2_gui.cpp.orig 2004-05-03 00:51:21.000000000 +0200
+++ src/gtkgui2/gtk2_gui.cpp 2004-05-03 00:51:33.000000000 +0200
@@ -47,6 +47,7 @@
_mix->quit = true;
} else {
int i;
+ lock();
wait();
/* update channels */
+12
View File
@@ -0,0 +1,12 @@
$NetBSD: patch-ae,v 1.3 2012/01/11 19:59:36 hans Exp $
--- po/Makefile.orig 2004-04-14 17:52:44.000000000 -0500
+++ po/Makefile
@@ -1,5 +1,5 @@
-INSTALL= /usr/bin/install -c
-INSTALLNLSDIR=$(BASEDIR)/usr/local/share/locale
+INSTALL= install -c
+INSTALLNLSDIR=$(DESTDIR)${PREFIX}/${PKGLOCALEDIR}/locale
PACKAGE = muse
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-af,v 1.1 2005/12/11 23:44:40 joerg Exp $
--- src/Makefile.in.orig 2005-12-11 23:32:28.000000000 +0000
+++ src/Makefile.in
@@ -207,7 +207,7 @@ muse_DEPENDENCIES = @GUI_DEPS@ resample/
muse_LDADD = \
$(top_srcdir)/src/resample/libresample.a \
$(top_srcdir)/src/libmpeg/libmpeg.a \
- -lpthread \
+ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} \
@LIBSHOUT_LIB@ \
@M_LIBS@ \
@LAME_LIBS@ \
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-ag,v 1.1 2006/10/23 23:48:45 rillig Exp $
--- utils/rami.orig 2003-12-08 13:20:33.000000000 +0100
+++ utils/rami 2006-10-24 01:45:59.000000000 +0200
@@ -66,8 +66,7 @@ FORMAT=$DEFAULT_FORMAT
RATE=22050
QUALITY=3
CHANNELS=2
-VUMETER="`which vumeter 2> /dev/null`"
-if [ $? == 1 ]; then VUMETER=""; fi
+VUMETER="`which vumeter 2> /dev/null`" || VUMETER=""
OPTS=`getopt -o hvQr:f:q:c:o:e: --long help,version,quiet,rate:,format:,quality:,channels:,output:,effect: \
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-ah,v 1.1 2007/10/17 21:46:13 rillig Exp $
--- src/linklist.h.orig 2004-02-13 16:58:16.000000000 +0000
+++ src/linklist.h 2007-10-17 21:44:34.000000000 +0000
@@ -44,7 +44,7 @@ class Linklist {
bool movedown(int pos);
bool moveto(int num, int pos);
Entry *pick(int pos);
- Entry *Linklist::selected();
+ Entry *selected();
Entry *operator[](int pos) { return pick(pos); };
@@ -0,0 +1,15 @@
$NetBSD: patch-src_libmpeg_fileplayer.cc,v 1.1 2011/11/22 20:50:54 wiz Exp $
iostream.h is deprecated.
--- src/libmpeg/fileplayer.cc.orig 2011-11-22 20:45:56.000000000 +0000
+++ src/libmpeg/fileplayer.cc
@@ -10,7 +10,7 @@
#endif
#include <string.h>
-#include <iostream.h>
+#include <iostream>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -0,0 +1,15 @@
$NetBSD: patch-src_libmpeg_mpegtoraw.cc,v 1.1 2011/11/22 20:50:54 wiz Exp $
iostream.h is deprecated.
--- src/libmpeg/mpegtoraw.cc.orig 2003-12-08 12:20:37.000000000 +0000
+++ src/libmpeg/mpegtoraw.cc
@@ -419,7 +419,7 @@ bool Mpegtoraw::loadheader(void)
return true;
}
-#include <iostream.h>
+#include <iostream>
// Convert mpeg to raw
bool Mpegtoraw::run(int frames) {
clearrawdata();