Date: Sat, 12 Oct 2013 17:30:09 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330152 - in head/audio/mumble: . files Message-ID: <201310121730.r9CHU9VZ048695@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Sat Oct 12 17:30:09 2013 New Revision: 330152 URL: http://svnweb.freebsd.org/changeset/ports/330152 Log: - Fix mumble not detecting celt libraries - New LIBDEPENDS format - Remove old message regarding FreeBSD 7.x - STAGE clean - Compiles with clang, supports FreeBSD 10 PR: ports/182215 Approved by: swills (mentor) Added: head/audio/mumble/files/patch-src__mumble__OSS.cpp (contents, props changed) head/audio/mumble/files/patch-src__mumble__VoiceRecorderDialog.cpp (contents, props changed) Deleted: head/audio/mumble/pkg-message Modified: head/audio/mumble/Makefile head/audio/mumble/pkg-plist Modified: head/audio/mumble/Makefile ============================================================================== --- head/audio/mumble/Makefile Sat Oct 12 17:17:31 2013 (r330151) +++ head/audio/mumble/Makefile Sat Oct 12 17:30:09 2013 (r330152) @@ -3,22 +3,21 @@ PORTNAME= mumble PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/Mumble/${PORTVERSION} MAINTAINER= marius@nuenneri.ch COMMENT= A voice chat software primarily intended for use while gaming -LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex \ - sndfile:${PORTSDIR}/audio/libsndfile \ - boost_iostreams:${PORTSDIR}/devel/boost-libs \ - boost_python:${PORTSDIR}/devel/boost-python-libs \ - protoc:${PORTSDIR}/devel/protobuf \ - opus:${PORTSDIR}/audio/opus +LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex \ + libsndfile.so:${PORTSDIR}/audio/libsndfile \ + libboost_iostreams.so:${PORTSDIR}/devel/boost-libs \ + libboost_python.so:${PORTSDIR}/devel/boost-python-libs \ + libprotoc.so:${PORTSDIR}/devel/protobuf \ + libopus.so:${PORTSDIR}/audio/opus USES= gmake pkgconfig -NO_STAGE= yes USE_QT4= gui svg iconengines_run xml sql network l10n \ linguist_build qmake_build moc_build rcc_build uic_build \ opengl sql-sqlite3_run @@ -26,6 +25,7 @@ USE_QT4= gui svg iconengines_run xml sql USE_XORG= ice HAS_CONFIGURE= yes INSTALLS_ICONS= yes +MAKE_JOBS_UNSAFE=yes CONFIG= no-server no-alsa no-speechd no-bundled-speex no-bundled-opus no-update \ bundled-celt no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations @@ -34,8 +34,6 @@ OPTIONS_DEFINE= DBUS BONJOUR OPTIONS_DEFAULT= DBUS BONJOUR_DESC= Bonjour support -MAN1= mumble.1 - .include <bsd.port.options.mk> .if ! ${PORT_OPTIONS:MDBUS} @@ -57,22 +55,22 @@ do-configure: cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}" do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${PREFIX}/bin - ${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${PREFIX}/lib/libcelt-mumble.so.0.11.0 - ${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.7.0 ${PREFIX}/lib/libcelt-mumble.so.0.7.0 - ${INSTALL_LIB} ${WRKSRC}/release/libmumble.so.1.2.4 ${PREFIX}/lib/libmumble.so.1.2.4 - ${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${PREFIX}/lib/libmumble.so - ${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${PREFIX}/lib/libmumble.so.1 - ${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${PREFIX}/lib/libmumble.so.1.2 - ${MKDIR} ${PREFIX}/share/services - ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${PREFIX}/share/services - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${PREFIX}/share/pixmaps - ${MKDIR} ${PREFIX}/share/icons/hicolor/128x128/apps ${PREFIX}/share/icons/hicolor/scalable/apps - ${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${PREFIX}/share/icons/hicolor/128x128/apps - @${MV} ${PREFIX}/share/icons/hicolor/128x128/apps/mumble.osx.png ${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png - ${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${PREFIX}/share/icons/hicolor/scalable/apps - ${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${STAGEDIR}${PREFIX}/bin + ${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.11.0 + ${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.7.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0 + ${INSTALL_LIB} ${WRKSRC}/release/libmumble.so.1.2.4 ${STAGEDIR}${PREFIX}/lib/libmumble.so.1.2.4 + ${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${STAGEDIR}${PREFIX}/lib/libmumble.so + ${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${STAGEDIR}${PREFIX}/lib/libmumble.so.1 + ${LN} -s ${PREFIX}/lib/libmumble.so.1.2.4 ${STAGEDIR}${PREFIX}/lib/libmumble.so.1.2 + ${MKDIR} ${STAGEDIR}${PREFIX}/share/services + ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${STAGEDIR}${PREFIX}/share/services + ${MKDIR} ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${STAGEDIR}${PREFIX}/share/pixmaps + ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps + ${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps + @${MV} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.osx.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png + ${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps + ${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${STAGEDIR}${MANPREFIX}/man/man1/mumble.1 .include <bsd.port.mk> Added: head/audio/mumble/files/patch-src__mumble__OSS.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/mumble/files/patch-src__mumble__OSS.cpp Sat Oct 12 17:30:09 2013 (r330152) @@ -0,0 +1,38 @@ +--- ./src/mumble/OSS.cpp.orig 2013-06-01 21:16:31.000000000 +0000 ++++ ./src/mumble/OSS.cpp 2013-10-12 02:38:45.443221514 +0000 +@@ -221,20 +221,23 @@ + ival = AFMT_S16_NE; + if ((ioctl(fd, SNDCTL_DSP_SETFMT, &ival) == -1) || (ival != AFMT_S16_NE)) { + qWarning("OSSInput: Failed to set sound format"); +- goto out; ++ close(fd); ++ return; + } + + ival = 1; + if ((ioctl(fd, SNDCTL_DSP_CHANNELS, &ival) == -1)) { + qWarning("OSSInput: Failed to set mono mode"); +- goto out; ++ close(fd); ++ return; + } + iMicChannels = ival; + + ival = SAMPLE_RATE; + if (ioctl(fd, SNDCTL_DSP_SPEED, &ival) == -1) { + qWarning("OSSInput: Failed to set speed"); +- goto out; ++ close(fd); ++ return; + } + iMicFreq = ival; + +@@ -258,8 +261,6 @@ + qWarning("OSSInput: Releasing."); + ioctl(fd, SNDCTL_DSP_RESET, NULL); + +-out: +- close(fd); + } + + OSSOutput::OSSOutput() { Added: head/audio/mumble/files/patch-src__mumble__VoiceRecorderDialog.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/mumble/files/patch-src__mumble__VoiceRecorderDialog.cpp Sat Oct 12 17:30:09 2013 (r330152) @@ -0,0 +1,11 @@ +--- ./src/mumble/VoiceRecorderDialog.cpp.orig 2013-06-01 21:16:32.000000000 +0000 ++++ ./src/mumble/VoiceRecorderDialog.cpp 2013-10-12 02:38:45.441221500 +0000 +@@ -38,7 +38,7 @@ + #include "ServerHandler.h" + #include "VoiceRecorder.h" + +-VoiceRecorderDialog::VoiceRecorderDialog(QWidget *p = NULL) : QDialog(p), qtTimer(new QTimer(this)) { ++VoiceRecorderDialog::VoiceRecorderDialog(QWidget *p) : QDialog(p), qtTimer(new QTimer(this)) { + qtTimer->setObjectName(QLatin1String("qtTimer")); + qtTimer->setInterval(200); + setupUi(this); Modified: head/audio/mumble/pkg-plist ============================================================================== --- head/audio/mumble/pkg-plist Sat Oct 12 17:17:31 2013 (r330151) +++ head/audio/mumble/pkg-plist Sat Oct 12 17:30:09 2013 (r330152) @@ -5,16 +5,17 @@ lib/libmumble.so lib/libmumble.so.1 lib/libmumble.so.1.2 lib/libmumble.so.1.2.4 +man/man1/mumble.1.gz share/applications/mumble.desktop -share/services/mumble.protocol share/icons/hicolor/128x128/apps/mumble.png share/icons/hicolor/scalable/apps/mumble.svg share/pixmaps/mumble.xpm -@dirrmtry share/applications +share/services/mumble.protocol @dirrmtry share/services -@dirrmtry share/icons/hicolor/128x128/apps -@dirrmtry share/icons/hicolor/128x128 @dirrmtry share/icons/hicolor/scalable/apps @dirrmtry share/icons/hicolor/scalable +@dirrmtry share/icons/hicolor/128x128/apps +@dirrmtry share/icons/hicolor/128x128 @dirrmtry share/icons/hicolor @dirrmtry share/icons +@dirrmtry share/applications
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310121730.r9CHU9VZ048695>