Date: Tue, 12 Jan 2016 12:42:59 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405868 - in head/x11/i3status: . files Message-ID: <201601121242.u0CCgxVI080780@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Jan 12 12:42:59 2016 New Revision: 405868 URL: https://svnweb.freebsd.org/changeset/ports/405868 Log: Instead of simply removing pulseaudio provide an option (off by default) Added: head/x11/i3status/files/no-pulseaudio.diff (contents, props changed) Deleted: head/x11/i3status/files/patch-Makefile head/x11/i3status/files/patch-src_print__volume.c Modified: head/x11/i3status/Makefile Modified: head/x11/i3status/Makefile ============================================================================== --- head/x11/i3status/Makefile Tue Jan 12 12:36:53 2016 (r405867) +++ head/x11/i3status/Makefile Tue Jan 12 12:42:59 2016 (r405868) @@ -10,6 +10,8 @@ COMMENT= Small program for generating a LICENSE= BSD3CLAUSE +OPTIONS_DEFINE= PULSEAUDIO + LIB_DEPENDS= libconfuse.so:${PORTSDIR}/devel/libconfuse \ libyajl.so:${PORTSDIR}/devel/yajl @@ -17,6 +19,9 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USES= gmake tar:bzip2 +PULSEAUDIO_EXTRA_PATCHES_OFF= ${FILESDIR}/no-pulseaudio.diff +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio + post-patch: @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/i3status.c Added: head/x11/i3status/files/no-pulseaudio.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/i3status/files/no-pulseaudio.diff Tue Jan 12 12:42:59 2016 (r405868) @@ -0,0 +1,25 @@ +--- Makefile.orig 2016-01-12 12:26:06 UTC ++++ Makefile +@@ -75,6 +75,11 @@ OBJS:=$(filter-out src/pulse.o, $(OBJS)) + LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread + endif + ++ifeq ($(OS),FreeBSD) ++OBJS:=$(filter-out src/pulse.o, $(OBJS)) ++LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread ++endif ++ + src/%.o: src/%.c include/i3status.h + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + @echo " CC $<" +--- src/print_volume.c.orig 2016-01-12 12:27:47 UTC ++++ src/print_volume.c +@@ -60,7 +60,7 @@ void print_volume(yajl_gen json_gen, cha + free(instance); + } + +-#ifndef __OpenBSD__ ++#if !defined(__OPENBSD__) && !defined(__FreeBSD__) + /* Try PulseAudio first */ + + /* If the device name has the format "pulse[:N]" where N is the
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601121242.u0CCgxVI080780>