Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Mar 2018 11:16:18 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
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
Message-ID:  <201803161116.w2GBGIcN043102@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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`



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803161116.w2GBGIcN043102>