From owner-dev-commits-ports-all@freebsd.org Wed Sep 15 15:43:30 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2CD92668E6D; Wed, 15 Sep 2021 15:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H8kyV0W9bz4tHh; Wed, 15 Sep 2021 15:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B45F410748; Wed, 15 Sep 2021 15:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18FFhTR0058657; Wed, 15 Sep 2021 15:43:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18FFhTXR058656; Wed, 15 Sep 2021 15:43:29 GMT (envelope-from git) Date: Wed, 15 Sep 2021 15:43:29 GMT Message-Id: <202109151543.18FFhTXR058656@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 3c1f4f5c8062 - main - audio/pulseaudio: fix build on ARMv6 in QEMU MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c1f4f5c80627a368ea17fe0918e3623e1b10b84 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2021 15:43:30 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c1f4f5c80627a368ea17fe0918e3623e1b10b84 commit 3c1f4f5c80627a368ea17fe0918e3623e1b10b84 Author: Adriaan de Groot AuthorDate: 2021-09-15 12:44:58 +0000 Commit: Adriaan de Groot 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