diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-12-15 15:45:15 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-12-15 15:45:15 +0000 |
| commit | ad5bbc65094369b7da6eedc58845d7dfec75ef51 (patch) | |
| tree | c86a34323ade83c56d3bf9aca8922f1c7c4e1812 | |
| parent | 1b4100d26b206eb971d681d2340b1e1107611fef (diff) | |
update alsa-driver to 1.1.14rc1 (fix build on 2.6.19)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5798 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/alsa/Makefile | 4 | ||||
| -rw-r--r-- | package/alsa/patches/110-cp_command.patch | 18 |
2 files changed, 7 insertions, 15 deletions
diff --git a/package/alsa/Makefile b/package/alsa/Makefile index 7bd155078e..320a918414 100644 --- a/package/alsa/Makefile +++ b/package/alsa/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=alsa-driver -PKG_VERSION:=1.0.11 +PKG_VERSION:=1.0.14rc1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/ -PKG_MD5SUM:=57534e4297cd683371402220e3753885 +PKG_MD5SUM:=4cff99be4b225e96663fbd61cabe3182 PKG_CAT:=bzcat PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/alsa/patches/110-cp_command.patch b/package/alsa/patches/110-cp_command.patch index 68499e8837..4684f9edde 100644 --- a/package/alsa/patches/110-cp_command.patch +++ b/package/alsa/patches/110-cp_command.patch @@ -1,19 +1,11 @@ -diff -ur alsa.old/Makefile alsa.dev/Makefile ---- alsa.old/Makefile 2006-10-14 07:07:48.000000000 -0700 -+++ alsa.dev/Makefile 2006-10-14 07:08:45.000000000 -0700 -@@ -100,6 +100,7 @@ - SUBDIRS += parisc - endif - CSUBDIRS += include test utils -+CP = cp -fPR - - KCONFIG_FILES = $(shell find $(SND_TOPDIR) -name Kconfig) $(shell find $(SND_TOPDIR)/alsa-kernel/ -name Kconfig) - -@@ -115,7 +116,7 @@ +diff -ruN alsa-driver-1.0.14rc1-old/Makefile alsa-driver-1.0.14rc1-new/Makefile +--- alsa-driver-1.0.14rc1-old/Makefile 2006-12-15 16:23:38.000000000 +0100 ++++ alsa-driver-1.0.14rc1-new/Makefile 2006-12-15 16:24:57.000000000 +0100 +@@ -116,7 +116,7 @@ if [ ! -d include/sound -a ! -L include/sound ]; then \ ln -sf ../alsa-kernel/include include/sound ; \ fi -- cp -auvf include/version.h include/sound/version.h +- cp -puvf include/version.h include/sound/version.h + $(CP) include/version.h include/sound/version.h utils/mod-deps: utils/mod-deps.c |