From 91a01e41067edb1d08727e7170b2fe76c4859f9c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 9 Aug 2008 20:36:05 +0000 Subject: move some webcam/sound related stuff from trunk to packages SVN-Revision: 12260 --- package/alsa/Makefile | 68 ------------------------------ package/alsa/files/alsa.modules | 10 ----- package/alsa/patches/100-compile_fix.patch | 19 --------- package/alsa/patches/110-cp_command.patch | 13 ------ package/alsa/patches/120-sndfops.patch | 13 ------ 5 files changed, 123 deletions(-) delete mode 100644 package/alsa/Makefile delete mode 100644 package/alsa/files/alsa.modules delete mode 100644 package/alsa/patches/100-compile_fix.patch delete mode 100644 package/alsa/patches/110-cp_command.patch delete mode 100644 package/alsa/patches/120-sndfops.patch (limited to 'package/alsa') diff --git a/package/alsa/Makefile b/package/alsa/Makefile deleted file mode 100644 index 8dc7b871a4..0000000000 --- a/package/alsa/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# $Id$ - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=alsa-driver -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:=4cff99be4b225e96663fbd61cabe3182 - -include $(INCLUDE_DIR)/package.mk - -define KernelPackage/alsa - SUBMENU:=Other modules - DEPENDS:=@USB_SUPPORT @LINUX_2_4 - TITLE:=Advanced Linux Sound Architecture - FILES:=$(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX) - AUTOLOAD=$(call AutoLoad,70,$(shell cat ./files/alsa.modules)) -endef - -ifeq ($(KERNEL),2.4) - ifeq ($(LINUX_KARCH),i386) - KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time - endif - ifeq ($(LINUX_KARCH),mips) - KERNEL_C_OPTS:= -Os -G 0 -mlong-calls -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap - endif -endif -ifeq ($(LINUX_KARCH),i386) - KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-i386/mach-generic -I$(LINUX_DIR)/include/asm-i386/mach-default -endif -ifeq ($(LINUX_KARCH),mips) - KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-mips/mach-generic -endif - -CONFIGURE_VARS:= \ - CFLAGS="$(KERNEL_C_INCS)" - -CONFIGURE_ARGS:= \ - --with-build="$(LINUX_DIR)" \ - --with-kernel="$(LINUX_DIR)" \ - --with-cross="$(KERNEL_CROSS)" \ - --with-redhat=no \ - --with-suse=no \ - --with-oss=yes \ - --with-isapnp=no \ - --with-sequencer=no \ - --with-cards=usb-audio - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - ARCH="$(LINUX_KARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - c_opts="$(KERNEL_C_OPTS)" \ - CP="$(CP)" \ - all -endef - -$(eval $(call KernelPackage,alsa)) diff --git a/package/alsa/files/alsa.modules b/package/alsa/files/alsa.modules deleted file mode 100644 index 6b16c8c586..0000000000 --- a/package/alsa/files/alsa.modules +++ /dev/null @@ -1,10 +0,0 @@ -snd-page-alloc -snd -snd-timer -snd-pcm -snd-rawmidi -snd-usb-lib -snd-hwdep -snd-usb-audio -snd-mixer-oss -snd-pcm-oss diff --git a/package/alsa/patches/100-compile_fix.patch b/package/alsa/patches/100-compile_fix.patch deleted file mode 100644 index edc15fea89..0000000000 --- a/package/alsa/patches/100-compile_fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: alsa-driver-1.0.14rc1/include/adriver.h -=================================================================== ---- alsa-driver-1.0.14rc1.orig/include/adriver.h 2007-06-04 13:22:44.887031416 +0200 -+++ alsa-driver-1.0.14rc1/include/adriver.h 2007-06-04 13:22:44.956020928 +0200 -@@ -514,7 +514,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 - -@@ -1360,4 +1360,5 @@ - #endif - #endif - -+#undef info /* used in several structs */ - #endif /* __SOUND_LOCAL_DRIVER_H */ diff --git a/package/alsa/patches/110-cp_command.patch b/package/alsa/patches/110-cp_command.patch deleted file mode 100644 index f9719b5741..0000000000 --- a/package/alsa/patches/110-cp_command.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: alsa-driver-1.0.14rc1/Makefile -=================================================================== ---- alsa-driver-1.0.14rc1.orig/Makefile 2007-06-04 13:22:44.865034760 +0200 -+++ alsa-driver-1.0.14rc1/Makefile 2007-06-04 13:22:45.149991440 +0200 -@@ -115,7 +115,7 @@ - if [ ! -d include/sound -a ! -L include/sound ]; then \ - ln -sf ../alsa-kernel/include include/sound ; \ - fi -- cp -puvf include/version.h include/sound/version.h -+ $(CP) include/version.h include/sound/version.h - - utils/mod-deps: utils/mod-deps.c - gcc utils/mod-deps.c -o utils/mod-deps diff --git a/package/alsa/patches/120-sndfops.patch b/package/alsa/patches/120-sndfops.patch deleted file mode 100644 index bc43eb5db4..0000000000 --- a/package/alsa/patches/120-sndfops.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: alsa-driver-1.0.14rc1/alsa-kernel/core/sound.c -=================================================================== ---- alsa-driver-1.0.14rc1.orig/alsa-kernel/core/sound.c 2007-07-11 12:15:11.408530571 +0200 -+++ alsa-driver-1.0.14rc1/alsa-kernel/core/sound.c 2007-07-11 12:15:26.421386105 +0200 -@@ -171,7 +171,7 @@ - return err; - } - --static struct file_operations snd_fops = -+struct file_operations snd_fops = - { - .owner = THIS_MODULE, - .open = snd_open -- cgit v1.2.3