[oe-commits] org.oe.dev merge of '24425de40f0bf34d6e4ec14e718e9691d9943c60'
florian commit
openembedded-commits at lists.openembedded.org
Fri Sep 14 19:51:54 UTC 2007
merge of '24425de40f0bf34d6e4ec14e718e9691d9943c60'
and '5fab22ef48f5f0191de6ab5177c8b8c65dd3b3cb'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 4cad04d38a26051257eb5a6d9947b4cbc5625e77
ViewMTN: http://monotone.openembedded.org/revision/info/4cad04d38a26051257eb5a6d9947b4cbc5625e77
Files:
1
packages/gpephone/gpe-applauncher
packages/gpephone/gpe-applauncher/fic-gta01
packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf
packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf
packages/gpephone/gpe-applauncher/hotkeys.conf
packages/gpephone/gpe-applauncher/softkeys.conf
packages/gpephone/gpe-applauncher_0.11.bb
packages/gpephone/gpe-applauncher_svn.bb
packages/gpephone/gpe-applauncher_0.10.bb
packages/gpephone/gpe-session-scripts-phone/phonesession
packages/gpephone/gpe-session-scripts-phone_0.67.bb
packages/tasks/task-sdk-extra.bb
packages/free42
packages/free42/files
packages/gsm/files/fic-gta01
packages/termcap
conf/machine/include/tune-geodelx.conf
packages/free42/files/free42-bcd-gtk-only.patch
packages/free42/files/free42-dont-declare-sincos.patch
packages/free42/files/free42-vga-skin.patch
packages/free42/files/free42dec.desktop
packages/free42/free42-vga_1.4.36.bb
packages/gsm/files/fic-gta01/gsmd
packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch
packages/linux/linux-ezx-2.6.21/patches/e6-mci.patch
packages/linux/linux-ezx-2.6.21/patches/e6-pcap.patch
packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch
packages/termcap/termcap_11.0.1.bb
packages/ttf-fonts/ttf-liberation_0.2.bb
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
conf/machine/alix.conf
packages/efl1/ecore.inc
packages/efl1/edje_cvs.bb
packages/exmap-console/exmap-console.inc
packages/gnome/gconf-dbus_svn.bb
packages/gsm/libgsmd_svn.bb
packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
packages/linux/linux-2.6.21/gumstix-verdex/defconfig
packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch
packages/linux/linux-ezx-2.6.21/rokre6/defconfig
packages/linux/linux-ezx_2.6.21.bb
packages/linux/linux-omap.inc
packages/linux/linux_2.6.21.bb
packages/openmoko2/openmoko-terminal2_svn.bb
packages/tasks/task-openmoko-feed.bb
packages/vte/vte_0.16.8.bb
Diffs:
#
# mt diff -r24425de40f0bf34d6e4ec14e718e9691d9943c60 -r4cad04d38a26051257eb5a6d9947b4cbc5625e77
#
#
#
# add_dir "packages/gpephone/gpe-applauncher"
#
# add_dir "packages/gpephone/gpe-applauncher/fic-gta01"
#
# add_file "packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf"
# content [217d1f1642f1bf620c6743ba01c1a6505d7d1d54]
#
# add_file "packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf"
# content [84522e43d3872a2bd2d6f0e6ab13692ac3dc5683]
#
# add_file "packages/gpephone/gpe-applauncher/hotkeys.conf"
# content [a0fe3ced21592299c7ff0c261f7fac24d377484a]
#
# add_file "packages/gpephone/gpe-applauncher/softkeys.conf"
# content [7a8e59d986bd2fa67ac058d3af3947d704f0eded]
#
# add_file "packages/gpephone/gpe-applauncher_0.11.bb"
# content [4cd8ca9197d759daf399a1817a800a2ca56b18de]
#
# add_file "packages/gpephone/gpe-applauncher_svn.bb"
# content [3776f2b66b25e0d25b0d2f0c7e35bbfe9dd5d36a]
#
# patch "packages/gpephone/gpe-applauncher_0.10.bb"
# from [fc172f9eabde581dd56130838da9ef7c15723ca3]
# to [0e87c045f63b3f7d6257a7f35b67b32550263c73]
#
# patch "packages/gpephone/gpe-session-scripts-phone/phonesession"
# from [fef840f9cf5db3a22ea5bfac5e0d27b6516b52f2]
# to [64cdd2bae43bf05a507bec4930e2fd64095d273e]
#
# patch "packages/gpephone/gpe-session-scripts-phone_0.67.bb"
# from [78d311fb6d468089b270987a262475a63969ba75]
# to [c0fb30d8f7a34358f19b89a40b169e9c37801963]
#
# patch "packages/tasks/task-sdk-extra.bb"
# from [8c20a97867e4791729e96505460675d101a5fa72]
# to [3ee583dac2ad876fca74c548987f47f28fc34ae2]
#
============================================================
--- packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf 217d1f1642f1bf620c6743ba01c1a6505d7d1d54
+++ packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf 217d1f1642f1bf620c6743ba01c1a6505d7d1d54
@@ -0,0 +1,20 @@
+# We have two types of sections in here:
+# 'System' defines the bindings for buit-in functions
+# Each 'Application' section defines a binding of an application (desktop file)
+# to a key.
+
+[System]
+homescreen_show=k
+homescreen_toggle=F5
+system_controls=Execute
+
+[Application0]
+key=F7
+application=abook
+hold=false
+
+[Application1]
+key=F8
+application=gpe-taskmanager
+hold=false
+
============================================================
--- packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf 84522e43d3872a2bd2d6f0e6ab13692ac3dc5683
+++ packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf 84522e43d3872a2bd2d6f0e6ab13692ac3dc5683
@@ -0,0 +1,25 @@
+# This an example configuration file for GPE Application launcher softkeys.
+# All sizes and positions have pixels as units.
+# The align setting is a positive value from 0 (left) to 10 (right).
+
+[Key 1]
+label = left
+width = 180
+height = 36
+xpos = 5
+ypos = 5
+xpos_menu = 5
+ypos_menu = 30
+align = 1
+key = F3
+
+[Key 2]
+label = right
+width = 180
+height = 36
+xpos = 295
+ypos = 5
+xpos_menu = 5
+ypos_menu = 30
+align = 9
+key = F4
============================================================
--- packages/gpephone/gpe-applauncher/hotkeys.conf a0fe3ced21592299c7ff0c261f7fac24d377484a
+++ packages/gpephone/gpe-applauncher/hotkeys.conf a0fe3ced21592299c7ff0c261f7fac24d377484a
@@ -0,0 +1,20 @@
+# We have two types of sections in here:
+# 'System' defines the bindings for buit-in functions
+# Each 'Application' section defines a binding of an application (desktop file)
+# to a key.
+
+[System]
+homescreen_show=k
+homescreen_toggle=F5
+system_controls=F6
+
+[Application0]
+key=F7
+application=abook
+hold=false
+
+[Application1]
+key=F8
+application=gpe-taskmanager
+hold=false
+
============================================================
--- packages/gpephone/gpe-applauncher/softkeys.conf 7a8e59d986bd2fa67ac058d3af3947d704f0eded
+++ packages/gpephone/gpe-applauncher/softkeys.conf 7a8e59d986bd2fa67ac058d3af3947d704f0eded
@@ -0,0 +1,25 @@
+# This an example configuration file for GPE Application launcher softkeys.
+# All sizes and positions have pixels as units.
+# The align setting is a positive value from 0 (left) to 10 (right).
+
+[Key 1]
+label = left
+width = 100
+height = 22
+xpos = 0
+ypos = 1
+xpos_menu = 1
+ypos_menu = 1
+align = 1
+key = F3
+
+[Key 2]
+label = right
+width = 100
+height = 22
+xpos = 140
+ypos = 1
+xpos_menu = 1
+ypos_menu = 1
+align = 9
+key = F4
============================================================
--- packages/gpephone/gpe-applauncher_0.11.bb 4cd8ca9197d759daf399a1817a800a2ca56b18de
+++ packages/gpephone/gpe-applauncher_0.11.bb 4cd8ca9197d759daf399a1817a800a2ca56b18de
@@ -0,0 +1,29 @@
+LICENSE = "GPL"
+DESCRIPTION = "A cellphone application launcher."
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r1"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
+
+PACKAGES += "gpe-applauncher-config"
+PACKAGE_ARCH_gpe-applauncher-config_fic-gta01 = "${MACHINE_ARCH}"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client"
+RDEPENDS_${PN} += "gpe-applauncher-config"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+SRC_URI += "file://hotkeys.conf \
+ file://softkeys.conf"
+
+EXTRA_OECONF = "--disable-gridlayout"
+
+FILES_${PN} = '${datadir} ${bindir}'
+FILES_gpe-applauncher-config = '${sysconfdir}/gpe/'
+
+do_configure_append () {
+ install ${WORKDIR}/hotkeys.conf ${S}
+ install ${WORKDIR}/softkeys.conf ${S}
+}
============================================================
--- packages/gpephone/gpe-applauncher_svn.bb 3776f2b66b25e0d25b0d2f0c7e35bbfe9dd5d36a
+++ packages/gpephone/gpe-applauncher_svn.bb 3776f2b66b25e0d25b0d2f0c7e35bbfe9dd5d36a
@@ -0,0 +1,35 @@
+LICENSE = "GPL"
+DESCRIPTION = "A cellphone application launcher."
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r0"
+PV = "0.11+svn-${SRCREV}"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone autotools
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+
+PACKAGES += "gpe-applauncher-config"
+PACKAGE_ARCH_gpe-applauncher-config_fic-gta01 = "${MACHINE_ARCH}"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client"
+RDEPENDS_${PN} += "gpe-applauncher-config"
+
+
+SRC_URI += "file://hotkeys.conf \
+ file://softkeys.conf"
+
+EXTRA_OECONF = "--disable-gridlayout"
+
+FILES_${PN} = '${datadir} ${bindir}'
+FILES_gpe-applauncher-config = '${sysconfdir}/gpe/'
+
+do_configure_append () {
+ install ${WORKDIR}/hotkeys.conf ${S}
+ install ${WORKDIR}/softkeys.conf ${S}
+}
============================================================
--- packages/gpephone/gpe-applauncher_0.10.bb fc172f9eabde581dd56130838da9ef7c15723ca3
+++ packages/gpephone/gpe-applauncher_0.10.bb 0e87c045f63b3f7d6257a7f35b67b32550263c73
@@ -1,12 +1,25 @@ PRIORITY = "optional"
LICENSE = "GPL"
DESCRIPTION = "A cellphone application launcher."
SECTION = "gpe"
PRIORITY = "optional"
-PR = "r0"
+PR = "r1"
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
+
+PACKAGES += "gpe-applauncher-config"
+PACKAGE_ARCH_gpe-applauncher-config_fic-gta01 = "${MACHINE_ARCH}"
+
DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client"
+RDEPENDS_${PN} += "gpe-applauncher-config"
GPE_TARBALL_SUFFIX= "bz2"
inherit gpephone autotools
+SRC_URI += "file://hotkeys.conf"
+
+FILES_${PN} = '${datadir} ${bindir}'
+FILES_gpe-applauncher-config = '${sysconfdir}/gpe/'
+
+do_configure_append () {
+ install ${WORKDIR}/hotkeys.conf ${S}
+}
-FILES_${PN} += '${datadir}/themes'
============================================================
--- packages/gpephone/gpe-session-scripts-phone/phonesession fef840f9cf5db3a22ea5bfac5e0d27b6516b52f2
+++ packages/gpephone/gpe-session-scripts-phone/phonesession 64cdd2bae43bf05a507bec4930e2fd64095d273e
@@ -47,8 +47,6 @@ matchbox-window-manager -use_titlebar no
gpe-applauncher&
matchbox-window-manager -use_titlebar no&
-# start device support daemon
-machined
# Start E-Sound Server
esd -nobeeps -as 2&
@@ -65,5 +63,8 @@ echo $DBUS_SESSION_BUS_ADDRESS > /tmp/db
#save session bus address to a file
echo $DBUS_SESSION_BUS_ADDRESS > /tmp/dbusaddress
+# Start PhoneServer
+phoneserver&
+
+# start device support daemon
+exec machined -n
-# Start PhoneServer - do not stop, it keeps the session running
-exec phoneserver
============================================================
--- packages/gpephone/gpe-session-scripts-phone_0.67.bb 78d311fb6d468089b270987a262475a63969ba75
+++ packages/gpephone/gpe-session-scripts-phone_0.67.bb c0fb30d8f7a34358f19b89a40b169e9c37801963
@@ -14,7 +14,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scr
file://disable-composite.xsettings \
file://standard-apps.patch;patch=1"
-PR = "r8"
+PR = "r9"
S = "${WORKDIR}/gpe-session-scripts-${PV}"
============================================================
--- packages/tasks/task-sdk-extra.bb 8c20a97867e4791729e96505460675d101a5fa72
+++ packages/tasks/task-sdk-extra.bb 3ee583dac2ad876fca74c548987f47f28fc34ae2
@@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages"
DESCRIPTION = "SDK packages"
-PR = "r7"
+PR = "r8"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
@@ -18,6 +18,7 @@ RDEPENDS_task-sdk-x11 = "\
libmatchbox-dev \
matchbox-desktop-dev \
pango-dev \
+ renderproto-dev \
startup-notification-dev"
RDEPENDS_task-sdk-x11-ext = "\
@@ -28,10 +29,7 @@ RDEPENDS_task-sdk-x11-ext = "\
libxrender-dev \
libxsettings-client-dev \
randrext-dev \
- resourceext-dev \
- libx11-dev \
libxau-dev \
- libxcalibrate-dev \
xcalibrateext-dev \
libxcomposite-dev \
libxdamage-dev \
@@ -53,5 +51,6 @@ RDEPENDS_task-sdk-gpe = "\
libgpevtype-dev \
libgpelaunch-dev \
libgpewidget-dev \
- libhandoff-dev"
+ libhandoff-dev \
+ gconf-dbus-dev"
#
# mt diff -r5fab22ef48f5f0191de6ab5177c8b8c65dd3b3cb -r4cad04d38a26051257eb5a6d9947b4cbc5625e77
#
#
#
# add_dir "packages/free42"
#
# add_dir "packages/free42/files"
#
# add_dir "packages/gsm/files/fic-gta01"
#
# add_dir "packages/termcap"
#
# add_file "conf/machine/include/tune-geodelx.conf"
# content [cb790563e96dcb829b7dd845a47129b0bd6255fe]
#
# add_file "packages/free42/files/free42-bcd-gtk-only.patch"
# content [5e700cd97adced79c681f2aa6e9bd8e4f89ff895]
#
# add_file "packages/free42/files/free42-dont-declare-sincos.patch"
# content [5e18862aa104d378555e3795e0d218cabe753e80]
#
# add_file "packages/free42/files/free42-vga-skin.patch"
# content [303f7bc3ae4924f88ea2694a9a1156f4f783bc97]
#
# add_file "packages/free42/files/free42dec.desktop"
# content [e1163c16c574864f887fa6786337cf60c2da4fac]
#
# add_file "packages/free42/free42-vga_1.4.36.bb"
# content [affee0392f2e9a5336abf00c6e4fd71d74c796cc]
#
# add_file "packages/gsm/files/fic-gta01/gsmd"
# content [4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22]
#
# add_file "packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch"
# content [29ee8f5ee384b18b942b0ec97bbf2863060ff82a]
#
# add_file "packages/linux/linux-ezx-2.6.21/patches/e6-mci.patch"
# content [b8385b3213943fc06356d7e77b7ecaffe8e3dfac]
#
# add_file "packages/linux/linux-ezx-2.6.21/patches/e6-pcap.patch"
# content [715f781fee89350333c1781d78b37a273e08564c]
#
# add_file "packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch"
# content [94c28b6a622e7780a5b713495bdf60040bbf6a47]
#
# add_file "packages/termcap/termcap_11.0.1.bb"
# content [48cdc1c638e5a412fa3ee8a54c4e33907a4ccbb5]
#
# add_file "packages/ttf-fonts/ttf-liberation_0.2.bb"
# content [11e4e167ce279f56d1eb6d9c2631a825ea600023]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [72eda7924347374e0ab868c3b35454bafd3d93d0]
# to [5709f08bc2fb571ee70795901ea2c48568d7653a]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [d8a4aae44c305a13e168a2f3641648fe0671207d]
# to [db2cb7f7e9a06a07e1f8adf006d23e857b02634b]
#
# patch "conf/distro/openmoko.conf"
# from [c246d427631dbd56b159221956899cc2f40f3b06]
# to [0a270926afec0c57fe65b21d888d50f318f58085]
#
# patch "conf/machine/alix.conf"
# from [6ac777208694aa9b00784052d5baca787f429532]
# to [f8fdaa68a61adeffcb530a174e2e182280770dd5]
#
# patch "packages/efl1/ecore.inc"
# from [a118a5964c5363f81cd965a8487f715eb588a60b]
# to [cec350030eb895068d6de7c48653ae95634e61c2]
#
# patch "packages/efl1/edje_cvs.bb"
# from [490a1f7b46b3e56b0050f754761788f5a7a50e41]
# to [354d625fd1e123d1629c55a11d24421decfc22a5]
#
# patch "packages/exmap-console/exmap-console.inc"
# from [63d7774ca1ed640b50ead734368313117dad3a6c]
# to [e377d685a9615554dd91e58878e366d0c7d3d0a3]
#
# patch "packages/gnome/gconf-dbus_svn.bb"
# from [7e4571428d559265f6ede4b261cd8d23c16ad8b7]
# to [ac71d333e0e42e01c188b5c90a4374123f6b96b5]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [f40a2af6cf0a3f96d564ff62dd07830973d9154a]
# to [9aa39b60aa04ee474e8c277bf9337a9194ce32a7]
#
# patch "packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb"
# from [7108300d1b93ae19d191325a41b16ac125504bd7]
# to [6b749d9ef772b8e60588711e9d902b4292a7e84b]
#
# patch "packages/linux/linux-2.6.21/gumstix-verdex/defconfig"
# from [000a3c21d871acfac60d70faca4943121dc77e67]
# to [d30c1b6220264072c4381f7f1942780b702a3a01]
#
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch"
# from [7ae0fbd7af5f0ed2b8633335ff8bca92accc11a0]
# to [08a4e592d7b7f3c689b3e8366522a8364be174a7]
#
# patch "packages/linux/linux-ezx-2.6.21/rokre6/defconfig"
# from [4b0c0f319a6890f47528ab86421d62be1f3926c8]
# to [e76c158c332dcdd6e636e5b628f7f86daac14a22]
#
# patch "packages/linux/linux-ezx_2.6.21.bb"
# from [5d1ec4b9844eed9888871827926c283e7ba4f98c]
# to [6e4787b56b3ece5bf65f590bc86d49ad31617a39]
#
# patch "packages/linux/linux-omap.inc"
# from [2d2e1563073a9c9e272aca35faa2b007040acc6e]
# to [ddb0989b0eff634d3c86b2b86fc04e7c795ae8c1]
#
# patch "packages/linux/linux_2.6.21.bb"
# from [27643b882eb2ef188e62836637b435c23a0cb9b6]
# to [d17402966b36edab990d122a0bdf917175c16bff]
#
# patch "packages/openmoko2/openmoko-terminal2_svn.bb"
# from [c03ebde8699bb2c4733c6fcdcd9ed4318fd438f1]
# to [efe846ff78659e363249638207d820fc5161383b]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [44daf5badff88f9c9cd129df8d27998b67606cb4]
# to [732cc2b15ee798ca00f5bf1855e650be36e08741]
#
# patch "packages/vte/vte_0.16.8.bb"
# from [877f5cc30d4eaa0bb61c823b10a4536806cf11bf]
# to [4642ff116b6101c8293be250f4507ca114aa02b7]
#
============================================================
--- conf/machine/include/tune-geodelx.conf cb790563e96dcb829b7dd845a47129b0bd6255fe
+++ conf/machine/include/tune-geodelx.conf cb790563e96dcb829b7dd845a47129b0bd6255fe
@@ -0,0 +1,6 @@
+# Geode CPU has it's own target in GCC 4.3
+# in older versions k6-2 is closest
+#
+TARGET_CC_ARCH = "-march=k6-2"
+PACKAGE_ARCH = "geode"
+
============================================================
--- packages/free42/files/free42-bcd-gtk-only.patch 5e700cd97adced79c681f2aa6e9bd8e4f89ff895
+++ packages/free42/files/free42-bcd-gtk-only.patch 5e700cd97adced79c681f2aa6e9bd8e4f89ff895
@@ -0,0 +1,100 @@
+--- free42-orig/gtk/Makefile 2007-01-06 09:37:55.000000000 -0800
++++ free42gtk/gtk/Makefile 2007-09-02 23:54:34.000000000 -0700
+@@ -35,20 +35,14 @@
+ core_math2.o core_phloat.o core_sto_rcl.o core_tables.o \
+ core_variables.o
+
+-ifdef BCD_MATH
+ CXXFLAGS += -DBCD_MATH
+ SRCS += bcdfloat.cc bcd.cc bcdmath.cc
+ OBJS += bcdfloat.o bcd.o bcdmath.o
+ EXE = free42dec
+-else
+-EXE = free42bin
+-endif
+
+ $(EXE): $(OBJS)
+ $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
+
+-$(SRCS): symlinks
+-
+ .cc.o:
+ $(CXX) $(CXXFLAGS) -c -o $@ $<
+
+@@ -64,74 +58,18 @@
+ keymap.cc: keymap2cc keymap.txt
+ ./keymap2cc
+
+-symlinks:
+- ln -s ../common/free42.h
+- ln -s ../common/core_commands1.cc
+- ln -s ../common/core_commands1.h
+- ln -s ../common/core_commands2.cc
+- ln -s ../common/core_commands2.h
+- ln -s ../common/core_commands3.cc
+- ln -s ../common/core_commands3.h
+- ln -s ../common/core_commands4.cc
+- ln -s ../common/core_commands4.h
+- ln -s ../common/core_commands5.cc
+- ln -s ../common/core_commands5.h
+- ln -s ../common/core_commands6.cc
+- ln -s ../common/core_commands6.h
+- ln -s ../common/core_display.cc
+- ln -s ../common/core_display.h
+- ln -s ../common/core_globals.cc
+- ln -s ../common/core_globals.h
+- ln -s ../common/core_helpers.cc
+- ln -s ../common/core_helpers.h
+- ln -s ../common/core_keydown.cc
+- ln -s ../common/core_keydown.h
+- ln -s ../common/core_linalg1.cc
+- ln -s ../common/core_linalg1.h
+- ln -s ../common/core_linalg2.cc
+- ln -s ../common/core_linalg2.h
+- ln -s ../common/core_math1.cc
+- ln -s ../common/core_math1.h
+- ln -s ../common/core_math2.cc
+- ln -s ../common/core_math2.h
+- ln -s ../common/core_main.cc
+- ln -s ../common/core_main.h
+- ln -s ../common/core_phloat.cc
+- ln -s ../common/core_phloat.h
+- ln -s ../common/core_sto_rcl.cc
+- ln -s ../common/core_sto_rcl.h
+- ln -s ../common/core_tables.cc
+- ln -s ../common/core_tables.h
+- ln -s ../common/core_variables.cc
+- ln -s ../common/core_variables.h
+- ln -s ../common/shell.h
+- ln -s ../common/shell_loadimage.cc
+- ln -s ../common/shell_loadimage.h
+- ln -s ../common/shell_spool.cc
+- ln -s ../common/shell_spool.h
+- ln -s ../common/skin2cc.cc
+- ln -s ../common/skin2cc.conf
+- ln -s ../common/keymap2cc.cc
+- ln -s ../common/bcd.cc
+- ln -s ../common/bcd.h
+- ln -s ../common/bcdfloat.cc
+- ln -s ../common/bcdfloat.h
+- ln -s ../common/bcdmath.cc
+- ln -s ../common/bcdmath.h
+- touch symlinks
+-
+ clean: FORCE
+ rm -f `find . -type l` \
+ skin2cc skin2cc.exe skins.cc \
+ keymap2cc keymap2cc.exe keymap.cc \
+- *.o *.d *.i *.ii *.s symlinks core.*
++ *.o *.d *.i *.ii *.s core.*
+
+ cleaner: FORCE
+ rm -f `find . -type l` \
+ free42bin free42bin.exe free42dec free42dec.exe \
+ skin2cc skin2cc.exe skins.cc \
+ keymap2cc keymap2cc.exe keymap.cc \
+- *.o *.d *.i *.ii *.s symlinks core.*
++ *.o *.d *.i *.ii *.s core.*
+
+ FORCE:
+
============================================================
--- packages/free42/files/free42-dont-declare-sincos.patch 5e18862aa104d378555e3795e0d218cabe753e80
+++ packages/free42/files/free42-dont-declare-sincos.patch 5e18862aa104d378555e3795e0d218cabe753e80
@@ -0,0 +1,11 @@
+--- free42-orig/common/free42.h 2007-01-06 09:37:50.000000000 -0800
++++ free42gtk/common/free42.h 2007-09-03 22:39:14.000000000 -0700
+@@ -150,7 +150,7 @@
+ * provided by MathLib.
+ */
+ #ifndef PALMOS
+-extern "C" void sincos(double x, double *sinx, double *cosx) HELPERS_SECT;
++
+ #endif
+ //#define NO_SINCOS 1
+
============================================================
--- packages/free42/files/free42-vga-skin.patch 303f7bc3ae4924f88ea2694a9a1156f4f783bc97
+++ packages/free42/files/free42-vga-skin.patch 303f7bc3ae4924f88ea2694a9a1156f4f783bc97
@@ -0,0 +1,12 @@
+--- free42-orig/common/skin2cc.conf 2006-03-22 11:33:35.000000000 -0800
++++ free42gtk/common/skin2cc.conf 2007-09-02 23:52:27.000000000 -0700
+@@ -1,4 +1,4 @@
+-skins/Standard
+-Standard
+-skins/Ehrling42sl
+-Realistic
++skins/Ehrling42ssv
++Portrait
++skins/42ct
++Landscape
+
============================================================
--- packages/free42/files/free42dec.desktop e1163c16c574864f887fa6786337cf60c2da4fac
+++ packages/free42/files/free42dec.desktop e1163c16c574864f887fa6786337cf60c2da4fac
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Free42
+Comment=RPN Calculator
+Exec=free42dec
+Icon=free42.xpm
+StartupNotify=true
+SingleInstance=true
+Terminal=false
+Type=Application
+Categories=Application
============================================================
--- packages/free42/free42-vga_1.4.36.bb affee0392f2e9a5336abf00c6e4fd71d74c796cc
+++ packages/free42/free42-vga_1.4.36.bb affee0392f2e9a5336abf00c6e4fd71d74c796cc
@@ -0,0 +1,44 @@
+DESCRIPTION = "Free42 RPN Calculator"
+SECTION = "openmoko/applications"
+DEPENDS = "gtk+"
+PV = "1.4.36"
+PR = "r1"
+
+SRC_URI = "http://home.planet.nl/~demun000/thomas_projects/free42/free42.tgz \
+ http://sense.net/zc/free42/42c_skins.tgz \
+ file://free42-bcd-gtk-only.patch;patch=1 \
+ file://free42-vga-skin.patch;patch=1 \
+ file://free42-dont-declare-sincos.patch;patch=1 \
+ file://free42dec.desktop"
+
+S = "${WORKDIR}/free42"
+
+TARGET_CXXFLAGS_append = " -fsigned-char"
+TARGET_CXXFLAGS_append += "-DVERSION=\\"${PV}\\" -DBCD_MATH"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/gtk-2.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_LIBDIR}/gtk-2.0/include"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/cairo"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/glib-2.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/pango-1.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/atk-1.0"
+
+do_compile() {
+ cp -fv ${S}/common/* ${S}/gtk
+ cp -fv ${S}/ppcskins/Ehrling42ssv.* ${S}/skins/
+ cp ${WORKDIR}/42ct.* ${S}/skins/
+ cd ${S}/gtk/
+ ${BUILD_CXX} -o skin2cc skin2cc.cc ${BUILD_CXXFLAGS}
+ ${BUILD_CXX} -o keymap2cc keymap2cc.cc ${BUILD_CXXFLAGS}
+ oe_runmake
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/gtk/free42dec ${D}${bindir}/free42dec
+ install -d ${D}${datadir}/applications
+ install -m 0644 ${WORKDIR}/free42dec.desktop ${D}${datadir}/applications/
+ install -d ${D}${datadir}/pixmaps
+ install -m 0644 ${S}/gtk/icon.xpm ${D}${datadir}/pixmaps/free42.xpm
+}
+
+
============================================================
--- packages/gsm/files/fic-gta01/gsmd 4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22
+++ packages/gsm/files/fic-gta01/gsmd 4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22
@@ -0,0 +1,51 @@
+##!/bin/sh
+#
+# gsmd This shell script starts and stops gsmd.
+#
+# chkconfig: 345 90 40
+# description: Gsmd manages access to a serial- or USB-connected GSM
+# processname: gsmd
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/gsmd ] && . /etc/default/gsmd
+
+case "$1" in
+ start)
+ stty -F "$GSM_DEV" -crtscts
+ [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
+ [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
+ [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
+ [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
+
+ echo -n "Starting GSM daemon: "
+ start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
+
+ if [ $? = 0 ]; then
+ echo "gsmd."
+ else
+ echo "(failed.)"
+ fi
+ ;;
+ stop)
+ [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
+
+ echo -n "Stopping GSM daemon: "
+ start-stop-daemon -K -x /usr/sbin/gsmd
+ stty -F "$GSM_DEV" -crtscts
+ echo "gsmd."
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ exit
+ ;;
+ *)
+ echo "Usage: /etc/init.d/apmd {start|stop|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
+
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch 29ee8f5ee384b18b942b0ec97bbf2863060ff82a
+++ packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch 29ee8f5ee384b18b942b0ec97bbf2863060ff82a
@@ -0,0 +1,82 @@
+Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c
+===================================================================
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c 2007-09-07 22:15:52.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c 2007-09-09 13:29:56.000000000 -0300
+@@ -25,6 +25,7 @@
+ #include <asm/arch/mmc.h>
+
+ #include "generic.h"
++#include "ezx-eoc.h"
+
+ extern void ezx_lcd_power(int, struct fb_var_screeninfo *);
+ extern void ezx_backlight_power(int);
+@@ -227,11 +228,69 @@
+ .resource = pcap_ts_resources,
+ };
+
++
++/* EOC */
++static const unsigned int tab_init_eoc_reg[][2] =
++{
++ {POWER_IC_REG_EOC_INT_MASK, 0x00000FEF},
++ {POWER_IC_REG_EOC_POWER_CONTROL_0, 0x00000C00},
++ {POWER_IC_REG_EOC_POWER_CONTROL_1, 0x0000000C},
++ {POWER_IC_REG_EOC_CONN_CONTROL, 0x00021044},
++};
++
++static void dump_eoc_registers(void)
++{
++ int i, val = 0;
++
++ printk("========DUMP EOC=========\n");
++ for (i = 0; i < POWER_IC_REG_EOC_NUM; i++) {
++ eoc_reg_read(i, &val);
++ printk("eoc_registers[%d] = 0x%08X\n", i, val);
++ }
++ printk("========END DUMP=========\n");
++}
++
++/*
++ * FIXME: The same about the PCAP driver applies here.
++ * This is the initial state only.
++ * Which bits does the change to USB/UART/AUDIO mode?
++ * I think that this is causing the crash on pxa27x-udc
++ * you are setting the 'port connected' bit, and thats why
++ * you are getting interrupts early.
++ * --WM
++ */
++
++static int __init e6_eoc_init(void)
++{
++ int i;
++
++ for (i = 0; i < sizeof(tab_init_eoc_reg)/sizeof(unsigned int)/2; i++)
++ {
++ eoc_reg_write(tab_init_eoc_reg[i][0], tab_init_eoc_reg[i][1]);
++ }
++ dump_eoc_registers();
++ return 0;
++}
++
++static struct ezx_eoc_platform_data e6_eoc_platform_data = {
++ .init = e6_eoc_init,
++};
++
++struct platform_device e6_eoc_device = {
++ .name = "ezx-eoc",
++ .id = -1,
++ .dev = {
++ .platform_data = &e6_eoc_platform_data,
++ },
++};
++
+ static struct platform_device *devices[] __initdata = {
+ &e6_pcap_device,
+ &pcap_ts_device,
++ &e6_eoc_device,
+ };
+
++
+ static void __init e6_init(void)
+ {
+ set_pxa_fb_info(&e6_fb_info);
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/e6-mci.patch b8385b3213943fc06356d7e77b7ecaffe8e3dfac
+++ packages/linux/linux-ezx-2.6.21/patches/e6-mci.patch b8385b3213943fc06356d7e77b7ecaffe8e3dfac
@@ -0,0 +1,124 @@
+Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c
+===================================================================
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c 2007-09-07 11:51:55.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c 2007-09-07 11:54:52.000000000 -0300
+@@ -13,6 +13,8 @@
+ #include <linux/init.h>
+ #include <linux/platform_device.h>
+ #include <linux/fb.h>
++#include <linux/mmc/host.h>
++#include <linux/irq.h>
+
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+@@ -20,12 +22,102 @%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list