git: 3c1f4f5c8062 - main - audio/pulseaudio: fix build on ARMv6 in QEMU

[Adriaan de Groot]

The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c1f4f5c80627a368ea17fe0918e3623e1b10b84

commit 3c1f4f5c80627a368ea17fe0918e3623e1b10b84
Author:     Adriaan de Groot <adridg at FreeBSD.org>
AuthorDate: 2021-09-15 12:44:58 +0000
Commit:     Adriaan de Groot <adridg at FreeBSD.org>
CommitDate: 2021-09-15 15:43:24 +0000

    audio/pulseaudio: fix build on ARMv6 in QEMU
    
    Switches to using GNU m4 (gm4) for processing PA configuration
    files; regular m4 behaves oddly in some build situations.
    
    PR:             208535
    Submitted by:   swills
---
 audio/pulseaudio/Makefile              |  4 ++--
 audio/pulseaudio/files/patch-configure | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 90dd24ed6895..a363d610e35b 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	pulseaudio
 DISTVERSION=	14.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://freedesktop.org/software/pulseaudio/releases/
 
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
 		libltdl.so:devel/libltdl \
 		libck-connector.so:sysutils/consolekit2
 
-USES=		compiler:c11 cpe gettext gmake gnome iconv libtool localbase:ldflags \
+USES=		compiler:c11 cpe gettext gmake gnome iconv libtool:build localbase:ldflags \
 		pathfix pkgconfig python:run shebangfix ssl tar:xz
 
 USE_GNOME=	glib20
diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure
new file mode 100644
index 000000000000..f4149d03fc01
--- /dev/null
+++ b/audio/pulseaudio/files/patch-configure
@@ -0,0 +1,22 @@
+Use gm4 instead of m4; this is probably just a work-around
+for some cross-build issues on ARM. However, it also means
+that we use the same GNU m4 as upstream developers presumably
+also use for processing these files and avoids future surprises.
+
+--- configure.orig	2020-06-23 06:37:52 UTC
++++ configure
+@@ -32212,10 +32212,10 @@ _LT_EOF
+  ;;
+     "src/esdcompat":F) chmod +x src/esdcompat ;;
+     "src/start-pulseaudio-x11":F) chmod +x src/start-pulseaudio-x11 ;;
+-    "src/daemon.conf":F) m4 src/daemon.conf > src/daemon.conf.gen && mv src/daemon.conf.gen src/daemon.conf ;;
+-    "src/default.pa":F) m4 src/default.pa > src/default.pa.gen && mv src/default.pa.gen src/default.pa ;;
+-    "src/system.pa":F) m4 src/system.pa > src/system.pa.gen && mv src/system.pa.gen src/system.pa ;;
+-    "PulseAudioConfig.cmake":F) m4 PulseAudioConfig.cmake > PulseAudioConfig.cmake.gen && mv PulseAudioConfig.cmake.gen PulseAudioConfig.cmake ;;
++    "src/daemon.conf":F) gm4 src/daemon.conf > src/daemon.conf.gen && mv src/daemon.conf.gen src/daemon.conf ;;
++    "src/default.pa":F) gm4 src/default.pa > src/default.pa.gen && mv src/default.pa.gen src/default.pa ;;
++    "src/system.pa":F) gm4 src/system.pa > src/system.pa.gen && mv src/system.pa.gen src/system.pa ;;
++    "PulseAudioConfig.cmake":F) gm4 PulseAudioConfig.cmake > PulseAudioConfig.cmake.gen && mv PulseAudioConfig.cmake.gen PulseAudioConfig.cmake ;;
+ 
+   esac
+ done # for ac_tag