From 4ffaae726ae789ad54e7d30923792d44dcc21f66 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Wed, 10 Aug 2005 20:20:14 +0000 Subject: Add Borzoi to xtscal cxk patch Combine gpe-dm Xserver patches for Spitz and Akita and add Borzoi --- packages/gpe-dm/files/Xserver-akita.patch | 11 ----------- packages/gpe-dm/files/Xserver-cxk.patch | 11 +++++++++++ packages/gpe-dm/files/Xserver-spitz.patch | 11 ----------- packages/gpe-dm/gpe-dm_0.47.bb | 5 ++--- packages/xtscal/xtscal/xtscal-cxk.patch | 2 +- 5 files changed, 14 insertions(+), 26 deletions(-) delete mode 100644 packages/gpe-dm/files/Xserver-akita.patch create mode 100644 packages/gpe-dm/files/Xserver-cxk.patch delete mode 100644 packages/gpe-dm/files/Xserver-spitz.patch (limited to 'packages') diff --git a/packages/gpe-dm/files/Xserver-akita.patch b/packages/gpe-dm/files/Xserver-akita.patch deleted file mode 100644 index 3439841969..0000000000 --- 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-cxk.patch b/packages/gpe-dm/files/Xserver-cxk.patch new file mode 100644 index 0000000000..89187a0e31 --- /dev/null +++ b/packages/gpe-dm/files/Xserver-cxk.patch @@ -0,0 +1,11 @@ +--- gpe-dm-0.47/Xserver~ 2005-07-29 11:58:59.000000000 -0700 ++++ gpe-dm-0.47/Xserver 2005-08-01 11:20:42.000000000 -0700 +@@ -62,6 +62,8 @@ + ;; + "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") + ARGS="$ARGS -rgba rgb" ;; ++ "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi") ++ ARGS="$ARGS -rgba rgb -screen 640x480@270" ;; + "Simpad") + ARGS="$ARGS -rgba rgb" ;; + "Generic OMAP1510/1610/1710") diff --git a/packages/gpe-dm/files/Xserver-spitz.patch b/packages/gpe-dm/files/Xserver-spitz.patch deleted file mode 100644 index f30b705d13..0000000000 --- a/packages/gpe-dm/files/Xserver-spitz.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpe-dm-0.47/Xserver~ 2005-07-29 11:58:59.000000000 -0700 -+++ gpe-dm-0.47/Xserver 2005-08-01 11:20:42.000000000 -0700 -@@ -62,6 +62,8 @@ - ;; - "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - ARGS="$ARGS -rgba rgb" ;; -+ "SHARP Spitz") -+ ARGS="$ARGS -rgba rgb -screen 640x480@270" ;; - "Simpad") - ARGS="$ARGS -rgba rgb" ;; - "Generic OMAP1510/1610/1710") diff --git a/packages/gpe-dm/gpe-dm_0.47.bb b/packages/gpe-dm/gpe-dm_0.47.bb index ba20745e0d..b98a235ac5 100644 --- 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 " 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 fd4febc209..1cab8efb57 100644 --- 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 -- cgit v1.2.3