]> code.ossystems Code Review - openembedded-core.git/commitdiff
Code Review / openembedded-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: fe4ec82)
xserver-kdrive: use extra-kmodes.patch for 1.4.99.901, changed status of patches
authorMarcin Juszkiewicz <hrw@openedhand.com>
Wed, 23 Apr 2008 10:33:39 +0000 (10:33 +0000)
committerMarcin Juszkiewicz <hrw@openedhand.com>
Wed, 23 Apr 2008 10:33:39 +0000 (10:33 +0000)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4321 311d38ba-8fff-0310-9ca6-ca027cbcb966

meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/extra-kmodes.patch [deleted file] patch | blob | history
meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/fix_default_mode.patch [deleted file] patch | blob | history
meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/kmode-palm.patch [deleted file] patch | blob | history
meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/kmode.patch [deleted file] patch | blob | history
meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb patch | blob | history
meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb patch | blob | history

diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/extra-kmodes.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/extra-kmodes.patch
deleted file mode 100644 (file)
index 14cf990..0000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/extra-kmodes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Add some extra video modes and change the default to VGA.
-
----
- hw/kdrive/src/kmode.c |   41 +++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 39 insertions(+), 2 deletions(-)
-
-Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c     2008-01-11 14:20:47.000000000 +0000
-+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c  2008-01-11 14:21:18.000000000 +0000
-@@ -32,6 +32,31 @@ const KdMonitorTiming  kdMonitorTimings[
-     /*        H       V       Hz      KHz */
-               /*  FP      BP      BLANK   POLARITY */
- 
-+      /* Treo 650 */
-+
-+    {   320,  320,    64,     16256,
-+                  17,     12,     32,     KdSyncNegative,
-+                  1,      11,     14,     KdSyncNegative,
-+    },
-+    
-+    {   320,  320,    64,         0,
-+                  0,      0,      0,     KdSyncNegative,
-+                  0,      0,      0,     KdSyncNegative,
-+    },
-+      
-+      /* LifeDrive/T3/TX modes */
-+
-+    {   320,  480,    64,     16256,
-+                  17,     12,     32,     KdSyncNegative,
-+                  1,      11,     14,     KdSyncNegative,
-+    },
-+    
-+    {   480,  320,    64,         0,
-+                  0,      0,      0,     KdSyncNegative,
-+                  0,      0,      0,     KdSyncNegative,
-+    },
-+
-+
-     /* IPAQ modeline:
-      *
-      * Modeline "320x240"      5.7222 320 337 340 352   240 241 244 254"
-@@ -41,6 +66,11 @@ const KdMonitorTiming  kdMonitorTimings[
-                   1,      11,     14,     KdSyncNegative,
-     },
-     
-+    {   240,  320,    64,         0,
-+                  0,      0,      0,     KdSyncNegative,
-+                  0,      0,      0,     KdSyncNegative,
-+    },
-+
-     /* Other VESA modes */
-     { 640,    350,    85,     31500,                      /* VESA */
-                   32,     96,     192,    KdSyncPositive, /* 26.413 */
-@@ -76,10 +106,19 @@ const KdMonitorTiming  kdMonitorTimings[
-                   16,     120,    176,    KdSyncNegative, /* 37.861 */
-                   1,      20,     24,     KdSyncNegative, /* 72.809 */
-     },
-+    /* DEFAULT */
-+#define MONITOR_TIMING_DEFAULT        13
-     { 640,    480,    60,     25175,                      /* VESA */
-                  16,      48,     160,    KdSyncNegative, /* 31.469 */
-                  10,      33,     45,     KdSyncNegative, /* 59.940 */
-     },
-+
-+
-+  {   480,    640,    60,     0,                      /* VESA */
-+               0,      0,     0,    KdSyncNegative, /* 31.469 */
-+               0,      0,     0,     KdSyncNegative, /* 59.940 */
-+   },
-+  
-     
-     /* 800x600 modes */
-     { 800,    600,    85,     56250,                      /* VESA */
-@@ -90,8 +129,6 @@ const KdMonitorTiming  kdMonitorTimings[
-                   16,     160,    256,    KdSyncPositive, /* 46.875 */
-                   1,      21,     25,     KdSyncPositive, /* 75.000 */
-     },
--    /* DEFAULT */
--#define MONITOR_TIMING_DEFAULT        9
-     { 800,    600,    72,     50000,                      /* VESA */
-                   56,     64,     240,    KdSyncPositive, /* 48.077 */
-                   37,     23,     66,     KdSyncPositive, /* 72.188 */
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/fix_default_mode.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/fix_default_mode.patch
deleted file mode 100644 (file)
index edc5146..0000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/fix_default_mode.patch
+++ /dev/null
@@ -1,26 +0,0 @@
----
- hw/kdrive/src/kmode.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c     2007-05-16 10:30:29.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c  2007-05-16 10:31:08.000000000 +0100
-@@ -106,6 +106,8 @@ const KdMonitorTiming  kdMonitorTimings[
-                   16,     120,    176,    KdSyncNegative, /* 37.861 */
-                   1,      20,     24,     KdSyncNegative, /* 72.809 */
-     },
-+    /* DEFAULT */
-+#define MONITOR_TIMING_DEFAULT        13
-     { 640,    480,    60,     25175,                      /* VESA */
-                  16,      48,     160,    KdSyncNegative, /* 31.469 */
-                  10,      33,     45,     KdSyncNegative, /* 59.940 */
-@@ -127,8 +129,6 @@ const KdMonitorTiming  kdMonitorTimings[
-                   16,     160,    256,    KdSyncPositive, /* 46.875 */
-                   1,      21,     25,     KdSyncPositive, /* 75.000 */
-     },
--    /* DEFAULT */
--#define MONITOR_TIMING_DEFAULT        9
-     { 800,    600,    72,     50000,                      /* VESA */
-                   56,     64,     240,    KdSyncPositive, /* 48.077 */
-                   37,     23,     66,     KdSyncPositive, /* 72.188 */
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/kmode-palm.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/kmode-palm.patch
deleted file mode 100644 (file)
index 255e707..0000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/kmode-palm.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- kmode.c    2006-05-03 19:48:42.000000000 +0200
-+++ xserver/hw/kdrive/src/kmode.c      2006-05-03 19:50:43.000000000 +0200
-@@ -32,6 +32,31 @@
-     /*        H       V       Hz      KHz */
-               /*  FP      BP      BLANK   POLARITY */
- 
-+      /* Treo 650 */
-+
-+    {   320,  320,    64,     16256,
-+                  17,     12,     32,     KdSyncNegative,
-+                  1,      11,     14,     KdSyncNegative,
-+    },
-+    
-+    {   320,  320,    64,         0,
-+                  0,      0,      0,     KdSyncNegative,
-+                  0,      0,      0,     KdSyncNegative,
-+    },
-+      
-+      /* LifeDrive/T3/TX modes */
-+
-+    {   320,  480,    64,     16256,
-+                  17,     12,     32,     KdSyncNegative,
-+                  1,      11,     14,     KdSyncNegative,
-+    },
-+    
-+    {   480,  320,    64,         0,
-+                  0,      0,      0,     KdSyncNegative,
-+                  0,      0,      0,     KdSyncNegative,
-+    },
-+
-+
-     /* IPAQ modeline:
-      *
-      * Modeline "320x240"      5.7222 320 337 340 352   240 241 244 254"
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/kmode.patch b/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/kmode.patch
deleted file mode 100644 (file)
index 5ad3e4e..0000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-1.4.99.901/kmode.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- /tmp/kmode.c       2005-06-27 14:46:19.716843288 +0200
-+++ xserver/hw/kdrive/src/kmode.c      2005-06-27 14:46:30.070269328 +0200
-@@ -41,6 +41,11 @@
-                   1,      11,     14,     KdSyncNegative,
-     },
-     
-+    {   240,  320,    64,         0,
-+                  0,      0,      0,     KdSyncNegative,
-+                  0,      0,      0,     KdSyncNegative,
-+    },
-+
-     /* Other VESA modes */
-     { 640,    350,    85,     31500,                      /* VESA */
-                   32,     96,     192,    KdSyncPositive, /* 26.413 */
-@@ -80,6 +85,13 @@
-                  16,      48,     160,    KdSyncNegative, /* 31.469 */
-                  10,      33,     45,     KdSyncNegative, /* 59.940 */
-     },
-+
-+
-+  {   480,    640,    60,     0,                      /* VESA */
-+               0,      0,     0,    KdSyncNegative, /* 31.469 */
-+               0,      0,     0,     KdSyncNegative, /* 59.940 */
-+   },
-+  
-     
-     /* 800x600 modes */
-     { 800,    600,    85,     56250,                      /* VESA */
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index b2acdd57c874f3310777f6957208217293c606a8..6b494d3e4571923aed658b5fa394273e742c758d 100644 (file)
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -7,7 +7,7 @@ PR = "r18"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        file://extra-kmodes.patch;patch=1 \
-       file://fbdev_use_current.patch;patch=1 \
+       file://fbdev_use_current.patch;patch=1;status=merged \
        file://disable-apm.patch;patch=1 \
        file://no-serial-probing.patch;patch=1 \
        file://kdrive-evdev.patch;patch=1  \
@@ -15,8 +15,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        file://enable-builtin-fonts.patch;patch=1 \
        file://disable-xf86-dga-xorgcfg.patch;patch=1 \
        file://optional-xkb.patch;patch=1 \
-       file://enable-epson.patch;patch=1 \
-       file://enable-tslib.patch;patch=1 \
+       file://enable-epson.patch;patch=1;status=merged \
+       file://enable-tslib.patch;patch=1;status=merged \
        file://enable-xcalibrate.patch;patch=1 \
        file://hide-cursor-and-ppm-root.patch;patch=1 \
        file://xcalibrate_coords.patch;patch=1 \
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
index 611c94c50a3468aaa6a05c3647aa205398877c1b..755b7c97f7fdba484986483eb238651ecfb61cca 100644 (file)
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
@@ -5,32 +5,30 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
 DEFAULT_PREFERENCE = "-99" 
 
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
-       file://kmode.patch;patch=1 \
+       file://extra-kmodes.patch;patch=1 \
        file://disable-apm.patch;patch=1 \
        file://no-serial-probing.patch;patch=1 \
        file://fbdev-not-fix.patch;patch=1  \
        file://optional-xkb.patch;patch=1 \
-       file://enable-tslib.patch;patch=1;merged \
-       file://kmode-palm.patch;patch=1 \
-       file://enable-epson.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
+       file://enable-tslib.patch;patch=1;status=merged \
+       file://enable-epson.patch;patch=1;status=merged \
 #      file://hide-cursor-and-ppm-root.patch;patch=1 \
 #      file://xcalibrate_coords.patch;patch=1 \
        file://w100.patch;patch=1 \
        file://w100-autofoo.patch;patch=1 \
        file://w100-fix-offscreen-bmp.patch;patch=1 \
        file://w100-new-input-world-order.patch;patch=1 \
-       file://linux-keyboard-mediumraw.patch;patch=1 \
+       file://linux-keyboard-mediumraw.patch;patch=1;status=merged \
        file://xcalibrate-new-input-world-order.patch;patch=1 \
-       file://tslib-default-device.patch;patch=1;merged \
+       file://tslib-default-device.patch;patch=1;status=merged \
 #      file://fbdev-evdev.patch;patch=1 \
        file://keyboard-resume-workaround.patch;patch=1 \
-       file://xorg-avr32-support.diff;patch=1;merged \
+       file://xorg-avr32-support.diff;patch=1;status=merged \
 #      file://pkgconfig_fix.patch;patch=1 \
-       file://no_xkb.patch;patch=1;pnum=0;merged \
+       file://no_xkb.patch;patch=1;pnum=0;status=merged \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"
Mirror of the official openembedded-core repository