4 files changed, 73 insertions, 3 deletions
diff --git a/packages/libopie/libopie2/odevice.h-jornada-fixup.patch b/packages/libopie/libopie2/odevice.h-jornada-fixup.patch
new file mode 100644
index 0000000000..d2e26a0b36
--- /dev/null
+++ b/packages/libopie/libopie2/odevice.h-jornada-fixup.patch
@@ -0,0 +1,12 @@
+--- libopie2/opiecore/device/odevice.h	2006-08-06 12:44:20.000000000 +0000
++++ libopie2/opiecore/device/odevice.h_orig	2006-08-06 12:42:46.000000000 +0000
+@@ -73,8 +73,7 @@
+     Model_iPAQ_HX4700   = ( Model_iPAQ | 0x000A ),
+     Model_Jornada       = ( 6 << 16 ),
+     Model_Jornada_56x   = ( Model_Jornada | 0x0001 ),
+-    Model_Jornada_6xx   = ( Model_Jornada | 0x0002 ),
+-    Model_Jornada_7xx   = ( Model_Jornada | 0x0003 ),
++    Model_Jornada_720   = ( Model_Jornada | 0x0002 ),
+ 
+     Model_Zaurus        = ( 2 << 16 ),
+ 
diff --git a/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch b/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch
new file mode 100644
index 0000000000..f3eff64b85
--- /dev/null
+++ b/packages/libopie/libopie2/odevice_jornada.cpp-fixup.patch
@@ -0,0 +1,56 @@
+--- libopie2/opiecore/device/odevice_jornada.cpp_orig	2006-08-06 12:36:55.000000000 +0000
++++ libopie2/opiecore/device/odevice_jornada.cpp	2006-08-06 12:53:45.000000000 +0000
+@@ -125,9 +125,12 @@
+     if ( model == "HP Jornada 56x" ) {
+         d->m_modelstr = "Jornada 56x";
+         d->m_model = Model_Jornada_56x;
+-    } else if ( model == "HP Jornada 720" ) {
+-        d->m_modelstr = "Jornada 720";
+-	d->m_model = Model_Jornada_720;
++    } else if ( model == "HP Jornada 7xx" ) {
++        d->m_modelstr = "Jornada 7xx";
++	d->m_model = Model_Jornada_7xx;
++    } else if ( model == "HP Jornada 6xx" ) {
++        d->m_modelstr = "Jornada 6xx";
++	d->m_model = Model_Jornada_6xx;
+     }
+ 
+     d->m_rotation = Rot0; //all Jornadas need this rotation
+@@ -162,7 +165,9 @@
+ {
+     if ( d->m_model == Model_Jornada_56x )
+         return 190;
+-    else if (d->m_model == Model_Jornada_720 )
++    else if (d->m_model == Model_Jornada_7xx )
++        return 255;
++    else if (d->m_model == Model_Jornada_6xx )
+         return 255;
+     else
+     	return 0;
+@@ -185,9 +190,10 @@
+     	    cmdline = QString::fromLatin1( "echo 4 > /sys/class/backlight/sa1100fb/power");
+         else
+     	    cmdline = QString::fromLatin1( "echo 0 > /sys/class/backlight/sa1100fb/power; echo %1 > /sys/class/backlight/sa1100fb/brightness" ).arg( bright );
+-    } else if ( d->m_model == Model_Jornada_720 ) {
++    } else if ( d->m_model == Model_Jornada_7xx ) {
+         cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/e1356fb/brightness" ).arg( bright );
+-    }
++    } else if ( d->m_model == Model_Jornada_6xx ) {
++        cmdline = QString::fromLatin1( "echo %1 > /sys/class/backlight/hp680-bl/brightness" ).arg( bright );
+ 
+     // No Global::shellQuote as we gurantee it to be sane
+     res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
+@@ -204,9 +210,11 @@
+ 
+     if ( d->m_model == Model_Jornada_56x ) {
+         cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/sa1100fb/power; echo %2 > /sys/class/backlight/sa1100fb/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" );
+-    } else if ( d->m_model == Model_Jornada_720 ) {
++    } else if ( d->m_model == Model_Jornada_7xx ) {
+         cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/e1356fb/power").arg( on ? "0" : "4" );
+-    }
++    } else if ( d->m_model == Model_Jornada_6xx ) {
++        cmdline = QString::fromLatin1( "echo %1 > /sys/class/lcd/hp680-bl/power").arg( on ? "0" : "4" );
++    }    
+ 
+     res = ( ::system( QFile::encodeName(cmdline) ) == 0 );
+ 
diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb
index 3f21426e46..220edc215b 100644
--- a/packages/libopie/libopie2_1.2.2.bb
+++ b/packages/libopie/libopie2_1.2.2.bb
@@ -1,7 +1,9 @@
-include ${PN}.inc
+require ${PN}.inc
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
-           file://include.pro"
+           file://include.pro \
+	   file://odevice.h-jornada-fixup.patch;patch=0 \
+	   file://odevice_jornada.cpp-fixup.patch;patch=0"
 	   
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index a7c7e1003c..da84cc40eb 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,4 +1,4 @@
-include ${PN}.inc
+require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"