From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 19 Apr 2007 17:10:09 +0000 (+0000)
Subject: xtscal: Update patch to fix some HTC Universal issues.
X-Git-Tag: Release-2010-05/1~8868^2~683^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55867fead4786bb7a609da96ac5fd4c67e2efdc1;p=openembedded.git

xtscal: Update patch to fix some HTC Universal issues.
---

diff --git a/packages/xtscal/xtscal/xtscal-cxk.patch b/packages/xtscal/xtscal/xtscal-cxk.patch
index 1cab8efb57..218e3c061e 100644
--- a/packages/xtscal/xtscal/xtscal-cxk.patch
+++ b/packages/xtscal/xtscal/xtscal-cxk.patch
@@ -1,11 +1,25 @@
---- xtscal-0.6.3/xtscal.in~	2004-09-10 12:10:36.000000000 -0700
-+++ xtscal-0.6.3/xtscal.in	2005-08-04 09:26:46.000000000 -0700
-@@ -8,7 +8,7 @@
+--- xtscal-0.6.3/xtscal.in~	
++++ xtscal-0.6.3/xtscal.in
+@@ -1,16 +1,15 @@
+ #!/bin/sh
+ 
+ module_id() {
+-    # Get model name
+-    echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z`
++        awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+ }
+ 
  case `module_id` in
- 	"HP IPAQ H3100" | "HP IPAQ H3800" )
- 		ARGS="-rotate 90" ;;
+-	"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 | *BORZOI)
- 		ARGS="-rotate 270" ;;
- 	# H2200: works without rotation
+-		ARGS="-rotate 270" ;;
+-	# H2200: works without rotation
++       "HP IPAQ H3100" | "HP IPAQ H3800" )
++               ARGS="-rotate 90" ;;
++       "HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | "HTC Universal" | *COLLIE | *POODLE | *SPITZ | *AKITA | *BORZOI)
++               ARGS="-rotate 270" ;;
++       # H2200: works without rotation
  esac
+ 
+ # the things we do for autoconf
diff --git a/packages/xtscal/xtscal_0.6.3.bb b/packages/xtscal/xtscal_0.6.3.bb
index 7a75cd0fd8..2c629dc162 100644
--- a/packages/xtscal/xtscal_0.6.3.bb
+++ b/packages/xtscal/xtscal_0.6.3.bb
@@ -1,5 +1,5 @@
 require xtscal.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://xtscal-cxk.patch;patch=1"