From owner-svn-ports-all@freebsd.org Fri Mar 16 11:16:19 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 44F4EF3266D; Fri, 16 Mar 2018 11:16:19 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DEA3D795AD; Fri, 16 Mar 2018 11:16:18 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D095E23460; Fri, 16 Mar 2018 11:16:18 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2GBGIFB043104; Fri, 16 Mar 2018 11:16:18 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2GBGIcN043102; Fri, 16 Mar 2018 11:16:18 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201803161116.w2GBGIcN043102@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 16 Mar 2018 11:16:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464674 - in head/audio/pulseaudio-module-sndio: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/audio/pulseaudio-module-sndio: . files X-SVN-Commit-Revision: 464674 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 11:16:19 -0000 Author: tobik Date: Fri Mar 16 11:16:18 2018 New Revision: 464674 URL: https://svnweb.freebsd.org/changeset/ports/464674 Log: audio/pulseaudio-module-sndio: Unbreak on armv6/armv7 `pulseaudio --version` fails to run on armv6/armv7 because etc/pulse/daemon.conf generation fails and still has m4 macros embedded in it. Get the PulseAudio version from pkg-config instead. PR: 208535 Reported by: linimon Added: head/audio/pulseaudio-module-sndio/files/patch-Makefile (contents, props changed) Modified: head/audio/pulseaudio-module-sndio/Makefile Modified: head/audio/pulseaudio-module-sndio/Makefile ============================================================================== --- head/audio/pulseaudio-module-sndio/Makefile Fri Mar 16 11:07:17 2018 (r464673) +++ head/audio/pulseaudio-module-sndio/Makefile Fri Mar 16 11:16:18 2018 (r464674) @@ -10,10 +10,7 @@ COMMENT= Sndio module for PulseAudio LICENSE= ISCL -BROKEN_armv6= fails to link: ld: cannot find -lpulsecore- -BROKEN_armv7= fails to link: ld: cannot find -lpulsecore- - -LIB_DEPENDS+= libsndio.so:audio/sndio \ +LIB_DEPENDS= libsndio.so:audio/sndio \ libpulse.so:audio/pulseaudio USES= pkgconfig Added: head/audio/pulseaudio-module-sndio/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/pulseaudio-module-sndio/files/patch-Makefile Fri Mar 16 11:16:18 2018 (r464674) @@ -0,0 +1,11 @@ +--- Makefile.orig 2018-03-16 08:56:13 UTC ++++ Makefile +@@ -2,7 +2,7 @@ MKDIR?= mkdir -p + PKGCONF?= pkg-config + INSTALL_LIB?= install -s -m 444 + DESTDIR?= +-PULSE_VERSION!= pulseaudio --version | cut -d' ' -f 2 | cut -d. -f 1-2 ++PULSE_VERSION!= ${PKGCONF} --modversion libpulse | cut -d. -f 1-2 + PULSE_LIBDIR?= `${PKGCONF} --variable=libdir libpulse` + PULSE_MODDIR?= `${PKGCONF} --variable=modlibexecdir libpulse` + CFLAGS+= -fPIC -I. `${PKGCONF} --cflags libpulse`