From owner-svn-ports-head@freebsd.org Thu Mar 21 13:53:06 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21132154140F; Thu, 21 Mar 2019 13:53:06 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B36258C5C8; Thu, 21 Mar 2019 13:53:05 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8AF929B02; Thu, 21 Mar 2019 13:53:05 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2LDr5Ia074968; Thu, 21 Mar 2019 13:53:05 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2LDr488074960; Thu, 21 Mar 2019 13:53:04 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201903211353.x2LDr488074960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 21 Mar 2019 13:53:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496458 - in head/audio: . mumble mumble/files X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in head/audio: . mumble mumble/files X-SVN-Commit-Revision: 496458 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B36258C5C8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Mar 2019 13:53:06 -0000 Author: feld Date: Thu Mar 21 13:53:03 2019 New Revision: 496458 URL: https://svnweb.freebsd.org/changeset/ports/496458 Log: audio/mumble: Revive and update to 1.3.0-rc1 - Now supports Qt5 PR: 235177 Added: head/audio/mumble/ - copied from r495966, head/audio/mumble/ Deleted: head/audio/mumble/files/extrapatch-fix-build-boost-1.66 head/audio/mumble/files/patch-compiler.pri head/audio/mumble/files/patch-cplusplus.pri head/audio/mumble/files/patch-plugins-plugins.pri head/audio/mumble/files/patch-src-Net.cpp head/audio/mumble/files/patch-src-mumble-ServerHandler.cpp head/audio/mumble/files/patch-src-mumble-mumble.pro head/audio/mumble/files/patch-src-mumble-mumble_pch.hpp Modified: head/audio/Makefile head/audio/mumble/Makefile head/audio/mumble/distinfo head/audio/mumble/files/patch-overlay_gl-overlay.c head/audio/mumble/files/patch-overlay_overlay.h head/audio/mumble/files/patch-src-mumble-CELTCodec.cpp head/audio/mumble/pkg-plist Modified: head/audio/Makefile ============================================================================== --- head/audio/Makefile Thu Mar 21 13:45:02 2019 (r496457) +++ head/audio/Makefile Thu Mar 21 13:53:03 2019 (r496458) @@ -550,6 +550,7 @@ SUBDIR += mpg321 SUBDIR += mpiosh SUBDIR += mps + SUBDIR += mumble SUBDIR += murmur SUBDIR += musepack SUBDIR += musescore Modified: head/audio/mumble/Makefile ============================================================================== --- head/audio/mumble/Makefile Sat Mar 16 21:52:35 2019 (r495966) +++ head/audio/mumble/Makefile Thu Mar 21 13:53:03 2019 (r496458) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= mumble -PORTVERSION= 1.2.19 -PORTREVISION= 14 +DISTVERSION= 1.3.0-rc1 +PORTREVISION= 0 CATEGORIES= audio MAINTAINER= feld@FreeBSD.org @@ -12,9 +12,6 @@ COMMENT= Voice chat software primarily intended for us LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 - LIB_DEPENDS+= libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp \ libsndfile.so:audio/libsndfile \ @@ -22,36 +19,38 @@ LIB_DEPENDS+= libspeex.so:audio/speex \ libprotoc.so:devel/protobuf \ libopus.so:audio/opus -PLIST_SUB+= PORTVERSION="${PORTVERSION}" +PLIST_SUB+= PORTVERSION="${PORTVERSION:R}" -USES= compiler:c++11-lang cpe desktop-file-utils gmake pkgconfig qmake qt:4 ssl +USES= compiler:c++11-lang cpe desktop-file-utils gmake pkgconfig qmake qt:5 ssl USE_CXXSTD= c++11 USE_GITHUB= yes -GH_ACCOUNT= mumble-voip -GH_PROJECT= mumble celt-0.7.0:mumble_celt_0_7 celt-0.11.0:mumble_celt_0_11 -GH_TAGNAME= 5a16cda:mumble_celt_0_7 e18de77:mumble_celt_0_11 -GH_SUBDIR= celt-0.7.0-src:mumble_celt_0_7 celt-0.11.0-src:mumble_celt_0_11 -USE_QT= gui svg iconengines_run xml sql network l10n \ - linguist_build moc_build rcc_build uic_build \ - opengl sql-sqlite3_run corelib +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: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 + +USE_QT= buildtools_build core gui l10n linguist_build network opengl sql sql-sqlite3_run svg xml USE_LDCONFIG= yes USE_XORG= ice xi x11 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-pulseaudio no-xevie no-embed-qt-translations +CONFIG= bundled-celt bundled-rnnoise no-alsa no-bundled-opus no-speechd no-bundled-speex \ + no-bundled-speexdsp no-embed-qt-translations no-g15 no-jackaudio no-pulseaudio \ + no-pulseaudio no-server no-update no-xevie -EXTRA_PATCHES= ${FILESDIR}/extrapatch-fix-build-boost-1.66:-p1 - QMAKE_ARGS= "CONFIG+=${CONFIG}" OPTIONS_DEFINE= DBUS BONJOUR PORTAUDIO OPTIONS_DEFAULT= DBUS DBUS_VARS_OFF= CONFIG+=no-dbus -DBUS_USES= qt:4 +DBUS_USES= qt:5 DBUS_USE= QT=dbus BONJOUR_DESC= Bonjour support @@ -76,17 +75,16 @@ 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} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PORTVERSION} - ${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so - ${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.1 - ${RLN} ${STAGEDIR}${PREFIX}/lib/libmumble.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmumble.so.1.2 + ${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 ${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 ${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.osx.installer.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 Modified: head/audio/mumble/distinfo ============================================================================== --- head/audio/mumble/distinfo Sat Mar 16 21:52:35 2019 (r495966) +++ head/audio/mumble/distinfo Thu Mar 21 13:53:03 2019 (r496458) @@ -1,7 +1,17 @@ -TIMESTAMP = 1496976137 -SHA256 (mumble-voip-mumble-1.2.19_GH0.tar.gz) = 7835e9cec78184cd73f091448e14daa451cd206431775b6babad70bc81b6fd50 -SIZE (mumble-voip-mumble-1.2.19_GH0.tar.gz) = 3324626 +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 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-e18de77_GH0.tar.gz) = b522482222c40c1f05ce9b6c4d19a05e8419a7850398dbbdea5854b78eadfd4a -SIZE (mumble-voip-celt-0.11.0-e18de77_GH0.tar.gz) = 212833 +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-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 +SIZE (mumble-voip-minhook-9fbd087_GH0.tar.gz) = 26391 +SHA256 (mumble-voip-rnnoise-b30f2bb_GH0.tar.gz) = 68ce21e49a0af3d06d87d27665d9a2102c249e4e5e91f777e47139d8707aeb6d +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 Modified: head/audio/mumble/files/patch-overlay_gl-overlay.c ============================================================================== --- head/audio/mumble/files/patch-overlay_gl-overlay.c Sat Mar 16 21:52:35 2019 (r495966) +++ head/audio/mumble/files/patch-overlay_gl-overlay.c Thu Mar 21 13:53:03 2019 (r496458) @@ -1,6 +1,6 @@ ---- overlay_gl/overlay.c.orig 2014-08-08 15:51:59 UTC +--- overlay_gl/overlay.c.orig 2019-03-13 18:38:10 UTC +++ overlay_gl/overlay.c -@@ -45,6 +45,7 @@ +@@ -16,6 +16,7 @@ #include #include #include Modified: head/audio/mumble/files/patch-overlay_overlay.h ============================================================================== --- head/audio/mumble/files/patch-overlay_overlay.h Sat Mar 16 21:52:35 2019 (r495966) +++ head/audio/mumble/files/patch-overlay_overlay.h Thu Mar 21 13:53:03 2019 (r496458) @@ -1,6 +1,6 @@ ---- overlay/overlay.h.orig 2014-08-08 15:51:59 UTC +--- overlay/overlay.h.orig 2019-03-13 18:38:10 UTC +++ overlay/overlay.h -@@ -42,6 +42,25 @@ struct OverlayMsgHeader { +@@ -18,6 +18,25 @@ struct OverlayMsgHeader { #define OVERLAY_MSGTYPE_INIT 0 struct OverlayMsgInit { unsigned int uiWidth; Modified: head/audio/mumble/files/patch-src-mumble-CELTCodec.cpp ============================================================================== --- head/audio/mumble/files/patch-src-mumble-CELTCodec.cpp Sat Mar 16 21:52:35 2019 (r495966) +++ head/audio/mumble/files/patch-src-mumble-CELTCodec.cpp Thu Mar 21 13:53:03 2019 (r496458) @@ -1,10 +1,10 @@ ---- src/mumble/CELTCodec.cpp.orig 2014-08-08 15:51:59 UTC +--- src/mumble/CELTCodec.cpp.orig 2019-03-20 19:21:57 UTC +++ src/mumble/CELTCodec.cpp -@@ -64,6 +64,7 @@ CELTCodec::CELTCodec(const QString &vers - alternatives << QString::fromLatin1("libcelt0.so.%1").arg(version); - alternatives << QString::fromLatin1("libcelt.so.%1").arg(version); - alternatives << QString::fromLatin1("celt.so.%1").arg(version); -+ alternatives << QString::fromLatin1("libcelt-mumble.so.%1").arg(version); +@@ -40,6 +40,7 @@ CELTCodec::CELTCodec(const QString &celt_version) { + alternatives << QString::fromLatin1("libcelt0.so.%1").arg(celt_version); + alternatives << QString::fromLatin1("libcelt.so.%1").arg(celt_version); + alternatives << QString::fromLatin1("celt.so.%1").arg(celt_version); ++ alternatives << QString::fromLatin1("libcelt-mumble.so.%1").arg(celt_version); #else int cpuinfo[4]; __cpuid(cpuinfo, 1); Modified: head/audio/mumble/pkg-plist ============================================================================== --- head/audio/mumble/pkg-plist Sat Mar 16 21:52:35 2019 (r495966) +++ head/audio/mumble/pkg-plist Thu Mar 21 13:53:03 2019 (r496458) @@ -3,7 +3,7 @@ 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.2 +lib/libmumble.so.1.3 lib/libmumble.so.%%PORTVERSION%% man/man1/mumble.1.gz share/applications/mumble.desktop