move alsa from target/linux/package to package, add compile fix for linux 2.4

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3862 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 44 insertions, 16 deletions

diff --git a/target/linux/package/alsa/Config.in b/package/alsa/Config.in
index 55d9abd1c..55d9abd1c 100644
--- a/target/linux/package/alsa/Config.in
+++ b/package/alsa/Config.in
diff --git a/target/linux/package/alsa/Makefile b/package/alsa/Makefile
index 665fc0045..5703db190 100644
--- a/target/linux/package/alsa/Makefile
+++ b/package/alsa/Makefile
@@ -1,18 +1,18 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
-include ../../rules.mk
+include $(TOPDIR)/package/kernel.mk
 
 PKG_NAME:=alsa-driver
-PKG_VERSION:=1.0.11rc4
+PKG_VERSION:=1.0.11
 PKG_RELEASE:=1
-PKG_MD5SUM:=8e5794026082a964b09b46f9d881e6ec
+PKG_MD5SUM:=57534e4297cd683371402220e3753885
 
 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(TOPDIR)/package/rules.mk
 
@@ -25,9 +25,7 @@ KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-mips/mach-generic
 KERNEL_C_OPTS:= -Os -G 0 -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap
 endif
 
-$(eval $(call PKG_template,KMOD_ALSA,kmod-alsa,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
-
-$(PKG_BUILD_DIR)/.configured:
+define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
 		CFLAGS="$(KERNEL_C_INCS)" \
 		./configure \
@@ -41,20 +39,32 @@ $(PKG_BUILD_DIR)/.configured:
 		--with-sequencer=no \
 		--with-cards=usb-audio \
 	);
-	touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built:
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		c_opts="$(KERNEL_C_OPTS)" \
 		all
-	touch $@
+endef
+
+define Package/kmod-alsa
+ SECTION:=drivers
+ CATEGORY:=Drivers
+ DEPENDS:=@PCI_SUPPORT
+ TITLE:=Advanced Linux Sound Architecture
+ DESCRIPTION:=Advanced Linux Sound Architecture
+ URL:=http://alsa-project.org/
+ VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+endef
 
-$(IPKG_KMOD_ALSA):
-	install -d -m0755 $(IDIR_KMOD_ALSA)/etc/modules.d
-	install -m0644 ./files/alsa.modules $(IDIR_KMOD_ALSA)/etc/modules.d/70-alsa
-	install -d -m0755 $(IDIR_KMOD_ALSA)/lib/modules/$(LINUX_VERSION)
+define Package/kmod-alsa/install
+	install -d -m0755 $(1)/etc/modules.d
+	install -m0644 ./files/alsa.modules $(1)/etc/modules.d/70-alsa
+	install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
 	install -m0644 $(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX) \
-		$(IDIR_KMOD_ALSA)/lib/modules/$(LINUX_VERSION)/
-	$(IPKG_BUILD) $(IDIR_KMOD_ALSA) $(PACKAGE_DIR)
+		$(1)/lib/modules/$(LINUX_VERSION)/
+endef
+
+$(eval $(call BuildPackage,kmod-alsa))
diff --git a/target/linux/package/alsa/files/alsa.modules b/package/alsa/files/alsa.modules
index 6b16c8c58..6b16c8c58 100644
--- a/target/linux/package/alsa/files/alsa.modules
+++ b/package/alsa/files/alsa.modules
diff --git a/target/linux/package/alsa/ipkg/kmod-alsa.control b/package/alsa/ipkg/kmod-alsa.control
index 5641785d8..5641785d8 100644
--- a/target/linux/package/alsa/ipkg/kmod-alsa.control
+++ b/package/alsa/ipkg/kmod-alsa.control
diff --git a/package/alsa/patches/100-compile_fix.patch b/package/alsa/patches/100-compile_fix.patch
new file mode 100644
index 000000000..2e2a3df79
--- /dev/null
+++ b/package/alsa/patches/100-compile_fix.patch
@@ -0,0 +1,18 @@
+diff -urN alsa.old/include/adriver.h alsa.dev/include/adriver.h
+--- alsa.old/include/adriver.h	2006-04-19 08:24:30.000000000 +0200
++++ alsa.dev/include/adriver.h	2006-05-31 17:24:49.000000000 +0200
+@@ -451,7 +451,7 @@
+ #endif /* < 2.6.0 */
+ 
+ /* workarounds for USB API */
+-#if defined(SND_NEED_USB_WRAPPER) && (defined(CONFIG_USB) || defined(CONFIG_USB_MODULE))
++#if 1
+ 
+ #include <linux/usb.h>
+ 
+@@ -1174,4 +1174,5 @@
+  */
+ #define OPL3_HW_OPL3_PC98	0x0305	/* PC9800 */
+ 
++#undef info /* used in several structs */
+ #endif /* __SOUND_LOCAL_DRIVER_H */