Attachment 244119 Details for Bug 272881 – Option OVERLAY_32BIT for 32bit overlay module v2

[patch] Option OVERLAY_32BIT for 32bit overlay module v2

mumble_v2.diff (text/plain), 6.18 KB, created by Vladimir Druzenko on 2023-08-15 14:44:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2023-08-15 14:44:04 UTC

Size: 6.18 KB

patch

obsolete

>diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
>index f7ee1c1707db..de00aaa68bc1 100644
>--- a/audio/mumble/Makefile
>+++ b/audio/mumble/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	mumble
> DISTVERSION=	1.5.517
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	audio
> 
> MAINTAINER=	vvd@FreeBSD.org
>@@ -49,16 +49,24 @@ USE_LDCONFIG=	yes
> USE_XORG=	x11 xext xi
> USE_GL=		gl
> 
>-CMAKE_ON=	bundled-gsl client oss overlay overlay-xcompile plugins \
>-		translations xinput2
>+CMAKE_ON=	bundled-gsl client oss overlay plugins translations xinput2
> CMAKE_OFF=	bundled-json bundle-qt-translations bundled-speex crash-report \
> 		g15 server tracy update
> 
> OPTIONS_DEFINE=		ALSA AVAHI DBUS JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RNNOISE
>+OPTIONS_DEFINE_aarch64=		OVERLAY_32BIT
>+OPTIONS_DEFINE_amd64=		OVERLAY_32BIT
>+OPTIONS_DEFINE_powerpc64=	OVERLAY_32BIT
> OPTIONS_DEFAULT=	DBUS
>+OPTIONS_DEFAULT_aarch64=	OVERLAY_32BIT
>+OPTIONS_DEFAULT_amd64=		OVERLAY_32BIT
>+OPTIONS_DEFAULT_powerpc64=	OVERLAY_32BIT
> OPTIONS_RADIO=		SPEECH
> OPTIONS_RADIO_SPEECH=	QTSPEECH SPEECHD
> 
>+OPTIONS_SUB=		yes
>+
>+OVERLAY_32BIT_DESC=	Build and install 32bit overlay module
> QTSPEECH_DESC=		Use Qt's text-to-speech system
> RNNOISE_DESC=		Use RNNoise for machine learning noise reduction
> SPEECH_DESC=		Support text-to-speech
>@@ -81,6 +89,8 @@ JACK_LIB_DEPENDS=	libjack.so:audio/jack
> 			https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273078
> LTO_CMAKE_BOOL=		lto
> 
>+OVERLAY_32BIT_CMAKE_BOOL=	overlay-xcompile
>+
> PIPEWIRE_CMAKE_BOOL=	pipewire
> PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
> 
>@@ -105,26 +115,56 @@ SPEECHD_LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
> 
> CONFIGURE_ENV+=		MUMBLE_PYTHON=${PYTHON_CMD}
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MOVERLAY_32BIT}
>+.if ${ARCH} == aarch64
>+OVERLAY_64BIT_SUFFIX=AAA64
>+OVERLAY_32BIT_SUFFIX=AAA32
>+.endif
>+.if ${ARCH} == amd64
>+OVERLAY_64BIT_SUFFIX=x86_64
>+OVERLAY_32BIT_SUFFIX=x86
>+.endif
>+.if ${ARCH} == powerpc64
>+OVERLAY_64BIT_SUFFIX=PPP64
>+OVERLAY_32BIT_SUFFIX=PPP32
>+.endif
>+.else
>+PLIST_SUB+=	OVERLAY_32BIT="@comment "
>+.endif
>+
> .include <bsd.port.pre.mk>
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKDIR}/.build/mumble ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_LIB} ${WRKDIR}/.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} ${WRKDIR}/.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}
>+.if ${PORT_OPTIONS:MOVERLAY_32BIT}
>+	${INSTALL_LIB} ${WRKDIR}/.build/libmumbleoverlay.${OVERLAY_64BIT_SUFFIX}.so.${MINORVERSION}.0 \
>+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so.${PATCHVERSION}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so.${PATCHVERSION} \
>+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so.${PATCHVERSION} \
>+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so.${MAJORVERSION}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so.${PATCHVERSION} \
>+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so.${MINORVERSION}
>+	${INSTALL_LIB} ${WRKDIR}/.build/libmumbleoverlay.${OVERLAY_32BIT_SUFFIX}.so.${MINORVERSION}.0 \
>+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay-32.so.${PATCHVERSION}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay-32.so.${PATCHVERSION} \
>+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay-32.so
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay-32.so.${PATCHVERSION} \
>+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay-32.so.${MAJORVERSION}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay-32.so.${PATCHVERSION} \
>+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay-32.so.${MINORVERSION}
>+.else
>+	${INSTALL_LIB} ${WRKDIR}/.build/libmumbleoverlay.so.${MINORVERSION}.0 \
>+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so.${PATCHVERSION}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so.${PATCHVERSION} \
>+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so.${PATCHVERSION} \
>+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so.${MAJORVERSION}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so.${PATCHVERSION} \
>+		${STAGEDIR}${PREFIX}/lib/libmumbleoverlay.so.${MINORVERSION}
>+.endif
> 	${INSTALL_DATA} ${WRKDIR}/.build/auxiliary_files/info.mumble.Mumble.desktop \
> 			${STAGEDIR}${PREFIX}/share/applications/mumble.desktop
> 	${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
>diff --git a/audio/mumble/pkg-plist b/audio/mumble/pkg-plist
>index 752646ef3d9a..d94b36f0af9f 100644
>--- a/audio/mumble/pkg-plist
>+++ b/audio/mumble/pkg-plist
>@@ -1,12 +1,12 @@
> bin/mumble
>-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%%
>+lib/libmumbleoverlay.so
>+lib/libmumbleoverlay.so.%%MAJORVERSION%%
>+lib/libmumbleoverlay.so.%%MINORVERSION%%
>+lib/libmumbleoverlay.so.%%PATCHVERSION%%
>+%%OVERLAY_32BIT%%lib/libmumbleoverlay-32.so
>+%%OVERLAY_32BIT%%lib/libmumbleoverlay-32.so.%%MAJORVERSION%%
>+%%OVERLAY_32BIT%%lib/libmumbleoverlay-32.so.%%MINORVERSION%%
>+%%OVERLAY_32BIT%%lib/libmumbleoverlay-32.so.%%PATCHVERSION%%
> share/applications/mumble.desktop
> share/icons/hicolor/256x256/apps/mumble.png
> share/icons/hicolor/scalable/apps/mumble.svg

Actions: View | Diff

Attachments on bug 272881: 243789 | 243872 | 244119