packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx-ioctl.patch, xorg...

[baggins]

Author: baggins                      Date: Thu Nov 25 23:08:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- fixed order of hunks in ioctl patch

---- Files affected:
packages/xorg-driver-video-fglrx:
   xorg-driver-video-fglrx-ioctl.patch (1.2 -> 1.3) , xorg-driver-video-fglrx.spec (1.207 -> 1.208) 

---- Diffs:

================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-ioctl.patch
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-ioctl.patch:1.2 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-ioctl.patch:1.3
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-ioctl.patch:1.2	Thu Nov 25 22:35:02 2010
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-ioctl.patch	Fri Nov 26 00:08:04 2010
@@ -1,17 +1,5 @@
 --- xorg-driver-video-fglrx-10.10/common/lib/modules/fglrx/build_mod/firegl_public.c~	2010-11-17 10:46:01.173842668 +0100
 +++ xorg-driver-video-fglrx-10.10/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-11-17 10:48:58.657176001 +0100
-@@ -404,7 +404,11 @@
- #endif
-     open:    ip_firegl_open,
-     release: ip_firegl_release,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
-     ioctl:   ip_firegl_ioctl,
-+#else
-+    unlocked_ioctl: ip_firegl_ioctl,
-+#endif
-     mmap:    ip_firegl_mmap,
- 
-     write:   ip_firegl_write,
 @@ -320,7 +320,11 @@
      return firegl_release((KCL_IO_FILE_Handle)filp);
  }
@@ -24,3 +12,15 @@
  {
      return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg);
  }
+@@ -404,7 +404,11 @@
+ #endif
+     open:    ip_firegl_open,
+     release: ip_firegl_release,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
+     ioctl:   ip_firegl_ioctl,
++#else
++    unlocked_ioctl: ip_firegl_ioctl,
++#endif
+     mmap:    ip_firegl_mmap,
+ 
+     write:   ip_firegl_write,

================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.207 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.208
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.207	Thu Nov 25 22:39:30 2010
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec	Fri Nov 26 00:08:04 2010
@@ -28,7 +28,7 @@
 %define		arch_dir	x86_64
 %endif
 
-%define		rel	3
+%define		rel	4
 %define		pname		xorg-driver-video-fglrx
 Summary:	Linux Drivers for ATI graphics accelerators
 Summary(pl.UTF-8):	Sterowniki do akceleratorów graficznych ATI
@@ -440,6 +440,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.208  2010/11/25 23:08:04  baggins
+- rel 4
+- fixed order of hunks in ioctl patch
+
 Revision 1.207  2010/11/25 21:39:30  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx-ioctl.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.207&r2=1.208&f=u