Received: by mail.netbsd.org (Postfix, from userid 605) id 95E2B84D32; Sat, 22 Dec 2018 18:17:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8787984D27 for ; Sat, 22 Dec 2018 18:17:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id RJ9D0Tc4tPfO for ; Sat, 22 Dec 2018 18:17:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B956684C77 for ; Sat, 22 Dec 2018 18:17:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A93ABFB16; Sat, 22 Dec 2018 18:17:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1545502659265980" MIME-Version: 1.0 Date: Sat, 22 Dec 2018 18:17:39 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/chat To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20181222181739.A93ABFB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1545502659265980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Dec 22 18:17:39 UTC 2018 Modified Files: pkgsrc/chat: Makefile Added Files: pkgsrc/chat/mumble: DESCR Makefile PLIST distinfo options.mk pkgsrc/chat/mumble/patches: patch-main.pro patch-src_mumble_AudioOutput.cpp patch-src_mumble_mumble.pro patch-src_mumble_mumble__pch.hpp Log Message: chat/mumble: Import version 1.2.19. Based partially on work in pkgsrc-wip. Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. This package contains the client and server software. To generate a diff of this commit: cvs rdiff -u -r1.210 -r1.211 pkgsrc/chat/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/chat/mumble/DESCR pkgsrc/chat/mumble/Makefile \ pkgsrc/chat/mumble/PLIST pkgsrc/chat/mumble/distinfo \ pkgsrc/chat/mumble/options.mk cvs rdiff -u -r0 -r1.1 pkgsrc/chat/mumble/patches/patch-main.pro \ pkgsrc/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp \ pkgsrc/chat/mumble/patches/patch-src_mumble_mumble.pro \ pkgsrc/chat/mumble/patches/patch-src_mumble_mumble__pch.hpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1545502659265980 Content-Disposition: inline Content-Length: 11099 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/Makefile diff -u pkgsrc/chat/Makefile:1.210 pkgsrc/chat/Makefile:1.211 --- pkgsrc/chat/Makefile:1.210 Sun Dec 16 02:05:23 2018 +++ pkgsrc/chat/Makefile Sat Dec 22 18:17:39 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.210 2018/12/16 02:05:23 nia Exp $ +# $NetBSD: Makefile,v 1.211 2018/12/22 18:17:39 nia Exp $ # COMMENT= Communication programs @@ -83,6 +83,7 @@ SUBDIR+= lurch-purple SUBDIR+= matterircd SUBDIR+= mcabber SUBDIR+= meanwhile +SUBDIR+= mumble SUBDIR+= ninja SUBDIR+= p5-IRC-Utils SUBDIR+= p5-Net-AIM Added files: Index: pkgsrc/chat/mumble/DESCR diff -u /dev/null pkgsrc/chat/mumble/DESCR:1.1 --- /dev/null Sat Dec 22 18:17:39 2018 +++ pkgsrc/chat/mumble/DESCR Sat Dec 22 18:17:39 2018 @@ -0,0 +1,4 @@ +Mumble is an open source, low-latency, high quality voice chat software +primarily intended for use while gaming. + +This package contains the client and server software. Index: pkgsrc/chat/mumble/Makefile diff -u /dev/null pkgsrc/chat/mumble/Makefile:1.1 --- /dev/null Sat Dec 22 18:17:39 2018 +++ pkgsrc/chat/mumble/Makefile Sat Dec 22 18:17:39 2018 @@ -0,0 +1,95 @@ +# $NetBSD: Makefile,v 1.1 2018/12/22 18:17:39 nia Exp $ + +DISTNAME= mumble-1.2.19 +CATEGORIES= chat audio +MASTER_SITES= ${MASTER_SITE_GITHUB:=mumble-voip/} +GITHUB_PROJECT= mumble +GITHUB_RELEASE= ${PKGVERSION_NOREV} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://wiki.mumble.info/wiki/Main_Page +COMMENT= Low latency VOIP software +LICENSE= modified-bsd + +USE_TOOLS+= pkg-config +USE_LANGUAGES= c c++11 +USE_LIBTOOL= yes + +BUILD_DEPENDS+= boost-headers-[0-9]*:../../devel/boost-headers +DEPENDS+= qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3 + +# cut down on excessive noise from headers to attempt to make it easier to +# find problems +CXXFLAGS+= -Wno-deprecated-declarations +CXXFLAGS+= -Wno-float-conversion +CXXFLAGS+= -Wno-unused-parameter + +BUILDLINK_TRANSFORM+= rm:-Wconversion +BUILDLINK_TRANSFORM+= rm:-Wold-style-cast + +CONFIG_OPTIONS+= CONFIG+=no-bundled-opus +CONFIG_OPTIONS+= CONFIG+=no-bundled-speex + +# appears to break the build +CONFIG_OPTIONS+= CONFIG+=no-embed-qt-translations + +# support for an old Logitech keyboard - requires missing library +CONFIG_OPTIONS+= CONFIG+=no-g15 + +# requires missing ZeroC utilities +CONFIG_OPTIONS+= CONFIG+=no-ice + +# required by protobuf +CONFIG_OPTIONS+= CONFIG+=c++11 + +.include "../../mk/oss.buildlink3.mk" + +.if ${OSS_TYPE} != "none" +SUBST_CLASSES+= oss +SUBST_STAGE.oss= pre-configure +SUBST_MESSAGE.oss= Correct path to OSS device. +SUBST_FILES.oss+= src/mumble/OSS.cpp +SUBST_SED.oss= -e "s,\"/dev/dsp\",\"${DEVOSSAUDIO}\",g" +.endif + +INSTALLATION_DIRS+= bin lib +INSTALLATION_DIRS+= share/applications +INSTALLATION_DIRS+= share/icons/hicolor/128x128/apps +INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps +INSTALLATION_DIRS+= share/pixmaps +INSTALLATION_DIRS+= ${PKGMANDIR}/man1 + +do-configure: + cd ${WRKSRC} && ${QTDIR}/bin/qmake -unix -recursive main.pro \ + ${CONFIG_OPTIONS} ${MAKE_ENV} \ + QMAKE_CFLAGS=${CFLAGS:Q} QMAKE_CXXFLAGS=${CXXFLAGS:Q} + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${DESTDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${DESTDIR}${PREFIX}/bin + ${INSTALL_LIB} ${WRKSRC}/release/.libs/libcelt0.so.0.11.0 ${DESTDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0 + ${INSTALL_LIB} ${WRKSRC}/release/.libs/libmumble.so.${PKGVERSION_NOREV} ${DESTDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${DESTDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${DESTDIR}${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps + ${MV} ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.osx.png ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png + ${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps + ${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + +.include "options.mk" +.include "../../audio/libopus/buildlink3.mk" +.include "../../audio/libsndfile/buildlink3.mk" +.include "../../audio/speech-dispatcher/buildlink3.mk" +.include "../../audio/speexdsp/buildlink3.mk" +.include "../../audio/speex/buildlink3.mk" +.include "../../devel/boost-headers/buildlink3.mk" +.include "../../devel/boost-libs/buildlink3.mk" +.include "../../devel/libltdl/buildlink3.mk" +.include "../../devel/protobuf/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../x11/libXi/buildlink3.mk" +.include "../../x11/qt4-libs/buildlink3.mk" +.include "../../x11/qt4-tools/buildlink3.mk" +.include "../../mk/dlopen.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/chat/mumble/PLIST diff -u /dev/null pkgsrc/chat/mumble/PLIST:1.1 --- /dev/null Sat Dec 22 18:17:39 2018 +++ pkgsrc/chat/mumble/PLIST Sat Dec 22 18:17:39 2018 @@ -0,0 +1,10 @@ +@comment $NetBSD: PLIST,v 1.1 2018/12/22 18:17:39 nia Exp $ +bin/mumble +bin/murmurd +lib/libcelt-mumble.so.0.7.0 +lib/libmumble.so.${PKGVERSION} +man/man1/mumble.1 +share/applications/mumble.desktop +share/icons/hicolor/128x128/apps/mumble.png +share/icons/hicolor/scalable/apps/mumble.svg +share/pixmaps/mumble.xpm Index: pkgsrc/chat/mumble/distinfo diff -u /dev/null pkgsrc/chat/mumble/distinfo:1.1 --- /dev/null Sat Dec 22 18:17:39 2018 +++ pkgsrc/chat/mumble/distinfo Sat Dec 22 18:17:39 2018 @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1 2018/12/22 18:17:39 nia Exp $ + +SHA1 (mumble-1.2.19.tar.gz) = 8ea9dafad14e6c730da72ae9b4625778e499d94f +RMD160 (mumble-1.2.19.tar.gz) = 9c24e5348c4ae5689d1fc0759c17d547a9b83eaf +SHA512 (mumble-1.2.19.tar.gz) = f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4 +Size (mumble-1.2.19.tar.gz) = 3210865 bytes +SHA1 (patch-main.pro) = af7e2dcdc803dc9c81ce1d8bff06fdbee30c9bfa +SHA1 (patch-src_mumble_AudioOutput.cpp) = 63ad8a2545af3c83daca8a953cc96030397869e8 +SHA1 (patch-src_mumble_mumble.pro) = 478325bf97a716da84374e16943b6e99b7ad4d78 +SHA1 (patch-src_mumble_mumble__pch.hpp) = aeb4e255e92e2f8cd7314241c81efdf63006e235 Index: pkgsrc/chat/mumble/options.mk diff -u /dev/null pkgsrc/chat/mumble/options.mk:1.1 --- /dev/null Sat Dec 22 18:17:39 2018 +++ pkgsrc/chat/mumble/options.mk Sat Dec 22 18:17:39 2018 @@ -0,0 +1,33 @@ +# $NetBSD: options.mk,v 1.1 2018/12/22 18:17:39 nia Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.mumble +PKG_SUPPORTED_OPTIONS= alsa dbus pulseaudio portaudio +PKG_SUGGESTED_OPTIONS= dbus +PKG_SUGGESTED_OPTIONS.Linux= alsa + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Malsa) +CONFIG_OPTIONS+= CONFIG+=alsa +.include "../../audio/alsa-lib/buildlink3.mk" +.else +CONFIG_OPTIONS+= CONFIG+=no-alsa +.endif + +.if !empty(PKG_OPTIONS:Mdbus) +.include "../../x11/qt4-qdbus/buildlink3.mk" +.else +CONFIG_OPTIONS+= CONFIG+=no-dbus +.endif + +.if !empty(PKG_OPTIONS:Mpulseaudio) +.include "../../audio/pulseaudio/buildlink3.mk" +.else +CONFIG_OPTIONS+= CONFIG+=no-pulseaudio +.endif + +.if !empty(PKG_OPTIONS:Mportaudio) +.include "../../audio/portaudio/buildlink3.mk" +.else +CONFIG_OPTIONS+= CONFIG+=no-portaudio +.endif Index: pkgsrc/chat/mumble/patches/patch-main.pro diff -u /dev/null pkgsrc/chat/mumble/patches/patch-main.pro:1.1 --- /dev/null Sat Dec 22 18:17:39 2018 +++ pkgsrc/chat/mumble/patches/patch-main.pro Sat Dec 22 18:17:39 2018 @@ -0,0 +1,16 @@ +$NetBSD: patch-main.pro,v 1.1 2018/12/22 18:17:39 nia Exp $ + +Always use the builtin version of celt to avoid API incompatibilities. + +--- main.pro.orig 2017-01-27 06:48:33.000000000 +0000 ++++ main.pro +@@ -12,9 +12,6 @@ CONFIG *= ordered debug_and_release + CONFIG(sbcelt) { + SUBDIRS *= celt-0.7.0-build sbcelt-lib-build sbcelt-helper-build + } else { +- unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt) { +- CONFIG *= no-bundled-celt +- } + !CONFIG(no-bundled-celt) { + SUBDIRS *= celt-0.7.0-build celt-0.11.0-build + } Index: pkgsrc/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp:1.1 --- /dev/null Sat Dec 22 18:17:39 2018 +++ pkgsrc/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp Sat Dec 22 18:17:39 2018 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_mumble_AudioOutput.cpp,v 1.1 2018/12/22 18:17:39 nia Exp $ + +https://github.com/mumble-voip/mumble/pull/3287 + +--- src/mumble/AudioOutput.cpp.orig 2017-01-27 06:48:33.000000000 +0000 ++++ src/mumble/AudioOutput.cpp +@@ -431,7 +431,7 @@ bool AudioOutput::mix(void *outbuff, uns + top[2] = 0.0f; + } + +- if (std::abs(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) { ++ if (std::abs(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) { + // Not perpendicular. Assume Y up and rotate 90 degrees. + + float azimuth = 0.0f; Index: pkgsrc/chat/mumble/patches/patch-src_mumble_mumble.pro diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_mumble.pro:1.1 --- /dev/null Sat Dec 22 18:17:39 2018 +++ pkgsrc/chat/mumble/patches/patch-src_mumble_mumble.pro Sat Dec 22 18:17:39 2018 @@ -0,0 +1,43 @@ +$NetBSD: patch-src_mumble_mumble.pro,v 1.1 2018/12/22 18:17:39 nia Exp $ + +Always use the builtin version of celt to avoid API incompatibilities. + +Use ${LIBOSSAUDIO}. + +Find speech-dispatcher's include directory with pkgconf. + +--- src/mumble/mumble.pro.orig 2017-01-27 06:48:33.000000000 +0000 ++++ src/mumble/mumble.pro +@@ -67,15 +67,7 @@ CONFIG(sbcelt) { + LIBS *= -lcelt -lsbcelt + DEFINES *= SBCELT_PREFIX_API SBCELT_COMPAT_API USE_SBCELT + } else { +- unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt) { +- CONFIG *= no-bundled-celt +- } +- CONFIG(no-bundled-celt) { +- INCLUDEPATH *= /usr/include/celt +- } +- !CONFIG(no-bundled-celt) { +- INCLUDEPATH *= ../../celt-0.7.0-src/libcelt +- } ++ INCLUDEPATH *= ../../celt-0.7.0-src/libcelt + } + + !win32 { +@@ -240,6 +232,7 @@ oss { + HEADERS *= OSS.h + SOURCES *= OSS.cpp + INCLUDEPATH *= /usr/lib/oss/include ++ LIBS *= "$$LIBOSSAUDIO" + } + + pulseaudio { +@@ -292,6 +285,7 @@ dbus { + + speechd { + DEFINES *= USE_SPEECHD ++ PKGCONFIG *= speech-dispatcher + LIBS *= -lspeechd + } + Index: pkgsrc/chat/mumble/patches/patch-src_mumble_mumble__pch.hpp diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_mumble__pch.hpp:1.1 --- /dev/null Sat Dec 22 18:17:39 2018 +++ pkgsrc/chat/mumble/patches/patch-src_mumble_mumble__pch.hpp Sat Dec 22 18:17:39 2018 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_mumble_mumble__pch.hpp,v 1.1 2018/12/22 18:17:39 nia Exp $ + +https://github.com/mumble-voip/mumble/pull/3287 + +--- src/mumble/mumble_pch.hpp.orig 2017-01-27 06:48:33.000000000 +0000 ++++ src/mumble/mumble_pch.hpp +@@ -71,6 +71,8 @@ + #include + #include + ++#include ++ + #ifdef Q_OS_WIN + #include + #include --_----------=_1545502659265980--