diff options
| author | nia <nia@pkgsrc.org> | 2019-12-08 13:26:55 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2019-12-08 13:26:55 +0000 |
| commit | 272d4a9ba0fbe255136400e62c31896889b99b0d (patch) | |
| tree | c8053a109a01ec393f9326a7f763b6247715dc1f /wm/enlightenment | |
| parent | 9ef50cda9cf037af34a2f67c8f718442e75d1aba (diff) | |
| download | pkgsrc-272d4a9ba0fbe255136400e62c31896889b99b0d.tar.gz | |
enlightenment: options.mk tweaks
- Move sound server to an options group, allowing sound to be disabled.
- Enable pango by default since it's a default upstream.
Bit uneasy about esound using libaudiofile given it's kind of dead and
full of bugs but the alternative might be worse.
Bump PKGREVISION
Diffstat (limited to 'wm/enlightenment')
| -rw-r--r-- | wm/enlightenment/Makefile | 3 | ||||
| -rw-r--r-- | wm/enlightenment/options.mk | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile index d2e8b7b9d46..a0d52bb3458 100644 --- a/wm/enlightenment/Makefile +++ b/wm/enlightenment/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.74 2019/12/07 05:34:10 gutteridge Exp $ +# $NetBSD: Makefile,v 1.75 2019/12/08 13:26:55 nia Exp $ DISTNAME= e16-1.0.21 PKGNAME= ${DISTNAME:S/e16/enlightenment/} +PKGREVISION= 1 CATEGORIES= x11 wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} diff --git a/wm/enlightenment/options.mk b/wm/enlightenment/options.mk index 6c81287ad7e..5e3a54d4bba 100644 --- a/wm/enlightenment/options.mk +++ b/wm/enlightenment/options.mk @@ -1,10 +1,14 @@ -# $NetBSD: options.mk,v 1.2 2019/12/07 05:11:27 gutteridge Exp $ +# $NetBSD: options.mk,v 1.3 2019/12/08 13:26:55 nia Exp $ # e16 is used here instead of enlightenment to avoid # potential conflict with x11/enlightenment. PKG_OPTIONS_VAR= PKG_OPTIONS.e16 -PKG_SUPPORTED_OPTIONS= pango pulseaudio vera-ttf +PKG_OPTIONS_OPTIONAL_GROUPS= sound +PKG_OPTIONS_GROUP.sound= pulseaudio esound + +PKG_SUPPORTED_OPTIONS= pango pulseaudio vera-ttf +PKG_SUGGESTED_OPTIONS= pango esound .include "../../mk/bsd.options.mk" @@ -20,11 +24,14 @@ CONFIGURE_ARGS+= --enable-sound=pulseaudio CONFIGURE_ARGS+= --with-sndldr=sndfile .include "../../audio/libsndfile/buildlink3.mk" .include "../../audio/pulseaudio/buildlink3.mk" -.else +.elif !empty(PKG_OPTIONS:Mesound) CONFIGURE_ARGS+= --enable-sound=esound CONFIGURE_ARGS+= --with-sndldr=audiofile .include "../../audio/libaudiofile/buildlink3.mk" .include "../../audio/esound/buildlink3.mk" +.else +CONFIGURE_ARGS+= --enable-sound=no +CONFIGURE_ARGS+= --with-sndldr=none .endif # The upstream package includes its own Vera fonts. Because these |