[oe-commits] org.oe.dev merge of '011ea838b318e8da2d5c0f2a9d9a8a41c2096ceb'

[oe commit]

merge of '011ea838b318e8da2d5c0f2a9d9a8a41c2096ceb'
     and 'ed0aa1600b77c27c385bdb61f6e9728aa499015b'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 37cd5a414f2408369f6ae26d79cd5e331c29920b
ViewMTN: http://monotone.openembedded.org/revision/info/37cd5a414f2408369f6ae26d79cd5e331c29920b
Files:
1
conf/machine/include/tune-mips2.inc
conf/machine/rb500.conf
conf/machine/wl500g.conf
conf/machine/wrt54.conf
packages/libopie/libopie2/remove_h2200_rotate_fix.patch
packages/qte/qte-2.3.10/disable-dup-rotation.patch
Diffs:

#
# mt diff -r011ea838b318e8da2d5c0f2a9d9a8a41c2096ceb -r37cd5a414f2408369f6ae26d79cd5e331c29920b
#
#
#
# add_file "conf/machine/include/tune-mips2.inc"
#  content [057bacb0584328df3d50b30000597eb1d919767b]
# 
# patch "conf/machine/rb500.conf"
#  from [c5e4304761ab59c29e7a9549abec25df0455a552]
#    to [ec3468237873c1f6f3831eb19db443d2aba4a9e0]
# 
# patch "conf/machine/wl500g.conf"
#  from [d7067382eb29e1f5c251a2c48f5e4f7d36f6f0f9]
#    to [b7ee5dd752935d7f8924e84976cadbce6359227d]
# 
# patch "conf/machine/wrt54.conf"
#  from [5d9e6710b8fae51d475e91a5c2047e7be52b7649]
#    to [2fe22c13b02b4959e3cab0cc7ff5c98fb68bf489]
#
============================================================
--- conf/machine/include/tune-mips2.inc	057bacb0584328df3d50b30000597eb1d919767b
+++ conf/machine/include/tune-mips2.inc	057bacb0584328df3d50b30000597eb1d919767b
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-mips2"
============================================================
--- conf/machine/rb500.conf	c5e4304761ab59c29e7a9549abec25df0455a552
+++ conf/machine/rb500.conf	ec3468237873c1f6f3831eb19db443d2aba4a9e0
@@ -3,5 +3,6 @@ TARGET_ARCH = "mipsel"
 #@DESCRIPTION: Machine configuration for the MIPS based Routerboard
 
 TARGET_ARCH = "mipsel"
-TARGET_CC_ARCH = "-Os -mips2"
 PREFERRED_PROVIDER_virtual/kernel = "linux-rb500"
+
+include conf/machine/include/tune-mips2.inc
============================================================
--- conf/machine/wl500g.conf	d7067382eb29e1f5c251a2c48f5e4f7d36f6f0f9
+++ conf/machine/wl500g.conf	b7ee5dd752935d7f8924e84976cadbce6359227d
@@ -5,4 +5,4 @@ MACHINE_FEATURES = "kernel26 usbhost wif
 TARGET_ARCH = "mipsel"
 MACHINE_FEATURES = "kernel26 usbhost wifi ext2"
 
+include conf/machine/include/mips2.inc
-TARGET_CC_ARCH = "-Os -mips2"
============================================================
--- conf/machine/wrt54.conf	5d9e6710b8fae51d475e91a5c2047e7be52b7649
+++ conf/machine/wrt54.conf	2fe22c13b02b4959e3cab0cc7ff5c98fb68bf489
@@ -3,7 +3,6 @@ TARGET_ARCH = "mipsel"
 #@DESCRIPTION: Machine configuration for the MIPS based WRT54G(S) devices
 
 TARGET_ARCH = "mipsel"
-TARGET_CC_ARCH = "-Os"
 
 SERIAL_CONSOLE = "tts/0"
 


#
# mt diff -red0aa1600b77c27c385bdb61f6e9728aa499015b -r37cd5a414f2408369f6ae26d79cd5e331c29920b
#
#
#
# add_file "packages/libopie/libopie2/remove_h2200_rotate_fix.patch"
#  content [971d8c3bbb6ab648db8f29cf5425c85557416af6]
# 
# add_file "packages/qte/qte-2.3.10/disable-dup-rotation.patch"
#  content [f90a467431d9bde1ffae27ccf563cfdeed54691e]
#
============================================================
--- packages/libopie/libopie2/remove_h2200_rotate_fix.patch	971d8c3bbb6ab648db8f29cf5425c85557416af6
+++ packages/libopie/libopie2/remove_h2200_rotate_fix.patch	971d8c3bbb6ab648db8f29cf5425c85557416af6
@@ -0,0 +1,15 @@
+--- libopie2/opiecore/device/odevice_ipaq.cpp	25 Jul 2007 10:49:20 -0000	1.32
++++ libopie2/opiecore/device/odevice_ipaq.cpp	17 Mar 2007 22:08:43 -0000	1.30
+@@ -330,12 +330,6 @@
+                 case Rot180: quarters = 1/*270deg*/; break;
+                 case Rot270: quarters = 0/*270deg*/; break;
+             }
+-            if( d->m_model == Model_iPAQ_H22xx ) {
+-              // FIXME: there's something screwed with the keycodes being sent on h2200. I have
+-              // added a temporary workaround for this here, but the bug should be fixed properly
+-              // later in the right place. - Paul Eggleton 25/07/2007
+-              quarters = 0;
+-            }
+             newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4;
+             break;
+         }
============================================================
--- packages/qte/qte-2.3.10/disable-dup-rotation.patch	f90a467431d9bde1ffae27ccf563cfdeed54691e
+++ packages/qte/qte-2.3.10/disable-dup-rotation.patch	f90a467431d9bde1ffae27ccf563cfdeed54691e
@@ -0,0 +1,13 @@
+--- qte/src/kernel/kernelkeyboard.cpp	2008-04-04 11:07:42.000000000 +0100
++++ qte/src/kernel/kernelkeyboard.cpp	2008-04-04 11:07:45.000000000 +0100
+@@ -627,8 +627,8 @@
+     case Qt::Key_Down:
+         unicode = 0xffff;
+         mod_key = false;
+-        if (qt_screen->isTransformed())
+-            qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) );
++//        if (qt_screen->isTransformed())
++//            qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) );
+         break;
+     /*
+      * handle lock, we don't handle scroll lock!