Attachment 231228 Details for Bug 261395 – audio/mumble: update to 1.4.230

[patch] audio/mumble: update to 1.4.230

mumble.diff (text/plain), 11.18 KB, created by Vladimir Druzenko on 2022-01-21 21:38:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2022-01-21 21:38:52 UTC

Size: 11.18 KB

patch

obsolete

>diff -urN audio/mumble.orig/Makefile audio/mumble/Makefile
>--- audio/mumble.orig/Makefile
>+++ audio/mumble/Makefile
>@@ -1,8 +1,7 @@
> # Created by: marius nuennerich
> 
> PORTNAME=	mumble
>-PORTVERSION=	1.3.3
>-PORTREVISION=	4
>+DISTVERSION=	1.4.230
> CATEGORIES=	audio
> 
> MAINTAINER=	feld@FreeBSD.org
>@@ -16,13 +15,17 @@
> 		libsndfile.so:audio/libsndfile \
> 		libboost_iostreams.so:devel/boost-libs \
> 		libprotoc.so:devel/protobuf \
>-		libopus.so:audio/opus
>+		libopus.so:audio/opus \
>+		libPocoFoundation.so:devel/poco \
>+		libPocoUtil.so:devel/poco \
>+		libPocoXML.so:devel/poco \
>+		libPocoZip.so:devel/poco
> 
>-USES=		compiler:c++11-lang cpe desktop-file-utils gl gmake gnome pkgconfig python:build qmake qt:5 ssl xorg
>+USES=		cmake compiler:c++11-lang cpe desktop-file-utils gl gnome pkgconfig python:build qt:5 ssl xorg
> 
>-PATCHVERSION=	${PORTVERSION}
>-MINORVERSION=	${PORTVERSION:R}
>-MAJORVERSION=	${PORTVERSION:R:R}
>+PATCHVERSION=	${DISTVERSION}
>+MINORVERSION=	${DISTVERSION:R}
>+MAJORVERSION=	${DISTVERSION:R:R}
> 
> PLIST_SUB+=	PATCHVERSION="${PATCHVERSION}"
> PLIST_SUB+=	MINORVERSION="${MINORVERSION}"
>@@ -30,14 +33,13 @@
> 
> USE_CXXSTD=	c++11
> USE_GITHUB=	yes
>-GH_TUPLE=	mumble-voip:mumble:${DISTVERSION} \
>+GH_TUPLE=	mumble-voip:mumble:v${DISTVERSION} \
> 		mumble-voip:celt-0.7.0:5a16cda:mumble_celt_0_7/3rdparty/celt-0.7.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:5e338f8: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:9467fe8:mumble_theme/themes/Mumble
>+		mumble-voip:rnnoise:a9afccc:mumble_rnnoise/3rdparty/rnnoise-src \
>+		mumble-voip:mumble-theme:f9868bd:mumble_Mumble/themes/Mumble \
>+		Krzmbrzl:FindPythonInterpreter:bb4d3ea:mumble_FindPythonInterpreter/3rdparty/FindPythonInterpreter
> 
> USE_QT=		buildtools_build core gui l10n linguist_build network opengl sql sql-sqlite3_run svg widgets xml
> USE_LDCONFIG=	yes
>@@ -45,63 +47,61 @@
> USE_XORG=	ice xi x11
> USE_GL=		gl
> 
>-CONFIG=		bundled-celt bundled-rnnoise no-bundled-opus no-bundled-speex no-bundled-speexdsp \
>-		no-embed-qt-translations no-g15 no-server no-update
>+CMAKE_ON=	bundled-celt rnnoise client oss overlay overlay-xcompile plugins translations xinput2
>+CMAKE_OFF=	bundled-opus bundle-qt-translations bundled-speex crash-report g15 server update
> 
>-QMAKE_ARGS=	"CONFIG+=${CONFIG}"
>-
>-OPTIONS_DEFINE=	ALSA DBUS BONJOUR JACK PORTAUDIO PULSEAUDIO SPEECHD
>+OPTIONS_DEFINE=	ALSA DBUS BONJOUR JACK PIPEWIRE PORTAUDIO PULSEAUDIO QTSPEECH SPEECHD
> OPTIONS_DEFAULT=	DBUS
> 
>-ALSA_VARS_OFF=		CONFIG+=no-alsa
>+ALSA_CMAKE_BOOL=	alsa
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
> 
>-DBUS_VARS_OFF=		CONFIG+=no-dbus
>+DBUS_CMAKE_BOOL=	dbus
> DBUS_USE=		QT=dbus
> 
> BONJOUR_DESC=		Bonjour support
>-BONJOUR_VARS_OFF=	CONFIG+=no-bonjour
>+BONJOUR_CMAKE_BOOL=	zeroconf
> BONJOUR_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
> 
>-JACK_VARS_OFF=		CONFIG+=no-jackaudio
>+JACK_CMAKE_BOOL=	jackaudio
> JACK_LIB_DEPENDS=	libjack.so:audio/jack
> 
>-PORTAUDIO_VARS_OFF=	CONFIG+=no-portaudio
>+PIPEWIRE_DESC=		Pipewire sound server support
>+PIPEWIRE_CMAKE_BOOL=	pipewire
>+PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
>+
>+PORTAUDIO_CMAKE_BOOL=	portaudio
> PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
> 
>-PULSEAUDIO_VARS_OFF=	CONFIG+=no-pulseaudio
>+PULSEAUDIO_CMAKE_BOOL=	pulseaudio
> PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
> 
>+QTSPEECH_DESC=		Use Qt's text-to-speech system
>+QTSPEECH_CMAKE_BOOL=	qtspeech
>+QTSPEECH_USE=		QT=speech
>+
> SPEECHD_DESC=		Support for Speech Dispatcher
>-SPEECHD_VARS_OFF=	CONFIG+=no-speechd
>+SPEECHD_CMAKE_BOOL=	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
>-.if ${CHOSEN_COMPILER_TYPE} == gcc
>-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.7.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0
>-	${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}
>+	${INSTALL_PROGRAM} ${WRKSRC}/../.build/mumble ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_LIB} ${WRKSRC}/../.build/libcelt0.so.0.7.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0
>+	${INSTALL_LIB} ${WRKSRC}/../.build/libmumbleoverlay.x86_64.so.${MINORVERSION}.0 ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${MAJORVERSION}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86_64.so.${MINORVERSION}
>+	${INSTALL_LIB} ${WRKSRC}/../.build/libmumbleoverlay.x86.so.${MINORVERSION}.0 ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${MAJORVERSION}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.so.${PATCHVERSION} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.x86.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
>+	${INSTALL_DATA} ${WRKSRC}/scripts/org.mumble_voip.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.installer.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
>diff -urN audio/mumble.orig/distinfo audio/mumble/distinfo
>--- audio/mumble.orig/distinfo
>+++ audio/mumble/distinfo
>@@ -1,17 +1,15 @@
>-TIMESTAMP = 1602265872
>-SHA256 (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 53a555092a03af2e6025c641bb748f013e1cfa8f61899a686bed8690439f36c7
>-SIZE (mumble-voip-mumble-1.3.3_GH0.tar.gz) = 4895708
>+TIMESTAMP = 1642727082
>+SHA256 (mumble-voip-mumble-1.4.230-v1.4.230_GH0.tar.gz) = 0a6591568a2d63b7a6bb29a3b10e4289a34dfd75e33cb2143ae6c738b1e92983
>+SIZE (mumble-voip-mumble-1.4.230-v1.4.230_GH0.tar.gz) = 5804439
> 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-mach_override-919148f_GH0.tar.gz) = 81b2e705a7cce1e3a9eb440cb2bca2f14fd83db162123f44faf17f0bf45da1bd
> SIZE (mumble-voip-mach_override-919148f_GH0.tar.gz) = 66278
> SHA256 (mumble-voip-minhook-5e338f8_GH0.tar.gz) = bc675c5b9def1fcef4b58c62e6d69eaa6e76d2fed89ace681059a7648e808033
> SIZE (mumble-voip-minhook-5e338f8_GH0.tar.gz) = 27651
>-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-9467fe8_GH0.tar.gz) = 4ac062686b75f8ea558a4d92df205e51c1d4c1b5676a28b656b8664fc56470db
>-SIZE (mumble-voip-mumble-theme-9467fe8_GH0.tar.gz) = 378261
>+SHA256 (mumble-voip-rnnoise-a9afccc_GH0.tar.gz) = f46c7608aff0d75c2a218b7f857fa3ff3d4ff932b9e252717a05eb6a8108e3fd
>+SIZE (mumble-voip-rnnoise-a9afccc_GH0.tar.gz) = 173954
>+SHA256 (mumble-voip-mumble-theme-f9868bd_GH0.tar.gz) = b923c13294fac9c41e00cd0fcfe095c6d1af7970b18be9da088e4bc0f129423d
>+SIZE (mumble-voip-mumble-theme-f9868bd_GH0.tar.gz) = 402733
>+SHA256 (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 8439bfe7daeb478d8e8aa09b3c111c3dc360064144d181fc5dcfef950e8eaa05
>+SIZE (Krzmbrzl-FindPythonInterpreter-bb4d3ea_GH0.tar.gz) = 4817
>diff -urN audio/mumble.orig/files/patch-overlay_gl-overlay.c audio/mumble/files/patch-overlay_gl-overlay.c
>--- audio/mumble.orig/files/patch-overlay_gl-overlay.c
>+++ audio/mumble/files/patch-overlay_gl-overlay.c
>@@ -1,10 +0,0 @@
>---- overlay_gl/overlay.c.orig	2019-03-13 18:38:10 UTC
>-+++ overlay_gl/overlay.c
>-@@ -16,6 +16,7 @@
>- #include <sys/ipc.h>
>- #include <sys/time.h>
>- #include <sys/socket.h>
>-+#include <sys/stat.h>
>- #include <sys/un.h>
>- #include <sys/stat.h>
>- #include <time.h>
>diff -urN audio/mumble.orig/files/patch-qmake_builddir.pri audio/mumble/files/patch-qmake_builddir.pri
>--- audio/mumble.orig/files/patch-qmake_builddir.pri
>+++ audio/mumble/files/patch-qmake_builddir.pri
>@@ -1,24 +0,0 @@
>---- qmake/builddir.pri.orig	2019-10-20 18:28:58 UTC
>-+++ qmake/builddir.pri
>-@@ -33,20 +33,7 @@ isEmpty(TOP_BUILDDIR) {
>-   TOP_BUILDDIR = $$TOP_SRCDIR
>- }
>- 
>--# If the build and source paths are equal,
>--# it's not a shadow build.
>--equals(TOP_BUILDDIR, $$TOP_SRCDIR) {
>--  CONFIG(debug, debug|release) {
>--    DESTDIR = $$TOP_BUILDDIR/debug
>--  }
>--
>--  CONFIG(release, debug|release) {
>--    DESTDIR = $$TOP_BUILDDIR/release
>--  }
>--} else {
>--  DESTDIR = $$TOP_BUILDDIR
>--}
>--
>-+DESTDIR = $$TOP_BUILDDIR/release
>- OBJECTS_ROOT = $$DESTDIR/.obj
>- MOC_ROOT = $$DESTDIR/.moc
>- RCC_ROOT = $$DESTDIR/.qrc
>diff -urN audio/mumble.orig/pkg-plist audio/mumble/pkg-plist
>--- audio/mumble.orig/pkg-plist
>+++ audio/mumble/pkg-plist
>@@ -1,12 +1,15 @@
> bin/mumble
>-lib/libcelt-mumble.so.0.11.0
> lib/libcelt-mumble.so.0.7.0
>-lib/libmumble.so
>-lib/libmumble.so.%%MAJORVERSION%%
>-lib/libmumble.so.%%MINORVERSION%%
>-lib/libmumble.so.%%PATCHVERSION%%
> man/man1/mumble.1.gz
>-share/applications/mumble.desktop
>+lib/libmumbleoverlay.x86_64.so
>+lib/libmumbleoverlay.x86_64.so.%%MAJORVERSION%%
>+lib/libmumbleoverlay.x86_64.so.%%MINORVERSION%%
>+lib/libmumbleoverlay.x86_64.so.%%PATCHVERSION%%
>+lib/libmumbleoverlay.x86.so
>+lib/libmumbleoverlay.x86.so.%%MAJORVERSION%%
>+lib/libmumbleoverlay.x86.so.%%MINORVERSION%%
>+lib/libmumbleoverlay.x86.so.%%PATCHVERSION%%
>+share/applications/org.mumble_voip.mumble.desktop
> share/icons/hicolor/128x128/apps/mumble.png
> share/icons/hicolor/scalable/apps/mumble.svg
> share/pixmaps/mumble.xpm

Actions: View | Diff

Attachments on bug 261395: 231228 | 231229 | 243408 | 243409