diff options
-rw-r--r-- | packages/efl1/ecore.inc | 29 | ||||
-rw-r--r-- | packages/efl1/ecore_0.9.9.038.bb | 2 | ||||
-rw-r--r-- | packages/gettext/gettext_0.14.1.bb | 2 | ||||
-rw-r--r-- | packages/opie-eye/opie-eye.inc | 4 | ||||
-rw-r--r-- | packages/opie-eye/opie-eye_cvs.bb | 1 | ||||
-rw-r--r-- | packages/qte/qte-2.3.10/kernel-keymap-tosa.patch | 81 | ||||
-rw-r--r-- | packages/qte/qte-2.3.12/kernel-keymap-tosa.patch | 81 | ||||
-rw-r--r-- | packages/qte/qte-common_2.3.10.inc | 2 | ||||
-rw-r--r-- | packages/qte/qte-common_2.3.12.inc | 2 | ||||
-rw-r--r-- | packages/qte/qte-mt_2.3.10.bb | 2 | ||||
-rw-r--r-- | packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch | 4 | ||||
-rw-r--r-- | packages/uicmoc/uicmoc-native_2.3.10.bb | 2 | ||||
-rw-r--r-- | packages/xqt2/xqt2_20060509.bb | 4 |
13 files changed, 26 insertions, 190 deletions
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index 7f67d2f281..fcf7292622 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -4,7 +4,7 @@ timeouts and idle handlers fast, optimized, and convenient." LICENSE = "MIT" DEPENDS = "curl dbus directfb eet evas tslib" # optional -# DEPENDS += "openssl iconv" +# DEPENDS += "openssl virtual/libiconv" inherit efl1 @@ -16,7 +16,6 @@ SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \ S = "${WORKDIR}/ecore-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" -EXTRA_OECONF = "<override me>" do_stage() { autotools_stage_all @@ -36,17 +35,17 @@ PACKAGES += "\ ${PN}-txt \ ${PN}-x \ " -FILES_${PN} = "${libdir}/libecore.so*" -FILES_${PN}-con = "${libdir}/libecore_con.so*" -FILES_${PN}-config = "${libdir}/libecore_config.so*" -FILES_${PN}-dbus = "${libdir}/libecore_dbus.so*" -FILES_${PN}-desktop = "${libdir}/libecore_desktop.so*" -FILES_${PN}-directfb = "${libdir}/libecore_directfb.so*" -FILES_${PN}-evas = "${libdir}/libecore_evas.so*" -FILES_${PN}-fb = "${libdir}/libecore_fb.so*" -FILES_${PN}-file = "${libdir}/libecore_file.so*" -FILES_${PN}-ipc = "${libdir}/libecore_ipc.so*" -FILES_${PN}-job = "${libdir}/libecore_job.so*" -FILES_${PN}-txt = "${libdir}/libecore_txt.so*" -FILES_${PN}-x = "${libdir}/libecore_x.so*" +FILES_${PN} = "${libdir}/libecore.so.*" +FILES_${PN}-con = "${libdir}/libecore_con.so.*" +FILES_${PN}-config = "${libdir}/libecore_config.so.*" +FILES_${PN}-dbus = "${libdir}/libecore_dbus.so.*" +FILES_${PN}-desktop = "${libdir}/libecore_desktop.so.*" +FILES_${PN}-directfb = "${libdir}/libecore_directfb.so.*" +FILES_${PN}-evas = "${libdir}/libecore_evas.so.*" +FILES_${PN}-fb = "${libdir}/libecore_fb.so.*" +FILES_${PN}-file = "${libdir}/libecore_file.so.*" +FILES_${PN}-ipc = "${libdir}/libecore_ipc.so.*" +FILES_${PN}-job = "${libdir}/libecore_job.so.*" +FILES_${PN}-txt = "${libdir}/libecore_txt.so.*" +FILES_${PN}-x = "${libdir}/libecore_x.so.*" diff --git a/packages/efl1/ecore_0.9.9.038.bb b/packages/efl1/ecore_0.9.9.038.bb index d61aeab3a1..57ab7ce9fb 100644 --- a/packages/efl1/ecore_0.9.9.038.bb +++ b/packages/efl1/ecore_0.9.9.038.bb @@ -1,5 +1,5 @@ require ecore.inc -PR = "r1" +PR = "r4" EXTRA_OECONF = "\ --enable-ecore-txt \ diff --git a/packages/gettext/gettext_0.14.1.bb b/packages/gettext/gettext_0.14.1.bb index 1cc272bf14..4e25c0e829 100644 --- a/packages/gettext/gettext_0.14.1.bb +++ b/packages/gettext/gettext_0.14.1.bb @@ -17,7 +17,7 @@ PARALLEL_MAKE = "" inherit autotools -EXTRA_OECONF += "--without-lisp" +EXTRA_OECONF += "--without-lisp --disable-csharp" acpaths = '-I ${S}/autoconf-lib-link/m4/ \ -I ${S}/gettext-runtime/m4 \ -I ${S}/gettext-tools/m4' diff --git a/packages/opie-eye/opie-eye.inc b/packages/opie-eye/opie-eye.inc index dc89d72ab4..925f9aa59c 100644 --- a/packages/opie-eye/opie-eye.inc +++ b/packages/opie-eye/opie-eye.inc @@ -19,8 +19,8 @@ do_compile_append() { } do_install() { - install -d ${D}${palmtopdir}/bin - install -m 0755 opie-eye_slave ${D}${palmtopdir}/bin/ + install -d ${D}${bindir} + install -m 0755 opie-eye_slave ${D}${bindir} install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ } diff --git a/packages/opie-eye/opie-eye_cvs.bb b/packages/opie-eye/opie-eye_cvs.bb index 6eee0c6d8e..ed73d8c7ee 100644 --- a/packages/opie-eye/opie-eye_cvs.bb +++ b/packages/opie-eye/opie-eye_cvs.bb @@ -1,6 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/opie-eye \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/qte/qte-2.3.10/kernel-keymap-tosa.patch b/packages/qte/qte-2.3.10/kernel-keymap-tosa.patch deleted file mode 100644 index ca445f4d1d..0000000000 --- a/packages/qte/qte-2.3.10/kernel-keymap-tosa.patch +++ /dev/null @@ -1,81 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp~kernel-keymap-tosa -+++ qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp -@@ -355,14 +355,24 @@ - { Qt::Key_CapsLock, 0xffff , 0xffff , 0xffff }, // 3c 60 - { Qt::Key_At, '@' , 's' , 'S'-64 }, // 3d - { Qt::Key_Question, '?' , '?' , 0xffff }, // 3e -+#ifdef QT_QWS_SL6000 -+ { Qt::Key_Comma, ',' , ';' , 0xffff }, // 3f -+ { Qt::Key_Period, '.' , ':' , 0xffff }, // 40 -+#else - { Qt::Key_Comma, ',' , ',' , 0xffff }, // 3f - { Qt::Key_Period, '.' , '.' , 0xffff }, // 40 -+#endif - { Qt::Key_Tab, 9 , '\\' , 0xffff }, // 41 - { Qt::Key_X, 0xffff , 'x' , 'X'-64 }, // 42 - { Qt::Key_C, 0xffff , 'c' , 'C'-64 }, // 43 - { Qt::Key_V, 0xffff , 'v' , 'V'-64 }, // 44 -+#ifdef QT_QWS_SL6000 -+ { Qt::Key_Slash, '/' , '?' , 0xffff }, // 45 -+ { Qt::Key_Apostrophe, '\'' , '"' , 0xffff }, // 46 70 -+#else - { Qt::Key_Slash, '/' , '/' , 0xffff }, // 45 - { Qt::Key_Apostrophe, '\'' , '\'' , 0xffff }, // 46 70 -+#endif - { Qt::Key_Semicolon, ';' , ';' , 0xffff }, // 47 - { Qt::Key_QuoteDbl, '\"' , '\"' , 0xffff }, // 48 - { Qt::Key_Colon, ':' , ':' , 0xffff }, // 49 -@@ -572,6 +582,32 @@ - static const int keyMSize = sizeof(keyM)/sizeof(QWSServer::KeyMap)-1; - static QIntDict<QWSServer::KeyMap> *overrideMap = 0; - -+#if defined(QT_QWS_SL6000) -+/* Translation table to obtain a 'legacy' keycode corresponding to -+ Fn+key on tosa -+ Other devices obviously send different keycodes while Fn is down, tosa sends -+ the same keys as usual bracketed by Fn-down/Fn-up. -+ This table is used while Fn is down to obtain the key-code the SL-5xxx would -+ send, so the rest of keyboard processing does not need to be adjusted. */ -+static const uchar sl6kFnTrans[] = { 0x00, -+ 0x5e, 0x3a, 0x43, 0x4a, 0x2b, 0x4b, 0x4c, 0x4d, 0x30, 0x4e, 0x4f, 0x50, -+ // !, -, cpy, #, 3, $, %, _, 8, &, *, (, -+ 0x53, 0x3b, 0x31, 0x32, 0x29, 0x2c, 0x3d, 0x2d, 0x2f, 0x44, 0x2a, 0x42, -+ // =, +, 9, 0, 1, 4, @, 5, 7, pste, 2, cut, -+ // padding for keycodes which don't ever get directly sent on tosa -+ // except for y->6, ret->'>', BS->DEL -+ 0x2e, 0x00, 0x00, 0x57, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // 6, _Z, shft, ret, F11, fn, BS?, F31, lght, cncl, lft, up, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // dn, rght, OK, home, 1, 2, 3, 4, 5, 6, 7, 8, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // 9, 0, UNK, UNK, UNK, UNK, UNK, UNK, UNK, -, +, caps, -+ // here are a few translatable codes again... -+ 0x00, 0x00, 0x54, 0x56, 0x3c, 0x00, 0x00, 0x00, 0x70, 0x55 }; -+ // @, ?, ,, ., tab, cut, cpy, pste, /, ' -+static const int sl6kFnSize = sizeof(sl6kFnTrans); -+#endif -+ - /*! - Changes the mapping of the keyboard; adding the scancode to Unicode - mappings from \a map. The server takes over ownership of \a map -@@ -882,6 +918,15 @@ - int keypad = 0; - - #ifndef QT_QWS_USE_KEYCODES -+#if defined(QT_QWS_SL6000) -+ qDebug("Key pressed: %x", code); -+ if (fn) -+ if (code < sl6kFnSize) { -+ code = sl6kFnTrans[code]; -+ qDebug("Translated Fn: %x", code); -+ } else -+ qDebug("Untranslatable Fn: %x", code); -+#endif - #if defined(QT_QWS_IPAQ) - // map ipaq 'action' key (0x60, 0xe0) - if ((code & 0x7f) == 0x60) { diff --git a/packages/qte/qte-2.3.12/kernel-keymap-tosa.patch b/packages/qte/qte-2.3.12/kernel-keymap-tosa.patch deleted file mode 100644 index ca445f4d1d..0000000000 --- a/packages/qte/qte-2.3.12/kernel-keymap-tosa.patch +++ /dev/null @@ -1,81 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp~kernel-keymap-tosa -+++ qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp -@@ -355,14 +355,24 @@ - { Qt::Key_CapsLock, 0xffff , 0xffff , 0xffff }, // 3c 60 - { Qt::Key_At, '@' , 's' , 'S'-64 }, // 3d - { Qt::Key_Question, '?' , '?' , 0xffff }, // 3e -+#ifdef QT_QWS_SL6000 -+ { Qt::Key_Comma, ',' , ';' , 0xffff }, // 3f -+ { Qt::Key_Period, '.' , ':' , 0xffff }, // 40 -+#else - { Qt::Key_Comma, ',' , ',' , 0xffff }, // 3f - { Qt::Key_Period, '.' , '.' , 0xffff }, // 40 -+#endif - { Qt::Key_Tab, 9 , '\\' , 0xffff }, // 41 - { Qt::Key_X, 0xffff , 'x' , 'X'-64 }, // 42 - { Qt::Key_C, 0xffff , 'c' , 'C'-64 }, // 43 - { Qt::Key_V, 0xffff , 'v' , 'V'-64 }, // 44 -+#ifdef QT_QWS_SL6000 -+ { Qt::Key_Slash, '/' , '?' , 0xffff }, // 45 -+ { Qt::Key_Apostrophe, '\'' , '"' , 0xffff }, // 46 70 -+#else - { Qt::Key_Slash, '/' , '/' , 0xffff }, // 45 - { Qt::Key_Apostrophe, '\'' , '\'' , 0xffff }, // 46 70 -+#endif - { Qt::Key_Semicolon, ';' , ';' , 0xffff }, // 47 - { Qt::Key_QuoteDbl, '\"' , '\"' , 0xffff }, // 48 - { Qt::Key_Colon, ':' , ':' , 0xffff }, // 49 -@@ -572,6 +582,32 @@ - static const int keyMSize = sizeof(keyM)/sizeof(QWSServer::KeyMap)-1; - static QIntDict<QWSServer::KeyMap> *overrideMap = 0; - -+#if defined(QT_QWS_SL6000) -+/* Translation table to obtain a 'legacy' keycode corresponding to -+ Fn+key on tosa -+ Other devices obviously send different keycodes while Fn is down, tosa sends -+ the same keys as usual bracketed by Fn-down/Fn-up. -+ This table is used while Fn is down to obtain the key-code the SL-5xxx would -+ send, so the rest of keyboard processing does not need to be adjusted. */ -+static const uchar sl6kFnTrans[] = { 0x00, -+ 0x5e, 0x3a, 0x43, 0x4a, 0x2b, 0x4b, 0x4c, 0x4d, 0x30, 0x4e, 0x4f, 0x50, -+ // !, -, cpy, #, 3, $, %, _, 8, &, *, (, -+ 0x53, 0x3b, 0x31, 0x32, 0x29, 0x2c, 0x3d, 0x2d, 0x2f, 0x44, 0x2a, 0x42, -+ // =, +, 9, 0, 1, 4, @, 5, 7, pste, 2, cut, -+ // padding for keycodes which don't ever get directly sent on tosa -+ // except for y->6, ret->'>', BS->DEL -+ 0x2e, 0x00, 0x00, 0x57, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // 6, _Z, shft, ret, F11, fn, BS?, F31, lght, cncl, lft, up, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // dn, rght, OK, home, 1, 2, 3, 4, 5, 6, 7, 8, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // 9, 0, UNK, UNK, UNK, UNK, UNK, UNK, UNK, -, +, caps, -+ // here are a few translatable codes again... -+ 0x00, 0x00, 0x54, 0x56, 0x3c, 0x00, 0x00, 0x00, 0x70, 0x55 }; -+ // @, ?, ,, ., tab, cut, cpy, pste, /, ' -+static const int sl6kFnSize = sizeof(sl6kFnTrans); -+#endif -+ - /*! - Changes the mapping of the keyboard; adding the scancode to Unicode - mappings from \a map. The server takes over ownership of \a map -@@ -882,6 +918,15 @@ - int keypad = 0; - - #ifndef QT_QWS_USE_KEYCODES -+#if defined(QT_QWS_SL6000) -+ qDebug("Key pressed: %x", code); -+ if (fn) -+ if (code < sl6kFnSize) { -+ code = sl6kFnTrans[code]; -+ qDebug("Translated Fn: %x", code); -+ } else -+ qDebug("Untranslatable Fn: %x", code); -+#endif - #if defined(QT_QWS_IPAQ) - // map ipaq 'action' key (0x60, 0xe0) - if ((code & 0x7f) == 0x60) { diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 79a77ba47a..8a262976ec 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -63,7 +63,6 @@ W100_ACCEL_PATCHES = "file://c7x0-w100-accel.patch;patch=1 \ SRC_URI_append_c7x0 = "${W100_ACCEL_PATCHES} " SRC_URI_append_spitz = "file://kernel-keymap-CXK.patch;patch=1 " SRC_URI_append_akita = "file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_tosa = "file://kernel-keymap-tosa.patch;patch=1 " # "ipaqs" used to have this, but later were proven to at least work # without it. Review again and see if has interesting bits to be applied @@ -115,6 +114,7 @@ EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada6xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada7xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_palmld = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_palmt650 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_palmtx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS" EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700" diff --git a/packages/qte/qte-common_2.3.12.inc b/packages/qte/qte-common_2.3.12.inc index cf812de460..4bb42a91c0 100644 --- a/packages/qte/qte-common_2.3.12.inc +++ b/packages/qte/qte-common_2.3.12.inc @@ -38,7 +38,7 @@ SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1;pnum=0 file:// SRC_URI_append_poodle = "file://kernel-keymap.patch;patch=1;pnum=0 " SRC_URI_append_a780 = "file://kernel-keymap.patch;patch=1;pnum=0 " SRC_URI_append_e680 = "file://kernel-keymap.patch;patch=1;pnum=0 " -SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 " +SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1;pnum=0 " SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index 428b9735d1..56872163d8 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r17" +PR = "r18" EXTRA_OECONF += "-thread" diff --git a/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch b/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch index bad2d95967..0d3187417a 100644 --- a/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch +++ b/packages/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch @@ -2,10 +2,10 @@ diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp index c2e7d9b..8d39585 100644 --- a/src/kernel/qpixmapcache.cpp +++ b/src/kernel/qpixmapcache.cpp -@@ -123,9 +123,13 @@ void cleanup_pixmap_cache(); +@@ -123,9 +123,12 @@ void cleanup_pixmap_cache(); #ifdef THROW_AWAY_UNUSED_PAGES # include <sys/mman.h> // madvise - # include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN +-# include <asm/page.h> // PAGE_SIZE,PAGE_MASK,PAGE_ALIGN +# include <unistd.h> // getpagesize() +# if (!defined(PAGE_ALIGN)) && defined(PAGE_SIZE) && defined(PAGE_MASK) +# define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb index cda233554c..4d6b16a3b3 100644 --- a/packages/uicmoc/uicmoc-native_2.3.10.bb +++ b/packages/uicmoc/uicmoc-native_2.3.10.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" PRIORITY = "optional" LICENSE = "GPL QPL" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://fix-makefile.patch;patch=1 \ diff --git a/packages/xqt2/xqt2_20060509.bb b/packages/xqt2/xqt2_20060509.bb index f1c839da86..12e210d036 100644 --- a/packages/xqt2/xqt2_20060509.bb +++ b/packages/xqt2/xqt2_20060509.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" SECTION = "opie/applications" APPTYPE = "binary" APPNAME = "Xqt" -PR = "r1" +PR = "r2" inherit palmtop @@ -102,8 +102,6 @@ do_install() { install -d ${D}${palmtopdir}/apps/Applications/ install -m 0644 ${WORKDIR}/xqt2/xfree86/files/Xqt.desktop ${D}${palmtopdir}/apps/Applications - install -d ${D}${palmtopdir}/bin/ - install -m 0755 ${D}${bindir}/Xqt ${D}${palmtopdir}/bin/Xqt install -d ${D}${palmtopdir}/pics install -m 0644 programs/Xserver/hw/xqt/Xqt.png ${D}${palmtopdir}/pics } |