diff options
author | Felix Fietkau <nbd@openwrt.org> | 2006-10-13 22:51:49 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-03-20 17:29:15 +0100 |
commit | 60c1f0f64d23003a19a07d6b9638542130f6641d (patch) | |
tree | 8fb2787f4c49baded97cd55e0c371fe1cffce2b6 /package/spca5xx/patches | |
parent | d58a09110ccfa95f06c983fe796806f2e035c9d2 (diff) | |
parent | b3ce218b51746d3a576221ea542facf3a1703ab2 (diff) | |
download | upstream-60c1f0f64d23003a19a07d6b9638542130f6641d.tar.gz upstream-60c1f0f64d23003a19a07d6b9638542130f6641d.tar.bz2 upstream-60c1f0f64d23003a19a07d6b9638542130f6641d.zip |
finally move buildroot-ng to trunk
Diffstat (limited to 'package/spca5xx/patches')
-rw-r--r-- | package/spca5xx/patches/01-kmod-build.patch | 177 | ||||
-rw-r--r-- | package/spca5xx/patches/02-seq_bug.patch | 14 |
2 files changed, 191 insertions, 0 deletions
diff --git a/package/spca5xx/patches/01-kmod-build.patch b/package/spca5xx/patches/01-kmod-build.patch new file mode 100644 index 0000000000..304df92047 --- /dev/null +++ b/package/spca5xx/patches/01-kmod-build.patch @@ -0,0 +1,177 @@ +diff -Nur spca5xx-20051212/Makefile spca5xx-20051212.patched/Makefile +--- spca5xx-20051212/Makefile 2005-12-10 17:05:51.000000000 +0100 ++++ spca5xx-20051212.patched/Makefile 2005-12-25 02:41:29.910720750 +0100 +@@ -33,7 +33,9 @@ + DEFINES += -DCONFIG_USB_SPCA5XX_MODULE=1 -DMODULE -D__KERNEL__ + DEFINES += -DVID_HARDWARE_SPCA5XX=0xFF -DSPCA5XX_VERSION=\"$(VERSION)\" + +-ifneq ($(shell uname -r | cut -d. -f1,2), 2.4) ++KERNELVERSION=$(shell uname -r | cut -d. -f1,2) ++ ++ifneq ($(KERNELVERSION), 2.4) + + ifneq ($(KERNELRELEASE),) # We were called by kbuild + CFLAGS += $(DEFINES) +@@ -68,152 +70,16 @@ + + else # kernel version test + +-############################################################################# +-# For Linux 2.4 users. +-# Change the following lines according to your system configuration. +-# It is important to configure your particular source tree ("make dep") before +-# compiling this module! +-############################################################################# +-### +-# This makefile will build the spca50x driver module external to the kernel +-# source tree. It makes it easier to swap kernels. +- +- +-KERNEL_VERSION = `uname -r` +- +-### +-# Location of the header files (most importantly the config files) +-# for the kernel you want to build the module against. +-# This should be correct for the currently installed kernel on your machine. +-KINCLUDE = /lib/modules/$(KERNEL_VERSION)/build/include +-KERNEL_ACFILE = $(KINCLUDE)/linux/autoconf.h +-KERNEL_MODVERSIONSFILE = $(KINCLUDE)/linux/modversions.h +-MODULE_INSTALLDIR = /lib/modules/$(KERNEL_VERSION)/kernel/drivers/usb/ +- +-# Detect module versioning support +-ifneq ($(strip $(shell grep 'define CONFIG_MODVERSIONS 1' $(KERNEL_ACFILE))),) +- DEFINES += -DMODVERSIONS -include $(KERNEL_MODVERSIONSFILE) +-endif +- +-# Detect SMP support +-ifneq ($(strip $(shell grep 'define CONFIG_SMP 1' $(KERNEL_ACFILE))),) +- DEFINES += -D__SMP__ -DSMP +-endif +- +-# Setup the tools +-CC = gcc +-LD = ld +- +-# Setup compiler warnings +-WARNINGS = -Wall -Wpointer-arith +-WARNINGS += -Wcast-align -Wwrite-strings -Wstrict-prototypes +-WARNINGS += -Wuninitialized -Wreturn-type -Wunused -Wparentheses +- +-# Setup compiler flags +-CFLAGS = -O2 -fomit-frame-pointer -fno-strict-aliasing -pipe +-CFLAGS += -mpreferred-stack-boundary=2 +-CFLAGS += -I$(KINCLUDE) -Idrivers/usb +- +-# Setup link flags +-LDFLAGS = --strip-debug -r +- +-# Setup the list of files to be included in a distribution +-DIST_FILES = CHANGELOG \ +- README \ +- Makefile \ +- drivers/usb/Config.in \ +- drivers/usb/spcadecoder.c \ +- drivers/usb/spcadecoder.h \ +- drivers/usb/spcagamma.h \ +- drivers/usb/spcaCompat.h \ +- drivers/usb/spcausb.h \ +- drivers/usb/spca500_init.h \ +- drivers/usb/spca501_init.h \ +- drivers/usb/sp5xxfw2.dat \ +- drivers/usb/sp5xxfw2.h \ +- drivers/usb/spca505_init.h \ +- drivers/usb/spca506.h \ +- drivers/usb/spca508_init.h \ +- drivers/usb/spca561.h \ +- drivers/usb/sonix.h \ +- drivers/usb/cs2102.h \ +- drivers/usb/hv7131b.h \ +- drivers/usb/icm105a.h \ +- drivers/usb/hv7131c.h \ +- drivers/usb/hdcs2020.h \ +- drivers/usb/pb0330.h \ +- drivers/usb/tas5130c.h \ +- drivers/usb/zc3xx.h\ +- drivers/usb/tv8532.h\ +- drivers/usb/cxlib.h\ +- drivers/usb/sn9cxxx.h\ +- drivers/usb/cx11646.h\ +- drivers/usb/pac207.h\ +- drivers/usb/spca5xx.c \ +- drivers/usb/spca5xx.h +- +-OBJS = drivers/usb/spcadecoder.o \ +- drivers/usb/spca5xx.o +- +-BINARY = spca5xx.o +- +-### +-# Targets follow here +- +-binary: $(OBJS) +- @echo Linking $(BINARY) +- @$(LD) $(LDFLAGS) -o $(BINARY) $(OBJS) +- +-install: binary +- @echo Installing.. Your root password may be required. +- su -c "make install-root" +- +-install-root: +- @echo Installing.. +- @mkdir -p /lib/modules/`uname -r`/kernel/drivers/usb +- @rm -f /lib/modules/`uname -r`/kernel/drivers/usb/spca50x.o +- @rm -f /lib/modules/`uname -r`/kernel/drivers/usb/et61x.o +- @cp spca5xx.o /lib/modules/`uname -r`/kernel/drivers/usb/spca5xx.o +- @/sbin/depmod +- +-dist: clean binary +- @echo Making distributable archives +- @rm -f spca5xx-src-$(VERSION).tar.gz +- @tar zcf spca5xx-src-$(VERSION).tar.gz $(DIST_FILES) +- @rm -f spca5xx-module-$(VERSION).tar.gz +- @cp $(BINARY) spca5xx-$(VERSION).o +- @tar zcf spca5xx-module-$(VERSION).tar.gz spca5xx-$(VERSION).o README +- @rm spca5xx-$(VERSION).o +- +-.c.o: Makefile $*.c +- @echo Compiling $*.c +- @$(CC) $(CFLAGS) $(WARNINGS) $(DEFINES) -c $*.c -o $*.o +- +-### +-# Dependencies follow here +- +-drivers/usb/spca5xx.o: drivers/usb/spca5xx.h \ +- drivers/usb/spcaCompat.h \ +- drivers/usb/spcausb.h \ +- drivers/usb/sonix.h \ +- drivers/usb/spca500_init.h \ +- drivers/usb/spca501_init.h \ +- drivers/usb/sp5xxfw2.h \ +- drivers/usb/spca505_init.h \ +- drivers/usb/spca506.h \ +- drivers/usb/spca508_init.h \ +- drivers/usb/spca561.h \ +- drivers/usb/zc3xx.h\ +- drivers/usb/tv8532.h\ +- drivers/usb/cx11646.h\ +- drivers/usb/mr97311.h\ +- drivers/usb/sn9cxxx.h\ +- drivers/usb/pac207.h\ +- +- +-drivers/usb/spcadecoder.o: drivers/usb/spcadecoder.h \ +- drivers/usb/spcagamma.h \ +- ++EXTRA_CFLAGS += $(DEFINES) ++ ++spca5xx-objs := drivers/usb/spca5xx.o drivers/usb/spcadecoder.o ++ ++obj-m += spca5xx.o ++obj-y := $(spca5xx-objs) ++ ++O_TARGET := $(obj-m) ++ ++-include $(TOPDIR)/Rules.make + + endif # End kernel version test + diff --git a/package/spca5xx/patches/02-seq_bug.patch b/package/spca5xx/patches/02-seq_bug.patch new file mode 100644 index 0000000000..ec1003e700 --- /dev/null +++ b/package/spca5xx/patches/02-seq_bug.patch @@ -0,0 +1,14 @@ +diff -Nur spca5xx-20060501/drivers/usb/spca5xx.c.orig spca5xx-20060501/drivers/usb/spca5xx.c +--- spca5xx-20060501/drivers/usb/spca5xx.c.orig 2006-08-16 11:56:33.000000000 -0700 ++++ spca5xx-20060501/drivers/usb/spca5xx.c 2006-08-16 11:55:41.000000000 -0700 +@@ -1092,8 +1092,8 @@ + // spca50x->avg_lum, spca50x->avg_lum); + for (i = 0; i < SPCA50X_NUMFRAMES; i++) { + out += sprintf(out, "frame : %d\n", i); +- out += +- sprintf(out, " sequence : %d\n", spca50x->frame[i].seq); ++// out += ++// sprintf(out, " sequence : %d\n", spca50x->frame[i].seq); + out += + sprintf(out, " grabstate : %d\n", + spca50x->frame[i].grabstate); |