Date: Mon, 21 Oct 2019 21:18:39 +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: r515129 - in head/audio/mumble: . files Message-ID: <201910212118.x9LLIdGJ080713@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Mon Oct 21 21:18:39 2019 New Revision: 515129 URL: https://svnweb.freebsd.org/changeset/ports/515129 Log: audio/mumble: Update to 1.3.0 PR: 240402 MFH: 2019Q4 Modified: head/audio/mumble/Makefile head/audio/mumble/distinfo head/audio/mumble/files/patch-src__mumble__OSS.cpp head/audio/mumble/pkg-plist Modified: head/audio/mumble/Makefile ============================================================================== --- head/audio/mumble/Makefile Mon Oct 21 20:59:20 2019 (r515128) +++ head/audio/mumble/Makefile Mon Oct 21 21:18:39 2019 (r515129) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= mumble -DISTVERSION= 1.3.0-rc1 -PORTREVISION= 8 +PORTVERSION= 1.3.0 +PORTREVISION= 0 CATEGORIES= audio MAINTAINER= feld@FreeBSD.org @@ -19,50 +19,66 @@ LIB_DEPENDS+= libspeex.so:audio/speex \ libprotoc.so:devel/protobuf \ libopus.so:audio/opus -PLIST_SUB+= PORTVERSION="${PORTVERSION:R}" +USES= compiler:c++11-lang cpe desktop-file-utils gl gmake gnome pkgconfig python:build qmake qt:5 ssl xorg -USES= compiler:c++11-lang cpe desktop-file-utils gmake pkgconfig python:2.7 qmake qt:5 ssl +PATCHVERSION= ${PORTVERSION} +MINORVERSION= ${PORTVERSION:R} +MAJORVERSION= ${PORTVERSION:R:R} + +PLIST_SUB+= PATCHVERSION="${PATCHVERSION}" +PLIST_SUB+= MINORVERSION="${MINORVERSION}" +PLIST_SUB+= MAJORVERSION="${MAJORVERSION}" + USE_CXXSTD= c++11 USE_GITHUB= yes GH_TUPLE= mumble-voip:mumble:${DISTVERSION} \ mumble-voip:celt-0.7.0:5a16cda:mumble_celt_0_7/3rdparty/celt-0.7.0-src \ - mumble-voip:celt-0.11.0:e3d39fe:mumble_celt_0_11/3rdparty/celt-0.11.0-src \ + mumble-voip:celt-0.11.0:e18de77:mumble_celt_0_11/3rdparty/celt-0.11.0-src \ mumble-voip:mach_override:919148f:mumble_mach_override/3rdparty/mach-override-src \ mumble-voip:minhook:9fbd087:mumble_minhook/3rdparty/minhook-src \ mumble-voip:rnnoise:b30f2bb:mumble_rnnoise/3rdparty/rnnoise-src \ mumble-voip:sbcelt:045493d:mumble_sbcelt/3rdparty/sbcelt-src \ - mumble-voip:mumble-theme:1d48b12:mumble_theme/themes/Mumble + mumble-voip:mumble-theme:7dfb1e9:mumble_theme/themes/Mumble -USE_QT= buildtools_build core gui l10n linguist_build network opengl sql sql-sqlite3_run svg xml +USE_QT= buildtools_build core gui l10n linguist_build network opengl sql sql-sqlite3_run svg widgets xml USE_LDCONFIG= yes USE_XORG= ice xi x11 -INSTALLS_ICONS= yes -MAKE_JOBS_UNSAFE=yes +USE_GL= gl CONFIG= bundled-celt bundled-rnnoise no-bundled-opus no-bundled-speex no-bundled-speexdsp \ - no-embed-qt-translations no-g15 no-alsa no-jackaudio no-pulseaudio no-server no-update + no-embed-qt-translations no-g15 no-server no-update QMAKE_ARGS= "CONFIG+=${CONFIG}" -OPTIONS_DEFINE= DBUS BONJOUR PORTAUDIO SPEECHD +OPTIONS_DEFINE= ALSA DBUS BONJOUR JACK PORTAUDIO PULSEAUDIO SPEECHD OPTIONS_DEFAULT= DBUS -DBUS_VARS_OFF= CONFIG+=no-dbus -DBUS_USES= qt:5 -DBUS_USE= QT=dbus +ALSA_VARS_OFF= CONFIG+=no-alsa +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +DBUS_VARS_OFF= CONFIG+=no-dbus +DBUS_USE= QT=dbus + BONJOUR_DESC= Bonjour support BONJOUR_VARS_OFF= CONFIG+=no-bonjour BONJOUR_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder +JACK_VARS_OFF= CONFIG+=no-jackaudio +JACK_LIB_DEPENDS= libjack.so:audio/jack + PORTAUDIO_VARS_OFF= CONFIG+=no-portaudio PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio +PULSEAUDIO_VARS_OFF= CONFIG+=no-pulseaudio +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio + SPEECHD_DESC= Support for Speech Dispatcher SPEECHD_VARS_OFF= CONFIG+=no-speechd SPEECHD_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher +CONFIGURE_ENV+= MUMBLE_PYTHON=${PYTHON_CMD} + .include <bsd.port.pre.mk> # PCH is broken on GCC @@ -70,18 +86,20 @@ SPEECHD_LIB_DEPENDS= libspeechd.so:accessibility/speec CONFIG+= no-pch .endif +MAKE_JOBS_UNSAFE=yes + post-patch: @${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro @${RM} ${WRKSRC}/plugins/manual/.qmake.cache do-install: ${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.${PORTVERSION:R} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PORTVERSION:R} - ${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PORTVERSION:R} ${STAGEDIR}${PREFIX}/lib/libmumble.so - ${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PORTVERSION:R} ${STAGEDIR}${PREFIX}/lib/libmumble.so.1 - ${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PORTVERSION:R} ${STAGEDIR}${PREFIX}/lib/libmumble.so.1.3 + ${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.11.0 + ${INSTALL_LIB} ${WRKSRC}/release/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} + ${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so + ${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${MAJORVERSION} + ${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${MINORVERSION} ${MKDIR} ${STAGEDIR}${PREFIX}/share/services ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.protocol ${STAGEDIR}${PREFIX}/share/services ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${STAGEDIR}${PREFIX}/share/applications Modified: head/audio/mumble/distinfo ============================================================================== --- head/audio/mumble/distinfo Mon Oct 21 20:59:20 2019 (r515128) +++ head/audio/mumble/distinfo Mon Oct 21 21:18:39 2019 (r515129) @@ -1,10 +1,10 @@ -TIMESTAMP = 1553173953 -SHA256 (mumble-voip-mumble-1.3.0-rc1_GH0.tar.gz) = acf475910923326ef3293192b2cfe2bc3cb0abeea444ac76b4c191b918a4cfeb -SIZE (mumble-voip-mumble-1.3.0-rc1_GH0.tar.gz) = 4741717 +TIMESTAMP = 1568241137 +SHA256 (mumble-voip-mumble-1.3.0_GH0.tar.gz) = 388d8f023a73dafdacdb7556bf503c40b57e2e41679cc7490e884dd7013ab600 +SIZE (mumble-voip-mumble-1.3.0_GH0.tar.gz) = 4888455 SHA256 (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = fbfdbb0767d9d67ea29270eb3e5e999eec6f7f3720a870e74776be426b10b53a SIZE (mumble-voip-celt-0.7.0-5a16cda_GH0.tar.gz) = 182631 -SHA256 (mumble-voip-celt-0.11.0-e3d39fe_GH0.tar.gz) = 4194754baf79c23967ec1f56f1d9d480152ecbea488cb40977d6a043aeccbba1 -SIZE (mumble-voip-celt-0.11.0-e3d39fe_GH0.tar.gz) = 210870 +SHA256 (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = b522482222c40c1f05ce9b6c4d19a05e8419a7850398dbbdea5854b78eadfd4a +SIZE (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = 212833 SHA256 (mumble-voip-mach_override-919148f_GH0.tar.gz) = 81b2e705a7cce1e3a9eb440cb2bca2f14fd83db162123f44faf17f0bf45da1bd SIZE (mumble-voip-mach_override-919148f_GH0.tar.gz) = 66278 SHA256 (mumble-voip-minhook-9fbd087_GH0.tar.gz) = 80a266b39a64106562400d328829f01787f60f91fca18c2255e20f2db0883d29 @@ -13,5 +13,5 @@ SHA256 (mumble-voip-rnnoise-b30f2bb_GH0.tar.gz) = 68ce SIZE (mumble-voip-rnnoise-b30f2bb_GH0.tar.gz) = 171240 SHA256 (mumble-voip-sbcelt-045493d_GH0.tar.gz) = dc9bdcc26a3642cb7ead98cb487c9a52225228fbbfa6f75906d9e479e11b862a SIZE (mumble-voip-sbcelt-045493d_GH0.tar.gz) = 20128 -SHA256 (mumble-voip-mumble-theme-1d48b12_GH0.tar.gz) = 9f95d471555de8dc644edd184d24fff415b7b74c743b2aca50aa89b268a851f0 -SIZE (mumble-voip-mumble-theme-1d48b12_GH0.tar.gz) = 138425 +SHA256 (mumble-voip-mumble-theme-7dfb1e9_GH0.tar.gz) = 97b79768523888ca67cd42cf04bffe9c7063702fa5f445c1ab851809934b8bf5 +SIZE (mumble-voip-mumble-theme-7dfb1e9_GH0.tar.gz) = 375075 Modified: head/audio/mumble/files/patch-src__mumble__OSS.cpp ============================================================================== --- head/audio/mumble/files/patch-src__mumble__OSS.cpp Mon Oct 21 20:59:20 2019 (r515128) +++ head/audio/mumble/files/patch-src__mumble__OSS.cpp Mon Oct 21 21:18:39 2019 (r515129) @@ -1,6 +1,6 @@ ---- src/mumble/OSS.cpp.orig 2014-08-08 15:51:59 UTC +--- src/mumble/OSS.cpp.orig 2019-08-30 01:01:56 UTC +++ src/mumble/OSS.cpp -@@ -153,7 +153,6 @@ OSSEnumerator::OSSEnumerator() { +@@ -130,7 +130,6 @@ OSSEnumerator::OSSEnumerator() { qhOutput.insert(QString(), QLatin1String("Default OSS Device")); qhDevices.insert(QString(), QLatin1String("/dev/dsp")); @@ -8,7 +8,7 @@ int mixerfd = open("/dev/mixer", O_RDWR, 0); if (mixerfd == -1) { qWarning("OSSEnumerator: Failed to open /dev/mixer"); -@@ -182,15 +181,14 @@ OSSEnumerator::OSSEnumerator() { +@@ -159,15 +158,14 @@ OSSEnumerator::OSSEnumerator() { if (ainfo.caps & PCM_CAP_HIDDEN) continue; @@ -27,7 +27,7 @@ } OSSInput::OSSInput() { -@@ -221,20 +219,23 @@ void OSSInput::run() { +@@ -198,20 +196,23 @@ void OSSInput::run() { ival = AFMT_S16_NE; if ((ioctl(fd, SNDCTL_DSP_SETFMT, &ival) == -1) || (ival != AFMT_S16_NE)) { qWarning("OSSInput: Failed to set sound format"); @@ -54,7 +54,7 @@ } iMicFreq = ival; -@@ -258,8 +259,6 @@ void OSSInput::run() { +@@ -235,8 +236,6 @@ void OSSInput::run() { qWarning("OSSInput: Releasing."); ioctl(fd, SNDCTL_DSP_RESET, NULL); Modified: head/audio/mumble/pkg-plist ============================================================================== --- head/audio/mumble/pkg-plist Mon Oct 21 20:59:20 2019 (r515128) +++ head/audio/mumble/pkg-plist Mon Oct 21 21:18:39 2019 (r515129) @@ -2,9 +2,9 @@ bin/mumble lib/libcelt-mumble.so.0.11.0 lib/libcelt-mumble.so.0.7.0 lib/libmumble.so -lib/libmumble.so.1 -lib/libmumble.so.1.3 -lib/libmumble.so.%%PORTVERSION%% +lib/libmumble.so.%%MAJORVERSION%% +lib/libmumble.so.%%MINORVERSION%% +lib/libmumble.so.%%PATCHVERSION%% man/man1/mumble.1.gz share/applications/mumble.desktop share/icons/hicolor/128x128/apps/mumble.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910212118.x9LLIdGJ080713>