From c95efadc5d475571a895372d5add94f3359d1907 Mon Sep 17 00:00:00 2001 From: tripolar Date: Mon, 29 Jul 2013 18:36:00 +0000 Subject: [PATCH] [packages] cmus: make OSS configurable Signed-off-by: Peter Wagner git-svn-id: svn://svn.openwrt.org/openwrt/packages@37614 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- sound/cmus/Config.in | 5 ++++- sound/cmus/Makefile | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sound/cmus/Config.in b/sound/cmus/Config.in index ac51088b2..f143133d8 100644 --- a/sound/cmus/Config.in +++ b/sound/cmus/Config.in @@ -3,7 +3,10 @@ menu "Configuration" config CMUS_WITH_PULSE bool "Enable pulseaudio support" - depends on PACKAGE_pulseaudio-daemon + default n + +config CONFIG_CMUS_WITH_OSS + bool "Enable OSS support" default n endmenu diff --git a/sound/cmus/Makefile b/sound/cmus/Makefile index 391fd8f07..1b90ed7c9 100644 --- a/sound/cmus/Makefile +++ b/sound/cmus/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmus PKG_VERSION:=2.5.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/cmus @@ -28,7 +28,8 @@ define Package/cmus DEPENDS:= \ +libpthread +librt +libncursesw $(ICONV_DEPENDS) \ +AUDIO_SUPPORT:alsa-lib \ - +BUILD_PATENTED:libmad +libvorbisidec +libflac + +BUILD_PATENTED:libmad +libvorbisidec +libflac \ + $(if $(CONFIG_CMUS_WITH_PULSE),+pulseaudio-daemon,) TITLE:=C* Music Player MAINTAINER:=Peter Wagner @@ -40,6 +41,7 @@ define Package/cmus/config source "$(SOURCE)/Config.in" endef + define Package/cmus/description C* Music Player is a modular and very configurable ncurses-based audio player. It has some interesting features like configurable @@ -74,7 +76,7 @@ define Build/Configure CONFIG_ALSA=$(if $(CONFIG_AUDIO_SUPPORT),a,n) \ CONFIG_AO=n \ CONFIG_ARTS=n \ - CONFIG_OSS=y \ + CONFIG_OSS=$(if $(CONFIG_CMUS_WITH_OSS),a,n) \ CONFIG_SUN=n \ CONFIG_WAVEOUT=n \ DEBUG=0 \