pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/chat/mumble
Module Name: pkgsrc
Committed By: nia
Date: Fri Apr 1 11:53:28 UTC 2022
Modified Files:
pkgsrc/chat/mumble: Makefile PLIST distinfo options.mk
pkgsrc/chat/mumble/patches: patch-src_mumble_OSS.cpp
Added Files:
pkgsrc/chat/mumble/patches: patch-overlay__gl_init__unix.c
patch-src_ProcessResolver.cpp patch-src_mumble_CMakeLists.txt
Removed Files:
pkgsrc/chat/mumble/patches: patch-src_mumble_mumble.pro
Log Message:
mumble: update to 1.4.230
Release notes:
https://www.mumble.info/blog/mumble-1.4.230/
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/chat/mumble/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/chat/mumble/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/chat/mumble/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/chat/mumble/options.mk
cvs rdiff -u -r0 -r1.1 \
pkgsrc/chat/mumble/patches/patch-overlay__gl_init__unix.c \
pkgsrc/chat/mumble/patches/patch-src_ProcessResolver.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_CMakeLists.txt
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp
cvs rdiff -u -r1.2 -r0 pkgsrc/chat/mumble/patches/patch-src_mumble_mumble.pro
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/chat/mumble/Makefile
diff -u pkgsrc/chat/mumble/Makefile:1.39 pkgsrc/chat/mumble/Makefile:1.40
--- pkgsrc/chat/mumble/Makefile:1.39 Mon Mar 28 10:52:56 2022
+++ pkgsrc/chat/mumble/Makefile Fri Apr 1 11:53:28 2022
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.39 2022/03/28 10:52:56 tnn Exp $
+# $NetBSD: Makefile,v 1.40 2022/04/01 11:53:28 nia Exp $
-DISTNAME= mumble-1.3.4
-PKGREVISION= 10
+DISTNAME= mumble-1.4.230
CATEGORIES= chat audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=mumble-voip/}
GITHUB_PROJECT= mumble
-GITHUB_RELEASE= ${PKGVERSION_NOREV}
+GITHUB_RELEASE= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://wiki.mumble.info/wiki/Main_Page
@@ -14,91 +13,53 @@ LICENSE= modified-bsd
TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
+WRKSRC= ${WRKDIR}/mumble-${PKGVERSION_NOREV}.src
+
+# NetBSD make not suitable due to targets with spaces
USE_TOOLS+= pkg-config gmake
USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-
-PYTHON_FOR_BUILD_ONLY= tool
-CONFIGURE_ENV+= MUMBLE_PYTHON=${PYTHONBIN:Q}
-BUILD_TARGET= release
+USE_CMAKE= yes
# C++11
GCC_REQD+= 4.8
LDFLAGS.NetBSD+= -lrt
-CONFIG_OPTIONS+= DEFINES+="PLUGIN_PATH=${PREFIX}/lib/mumble"
+# Basic sensible stuff for packaging.
+CMAKE_ARGS+= -Dbundled-celt=off
+CMAKE_ARGS+= -Dbundled-opus=off
+CMAKE_ARGS+= -Dbundled-speex=off
+CMAKE_ARGS+= -Dwarnings-as-errors=off
-CONFIG_OPTIONS+= CONFIG+=c++11
+# Compatibility.
+CXXFLAGS+= -DCELT_SET_VBR_RATE=CELT_SET_BITRATE
-CONFIG_OPTIONS+= CONFIG+=no-bundled-opus
-CONFIG_OPTIONS+= CONFIG+=no-bundled-speex
+# Architecture-specific due to nasty hacks...
+CMAKE_ARGS+= -Doverlay=off
-# appears to break the build
-CONFIG_OPTIONS+= CONFIG+=no-embed-qt-translations
-CONFIG_OPTIONS+= CONFIG+=no-pch
+# Not available in pkgsrc yet.
+CMAKE_ARGS+= -Dpipewire=off
# support for an old Logitech keyboard - requires missing library
-CONFIG_OPTIONS+= CONFIG+=no-g15
+CMAKE_ARGS+= -Dg15=off
# requires missing ZeroC utilities
-CONFIG_OPTIONS+= CONFIG+=no-ice
+CMAKE_ARGS+= -Dice=off
.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} != "none"
-SUBST_CLASSES+= oss
-SUBST_STAGE.oss= pre-configure
-SUBST_MESSAGE.oss= Setting the OSS library.
-SUBST_FILES.oss+= src/mumble/mumble.pro
-SUBST_VARS.oss+= LIBOSSAUDIO
+LDFLAGS+= ${LIBOSSAUDIO}
+CMAKE_ARGS+= -Doss=on
+.else
+CMAKE_ARGS+= -Doss=off
.endif
-INSTALLATION_DIRS+= bin lib/mumble
-INSTALLATION_DIRS+= share/applications
-INSTALLATION_DIRS+= share/icons/hicolor/128x128/apps
-INSTALLATION_DIRS+= share/icons/hicolor/512x512/apps
-INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps
-INSTALLATION_DIRS+= share/pixmaps
-INSTALLATION_DIRS+= ${PKGMANDIR}/man1
-
CHECK_PORTABILITY_SKIP+= 3rdparty/opus-src/doc/build_draft.sh
-do-configure:
- cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QTDIR}/bin/qmake -unix -recursive main.pro \
- ${CONFIG_OPTIONS} ${MAKE_ENV} \
- QMAKE_CFLAGS=${CFLAGS:Q} \
- QMAKE_CXXFLAGS=${CXXFLAGS:Q} \
- QMAKE_LFLAGS=${LDFLAGS:Q}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/release/mumble \
- ${DESTDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd \
- ${DESTDIR}${PREFIX}/bin
- ${INSTALL_LIB} ${WRKSRC}/release/libmumble* \
- ${DESTDIR}${PREFIX}/lib/mumble
- ${INSTALL_LIB} ${WRKSRC}/release/plugins/liblink* \
- ${DESTDIR}${PREFIX}/lib/mumble
- ${INSTALL_LIB} ${WRKSRC}/release/libcelt* \
- ${DESTDIR}${PREFIX}/lib/mumble
- ${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop \
- ${DESTDIR}${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/man/mumble.1 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA} ${WRKSRC}/man/murmurd.1 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg \
- ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
- ${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm \
- ${DESTDIR}${PREFIX}/share/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/themes/Mumble/mumble.png \
- ${DESTDIR}${PREFIX}/share/icons/hicolor/512x512/apps/mumble.png
- ${INSTALL_DATA} ${WRKSRC}/themes/Mumble/mumble.osx.png \
- ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
-
.include "options.mk"
+.include "../../audio/celt/buildlink3.mk"
.include "../../audio/libopus/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/speech-dispatcher/buildlink3.mk"
@@ -107,13 +68,14 @@ do-install:
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
+.include "../../devel/poco/buildlink3.mk"
.include "../../devel/protobuf/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/python/pyversion.mk"
.include "../../net/mDNSResponder/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXi/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/chat/mumble/PLIST
diff -u pkgsrc/chat/mumble/PLIST:1.4 pkgsrc/chat/mumble/PLIST:1.5
--- pkgsrc/chat/mumble/PLIST:1.4 Fri Mar 5 09:57:20 2021
+++ pkgsrc/chat/mumble/PLIST Fri Apr 1 11:53:28 2022
@@ -1,22 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2021/03/05 09:57:20 nia Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/04/01 11:53:28 nia Exp $
bin/mumble
-bin/murmurd
-lib/mumble/libcelt0.so
-lib/mumble/libcelt0.so.0
-lib/mumble/libcelt0.so.0.11
-lib/mumble/libcelt0.so.0.11.0
-lib/mumble/libcelt0.so.0.7
-lib/mumble/libcelt0.so.0.7.0
-lib/mumble/liblink.so
-lib/mumble/libmumble.so
-lib/mumble/libmumble.so.1
-lib/mumble/libmumble.so.1.3
-lib/mumble/libmumble.so.1.3.3
-lib/mumble/libmumble_proto.a
+bin/mumble-server
man/man1/mumble.1
+man/man1/murmur-user-wrapper.1
man/man1/murmurd.1
-share/applications/mumble.desktop
-share/icons/hicolor/128x128/apps/mumble.png
-share/icons/hicolor/512x512/apps/mumble.png
+share/applications/org.mumble_voip.mumble.desktop
+share/icons/hicolor/256x256/apps/mumble.png
share/icons/hicolor/scalable/apps/mumble.svg
-share/pixmaps/mumble.xpm
+share/metainfo/org.mumble_voip.mumble.appdata.xml
Index: pkgsrc/chat/mumble/distinfo
diff -u pkgsrc/chat/mumble/distinfo:1.9 pkgsrc/chat/mumble/distinfo:1.10
--- pkgsrc/chat/mumble/distinfo:1.9 Tue Oct 26 10:05:21 2021
+++ pkgsrc/chat/mumble/distinfo Fri Apr 1 11:53:28 2022
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:05:21 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/04/01 11:53:28 nia Exp $
-BLAKE2s (mumble-1.3.4.tar.gz) = f5532d8db01b260f443b23c7da2af28b246c6c4d02cdf90d5073f36ac94f708c
-SHA512 (mumble-1.3.4.tar.gz) = e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
-Size (mumble-1.3.4.tar.gz) = 8592741 bytes
-SHA1 (patch-src_mumble_OSS.cpp) = cf441337a6284da7f87429610275ef14d084ddbf
-SHA1 (patch-src_mumble_mumble.pro) = a49c3263f6034b2ea7c8633e24823937f4c4d3f5
+BLAKE2s (mumble-1.4.230.tar.gz) = 71d12d9d94a06a3c57b8b2230040efe3dff77048cbc5c4da11d1762bd5378cc8
+SHA512 (mumble-1.4.230.tar.gz) = 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
+Size (mumble-1.4.230.tar.gz) = 9441667 bytes
+SHA1 (patch-overlay__gl_init__unix.c) = e8db446ee6b62af5c8e580a3927664c9b52bf4f7
+SHA1 (patch-src_ProcessResolver.cpp) = f75286127d01c2f44308d6483e2af5b5e7bc1304
+SHA1 (patch-src_mumble_CMakeLists.txt) = a171b707b8f5c8316f0c0c45bb0f8a38545f0f6a
+SHA1 (patch-src_mumble_OSS.cpp) = b0e38bade402998f7c5d0d71090a26fa4a77eb97
Index: pkgsrc/chat/mumble/options.mk
diff -u pkgsrc/chat/mumble/options.mk:1.6 pkgsrc/chat/mumble/options.mk:1.7
--- pkgsrc/chat/mumble/options.mk:1.6 Fri Oct 16 07:42:48 2020
+++ pkgsrc/chat/mumble/options.mk Fri Apr 1 11:53:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2020/10/16 07:42:48 nia Exp $
+# $NetBSD: options.mk,v 1.7 2022/04/01 11:53:28 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mumble
PKG_SUPPORTED_OPTIONS= alsa dbus jack pulseaudio portaudio
@@ -8,35 +8,35 @@ PKG_SUGGESTED_OPTIONS.Linux= alsa
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
-CONFIG_OPTIONS+= CONFIG+=alsa
+CMAKE_ARGS+= -Dalsa=on
.include "../../audio/alsa-lib/buildlink3.mk"
.else
-CONFIG_OPTIONS+= CONFIG+=no-alsa
+CMAKE_ARGS+= -Dalsa=off
.endif
.if !empty(PKG_OPTIONS:Mdbus)
-CONFIG_OPTIONS+= CONFIG+=dbus
+CMAKE_ARGS+= -Ddbus=on
.else
-CONFIG_OPTIONS+= CONFIG+=no-dbus
+CMAKE_ARGS+= -Ddbus=off
.endif
.if !empty(PKG_OPTIONS:Mjack)
-CONFIG_OPTIONS+= CONFIG+=jackaudio
+CMAKE_ARGS+= -Djackaudio=on
.include "../../audio/jack/buildlink3.mk"
.else
-CONFIG_OPTIONS+= CONFIG+=no-jackaudio
+CMAKE_ARGS+= -Djackaudio=off
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
-CONFIG_OPTIONS+= CONFIG+=pulseaudio
+CMAKE_ARGS+= -Dpulseaudio=on
.include "../../audio/pulseaudio/buildlink3.mk"
.else
-CONFIG_OPTIONS+= CONFIG+=no-pulseaudio
+CMAKE_ARGS+= -Dpulseaudio=off
.endif
.if !empty(PKG_OPTIONS:Mportaudio)
-CONFIG_OPTIONS+= CONFIG+=portaudio
+CMAKE_ARGS+= -Dportaudio=on
.include "../../audio/portaudio/buildlink3.mk"
.else
-CONFIG_OPTIONS+= CONFIG+=no-portaudio
+CMAKE_ARGS+= -Dportaudio=off
.endif
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp
diff -u pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp:1.3 pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp:1.4
--- pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp:1.3 Fri Oct 16 07:42:48 2020
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp Fri Apr 1 11:53:28 2022
@@ -1,15 +1,16 @@
-$NetBSD: patch-src_mumble_OSS.cpp,v 1.3 2020/10/16 07:42:48 nia Exp $
+$NetBSD: patch-src_mumble_OSS.cpp,v 1.4 2022/04/01 11:53:28 nia Exp $
Make device iteration work with NetBSD's OSS compat layer.
-XXX: Fix this in libossaudio.
+This is fixed in NetBSD 10.x.
---- src/mumble/OSS.cpp.orig 2020-10-04 20:25:02.000000000 +0000
+--- src/mumble/OSS.cpp.orig 2022-01-18 01:00:00.346014000 +0000
+++ src/mumble/OSS.cpp
-@@ -128,9 +128,46 @@ void OSSOutputRegistrar::setDeviceChoice
+@@ -123,9 +123,45 @@ void OSSOutputRegistrar::setDeviceChoice
OSSEnumerator::OSSEnumerator() {
qhInput.insert(QString(), QLatin1String("Default OSS Device"));
qhOutput.insert(QString(), QLatin1String("Default OSS Device"));
++
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+ qhDevices.insert(QString(), QLatin1String("/dev/audio"));
+#else
@@ -17,11 +18,12 @@ XXX: Fix this in libossaudio.
+#endif
+
+#if defined(__NetBSD__)
-+ for (int i=0;i< 32;i++) {
++ for (int i = 0; i < 32; i++) {
+ char audiodevname[32];
+ int fd;
+ oss_audioinfo ainfo;
-+
+
+-#if (SOUND_VERSION >= 0x040002)
+ ainfo.dev = i;
+ snprintf(audiodevname, sizeof(audiodevname), "/dev/audio%d", i);
+ if ((fd = open(audiodevname, O_RDWR)) == -1) {
@@ -32,10 +34,8 @@ XXX: Fix this in libossaudio.
+ qWarning("OSSEnumerator: SNDCTL_AUDIOINFO failed for device %d", i);
+ continue;
+ }
-+
+ close(fd);
-
--#if (SOUND_VERSION >= 0x040002)
++
+ QString handle = QLatin1String(ainfo.handle);
+ QString name = QLatin1String(ainfo.name);
+ QString device = QLatin1String(ainfo.devnode);
@@ -44,13 +44,12 @@ XXX: Fix this in libossaudio.
+ continue;
+
+ qhDevices.insert(device, device);
-+
+ if (ainfo.caps & PCM_CAP_INPUT)
+ qhInput.insert(device, name);
+ if (ainfo.caps & PCM_CAP_OUTPUT)
+ qhOutput.insert(device, name);
+ }
-+#elif (SOUND_VERSION >= 0x040002) && !defined(__NetBSD__)
++#elif (SOUND_VERSION >= 0x040002)
int mixerfd = open("/dev/mixer", O_RDWR, 0);
if (mixerfd == -1) {
qWarning("OSSEnumerator: Failed to open /dev/mixer");
Added files:
Index: pkgsrc/chat/mumble/patches/patch-overlay__gl_init__unix.c
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-overlay__gl_init__unix.c:1.1
--- /dev/null Fri Apr 1 11:53:28 2022
+++ pkgsrc/chat/mumble/patches/patch-overlay__gl_init__unix.c Fri Apr 1 11:53:28 2022
@@ -0,0 +1,48 @@
+$NetBSD: patch-overlay__gl_init__unix.c,v 1.1 2022/04/01 11:53:28 nia Exp $
+
+NetBSD support.
+
+XXX hacky, verify correct
+
+--- overlay_gl/init_unix.c.orig 2022-01-18 01:00:00.330013500 +0000
++++ overlay_gl/init_unix.c
+@@ -161,6 +161,12 @@ __attribute__((visibility("default"))) v
+ return symbol;
+ }
+
++#ifdef __FreeBSD__
++#define LD_ELF_SO "/libexec/ld-elf.so.1"
++#else
++#define LD_ELF_SO "/libexec/ld.elf_so"
++#endif
++
+ static int find_odlsym() {
+ #if defined(__linux__)
+ void *dl = dlopen("libdl.so.2", RTLD_LAZY);
+@@ -170,7 +176,7 @@ static int find_odlsym() {
+ }
+
+ struct link_map *lm = dl;
+-#elif defined(__FreeBSD__)
++#else
+ struct link_map *lm = NULL;
+ if (dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &lm) == -1) {
+ ods("Unable to acquire link_map: %s", dlerror());
+@@ -178,7 +184,7 @@ static int find_odlsym() {
+ }
+
+ while (lm) {
+- if (strcmp(lm->l_name, "/libexec/ld-elf.so.1") == 0) {
++ if (strcmp(lm->l_name, LD_ELF_SO) == 0) {
+ break;
+ }
+
+@@ -186,7 +192,7 @@ static int find_odlsym() {
+ }
+
+ if (!lm) {
+- ods("Failed to find ld-elf.so.1!");
++ ods("Failed to find " LD_ELF_SO);
+ return -1;
+ }
+ #endif
Index: pkgsrc/chat/mumble/patches/patch-src_ProcessResolver.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_ProcessResolver.cpp:1.1
--- /dev/null Fri Apr 1 11:53:28 2022
+++ pkgsrc/chat/mumble/patches/patch-src_ProcessResolver.cpp Fri Apr 1 11:53:28 2022
@@ -0,0 +1,48 @@
+$NetBSD: patch-src_ProcessResolver.cpp,v 1.1 2022/04/01 11:53:28 nia Exp $
+
+NetBSD support.
+
+XXX hacky, verify correct
+
+--- src/ProcessResolver.cpp.orig 2022-01-18 01:00:00.338013600 +0000
++++ src/ProcessResolver.cpp
+@@ -195,7 +195,6 @@ void ProcessResolver::doResolve() {
+ // Implementation for FreeBSD
+ # include <libutil.h>
+ # include <sys/types.h>
+-# include <sys/user.h>
+
+ void ProcessResolver::doResolve() {
+ int n_procs;
+@@ -221,7 +220,6 @@ void ProcessResolver::doResolve() {
+ # include <kvm.h>
+ # include <paths.h>
+ # include <sys/sysctl.h>
+-# include <sys/user.h>
+
+ bool kvm_cleanup(kvm_t *kd) {
+ if (kvm_close(kd) == -1) {
+@@ -250,7 +248,11 @@ void ProcessResolver::doResolve() {
+ }
+
+ int n_procs;
++#ifndef __NetBSD__
+ struct kinfo_proc *procs_info = kvm_getprocs(kd, KERN_PROC_PROC, 0, &n_procs);
++#else
++ struct kinfo_proc2 *procs_info = kvm_getproc2(kd, KERN_PROC2, 0, sizeof(struct kinfo_proc2), &n_procs);
++#endif
+ if (!procs_info) {
+ # ifndef QT_NO_DEBUG
+ qCritical("ProcessResolver: kvm_getprocs() failed\n");
+@@ -261,7 +263,11 @@ void ProcessResolver::doResolve() {
+ }
+
+ for (int i = 0; i < n_procs; ++i) {
++#ifndef __NetBSD__
+ addEntry(procs_info[i].ki_pid, procs_info[i].ki_comm, m_processMap);
++#else
++ addEntry(procs_info[i].p_pid, procs_info[i].p_comm, m_processMap);
++#endif
+ }
+
+ kvm_cleanup(kd);
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_CMakeLists.txt
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_CMakeLists.txt:1.1
--- /dev/null Fri Apr 1 11:53:28 2022
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_CMakeLists.txt Fri Apr 1 11:53:28 2022
@@ -0,0 +1,39 @@
+$NetBSD: patch-src_mumble_CMakeLists.txt,v 1.1 2022/04/01 11:53:28 nia Exp $
+
+- Do not limit audio backends to Linux/FreeBSD.
+- Recognize DNS-SD on NetBSD.
+
+--- src/mumble/CMakeLists.txt.orig 2022-01-18 01:00:00.342013800 +0000
++++ src/mumble/CMakeLists.txt
+@@ -43,16 +43,14 @@ if(WIN32)
+ option(xboxinput "Build support for global shortcuts from Xbox controllers via the XInput DLL." ON)
+ option(gkey "Build support for Logitech G-Keys. Note: This feature does not require any build-time dependencies, and requires Logitech Gaming Software to be installed to have any effect at
runtime." ON)
+ elseif(UNIX)
++ option(alsa "Build support for ALSA." ON)
++ option(oss "Build support for OSS." ON)
++ option(pipewire "Build support for PipeWire." ON)
++ option(pulseaudio "Build support for PulseAudio." ON)
++ option(speechd "Build support for Speech Dispatcher." ON)
++ option(xinput2 "Build support for XI2" ON)
+ if(APPLE)
+ option(coreaudio "Build support for CoreAudio." ON)
+- elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+- option(oss "Build support for OSS." ON)
+- elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+- option(alsa "Build support for ALSA." ON)
+- option(pipewire "Build support for PipeWire." ON)
+- option(pulseaudio "Build support for PulseAudio." ON)
+- option(speechd "Build support for Speech Dispatcher." ON)
+- option(xinput2 "Build support for XI2" ON)
+ endif()
+ endif()
+
+@@ -897,7 +895,7 @@ if(zeroconf)
+ target_include_directories(mumble PRIVATE ${avahi-compat-libdns_sd_INCLUDE_DIRS})
+ target_link_libraries(mumble PRIVATE ${avahi-compat-libdns_sd_LIBRARIES})
+ else()
+- find_library(LIB_DNSSD "dnssd")
++ find_library(LIB_DNSSD NAMES "dnssd" "dns_sd")
+ if(${LIB_DNSSD} STREQUAL "LIB_DNSSD-NOTFOUND")
+ message(FATAL_ERROR "DNS-SD library not found!")
+ endif()
Home |
Main Index |
Thread Index |
Old Index