r3487 - trunk/src/target/xserver/patches
olv at sita.openmoko.org
olv at sita.openmoko.org
Fri Nov 23 12:23:48 CET 2007
Author: olv
Date: 2007-11-23 12:23:44 +0100 (Fri, 23 Nov 2007)
New Revision: 3487
Modified:
trunk/src/target/xserver/patches/xglamo-kaa.patch
trunk/src/target/xserver/patches/xglamo-xv.patch
trunk/src/target/xserver/patches/xglamo.patch
Log:
regenerate patches with --no-timestamps flag
Modified: trunk/src/target/xserver/patches/xglamo-kaa.patch
===================================================================
--- trunk/src/target/xserver/patches/xglamo-kaa.patch 2007-11-23 11:00:33 UTC (rev 3486)
+++ trunk/src/target/xserver/patches/xglamo-kaa.patch 2007-11-23 11:23:44 UTC (rev 3487)
@@ -1,7 +1,7 @@
Index: xserver/hw/kdrive/glamo/Makefile.am
===================================================================
---- xserver.orig/hw/kdrive/glamo/Makefile.am 2007-11-23 17:05:49.000000000 +0800
-+++ xserver/hw/kdrive/glamo/Makefile.am 2007-11-23 17:07:50.000000000 +0800
+--- xserver.orig/hw/kdrive/glamo/Makefile.am
++++ xserver/hw/kdrive/glamo/Makefile.am
@@ -13,6 +13,10 @@
noinst_LIBRARIES = libglamo.a
@@ -15,8 +15,8 @@
glamo-regs.h
Index: xserver/hw/kdrive/glamo/glamo.c
===================================================================
---- xserver.orig/hw/kdrive/glamo/glamo.c 2007-11-23 17:05:49.000000000 +0800
-+++ xserver/hw/kdrive/glamo/glamo.c 2007-11-23 17:07:50.000000000 +0800
+--- xserver.orig/hw/kdrive/glamo/glamo.c
++++ xserver/hw/kdrive/glamo/glamo.c
@@ -442,11 +442,10 @@
0, /* recolorCursor */
#endif
@@ -35,8 +35,8 @@
GLAMOPutColors, /* putColors */
Index: xserver/hw/kdrive/glamo/glamo.h
===================================================================
---- xserver.orig/hw/kdrive/glamo/glamo.h 2007-11-23 17:05:49.000000000 +0800
-+++ xserver/hw/kdrive/glamo/glamo.h 2007-11-23 17:07:50.000000000 +0800
+--- xserver.orig/hw/kdrive/glamo/glamo.h
++++ xserver/hw/kdrive/glamo/glamo.h
@@ -307,6 +307,22 @@
void
GLAMOUnmapReg(KdCardInfo *card, GLAMOCardInfo *glamoc);
@@ -62,8 +62,8 @@
Bool
Index: xserver/hw/kdrive/glamo/glamo_dma.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo_dma.c 2007-11-23 17:07:50.000000000 +0800
+--- /dev/null
++++ xserver/hw/kdrive/glamo/glamo_dma.c
@@ -0,0 +1,530 @@
+/*
+ * Copyright © 2007 OpenMoko, Inc.
@@ -597,8 +597,8 @@
+}
Index: xserver/hw/kdrive/glamo/glamo_dma.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo_dma.h 2007-11-23 17:07:50.000000000 +0800
+--- /dev/null
++++ xserver/hw/kdrive/glamo/glamo_dma.h
@@ -0,0 +1,153 @@
+/*
+ * Copyright © 2007 OpenMoko, Inc.
@@ -755,8 +755,8 @@
+#endif /* _GLAMO_DMA_H_ */
Index: xserver/hw/kdrive/glamo/glamo_draw.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo_draw.c 2007-11-23 17:07:50.000000000 +0800
+--- /dev/null
++++ xserver/hw/kdrive/glamo/glamo_draw.c
@@ -0,0 +1,541 @@
+/*
+ * Copyright © 2007 OpenMoko, Inc.
@@ -1301,8 +1301,8 @@
+}
Index: xserver/hw/kdrive/glamo/glamo_draw.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo_draw.h 2007-11-23 17:07:50.000000000 +0800
+--- /dev/null
++++ xserver/hw/kdrive/glamo/glamo_draw.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2007 OpenMoko, Inc.
Modified: trunk/src/target/xserver/patches/xglamo-xv.patch
===================================================================
--- trunk/src/target/xserver/patches/xglamo-xv.patch 2007-11-23 11:00:33 UTC (rev 3486)
+++ trunk/src/target/xserver/patches/xglamo-xv.patch 2007-11-23 11:23:44 UTC (rev 3487)
@@ -1,7 +1,7 @@
Index: xserver/hw/kdrive/glamo/Makefile.am
===================================================================
---- xserver.orig/hw/kdrive/glamo/Makefile.am 2007-11-23 17:08:34.000000000 +0800
-+++ xserver/hw/kdrive/glamo/Makefile.am 2007-11-23 17:08:40.000000000 +0800
+--- xserver.orig/hw/kdrive/glamo/Makefile.am
++++ xserver/hw/kdrive/glamo/Makefile.am
@@ -17,6 +17,7 @@
glamo_dma.h \
glamo_draw.c \
@@ -12,8 +12,8 @@
glamo-regs.h
Index: xserver/hw/kdrive/glamo/glamo.h
===================================================================
---- xserver.orig/hw/kdrive/glamo/glamo.h 2007-11-23 17:08:34.000000000 +0800
-+++ xserver/hw/kdrive/glamo/glamo.h 2007-11-23 17:08:40.000000000 +0800
+--- xserver.orig/hw/kdrive/glamo/glamo.h
++++ xserver/hw/kdrive/glamo/glamo.h
@@ -351,6 +351,19 @@
int
GLAMOLog2(int val);
@@ -36,8 +36,8 @@
#endif /* _GLAMO_H_ */
Index: xserver/hw/kdrive/glamo/glamo_draw.c
===================================================================
---- xserver.orig/hw/kdrive/glamo/glamo_draw.c 2007-11-23 17:08:34.000000000 +0800
-+++ xserver/hw/kdrive/glamo/glamo_draw.c 2007-11-23 17:08:40.000000000 +0800
+--- xserver.orig/hw/kdrive/glamo/glamo_draw.c
++++ xserver/hw/kdrive/glamo/glamo_draw.c
@@ -448,6 +448,10 @@
if (!kaaDrawInit(pScreen, &glamos->kaa))
return FALSE;
@@ -83,8 +83,8 @@
GLAMOScreenInfo(pScreenPriv);
Index: xserver/hw/kdrive/glamo/glamo_video.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo_video.c 2007-11-23 17:08:58.000000000 +0800
+--- /dev/null
++++ xserver/hw/kdrive/glamo/glamo_video.c
@@ -0,0 +1,974 @@
+/*
+ * Copyright © 2007 OpenMoko, Inc.
Modified: trunk/src/target/xserver/patches/xglamo.patch
===================================================================
--- trunk/src/target/xserver/patches/xglamo.patch 2007-11-23 11:00:33 UTC (rev 3486)
+++ trunk/src/target/xserver/patches/xglamo.patch 2007-11-23 11:23:44 UTC (rev 3487)
@@ -1,7 +1,7 @@
Index: xserver/hw/kdrive/glamo/Makefile.am
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/Makefile.am 2007-11-23 17:24:26.000000000 +0800
+--- /dev/null
++++ xserver/hw/kdrive/glamo/Makefile.am
@@ -0,0 +1,37 @@
+if KDRIVEFBDEV
+FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev
@@ -42,8 +42,8 @@
+ rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
Index: xserver/hw/kdrive/glamo/glamo-regs.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo-regs.h 2007-11-23 17:24:26.000000000 +0800
+--- /dev/null
++++ xserver/hw/kdrive/glamo/glamo-regs.h
@@ -0,0 +1,757 @@
+#ifndef _GLAMO_REGS_H
+#define _GLAMO_REGS_H
@@ -804,8 +804,8 @@
+#endif /* _GLAMO_REGS_H */
Index: xserver/hw/kdrive/glamo/glamo.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo.c 2007-11-23 17:24:26.000000000 +0800
+--- /dev/null
++++ xserver/hw/kdrive/glamo/glamo.c
@@ -0,0 +1,453 @@
+/*
+ * Copyright © 2007 OpenMoko, Inc.
@@ -1262,8 +1262,8 @@
+};
Index: xserver/hw/kdrive/glamo/glamo.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo.h 2007-11-23 17:24:26.000000000 +0800
+--- /dev/null
++++ xserver/hw/kdrive/glamo/glamo.h
@@ -0,0 +1,340 @@
+/*
+ * Copyright © 2007 OpenMoko, Inc.
@@ -1607,8 +1607,8 @@
+#endif /* _GLAMO_H_ */
Index: xserver/hw/kdrive/glamo/glamo_stub.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/kdrive/glamo/glamo_stub.c 2007-11-23 17:24:26.000000000 +0800
+--- /dev/null
++++ xserver/hw/kdrive/glamo/glamo_stub.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright © 2007 OpenMoko, Inc.
More information about the commitlog
mailing list