From 6f74e07ce0b44e53fbe56266278f252f252d7ed4 Mon Sep 17 00:00:00 2001 From: DPorts Builder Date: Sat, 17 Dec 2016 08:53:19 -0800 Subject: [PATCH] Import audio/muse version 0.9.2_15 --- audio/muse/Makefile | 51 ++++++++++++++++ audio/muse/Makefile.DragonFly | 4 ++ audio/muse/distinfo | 2 + audio/muse/files/patch-Makefile.in | 11 ++++ audio/muse/files/patch-configure | 58 +++++++++++++++++++ audio/muse/files/patch-src_Makefile.in | 10 ++++ audio/muse/files/patch-src_jmixer.cpp | 40 +++++++++++++ .../muse/files/patch-src_libmpeg_mpegtoraw.cc | 22 +++++++ audio/muse/files/patch-src_linklist.h | 11 ++++ audio/muse/files/patch-src_outchannels.cpp | 15 +++++ audio/muse/files/patch-src_pipe.cpp | 14 +++++ audio/muse/files/patch-src_shout_sock.c | 14 +++++ audio/muse/pkg-descr | 8 +++ 13 files changed, 260 insertions(+) create mode 100644 audio/muse/Makefile create mode 100644 audio/muse/Makefile.DragonFly create mode 100644 audio/muse/distinfo create mode 100644 audio/muse/files/patch-Makefile.in create mode 100644 audio/muse/files/patch-configure create mode 100644 audio/muse/files/patch-src_Makefile.in create mode 100644 audio/muse/files/patch-src_jmixer.cpp create mode 100644 audio/muse/files/patch-src_libmpeg_mpegtoraw.cc create mode 100644 audio/muse/files/patch-src_linklist.h create mode 100644 audio/muse/files/patch-src_outchannels.cpp create mode 100644 audio/muse/files/patch-src_pipe.cpp create mode 100644 audio/muse/files/patch-src_shout_sock.c create mode 100644 audio/muse/pkg-descr diff --git a/audio/muse/Makefile b/audio/muse/Makefile new file mode 100644 index 00000000000..3dda94ebc5c --- /dev/null +++ b/audio/muse/Makefile @@ -0,0 +1,51 @@ +# Created by: ijliao +# $FreeBSD$ + +PORTNAME= MuSE +PORTVERSION= 0.9.2 +PORTREVISION= 15 +CATEGORIES= audio +MASTER_SITES= https://files.dyne.org/muse/sources/ + +MAINTAINER= ports@FreeBSD.org +COMMENT= Multiple Streaming Engine + +LICENSE= GPLv2 + +LIB_DEPENDS= libogg.so:audio/libogg \ + libvorbis.so:audio/libvorbis + +OPTIONS_DEFINE= X11 LAME SNDFILE DOCS +OPTIONS_DEFAULT=X11 + +USES= gettext gmake +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-debug --disable-lubrify --disable-rpath + +CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_SYS_UIO_H +LDFLAGS+= -lpthread -L${LOCALBASE}/lib -lintl + +PORTDOCS= AUTHORS ChangeLog NEWS KNOWN-BUGS README TODO USAGE +PLIST_FILES= bin/muse man/man1/muse.1.gz +.for lang in es it +PLIST_FILES+= share/locale/${lang}/LC_MESSAGES/muse.mo +.endfor + +LAME_LIB_DEPENDS= libmp3lame.so:audio/lame +LAME_CONFIGURE_ENV= ac_cv_header_lame_lame_h=no +SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile +X11_USE= GNOME=gtk20 +X11_CONFIGURE_OFF= --without-x --with-rubik + +post-patch: + @${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' \ + ${WRKSRC}/src/portaudio/pa_unix_oss.c +post-patch-SNDFILE-off: + @${REINPLACE_CMD} -e '/sndfile >=/s|$$PKG_CONFIG|${FALSE}|' \ + ${WRKSRC}/configure + +post-install: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) + +.include diff --git a/audio/muse/Makefile.DragonFly b/audio/muse/Makefile.DragonFly new file mode 100644 index 00000000000..417f4cb92e8 --- /dev/null +++ b/audio/muse/Makefile.DragonFly @@ -0,0 +1,4 @@ + +dfly-patch: + ${REINPLACE_CMD} -e "s@\(Linux|FreeBSD\))@\1|DragonFly)@g" \ + ${WRKSRC}/configure diff --git a/audio/muse/distinfo b/audio/muse/distinfo new file mode 100644 index 00000000000..7b7ebb6ae68 --- /dev/null +++ b/audio/muse/distinfo @@ -0,0 +1,2 @@ +SHA256 (MuSE-0.9.2.tar.gz) = 270f95b3a4f9d11bea04d5db4b3868aee1fa78177da0b5d9a74f26c4cfa5e197 +SIZE (MuSE-0.9.2.tar.gz) = 1420411 diff --git a/audio/muse/files/patch-Makefile.in b/audio/muse/files/patch-Makefile.in new file mode 100644 index 00000000000..06a19bf2a07 --- /dev/null +++ b/audio/muse/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2005-12-27 13:09:38 UTC ++++ Makefile.in +@@ -690,7 +690,7 @@ info: info-recursive + + info-am: + +-install-data-am: install-docsDATA install-man ++install-data-am: install-man + + install-exec-am: + diff --git a/audio/muse/files/patch-configure b/audio/muse/files/patch-configure new file mode 100644 index 00000000000..51c9ada0c7b --- /dev/null +++ b/audio/muse/files/patch-configure @@ -0,0 +1,58 @@ +--- configure.orig 2005-12-27 13:03:15 UTC ++++ configure +@@ -1894,7 +1894,7 @@ uversion=`uname -r | sed -e 's/-.*$//g;s + echo "$as_me:$LINENO: checking for which platform we are compiling" >&5 + echo $ECHO_N "checking for which platform we are compiling... $ECHO_C" >&6 + case $uname in +- Linux) ++ Linux|FreeBSD) + echo "$as_me:$LINENO: result: Linux" >&5 + echo "${ECHO_T}Linux" >&6 + +@@ -2613,16 +2613,12 @@ if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then +- CFLAGS="-g -O2" ++ CFLAGS="-g ${CFLAGS}" + else +- CFLAGS="-g" ++ CFLAGS="-g ${CFLAGS}" + fi + else +- if test "$GCC" = yes; then +- CFLAGS="-O2" +- else +- CFLAGS= +- fi ++ CFLAGS="${CFLAGS}" + fi + echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 + echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +@@ -3738,7 +3734,7 @@ fi + #AM_DEFINE_UNQUOTED(HOST_CPU, "${host_cpu}") + + #CFLAGS="-O4 -D_REENTRANT -fomit-frame-pointer -march=${host_cpu} -ffast-math -malign-double -funroll-loops -pipe" +-CFLAGS="-pipe -D_REENTRANT" ++#CFLAGS="-pipe -D_REENTRANT" + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -14588,7 +14584,7 @@ if test "${ac_cv_c99_lrint+set}" = set; + else + + lrint_save_CFLAGS=$CFLAGS +-CFLAGS="-O2 -lm" ++CFLAGS="${CFLAGS} -lm" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -14665,7 +14661,7 @@ if test "${ac_cv_c99_lrintf+set}" = set; + else + + lrintf_save_CFLAGS=$CFLAGS +-CFLAGS="-O2 -lm" ++CFLAGS="${CFLAGS} -lm" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF diff --git a/audio/muse/files/patch-src_Makefile.in b/audio/muse/files/patch-src_Makefile.in new file mode 100644 index 00000000000..8f04dfe2616 --- /dev/null +++ b/audio/muse/files/patch-src_Makefile.in @@ -0,0 +1,10 @@ +--- src/Makefile.in.orig 2005-12-27 13:09:36 UTC ++++ src/Makefile.in +@@ -268,7 +268,6 @@ muse_LDADD = \ + $(top_srcdir)/src/libmpeg/libmpeg.a \ + $(top_srcdir)/src/shout/libshout.a \ + $(top_srcdir)/src/portaudio/libportaudio.a \ +- -lpthread \ + @M_LIBS@ \ + @LAME_LIBS@ \ + @OGG_LIBS@ \ diff --git a/audio/muse/files/patch-src_jmixer.cpp b/audio/muse/files/patch-src_jmixer.cpp new file mode 100644 index 00000000000..a0d82346df2 --- /dev/null +++ b/audio/muse/files/patch-src_jmixer.cpp @@ -0,0 +1,40 @@ +--- src/jmixer.cpp.orig 2004-12-16 11:04:31 UTC ++++ src/jmixer.cpp +@@ -20,18 +20,19 @@ + */ + + #include +-#include +-#include +-#include ++#include ++#include ++#include + #include + #include + #include + #include +-#include ++#include ++#include + #include + +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -640,7 +641,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__) && __FreeBSD_version < 800501 ++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 diff --git a/audio/muse/files/patch-src_libmpeg_mpegtoraw.cc b/audio/muse/files/patch-src_libmpeg_mpegtoraw.cc new file mode 100644 index 00000000000..5c388cf890e --- /dev/null +++ b/audio/muse/files/patch-src_libmpeg_mpegtoraw.cc @@ -0,0 +1,22 @@ +--- src/libmpeg/mpegtoraw.cc.orig 2003-12-08 12:20:37 UTC ++++ src/libmpeg/mpegtoraw.cc +@@ -9,8 +9,8 @@ + #include + #endif + +-#include +-#include ++#include ++#include + #include + + #include "mpegsound.h" +@@ -419,7 +419,7 @@ bool Mpegtoraw::loadheader(void) + return true; + } + +-#include ++#include + // Convert mpeg to raw + bool Mpegtoraw::run(int frames) { + clearrawdata(); diff --git a/audio/muse/files/patch-src_linklist.h b/audio/muse/files/patch-src_linklist.h new file mode 100644 index 00000000000..2bdc384be73 --- /dev/null +++ b/audio/muse/files/patch-src_linklist.h @@ -0,0 +1,11 @@ +--- src/linklist.h.orig 2004-02-13 16:58:16 UTC ++++ src/linklist.h +@@ -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); }; + diff --git a/audio/muse/files/patch-src_outchannels.cpp b/audio/muse/files/patch-src_outchannels.cpp new file mode 100644 index 00000000000..ed61b09da1b --- /dev/null +++ b/audio/muse/files/patch-src_outchannels.cpp @@ -0,0 +1,15 @@ +--- src/outchannels.cpp.orig 2004-12-15 18:18:06 UTC ++++ src/outchannels.cpp +@@ -24,11 +24,11 @@ + #include + #include + #include ++#include + #include + #include + #include + #include +-#include + #include + #include + #include diff --git a/audio/muse/files/patch-src_pipe.cpp b/audio/muse/files/patch-src_pipe.cpp new file mode 100644 index 00000000000..d6dc5f97af0 --- /dev/null +++ b/audio/muse/files/patch-src_pipe.cpp @@ -0,0 +1,14 @@ +--- src/pipe.cpp.orig 2005-12-24 15:19:31 UTC ++++ src/pipe.cpp +@@ -25,9 +25,9 @@ Boston, MA 02111-1307, USA. + */ + + #include +-#include ++#include + #include +-#include ++#include + + #include + #include diff --git a/audio/muse/files/patch-src_shout_sock.c b/audio/muse/files/patch-src_shout_sock.c new file mode 100644 index 00000000000..3d8a57773d9 --- /dev/null +++ b/audio/muse/files/patch-src_shout_sock.c @@ -0,0 +1,14 @@ +--- src/shout/sock.c.orig 2004-03-29 16:04:27 UTC ++++ src/shout/sock.c +@@ -336,7 +336,11 @@ int sock_write_fmt(sock_t sock, const ch + int rc = SOCK_ERROR; + va_list ap_retry; + ++#if (defined(__FreeBSD__) && __FreeBSD__ < 5) ++ ap_retry = ap; ++#else + va_copy (ap_retry, ap); ++#endif + + len = vsnprintf (buff, sizeof (buffer), fmt, ap); + diff --git a/audio/muse/pkg-descr b/audio/muse/pkg-descr new file mode 100644 index 00000000000..f923827a89a --- /dev/null +++ b/audio/muse/pkg-descr @@ -0,0 +1,8 @@ +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 sound card 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. + +WWW: http://muse.dyne.org/ -- 2.41.0