packages: gspca/gspca.spec, gspca/gspca_kernel_2.6.27.diff (NEW), gspca/gsp...

glen glen at pld-linux.org
Sat Apr 10 19:21:17 CEST 2010 

Author: glen                         Date: Sat Apr 10 17:21:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add 2.6.27 build fixes, more needed for current th

---- Files affected:
packages/gspca:
   gspca.spec (1.12 -> 1.13) , gspca_kernel_2.6.27.diff (NONE -> 1.1)  (NEW), gspcav1_nodebug.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gspca/gspca.spec
diff -u packages/gspca/gspca.spec:1.12 packages/gspca/gspca.spec:1.13
--- packages/gspca/gspca.spec:1.12	Tue Dec 25 14:08:36 2007
+++ packages/gspca/gspca.spec	Sat Apr 10 19:21:11 2010
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-#
 # TODO:
 #	- rename thiis to gspcav1 ?
 #	- use the snapshot dates for %{version}? old versioning seems
@@ -14,19 +13,21 @@
 %undefine	with_dist_kernel
 %endif
 
-%define		_ver 01.00.20
-%define		_snap 20071224
-%define 	_rel 0.1
+%define		ver	 01.00.20
+%define		snap 20071224
+%define 	rel	 0.1
 Summary:	Linux Generic Software Package for Camera Adapters
 Summary(pl.UTF-8):	Generic Software Package for Camera Adapters - pakiet do obsługi kamer pod Linuksem
 Name:		gspca
-Version:	%{_ver}
-Release:	1.%{_snap}.%{_rel}@%{_kernel_ver_str}
+Version:	%{ver}
+Release:	1.%{snap}.%{rel}@%{_kernel_ver_str}
 Epoch:		0
 License:	GPL v2+
 Group:		Base/Kernel
-Source0:	http://mxhaard.free.fr/spca50x/Download/%{name}v1-%{_snap}.tar.gz
+Source0:	http://mxhaard.free.fr/spca50x/Download/%{name}v1-%{snap}.tar.gz
 # Source0-md5:	14853ba1f4edc1e685039fca56e5ebf2
+Patch0:		http://connie.slackware.com/~alien/slackbuilds/gspcav1/build/%{name}_kernel_2.6.27.diff
+Patch1:		http://connie.slackware.com/~alien/slackbuilds/gspcav1/build/%{name}v1_nodebug.patch
 URL:		http://mxhaard.free.fr/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
@@ -39,7 +40,7 @@
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define	_module_dir	kernel/drivers/media/video
+%define		module_dir	kernel/drivers/media/video
 
 %description
 GSPCA is a Linux Generic Software Package for Camera Adapters. It
@@ -54,7 +55,7 @@
 %package -n kernel%{_alt_kernel}-video-%{name}
 Summary:	Generic Software Package for Camera Adapters - Linux kernel module
 Summary(pl.UTF-8):	Oprogramowanie do obsługi kamer - moduł jądra Linuksa
-Release:	1.%{_snap}.%{_rel}@%{_kernel_ver_str}
+Release:	1.%{snap}.%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
@@ -76,7 +77,9 @@
 Ten pakiet zawiera moduł jądra Linuksa.
 
 %prep
-%setup -q -n %{name}v1-%{_snap}
+%setup -q -n %{name}v1-%{snap}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %if %{with kernel}
@@ -87,7 +90,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-%install_kernel_modules -m gspca -d %{_module_dir}
+%install_kernel_modules -m gspca -d %{module_dir}
 %endif
 
 %clean
@@ -102,7 +105,7 @@
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-video-%{name}
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/%{_module_dir}/gspca.ko*
+/lib/modules/%{_kernel_ver}/%{module_dir}/gspca.ko*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -111,6 +114,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/04/10 17:21:11  glen
+- add 2.6.27 build fixes, more needed for current th
+
 Revision 1.12  2007/12/25 13:08:36  lisu
 - up to 20071224
 

