From 85bb2caf7878cee50b323efdf3d6d69668294e4a Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 15 Jun 2010 22:25:42 +0200 Subject: alsa-utils: add flavour for alsamixer --- package/alsa-utils/Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'package/alsa-utils/Makefile') diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 63ce6faf5..00920a740 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -11,20 +11,35 @@ PKG_DESCR:= ALSA mixer utility PKG_SECTION:= utils PKG_DEPENDS:= alsa-lib libpthread PKG_BUILDDEP+= alsa-lib +ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) +PKG_DEPENDS+= libncurses +PKG_BUILDDEP+= libncurses +endif PKG_URL:= http://www.alsa-project.org PKG_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \ ftp://ftp.alsa-project.org/pub/utils/ +PKG_FLAVOURS:= WITH_ALSAMIXER +PKGFD_WITH_ALSAMIXER:= include alsamixer ncurses applet + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ALSA_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) +CONFIGURE_ARGS+= --enable-alsamixer +else CONFIGURE_ARGS+= --disable-alsamixer +endif post-install: - ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin + ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin/ ${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin/ +ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) + ${INSTALL_BIN} ${WRKINST}/usr/bin/alsamixer \ + ${IDIR_ALSA_UTILS}/usr/bin/ +endif include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 47e110abbf0d3142d737e753833d0d6239965b2a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 22 Jun 2010 13:46:25 +0200 Subject: fix package names and package flavour dependencies ipkg does not allow package names with uppercase, so revert some of phil changes. dependency handling of package flavours were broken, because of a chicken and egg problem. implement a new variable (PKGFS_XXX) containing flavour dependent package dependencies. --- package/alsa-utils/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/alsa-utils/Makefile') diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 00920a740..2a4496913 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -12,7 +12,6 @@ PKG_SECTION:= utils PKG_DEPENDS:= alsa-lib libpthread PKG_BUILDDEP+= alsa-lib ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) -PKG_DEPENDS+= libncurses PKG_BUILDDEP+= libncurses endif PKG_URL:= http://www.alsa-project.org @@ -20,6 +19,7 @@ PKG_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \ ftp://ftp.alsa-project.org/pub/utils/ PKG_FLAVOURS:= WITH_ALSAMIXER +PKGFS_WITH_ALSAMIXER:= libncurses PKGFD_WITH_ALSAMIXER:= include alsamixer ncurses applet DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -- cgit v1.2.3