summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/images/openmoko-qtopia-x11-image.bb7
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia1
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb4
-rw-r--r--packages/tasks/task-openmoko-qtopia-x11.bb35
4 files changed, 45 insertions, 2 deletions
diff --git a/packages/images/openmoko-qtopia-x11-image.bb b/packages/images/openmoko-qtopia-x11-image.bb
new file mode 100644
index 0000000000..3291c53369
--- /dev/null
+++ b/packages/images/openmoko-qtopia-x11-image.bb
@@ -0,0 +1,7 @@
+#------------------------------------------------------
+# OpenMoko Qtopia/X11 Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+IMAGE_INSTALL += "task-openmoko-qtopia-x11"
diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia
index 3eca6bba91..0496deff86 100644
--- a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia
+++ b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia
@@ -3,6 +3,7 @@
# path setup
export QPEDIR=/opt/Qtopia
export PATH=$QPEDIR/bin:$PATH
+export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH
#tell how to inform illume on incoming phone calls
#export ILLUME_PHONE_CALL=
diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
index 21945c5011..e4be0e7246 100644
--- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
+++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
@@ -10,9 +10,9 @@ SECTION = "qtopia-phone"
LICENSE = "GPL"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
-DEPENDS = "glib-2.0 dbus tslib freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"
+DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"
PROVIDES = "qtopia-phone"
-PR = "r1"
+PR = "r2"
SRCREV = "${AUTOREV}"
SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
file://device-conf \
diff --git a/packages/tasks/task-openmoko-qtopia-x11.bb b/packages/tasks/task-openmoko-qtopia-x11.bb
new file mode 100644
index 0000000000..801e0e4ea5
--- /dev/null
+++ b/packages/tasks/task-openmoko-qtopia-x11.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+LICENSE = "MIT"
+PR = "r46"
+
+inherit task
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+PACKAGES = "task-openmoko-qtopia-x11"
+
+#
+# task-openmoko-qtopia-x11
+#
+DESCRIPTION_task-openmoko-qtopia-x11 = "OpenMoko: The Qtopia/X11 based User Interface"
+RDEPENDS_task-openmoko-qtopia-x11 = "\
+ alsa-state \
+ bluez-hcidump \
+ readline \
+ qtopia-phone-x11 \
+ e-wm \
+ illume \
+ ${XSERVER} \
+ xserver-kdrive-common \
+ xserver-nodm-init \
+ xauth \
+ xhost \
+ xset \
+ xrandr \
+ neod \
+ libnotify \
+"
+