|
From: <mar...@us...> - 2007-02-19 22:05:38
|
Revision: 851
http://svn.sourceforge.net/hackndev/?rev=851&view=rev
Author: marex_z71
Date: 2007-02-19 14:05:22 -0800 (Mon, 19 Feb 2007)
Log Message:
-----------
OE: Updated libopie2 patches for OE
Modified Paths:
--------------
OE/com.hackndev/packages/libopie/libopie2/palm.patch
Added Paths:
-----------
OE/com.hackndev/packages/libopie/libopie2_1.2.2.bb
OE/com.hackndev/packages/libopie/libopie2_cvs.bb
Removed Paths:
-------------
OE/com.hackndev/packages/libopie/libopie2_1.2.1.bb
Modified: OE/com.hackndev/packages/libopie/libopie2/palm.patch
===================================================================
--- OE/com.hackndev/packages/libopie/libopie2/palm.patch 2007-02-18 17:49:55 UTC (rev 850)
+++ OE/com.hackndev/packages/libopie/libopie2/palm.patch 2007-02-19 22:05:22 UTC (rev 851)
@@ -1,55 +1,50 @@
diff -Naur libopie2-orig/opiecore/device/device.pro libopie2/opiecore/device/device.pro
---- libopie2-orig/opiecore/device/device.pro 2005-08-10 22:04:08.000000000 +0200
-+++ libopie2/opiecore/device/device.pro 2006-07-30 10:44:24.000000000 +0200
-@@ -9,7 +9,8 @@
- device/odevice_zaurus.h \
- device/odevice_genuineintel.h \
+--- libopie2-orig/opiecore/device/device.pro 2007-02-19 22:46:30.000000000 +0100
++++ libopie2/opiecore/device/device.pro 2007-02-19 22:46:54.000000000 +0100
+@@ -11,7 +11,8 @@
device/odevice_yopy.h \
-- device/odevice_mypal.h
-+ device/odevice_mypal.h \
-+ device/odevice_palm.h
+ device/odevice_mypal.h \
+ device/odevice_htc.h \
+- device/odevice_motorola_ezx.h
++ device/odevice_motorola_ezx.h \
++ device/odevice_palm.h
SOURCES += device/odevice.cpp \
device/odevicebutton.cpp \
-@@ -22,5 +23,6 @@
- device/odevice_zaurus.cpp \
- device/odevice_genuineintel.cpp \
+@@ -26,5 +27,6 @@
device/odevice_yopy.cpp \
-- device/odevice_mypal.cpp
-+ device/odevice_mypal.cpp \
-+ device/odevice_palm.cpp
+ device/odevice_mypal.cpp \
+ device/odevice_htc.cpp \
+- device/odevice_motorola_ezx.cpp
++ device/odevice_motorola_ezx.cpp \
++ device/odevice_palm.cpp
diff -Naur libopie2-orig/opiecore/device/odevice.cpp libopie2/opiecore/device/odevice.cpp
---- libopie2-orig/opiecore/device/odevice.cpp 2006-07-29 14:49:06.000000000 +0200
-+++ libopie2/opiecore/device/odevice.cpp 2006-07-30 10:46:48.000000000 +0200
-@@ -37,6 +37,7 @@
- #include "odevice_yopy.h"
- #include "odevice_zaurus.h"
+--- libopie2-orig/opiecore/device/odevice.cpp 2007-02-19 22:45:55.000000000 +0100
++++ libopie2/opiecore/device/odevice.cpp 2007-02-19 22:48:15.000000000 +0100
+@@ -39,6 +39,7 @@
#include "odevice_genuineintel.h"
+ #include "odevice_htc.h"
+ #include "odevice_motorola_ezx.h"
+#include "odevice_palm.h"
/* QT */
#include <qapplication.h>
-@@ -144,7 +145,8 @@
- else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada();
- else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses();
+@@ -148,6 +149,7 @@
else if ( line.contains( "Tradesquare.NL", false ) ) dev = new Internal::Beagle();
-- else qWarning( "ODevice() - unknown hardware - using default." );
-+ else if ( line.contains( "Palm", false ) ) dev = new Internal::Palm();
-+ else qWarning( "ODevice() - unknown hardware - using default." );
+ else if ( line.contains( "HTC", false ) ) dev = new Internal::HTC();
+ else if ( line.contains( "Motorola", false ) ) dev = new Internal::Motorola_EZX();
++ else if ( line.contains( "Palm", false ) ) dev = new Internal::Palm();
+
+ else qWarning( "ODevice() - unknown hardware - using default." );
break;
- } else if ( line.startsWith( "vendor_id" ) ) {
- qDebug( "ODevice() - found '%s'", (const char*) line );
diff -Naur libopie2-orig/opiecore/device/odevice.h libopie2/opiecore/device/odevice.h
---- libopie2-orig/opiecore/device/odevice.h 2006-07-29 14:49:06.000000000 +0200
-+++ libopie2/opiecore/device/odevice.h 2006-07-30 10:49:24.000000000 +0200
-@@ -120,7 +120,20 @@
- Model_MyPal_All = ( Model_MyPal | 0xffff ),
- Model_MyPal_620 = ( Model_MyPal | 0x0001 ),
- Model_MyPal_716 = ( Model_MyPal | 0x0002 ),
-- Model_MyPal_730 = ( Model_MyPal | 0x0003 )
-+ Model_MyPal_730 = ( Model_MyPal | 0x0003 ),
-+
+--- libopie2-orig/opiecore/device/odevice.h 2007-02-19 22:45:55.000000000 +0100
++++ libopie2/opiecore/device/odevice.h 2007-02-19 22:50:21.000000000 +0100
+@@ -138,6 +138,19 @@
+ Model_Motorola_All = ( Model_Motorola | 0xffff ),
+ Model_Motorola_EZX = ( Model_Motorola | 0x0001 ),
+
+ Model_Palm = ( 9 << 16),
+
+ Model_Palm_All = ( Model_Palm | 0xffff ),
@@ -62,23 +57,22 @@
+ Model_Palm_TX = ( Model_Palm | 0x0007 ),
+ Model_Palm_Z71 = ( Model_Palm | 0x0008 ),
+ Model_Palm_Z72 = ( Model_Palm | 0x0009 )
++
};
/**
-@@ -136,7 +149,8 @@
- Vendor_GMate,
- Vendor_MasterIA,
- Vendor_GenuineIntel,
-- Vendor_Asus
-+ Vendor_Asus,
-+ Vendor_Palm
+@@ -156,6 +169,7 @@
+ Vendor_Asus,
+ Vendor_HTC,
+ Vendor_Motorola,
++ Vendor_Palm,
};
/**
diff -Naur libopie2-orig/opiecore/device/odevice_palm.cpp libopie2/opiecore/device/odevice_palm.cpp
--- libopie2-orig/opiecore/device/odevice_palm.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ libopie2/opiecore/device/odevice_palm.cpp 2006-07-30 16:39:53.000000000 +0200
-@@ -0,0 +1,296 @@
++++ libopie2/opiecore/device/odevice_palm.cpp 2007-02-19 22:54:23.000000000 +0100
+@@ -0,0 +1,294 @@
+/*
+ This file is part of the Opie Project
+
@@ -375,7 +369,7 @@
+}
diff -Naur libopie2-orig/opiecore/device/odevice_palm.h libopie2/opiecore/device/odevice_palm.h
--- libopie2-orig/opiecore/device/odevice_palm.h 1970-01-01 01:00:00.000000000 +0100
-+++ libopie2/opiecore/device/odevice_palm.h 2006-07-30 14:50:05.000000000 +0200
++++ libopie2/opiecore/device/odevice_palm.h 2007-02-19 22:52:58.000000000 +0100
@@ -0,0 +1,72 @@
+/*
+\xA0 \xA0 \xA0 \xA0 \xA0 \xA0 \xA0 \xA0 This file is part of the Opie Project
Deleted: OE/com.hackndev/packages/libopie/libopie2_1.2.1.bb
===================================================================
--- OE/com.hackndev/packages/libopie/libopie2_1.2.1.bb 2007-02-18 17:49:55 UTC (rev 850)
+++ OE/com.hackndev/packages/libopie/libopie2_1.2.1.bb 2007-02-19 22:05:22 UTC (rev 851)
@@ -1,11 +0,0 @@
-include ${PN}.inc
-
-PR = "r5"
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
- file://openzaurus-branding.patch;patch=1 \
- file://prelim-h191x-hx4700-supp.patch;patch=1;pnum=2 \
- file://ipaq-2.6-sys-class-backlight-support.patch;patch=1 \
- file://h2200-keys.patch;patch=1 \
- file://palm.patch;patch=1 \
- file://include.pro"
Added: OE/com.hackndev/packages/libopie/libopie2_1.2.2.bb
===================================================================
--- OE/com.hackndev/packages/libopie/libopie2_1.2.2.bb (rev 0)
+++ OE/com.hackndev/packages/libopie/libopie2_1.2.2.bb 2007-02-19 22:05:22 UTC (rev 851)
@@ -0,0 +1,10 @@
+require ${PN}.inc
+PR = "r1"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
+ file://include.pro \
+ file://odevice.h-jornada-fixup.patch;patch=1 \
+ file://odevice_jornada.cpp-fixup.patch;patch=1" \
+ file://palm.patch;patch=1
+
+SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
Added: OE/com.hackndev/packages/libopie/libopie2_cvs.bb
===================================================================
--- OE/com.hackndev/packages/libopie/libopie2_cvs.bb (rev 0)
+++ OE/com.hackndev/packages/libopie/libopie2_cvs.bb 2007-02-19 22:05:22 UTC (rev 851)
@@ -0,0 +1,14 @@
+require ${PN}.inc
+
+PV = "1.2.2+cvs${SRCDATE}"
+PR = "r4"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
+ file://ipaq-2.6-sys-class-backlight-support.patch;patch=1 \
+ file://ipaq-lcd-rotate-cleanup.patch;patch=1 \
+ file://include.pro" \
+ file://palm.patch;patch=1
+
+SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|