Add Borzoi to xtscal cxk patch

Combine gpe-dm Xserver patches for Spitz and Akita and add Borzoi

diff --git a/packages/gpe-dm/files/Xserver-akita.patch b/packages/gpe-dm/files/Xserver-akita.patch
deleted file mode 100644 (file)
index 3439841..0000000
--- a/packages/gpe-dm/files/Xserver-akita.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpe-dm-0.47/Xserver.old    2005-08-05 20:42:27.246027809 +0200
-+++ gpe-dm-0.47/Xserver        2005-08-05 20:41:06.000000000 +0200
-@@ -62,7 +62,7 @@
-               ;;
-       "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
-               ARGS="$ARGS -rgba rgb" ;;
--      "SHARP Spitz")
-+      "SHARP Spitz" | "SHARP Akita")
-               ARGS="$ARGS -rgba rgb -screen 640x480@270" ;;
-       "Simpad")
-               ARGS="$ARGS -rgba rgb" ;;

diff --git a/packages/gpe-dm/files/Xserver-spitz.patch b/packages/gpe-dm/files/Xserver-cxk.patch
similarity index 87%
rename from packages/gpe-dm/files/Xserver-spitz.patch
rename to packages/gpe-dm/files/Xserver-cxk.patch
index f30b705..89187a0 100644 (file)
--- a/packages/gpe-dm/files/Xserver-spitz.patch
+++ b/packages/gpe-dm/files/Xserver-cxk.patch
@@ -4,7 +4,7 @@
                ;;
        "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
                ARGS="$ARGS -rgba rgb" ;;
-+      "SHARP Spitz")
++      "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
 +              ARGS="$ARGS -rgba rgb -screen 640x480@270" ;;
        "Simpad")
                ARGS="$ARGS -rgba rgb" ;;

diff --git a/packages/gpe-dm/gpe-dm_0.47.bb b/packages/gpe-dm/gpe-dm_0.47.bb
index ba20745..b98a235 100644 (file)
--- a/packages/gpe-dm/gpe-dm_0.47.bb
+++ b/packages/gpe-dm/gpe-dm_0.47.bb
@@ -6,11 +6,10 @@ SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0"
-PR = "r3"
+PR = "r4"
 
 INITSCRIPT_NAME = "gpe-dm"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
 
 SRC_URI += "file://collie-suspend-hack.patch;patch=1 \
-            file://Xserver-spitz.patch;patch=1 \
-           file://Xserver-akita.patch;patch=1"
+           file://Xserver-cxk.patch;patch=1"

diff --git a/packages/xtscal/xtscal/xtscal-cxk.patch b/packages/xtscal/xtscal/xtscal-cxk.patch
index fd4febc..1cab8ef 100644 (file)
--- a/packages/xtscal/xtscal/xtscal-cxk.patch
+++ b/packages/xtscal/xtscal/xtscal-cxk.patch
@@ -5,7 +5,7 @@
        "HP IPAQ H3100" | "HP IPAQ H3800" )
                ARGS="-rotate 90" ;;
 -      "HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE)
-+      "HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE | *SPITZ | *AKITA)
++      "HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE | *SPITZ | *AKITA | *BORZOI)
                ARGS="-rotate 270" ;;
        # H2200: works without rotation
  esac