================================================================
Index: packages/gspca/gspca_kernel_2.6.27.diff
diff -u /dev/null packages/gspca/gspca_kernel_2.6.27.diff:1.1
--- /dev/null	Sat Apr 10 19:21:17 2010
+++ packages/gspca/gspca_kernel_2.6.27.diff	Sat Apr 10 19:21:11 2010
@@ -0,0 +1,73 @@
+diff -uarN gspcav1-20071224.orig/gspca.h gspcav1-20071224/gspca.h
+--- gspcav1-20071224.orig/gspca.h	2007-12-24 17:56:47.000000000 +0100
++++ gspcav1-20071224/gspca.h	2008-12-08 14:30:57.000000000 +0100
+@@ -14,6 +14,7 @@
+ #include <linux/version.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+ #include <media/v4l2-common.h>
++#include <media/v4l2-ioctl.h>
+ #endif
+ /* V4L API extension for raw JPEG (=JPEG without header) and JPEG with header   
+ */
+diff -uarN gspcav1-20071224.orig/gspca_core.c gspcav1-20071224/gspca_core.c
+--- gspcav1-20071224.orig/gspca_core.c	2007-12-24 17:56:47.000000000 +0100
++++ gspcav1-20071224/gspca_core.c	2008-12-08 14:30:57.000000000 +0100
+@@ -51,7 +51,7 @@
+ #include <linux/pagemap.h>
+ #include <linux/usb.h>
+ #include <asm/io.h>
+-#include <asm/semaphore.h>
++#include <linux/semaphore.h>
+ #include <asm/page.h>
+ #include <asm/uaccess.h>
+ #include <asm/atomic.h>
+@@ -2606,9 +2606,9 @@
+ 	.llseek = no_llseek,
+ };
+ static struct video_device spca50x_template = {
+-	.owner = THIS_MODULE,
++      //.owner = THIS_MODULE,
+ 	.name = "GSPCA USB Camera",
+-	.type = VID_TYPE_CAPTURE,
++      .vfl_type = VID_TYPE_CAPTURE,
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)	
+ 	.hardware = VID_HARDWARE_GSPCA,
+ #endif
+@@ -2766,22 +2766,22 @@
+ spca50x_create_sysfs(struct video_device *vdev)
+ {
+ 	int rc = 0;
+-	rc = video_device_create_file(vdev, &dev_attr_stream_id);
++      rc = device_create_file(&vdev->dev, &dev_attr_stream_id);
+ 	if (rc)
+ 		goto err_stream_id;
+-	rc = video_device_create_file(vdev, &dev_attr_model);
++      rc = device_create_file(&vdev->dev, &dev_attr_model);
+ 	if (rc)
+ 		goto err_model;
+-	rc = video_device_create_file(vdev, &dev_attr_pictsetting);
++      rc = device_create_file(&vdev->dev, &dev_attr_pictsetting);
+ 	if (rc)
+ 		goto err_pictsetting;
+ 	return 0;
+       err_pictsetting:
+-	video_device_remove_file(vdev, &dev_attr_pictsetting);
++      device_remove_file(&vdev->dev, &dev_attr_pictsetting);
+       err_model:
+-	video_device_remove_file(vdev, &dev_attr_model);
++      device_remove_file(&vdev->dev, &dev_attr_model);
+       err_stream_id:
+-	video_device_remove_file(vdev, &dev_attr_stream_id);
++      device_remove_file(&vdev->dev, &dev_attr_stream_id);
+ 	return rc;
+ }
+ #endif 
+@@ -4298,7 +4298,7 @@
+ 	if (!spca50x->vdev)
+ 		goto error;
+ 	memcpy(spca50x->vdev, &spca50x_template, sizeof (spca50x_template));
+-	spca50x->vdev->dev = &dev->dev;
++    spca50x->vdev->dev = dev->dev;
+ 	video_set_drvdata(spca50x->vdev, spca50x);
+ 	PDEBUG(2, "setting video device = %p, spca50x = %p", spca50x->vdev,
+ 	       spca50x);

================================================================
Index: packages/gspca/gspcav1_nodebug.patch
diff -u /dev/null packages/gspca/gspcav1_nodebug.patch:1.1
--- /dev/null	Sat Apr 10 19:21:17 2010
+++ packages/gspca/gspcav1_nodebug.patch	Sat Apr 10 19:21:11 2010
@@ -0,0 +1,11 @@
+--- Makefile.org	2006-12-07 14:59:17.000000000 +0100
++++ Makefile	2007-01-09 22:31:16.000000000 +0100
+@@ -8,7 +8,7 @@
+ # disabled for release versions.
+ 
+ # Optional: Enable driver debugging
+-DEFINES   += -DGSPCA_ENABLE_DEBUG
++#DEFINES   += -DGSPCA_ENABLE_DEBUG
+ 
+ # Optional: Enable direct register read/write for PAC207 development
+ #DEFINES   += -DGSPCA_ENABLE_REGISTERPLAY
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gspca/gspca.spec?r1=1.12&r2=1.13&f=u

More information about the pld-cvs-commit mailing list