diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-08 13:07:43 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-08 13:07:43 +0100 |
| commit | 1b4303286aab39ee1d4da3318a179f37b51c62b9 (patch) | |
| tree | 72a482abd2692df1c3848693540d58b0b56b5711 /package/alsa-utils | |
| parent | e50736af98b7313893bf6aee01586d8fcec9d3e9 (diff) | |
update to latest upstream version
Diffstat (limited to 'package/alsa-utils')
| -rw-r--r-- | package/alsa-utils/Makefile | 21 | ||||
| -rw-r--r-- | package/alsa-utils/patches/patch-alsactl_Makefile_in | 31 |
2 files changed, 11 insertions, 41 deletions
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index c134b85be..972228cc2 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-utils -PKG_VERSION:= 1.0.22 -PKG_RELEASE:= 4 -PKG_MD5SUM:= f7180316188552ee1e6759a03f1fe98d +PKG_VERSION:= 1.0.24.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 8238cd57cb301d1c36bcf0ecb59ce6b2 PKG_DESCR:= ALSA mixer utility PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libpthread @@ -14,10 +14,10 @@ PKG_BUILDDEP:= alsa-lib PKG_URL:= http://www.alsa-project.org/ PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/ -PKG_FLAVOURS_ALSA_UTILS:= WITH_ALSAMIXER -PKGFS_WITH_ALSAMIXER:= libncurses -PKGFD_WITH_ALSAMIXER:= include alsamixer ncurses applet -PKGFB_WITH_ALSAMIXER:= ncurses +PKG_FLAVOURS_ALSA_UTILS:=WITH_ALSAMIXER +PKGFS_WITH_ALSAMIXER:= libncurses +PKGFD_WITH_ALSAMIXER:= include alsamixer ncurses applet +PKGFB_WITH_ALSAMIXER:= ncurses DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -25,6 +25,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ALSA_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ARGS+= --disable-xmlto ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) CONFIGURE_ARGS+= --enable-alsamixer else @@ -32,11 +33,11 @@ CONFIGURE_ARGS+= --disable-alsamixer endif post-install: - ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin/ - ${CP} ${WRKINST}/usr/bin/amixer ${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/ + ${IDIR_ALSA_UTILS}/usr/bin endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/alsa-utils/patches/patch-alsactl_Makefile_in b/package/alsa-utils/patches/patch-alsactl_Makefile_in deleted file mode 100644 index bc9f90dd5..000000000 --- a/package/alsa-utils/patches/patch-alsactl_Makefile_in +++ /dev/null @@ -1,31 +0,0 @@ ---- alsa-utils-1.0.21.orig/alsactl/Makefile.in 2009-08-31 17:14:23.000000000 +0200 -+++ alsa-utils-1.0.21/alsactl/Makefile.in 2009-12-28 17:27:46.140625000 +0100 -@@ -573,7 +573,7 @@ distdir: $(DISTFILES) - done - check-am: all-am - check: check-recursive --all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) -+all-am: Makefile $(PROGRAMS) $(HEADERS) - installdirs: installdirs-recursive - installdirs-am: - for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)"; do \ -@@ -623,7 +623,7 @@ info: info-recursive - - info-am: - --install-data-am: install-man -+install-data-am: - - install-exec-am: install-sbinPROGRAMS - -@@ -672,8 +672,8 @@ uninstall-man: uninstall-man1 uninstall- - uninstall-man1 uninstall-man7 uninstall-sbinPROGRAMS - - --%.7: %.xml -- xmlto man $? -+#%.7: %.xml -+# xmlto man $? - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: |