packages: linux-libc-headers/linux-libc-headers-fbsplash.patch, linux-libc-...

[qboosh]

Author: qboosh                       Date: Wed Aug  4 07:28:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.6.35
- updated fbsplash patch, removed obsolete align patch
- use updated build macros instead of special ARCH case for arm

---- Files affected:
packages/linux-libc-headers:
   linux-libc-headers-fbsplash.patch (1.5 -> 1.6) , linux-libc-headers.spec (1.160 -> 1.161) , linux-libc-headers-align.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/linux-libc-headers/linux-libc-headers-fbsplash.patch
diff -u packages/linux-libc-headers/linux-libc-headers-fbsplash.patch:1.5 packages/linux-libc-headers/linux-libc-headers-fbsplash.patch:1.6
--- packages/linux-libc-headers/linux-libc-headers-fbsplash.patch:1.5	Tue Apr  3 16:41:14 2007
+++ packages/linux-libc-headers/linux-libc-headers-fbsplash.patch	Wed Aug  4 09:28:17 2010
@@ -17,12 +17,10 @@
 +};
 +
 +#endif
-diff --git a/include/linux/fb.h b/include/linux/fb.h
-index 64177ec..dc99c4f 100644
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -9,6 +9,13 @@
- #define FB_MAJOR		29
+--- linux-2.6.35/include/linux/fb.h.orig	2010-08-02 00:11:14.000000000 +0200
++++ linux-2.6.35/include/linux/fb.h	2010-08-04 08:51:32.242821619 +0200
+@@ -8,6 +8,13 @@
+ 
  #define FB_MAX			32	/* sufficient for now */
  
 +struct fb_splash_iowrapper
@@ -35,7 +33,7 @@
  /* ioctls
     0x46 is 'F'								*/
  #define FBIOGET_VSCREENINFO	0x4600
-@@ -36,7 +43,15 @@
+@@ -35,8 +42,17 @@
  #define FBIOGET_HWCINFO         0x4616
  #define FBIOPUT_MODEINFO        0x4617
  #define FBIOGET_DISPINFO        0x4618
@@ -44,13 +42,15 @@
 +#define FBIOSPLASH_SETSTATE	_IOWR('F', 0x1B, struct fb_splash_iowrapper)
 +#define FBIOSPLASH_GETSTATE	_IOR('F', 0x1C, struct fb_splash_iowrapper)
 +#define FBIOSPLASH_SETPIC 	_IOWR('F', 0x1D, struct fb_splash_iowrapper)
+ #define FBIO_WAITFORVSYNC	_IOW('F', 0x20, __u32)
  
 +#define FB_SPLASH_THEME_LEN		128	/* Maximum lenght of a theme name */
 +#define FB_SPLASH_IO_ORIG_KERNEL	0	/* Kernel ioctl origin */
 +#define FB_SPLASH_IO_ORIG_USER		1 	/* User ioctl origin */
- 
++  
  #define FB_TYPE_PACKED_PIXELS		0	/* Packed Pixels	*/
  #define FB_TYPE_PLANES			1	/* Non interleaved planes */
+ #define FB_TYPE_INTERLEAVED_PLANES	2	/* Interleaved planes	*/
 --- a/include/linux/Kbuild
 +++ b/include/linux/Kbuild
 @@ -342,0 +342,1 @@

================================================================
Index: packages/linux-libc-headers/linux-libc-headers.spec
diff -u packages/linux-libc-headers/linux-libc-headers.spec:1.160 packages/linux-libc-headers/linux-libc-headers.spec:1.161
--- packages/linux-libc-headers/linux-libc-headers.spec:1.160	Fri Jun 25 11:49:10 2010
+++ packages/linux-libc-headers/linux-libc-headers.spec	Wed Aug  4 09:28:17 2010
@@ -1,16 +1,16 @@
 # $Revision$, $Date$
-%define	basever	2.6.34
+%define	basever	2.6.35
 %define	postver	%{nil}
 Summary:	Linux kernel headers for use with C libraries
 Summary(pl.UTF-8):	Nagłówki jądra Linuksa do użytku z bibliotekami C
 Name:		linux-libc-headers
 Version:	%{basever}%{postver}
-Release:	2
+Release:	1
 Epoch:		7
 License:	GPL v2
 Group:		Development
 Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
-# Source0-md5:	10eebcb0178fb4540e2165bfd7efc7ad
+# Source0-md5:	091abeb4684ce03d1d936851618687b6
 %if "%{postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
 # Source1-md5:	745fd1355c630e163e40c40d4c9b79f9
@@ -26,10 +26,9 @@
 Patch6:		linux-kernel-headers.SuSE.TIOCGDEV.patch
 Patch7:		%{name}-atm-vbr.patch
 Patch8:		vserver.patch
-Patch9:		%{name}-align.patch
 AutoReqProv:	no
 BuildRequires:	perl-base
-BuildRequires:	rpmbuild(macros) >= 1.567
+BuildRequires:	rpmbuild(macros) >= 1.568
 Requires(pre):	fileutils
 Provides:	alsa-driver-devel
 Provides:	glibc-kernel-headers = %{epoch}:%{version}-%{release}
@@ -72,7 +71,6 @@
 %patch6 -p2
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -82,12 +80,8 @@
 %ifarch ppc ppc64
 	ARCH=powerpc
 %else
-%ifarch %{arm}
-	ARCH=arm
-%else
 	ARCH=%{_target_base_arch}
 %endif
-%endif
 
 # provided by glibc-headers
 rm -rf $RPM_BUILD_ROOT%{_includedir}/scsi
@@ -123,6 +117,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161  2010/08/04 07:28:17  qboosh
+- updated to 2.6.35
+- updated fbsplash patch, removed obsolete align patch
+- use updated build macros instead of special ARCH case for arm
+
 Revision 1.160  2010/06/25 09:49:10  tommat
 - arm added
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/linux-libc-headers/linux-libc-headers-fbsplash.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/linux-libc-headers/linux-libc-headers.spec?r1=1.160&r2=1.161&f=u