From 56bd25c1cac0d0b433c3b2b5b4e075319b4aa324 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 23 May 2008 14:10:08 +0000 Subject: [PATCH] openmoko: merge with OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4552 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../openmoko2/libjana/clockpatch.patch | 31 +++++ .../packages/openmoko2/libjana_svn.bb | 9 +- .../packages/openmoko2/libmokogsmd2_svn.bb | 2 +- .../packages/openmoko2/libmokopanelui2_svn.bb | 10 ++ .../packages/openmoko2/libmokoui2_svn.bb | 1 + .../packages/openmoko2/moko-gtk-engine_svn.bb | 14 +++ .../packages/openmoko2/neod/htc.patch | 32 +++++ .../packages/openmoko2/neod/ipaq.patch | 32 +++++ meta-openmoko/packages/openmoko2/neod_svn.bb | 7 -- .../openmoko2/openmoko-alsa-scenarios.bb | 21 ++++ .../openmoko2/openmoko-appearance_svn.bb | 8 ++ .../openmoko-browser2/fingerscroll.diff | 13 ++ .../openmoko-browser2/webkit-update.patch | 99 +++++++++++++++ .../openmoko2/openmoko-browser2_svn.bb | 17 +++ .../openmoko2/openmoko-calculator2_svn.bb | 7 ++ .../openmoko2/openmoko-common2_svn.bb | 14 ++- .../openmoko2/openmoko-contacts2_svn.bb | 8 +- .../packages/openmoko2/openmoko-dates2_svn.bb | 4 +- .../om-gta01/kernel-2.6.24.patch | 13 ++ .../om-gta02/kernel-2.6.24.patch | 15 +++ .../openmoko-dialer2/openmoko-dialer.patch | 117 ++++++++++++++++++ .../openmoko2/openmoko-dialer2_svn.bb | 10 +- .../openmoko-icon-theme-standard2_svn.bb | 6 +- .../openmoko2/openmoko-mediaplayer2_svn.bb | 25 ++++ .../openmoko2/openmoko-messages2_svn.bb | 11 ++ .../openmoko2/openmoko-sample2_svn.bb | 24 ++++ .../packages/openmoko2/openmoko-session2.bb | 46 +++++-- .../openmoko-session2/etc/matchbox/session | 9 +- .../openmoko-session2/matchbox-session | 0 .../openmoko-sound-system2/pulseaudio | 50 ++++++++ .../openmoko2/openmoko-sound-system2/session | 28 +++++ .../openmoko2/openmoko-sound-system2_0.1.0.bb | 34 +++++ .../openmoko-sound-theme-standard2_svn.bb | 25 ++++ .../openmoko-tasks2/openmoko-tasks.desktop | 12 ++ .../openmoko-tasks2/openmoko-tasks.png | Bin 0 -> 14517 bytes .../packages/openmoko2/openmoko-tasks2_svn.bb | 17 ++- .../openmoko2/openmoko-terminal2_svn.bb | 8 ++ .../openmoko2/openmoko-theme-standard2_svn.bb | 12 +- .../openmoko2/openmoko-today2-folders_svn.bb | 5 +- .../packages/openmoko2/openmoko-today2_svn.bb | 4 +- .../openmoko2/openmoko-worldclock2_svn.bb | 6 + 41 files changed, 746 insertions(+), 60 deletions(-) create mode 100644 meta-openmoko/packages/openmoko2/libjana/clockpatch.patch create mode 100644 meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb create mode 100644 meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb create mode 100644 meta-openmoko/packages/openmoko2/neod/htc.patch create mode 100644 meta-openmoko/packages/openmoko2/neod/ipaq.patch delete mode 100644 meta-openmoko/packages/openmoko2/neod_svn.bb create mode 100644 meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb create mode 100644 meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb create mode 100644 meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff create mode 100644 meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch create mode 100644 meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb create mode 100644 meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb create mode 100644 meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch create mode 100644 meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch create mode 100644 meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch create mode 100644 meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb create mode 100644 meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb create mode 100644 meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb mode change 100644 => 100755 meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session create mode 100755 meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio create mode 100644 meta-openmoko/packages/openmoko2/openmoko-sound-system2/session create mode 100644 meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb create mode 100644 meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb create mode 100644 meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop create mode 100644 meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png create mode 100644 meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb create mode 100644 meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb diff --git a/meta-openmoko/packages/openmoko2/libjana/clockpatch.patch b/meta-openmoko/packages/openmoko2/libjana/clockpatch.patch new file mode 100644 index 00000000000..7b20222239c --- /dev/null +++ b/meta-openmoko/packages/openmoko2/libjana/clockpatch.patch @@ -0,0 +1,31 @@ +Index: jana/libjana-gtk/jana-gtk-clock.c +=================================================================== +--- jana.orig/libjana-gtk/jana-gtk-clock.c ++++ jana/libjana-gtk/jana-gtk-clock.c +@@ -695,7 +695,7 @@ draw_digital_clock (JanaGtkClock *clock, + cairo_fill (cr); + + /* Draw dark outline frame */ +- thickness = width/20; ++ thickness = width/40; + cairo_new_path (cr); + cairo_rectangle (cr, thickness/2, thickness/2, + width - thickness, height - thickness); +@@ -703,7 +703,7 @@ draw_digital_clock (JanaGtkClock *clock, + cairo_set_source_rgb (cr, base_color[0]/2, + base_color[1]/2, base_color[2]/2); + cairo_stroke (cr); +- ++#if 0 + /* Draw main outline frame */ + cairo_new_path (cr); + cairo_rectangle (cr, thickness, thickness, +@@ -728,7 +728,7 @@ draw_digital_clock (JanaGtkClock *clock, + base_color[1]/1.5, base_color[2]/1.5); + cairo_set_line_width (cr, thickness/2); + cairo_stroke (cr); +- ++#endif + cairo_identity_matrix (cr); + } + diff --git a/meta-openmoko/packages/openmoko2/libjana_svn.bb b/meta-openmoko/packages/openmoko2/libjana_svn.bb index 065f380969e..48779e50fed 100644 --- a/meta-openmoko/packages/openmoko2/libjana_svn.bb +++ b/meta-openmoko/packages/openmoko2/libjana_svn.bb @@ -1,13 +1,15 @@ DESCRIPTION = "O-Hand Jana Library" DEPENDS = "libmokojournal2 gtk+ eds-dbus gconf" PV = "0.1.0+svnr${SRCREV}" -PR = "r4" +PR = "r5" inherit autotools pkgconfig lib_package SRC_URI = "svn://svn.o-hand.com/repos/jana/;module=trunk;proto=http" S = "${WORKDIR}/trunk/" +EXTRA_OECONF = "--enable-examples " + do_configure_prepend() { touch gtk-doc.make } @@ -23,6 +25,7 @@ PACKAGES =+ "libjana-ecal libjana-ecal-dbg \ LEAD_SONAME = "libjana.so" FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*" -FILES_libjana-ecal-dbg = "${libdir}/.debug/libjana-ecal*" +FILES_libjana-ecal-dbg += "${libdir}/.debug/libjana-ecal*" FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf" -FILES_libjana-gtk-dbg = "${libdir}/.debug/libjana-gtk.so.*" +FILES_libjana-gtk-dbg += "${libdir}/.debug/libjana-gtk.so.*" +FILES_libjana-bin_append = " ${datadir}/jana/flag-uk.png " diff --git a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb index 8e547b36635..5625bf809d3 100644 --- a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb +++ b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb @@ -1,7 +1,7 @@ SECTION = "openmoko/libs" DEPENDS = "libgsmd glib-2.0" PV = "0.1.0+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit openmoko2 diff --git a/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb new file mode 100644 index 00000000000..08131118218 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb @@ -0,0 +1,10 @@ +SECTION = "openmoko/libs" +DEPENDS = "gtk+ matchbox-panel-2" +PV = "0.3.0+svnr${SRCREV}" +PR = "r0" + +inherit openmoko2 + +do_stage() { + autotools_stage_all +} diff --git a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb index 7d22f27a582..3785074a823 100644 --- a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb +++ b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb @@ -12,3 +12,4 @@ do_configure_prepend() { do_stage() { autotools_stage_all } + diff --git a/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb b/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb new file mode 100644 index 00000000000..027b3cb22be --- /dev/null +++ b/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Moko GTK+ theme engine" +SECTION = "openmoko/libs" +PV = "0.1.0+svnr${SRCREV}" +PR = "r0" + +inherit openmoko2 + +PACKAGES += "moko-gtk-theme" +FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so " +FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug" +FILES_moko-gtk-theme = "${datadir}/themes" +RDEPENDS_${PN} = "moko-gtk-theme" + diff --git a/meta-openmoko/packages/openmoko2/neod/htc.patch b/meta-openmoko/packages/openmoko2/neod/htc.patch new file mode 100644 index 00000000000..0ced894a456 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/neod/htc.patch @@ -0,0 +1,32 @@ +Index: neod/configure.ac +=================================================================== +--- neod.orig/configure.ac 2007-09-15 23:01:30.000000000 +0200 ++++ neod/configure.ac 2007-09-15 23:02:01.000000000 +0200 +@@ -32,6 +32,10 @@ + NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_MOTOROLA_EZX" + fi + ++if test x"$neod_platform" = x"htc"; then ++ NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC" ++fi ++ + CFLAGS=$NEOD_CFLAGS + + AC_OUTPUT([ +Index: neod/src/buttonactions.c +=================================================================== +--- neod.orig/src/buttonactions.c 2007-09-15 23:02:15.000000000 +0200 ++++ neod/src/buttonactions.c 2007-09-15 23:04:16.000000000 +0200 +@@ -63,6 +63,12 @@ + #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a + #endif + ++#ifdef NEOD_PLATFORM_HTC ++ #define AUX_BUTTON_KEYCODE 0xd4 /* camera */ ++ #define POWER_BUTTON_KEYCODE 0x74 /* power */ ++ #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a ++#endif ++ + #define HEADPHONE_INSERTION_SWITCHCODE 0x02 + + GPollFD input_fd[10]; diff --git a/meta-openmoko/packages/openmoko2/neod/ipaq.patch b/meta-openmoko/packages/openmoko2/neod/ipaq.patch new file mode 100644 index 00000000000..19b61ab1f50 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/neod/ipaq.patch @@ -0,0 +1,32 @@ +Index: neod/src/buttonactions.c +=================================================================== +--- neod.orig/src/buttonactions.c 2007-09-29 17:24:43.000000000 +0200 ++++ neod/src/buttonactions.c 2007-09-29 17:24:49.000000000 +0200 +@@ -69,6 +69,12 @@ + #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a + #endif + ++#ifdef NEOD_PLATFORM_IPAQ ++ #define AUX_BUTTON_KEYCODE 89 /* _KEY_RECORD */ ++ #define POWER_BUTTON_KEYCODE 0x74 /* KEY_POWER */ ++ #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a ++#endif ++ + #define HEADPHONE_INSERTION_SWITCHCODE 0x02 + + GPollFD input_fd[10]; +Index: neod/configure.ac +=================================================================== +--- neod.orig/configure.ac 2007-09-29 17:25:12.000000000 +0200 ++++ neod/configure.ac 2007-09-29 17:25:48.000000000 +0200 +@@ -36,6 +36,10 @@ + NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC" + fi + ++if test x"$neod_platform" = x"ipaq"; then ++ NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_IPAQ" ++fi ++ + CFLAGS=$NEOD_CFLAGS + + AC_OUTPUT([ diff --git a/meta-openmoko/packages/openmoko2/neod_svn.bb b/meta-openmoko/packages/openmoko2/neod_svn.bb deleted file mode 100644 index 4d6115ae93e..00000000000 --- a/meta-openmoko/packages/openmoko2/neod_svn.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management" -SECTION = "openmoko/daemons" -DEPENDS = "gconf gtk+ pulseaudio" -PV = "0.1.0+svn${SVNREV}" -PR = "r0" - -inherit openmoko2 gconf diff --git a/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb b/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb new file mode 100644 index 00000000000..08531e898e5 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Package for the different scenarios used by Openmoko" +SECTION = "openmoko/base" +PV = "1.0+svnr${SRCREV}" +PR = "r1" + +COMPATIBLE_MACHINE = "(om-gta01|om-gta02)" + +SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http" + +S = "${WORKDIR}/${MACHINE_ARCH}" + +do_install() { + install -d ${D}${datadir}/openmoko/scenarios/ + install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/ + install -d ${D}${sysconfdir}/ + install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state +} + +PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" + +FILES_${PN} += "${datadir}/openmoko" diff --git a/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb new file mode 100644 index 00000000000..a6f5c11171a --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "The Openmoko Appearance Editor" +SECTION = "openmoko/pim" +DEPENDS = "libmokoui2 gconf gtk+" +RDEPENDS = "libedata-cal openmoko-today2-folders" +PV = "0.1.0+svnr${SRCREV}" +PR = "r0" + +inherit openmoko2 gtk-icon-cache diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff b/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff new file mode 100644 index 00000000000..89f79496a0e --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff @@ -0,0 +1,13 @@ +Index: src/current-page.c +=================================================================== +--- openmoko-browser2/src/current-page.c (revision 3249) ++++ openmoko-browser2/src/current-page.c (working copy) +@@ -129,7 +129,7 @@ + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->currentClose, 8); + + +- data->currentFingerScroll = gtk_scrolled_window_new (NULL, NULL); //moko_finger_scroll_new (); ++ data->currentFingerScroll = moko_finger_scroll_new (); + gtk_box_pack_start (box, data->currentFingerScroll, TRUE, TRUE, 0); + } + diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch b/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch new file mode 100644 index 00000000000..18e8a88e251 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch @@ -0,0 +1,99 @@ +diff -Nurd openmoko-browser2.orig/configure.ac openmoko-browser2/configure.ac +--- openmoko-browser2.orig/configure.ac 2007-10-02 09:00:38.000000000 +0200 ++++ openmoko-browser2/configure.ac 2008-03-05 12:12:32.954623867 +0100 +@@ -40,7 +40,7 @@ + # base deps + PKG_CHECK_MODULES(OPENMOKO, libmokoui2 >= 0.1.0) + PKG_CHECK_MODULES(GTHREAD, gthread-2.0 ) +-PKG_CHECK_MODULES(WEBKITGTK, WebKitGtk) ++PKG_CHECK_MODULES(WEBKITGTK, webkit-1.0) + + # glib-genmarshal + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` +diff -Nurd openmoko-browser2.orig/src/browser-data.h openmoko-browser2/src/browser-data.h +--- openmoko-browser2.orig/src/browser-data.h 2007-12-12 20:31:07.000000000 +0100 ++++ openmoko-browser2/src/browser-data.h 2008-03-05 12:12:50.497959252 +0100 +@@ -27,7 +27,7 @@ + #ifndef OPENMOKO_BROWSER_DATA_H + #define OPENMOKO_BROWSER_DATA_H + +-#include "webkitwebview.h" ++#include + + #include + #include +diff -Nurd openmoko-browser2.orig/src/current-page.c openmoko-browser2/src/current-page.c +--- openmoko-browser2.orig/src/current-page.c 2007-12-12 20:31:07.000000000 +0100 ++++ openmoko-browser2/src/current-page.c 2008-03-05 12:13:56.032884030 +0100 +@@ -28,8 +28,8 @@ + #include "current-page.h" + + #include +-#include +-#include ++#include ++#include + + /* + * From a list of BrowserPage's in BrowserData::currentPage show +@@ -42,7 +42,7 @@ + static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data) + { + g_return_if_fail (data->currentPage); +- webkit_web_view_go_backward(data->currentPage->webKitPage); ++ webkit_web_view_go_back(data->currentPage->webKitPage); + } + + static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data) +@@ -66,7 +66,7 @@ + g_assert (page == data->currentPage->webKitPage); + + if (prog == 100) { +- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (page)); ++ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (page)); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (page)); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (page)) != NULL); + } +@@ -176,7 +176,7 @@ + * Update the GtkToolItems + */ + /* XXX ### FIXME TODO check if we should show stop/reload */ +- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (data->currentPage->webKitPage)); ++ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (data->currentPage->webKitPage)); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (data->currentPage->webKitPage)); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (data->currentPage->webKitPage)) != NULL); + gtk_widget_set_sensitive (GTK_WIDGET (data->currentClose), TRUE); +diff -Nurd openmoko-browser2.orig/src/main.c openmoko-browser2/src/main.c +--- openmoko-browser2.orig/src/main.c 2007-12-12 20:31:07.000000000 +0100 ++++ openmoko-browser2/src/main.c 2008-03-05 12:14:46.337942098 +0100 +@@ -33,7 +33,7 @@ + #include + #include + +-#include ++#include + + #include + #include +@@ -55,7 +55,6 @@ + gdk_threads_init (); + gdk_threads_enter (); + gtk_init (&argc, &argv); +- webkit_init (); + moko_stock_register (); + g_set_application_name (_("Browser")); + +diff -Nurd openmoko-browser2.orig/src/open-pages-page.c openmoko-browser2/src/open-pages-page.c +--- openmoko-browser2.orig/src/open-pages-page.c 2007-12-12 20:31:07.000000000 +0100 ++++ openmoko-browser2/src/open-pages-page.c 2008-03-05 12:13:37.671282983 +0100 +@@ -28,8 +28,8 @@ + #include "open-pages-page.h" + #include "current-page.h" + +-#include +-#include ++#include ++#include + #include + + #include diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb new file mode 100644 index 00000000000..c7f3066946e --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "The Openmoko Webbrowser" +SECTION = "openmoko/apps" +DEPENDS += "intltool libmokoui2 check webkit-gtk" +PV = "0.0.1+svnr${SRCREV}" +PR = "r2" + +inherit openmoko2 +LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib" + +SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171" + +#SRC_URI += "file://fingerscroll.diff;patch=1" + +do_compile_prepend() { + find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g +} + diff --git a/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb new file mode 100644 index 00000000000..ba202bcec9f --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "A Calculator for Openmoko" +SECTION = "openmoko/tools" +DEPENDS = "libmokoui2" +PV = "0.1.0+svnr${SRCREV}" +PR = "r0" + +inherit openmoko2 diff --git a/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb index f54a23de18b..0ea381437cb 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb @@ -1,21 +1,25 @@ -DESCRIPTION = "Common files for the OpenMoko distribution" +DESCRIPTION = "Common files for the Openmoko framework" SECTION = "openmoko/base" -PV = "0.0+svn${SRCDATE}" -PR = "r3" +PV = "0.1.0+svnr${SRCREV}" +PR = "r0" inherit openmoko2 SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http" S = "${WORKDIR}" +ALLOW_EMPTY = "1" + dirs = "pixmaps" do_install() { - find ${WORKDIR} -name ".svn" | xargs rm -rf + find . -name .svn | xargs rm -rf install -d ${D}${datadir} for i in ${dirs}; do - cp -fpPR ${S}/$i ${D}${datadir} + cp -fR $i ${D}${datadir}/$i; done + # moved to xserver-kdrive-common + rm -f ${D}${datadir}/pixmaps/xsplash* } PACKAGE_ARCH = "all" diff --git a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb index c63738a9124..4d7b1bcd7da 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb @@ -1,9 +1,9 @@ -DESCRIPTION = "The OpenMoko Address Book" +DESCRIPTION = "The Openmoko Address Book" SECTION = "openmoko/pim" -DEPENDS = "libmokoui2 libmokojournal2 dbus-glib" +DEPENDS = "libmokoui2 libmokojournal2 dbus-glib libjana" RDEPENDS = "libedata-book" -PV = "0.1.0+svn${SVNREV}" -PR = "r4" +PV = "0.1.0+svnr${SRCREV}" +PR = "r5" inherit openmoko2 diff --git a/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb index 1fa610020d1..ff3bfa62a62 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "The OpenMoko Calendar" +DESCRIPTION = "The Openmoko Calendar" SECTION = "openmoko/pim" DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana" RDEPENDS = "libedata-cal" @@ -15,3 +15,5 @@ EXTRA_OECONF = "--with-frontend=openmoko" do_configure_prepend() { touch gtk-doc.make } + + diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch new file mode 100644 index 00000000000..c6f34f41312 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch @@ -0,0 +1,13 @@ +Index: openmoko-dialer2/src/phone-kit/moko-notify.c +=================================================================== +--- openmoko-dialer2/src/phone-kit/moko-notify.c.orig 2008-02-14 17:47:23.000000000 +0800 ++++ openmoko-dialer2/src/phone-kit/moko-notify.c 2008-02-14 17:48:19.000000000 +0800 +@@ -38,7 +38,7 @@ + + #define DEFAULT_RINGTONE "/default_ringtone.ogg" + #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" +-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" ++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" + + struct _MokoNotifyPrivate + { diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch new file mode 100644 index 00000000000..72c516f5d60 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch @@ -0,0 +1,15 @@ +Index: openmoko-dialer2/src/phone-kit/moko-notify.c +=================================================================== +--- openmoko-dialer2/src/phone-kit/moko-notify.c (revision 4051) ++++ openmoko-dialer2/src/phone-kit/moko-notify.c (working copy) +@@ -37,8 +37,8 @@ + MOKO_TYPE_NOTIFY, MokoNotifyPrivate)) + + #define DEFAULT_RINGTONE "/default_ringtone.ogg" +-#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" +-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" ++#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl" ++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" + + struct _MokoNotifyPrivate + { diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch b/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch new file mode 100644 index 00000000000..5969726857a --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch @@ -0,0 +1,117 @@ +--- openmoko-dialer2/src/moko-dialer.c~ 2007-08-27 20:02:37.000000000 +0930 ++++ openmoko-dialer2/src/moko-dialer.c 2007-08-27 18:59:37.000000000 +0930 +@@ -69,8 +69,7 @@ + + /* Registration variables */ + guint reg_timeout; +- gboolean reg_request; +- gboolean registered; ++ MokoGsmdConnectionNetregType registered; + }; + + enum +@@ -292,8 +291,7 @@ + + moko_keypad_set_pin_mode (MOKO_KEYPAD (priv->keypad), FALSE); + +- priv->reg_request = TRUE; +- priv->registered = FALSE; ++ priv->registered = MOKO_GSMD_CONNECTION_NETREG_NONE; + priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT, + (GSourceFunc)register_network_cb, + dialer); +@@ -424,14 +422,14 @@ + g_return_if_fail (MOKO_IS_DIALER (dialer)); + priv = dialer->priv; + ++ g_warning ("on_network_registered: type is %d\n", type); ++ + switch (type) + { + case MOKO_GSMD_CONNECTION_NETREG_NONE: + case MOKO_GSMD_CONNECTION_NETREG_SEARCHING: + /* Do nothing */ + g_print ("NetReg: Searching for network\n"); +- g_source_remove (priv->reg_timeout); +- priv->registered = TRUE; + break; + case MOKO_GSMD_CONNECTION_NETREG_DENIED: + /* This may be a pin issue*/ +@@ -441,11 +439,12 @@ + g_print ("NetReg: Network registered\n"); + g_print("\tLocationAreaCode = %x\n\tCellID = %x\n", lac, cell); + g_source_remove (priv->reg_timeout); +- priv->registered = TRUE; + break; + default: + g_warning ("Unhandled register event type = %d\n", type); + }; ++ ++ priv->registered = type; + } + + static void +@@ -619,28 +618,32 @@ + g_return_val_if_fail (MOKO_DIALER (dialer), TRUE); + priv = MOKO_DIALER_GET_PRIVATE (dialer); + +- if (!priv->reg_request) ++ /* We check whether we've been registered yet, otherwise keep poking ++ * gsmd ++ */ ++ switch (priv->registered) + { +- /* We have yet to request registration, so lets do it */ +- /* FIXME: do the pin stuff */ +- g_print ("Requesting registration\n"); +- moko_gsmd_connection_network_register (priv->connection); +- } +- else +- { +- /* We check whether we've been registered yet, otherwise keep poking +- * gsmd +- */ +- if (priv->registered) +- { +- g_print ("Network Registered\n"); +- return FALSE; +- } +- else +- { ++ case MOKO_GSMD_CONNECTION_NETREG_NONE: ++ /* We have yet to request registration, so lets do it */ ++ /* FIXME: do the pin stuff */ + g_print ("Requesting registration\n"); + moko_gsmd_connection_network_register (priv->connection); +- } ++ priv->registered = MOKO_GSMD_CONNECTION_NETREG_SEARCHING; ++ break; ++ case MOKO_GSMD_CONNECTION_NETREG_SEARCHING: ++ g_print ("Waiting for registration\n"); ++ break; ++ case MOKO_GSMD_CONNECTION_NETREG_DENIED: ++ g_print ("Registration denied, retrying\n"); ++ moko_gsmd_connection_network_register (priv->connection); ++ priv->registered = MOKO_GSMD_CONNECTION_NETREG_SEARCHING; ++ break; ++ case MOKO_GSMD_CONNECTION_NETREG_HOME: ++ case MOKO_GSMD_CONNECTION_NETREG_ROAMING: ++ g_print ("Network Registered\n"); ++ return FALSE; ++ default: ++ g_warning ("Unhandled register event type = %d\n", priv->registered); + } + + return TRUE; +@@ -754,9 +757,8 @@ + + /* Handle network registration a few seconds after powering up the + * antenna*/ +- priv->reg_request = TRUE; +- priv->registered = FALSE; +- priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT, ++ priv->registered = MOKO_GSMD_CONNECTION_NETREG_NONE; ++ priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT * 2, + (GSourceFunc)register_network_cb, + dialer); + diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb index b01d9d3c05a..fa76c44a14c 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb @@ -1,11 +1,15 @@ -DESCRIPTION = "The OpenMoko Dialer" +DESCRIPTION = "The Openmoko Dialer" SECTION = "openmoko/pim" -DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio" +DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify" PV = "0.1.0+svnr${SRCREV}" -PR = "r5" +PR = "r8" +PE = "1" inherit openmoko2 +SRC_URI_append_om-gta01 = " file://kernel-2.6.24.patch;patch=1" +SRC_URI_append_om-gta02 = " file://kernel-2.6.24.patch;patch=1" + EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/" diff --git a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb index e443e360753..e145fb2d98a 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb @@ -1,7 +1,7 @@ -DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" +DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework" SECTION = "openmoko/base" -PV = "0.1.0+svn${SVNREV}" -PR = "r0" +PV = "0.1.0+svnr${SRCREV}" +PR = "r1" inherit openmoko2 diff --git a/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb new file mode 100644 index 00000000000..79a81633283 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "A media player for Openmoko" +SECTION = "openmoko/tools" +DEPENDS = "libmokoui2 expat gstreamer libspiff curl" +RDEPENDS = "gst-meta-audio gconf openmoko-sound-system2" +PV = "0.1.0+svnr${SRCREV}" +PR = "r4" + +inherit openmoko2 + +FILES_${PN} += "${datadir}/openmoko-mediaplayer" + +do_install_append() { + install -d ${D}${sysconfdir}/gconf/schemas + install -m 0644 ${S}/openmoko-mediaplayer.schemas ${D}${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas +} + +pkg_postinst_openmoko-mediaplayer2 () { +#!/bin/sh -e +if [ "x$D" != "x" ]; then + exit 1 +fi + +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule ${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null +} diff --git a/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb new file mode 100644 index 00000000000..f28f7f8e0ae --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "The Openmoko Message application" +SECTION = "openmoko/pim" +DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana" +PV = "0.1.0+svnr${SRCREV}" +PR = "r1" + +inherit openmoko2 + +EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" + +FILES_${PN} += "${datadir}/openmoko-messages/ ${datadir}/dbus-1/services/" diff --git a/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb new file mode 100644 index 00000000000..b944e79b450 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "The Openmoko Sample Project" +SECTION = "openmoko/applications" +DEPENDS = "libmokoui2 intltool gconf" +PV = "0.0.1+svnr${SRCREV}" +PR = "r0" + +inherit openmoko2 + +PACKAGES += "${PN}-src" +# path should match the toolchain path +FILES_${PN}-src = "/usr/local/openmoko" +PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk" + +do_configure_prepend() { + install -d ${WORKDIR}/source + cp -pPR ${S} ${WORKDIR}/source/ + find ${WORKDIR}/source -name ".svn"|xargs rm -rf +} + +do_install_append() { + install -d ${D}/usr/local/openmoko/source/ + cp -pPR ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/ +} + diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2.bb b/meta-openmoko/packages/openmoko2/openmoko-session2.bb index 046f59b3d9e..d0c3268e0ce 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-session2.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-session2.bb @@ -1,33 +1,53 @@ -DESCRIPTION = "Custom MB session files for OpenMoko" +DESCRIPTION = "Custom Matchbox session files for Openmoko" LICENSE = "GPL" SECTION = "x11" -RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" -RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" -RCONFLICTS = "openmoko-session" -PR = "r29" +RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2" +RCONFLICTS_${PN} = "openmoko-session matchbox-common" +PR = "r69" -SRC_URI = "file://etc" -S = ${WORKDIR} +SRC_URI = "\ + file://etc \ + file://matchbox-session \ +" + +S = "${WORKDIR}" + +inherit update-alternatives do_install() { - cp -R ${S}/etc ${D}/etc - rm -fR ${D}/etc/.svn - rm -fR ${D}/etc/matchbox/.svn - chmod -R 755 ${D}/etc + install -d ${D}${bindir} + install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir} + install -d ${D}${sysconfdir} + cp -R ${S}/etc/* ${D}${sysconfdir} + rm -fR ${D}${sysconfdir}/.svn + rm -fR ${D}${sysconfdir}/matchbox/.svn + chmod -R 755 ${D}${sysconfdir}/ } +PACKAGE_ARCH = "all" + pkg_postinst_openmoko-session2 () { #!/bin/sh -e if [ "x$D" != "x" ]; then exit 1 fi -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme openmoko-standard-2 +gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Moko gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5" +gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png +gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/digital_clock 1 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2 +# gstreamer audio settings +gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink +gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc } -PACKAGE_ARCH = "all" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_PATH = "${bindir}/matchbox-session" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "11" + +CONFFILES_${PN} = "${sysconfdir}/matchbox/session" diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session b/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session index 787d9c72ba1..732cce9d3f6 100755 --- a/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -1,11 +1,12 @@ #!/bin/sh - SHOWCURSOR="no" openmoko-today & -openmoko-dialer & +phone-kit & -matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & +matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme Moko -use_cursor $SHOWCURSOR $@ & -exec matchbox-panel --start-applets showdesktop --end-applets clock,battery,systray,startup --titlebar +matchbox-panel-2 --start-applets systray,startup \ + --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,openmoko-panel-wifi --titlebar & +exec neod diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session b/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session old mode 100644 new mode 100755 diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio new file mode 100755 index 00000000000..964947376e0 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio @@ -0,0 +1,50 @@ +#!/bin/sh +# +# pulseaudio This shell script starts and stops pulseaudio. +# +# chkconfig: 345 90 40 +# description: Pulseaudio manages the sound input/output +# processname: pulseaudio + +# Source function library. +#. /etc/rc.d/init.d/functions + +RETVAL=0 +prog="pulseaudio" + +start() { + echo -n "Starting audio server: " + # FIXME once alsa/shm permissions have been fixed, supply --system + start-stop-daemon -S -x /usr/bin/pulseaudio -- --no-cpu-limit --resample-method=trivial -D -nF /etc/pulse/session + + if [ $? = 0 ]; then + echo "$prog (warning ignores)." # FIXME remove comment on warning + else + echo "(failed.)" + fi +} + +stop() { + echo -n "Stopping audio server: " + start-stop-daemon -K -x /usr/bin/pulseaudio + echo "pulseaudio." +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $RETVAL diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session new file mode 100644 index 00000000000..7ba07e97846 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session @@ -0,0 +1,28 @@ +#!/usr/bin/pulseaudio -nF + +# Create autoload entries for the device drivers +add-autoload-sink output module-alsa-sink sink_name=output +add-autoload-source input module-alsa-source source_name=input + +# Load several protocols +load-module module-esound-protocol-unix +load-module module-simple-protocol-tcp +load-module module-native-protocol-unix +load-module module-cli-protocol-unix + +# Make some devices default +set-default-sink output +set-default-source input + +# Don't fail if the audio files referred to below don't exist +.nofail + +# Load an audio to the sample cache for usage with module-x11-bell +load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav +load-module module-x11-bell sample=x11-bell + +# Load samples +load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav +load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav +load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav + diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb new file mode 100644 index 00000000000..33cd5648d44 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Openmoko Sound System" +SECTION = "openmoko/base" +RDEPENDS = "\ + pulseaudio-server \ + pulseaudio-module-alsa-sink \ + pulseaudio-module-alsa-source \ + pulseaudio-module-cli \ + pulseaudio-module-esound-protocol-unix \ + pulseaudio-module-simple-protocol-tcp \ + pulseaudio-module-native-protocol-unix \ + pulseaudio-module-cli-protocol-unix \ + gst-plugin-pulse \ +" +RREPLACES = "openmoko-sound-system" +RPROVIDES = "openmoko-sound-system" +PR = "r5" + +inherit openmoko-base update-rc.d + +INITSCRIPT_NAME = "pulseaudio" +INITSCRIPT_PARAMS = "defaults 35" + +SRC_URI = "file://pulseaudio \ + file://session" +S = "${WORKDIR}" + +do_install() { + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/ + install -d ${D}/${sysconfdir}/pulse + install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session +} + +PACKAGE_ARCH = "all" diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb new file mode 100644 index 00000000000..3096da48137 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Standard sound theme for the Openmoko framework" +SECTION = "openmoko/base" +RREPLACES = "openmoko-sound-theme-standard" +RPROVIDES = "openmoko-sound-theme-standard" +PV = "0.1+svnr${SRCREV}" +PR = "r3" + +inherit openmoko2 autotools + +SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=sounds;proto=http" +S = "${WORKDIR}/sounds" + +do_install() { + find ${WORKDIR} -name ".svn" | xargs rm -rf + install -d ${D}${datadir}/openmoko/sounds + for i in *.mp3; do + cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/ + done + for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do + cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/ + done +} + +FILES_${PN} = "${datadir}" + diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop new file mode 100644 index 00000000000..f9e813a7346 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Tasks +Comment=What you need to do +Exec=tasks +Icon=openmoko-tasks +Terminal=false +Type=Application +Categories=GTK;Application;PIM;Office +MimeType=text/x-vcard; +SingleInstance=true +StartupNotify=true diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png new file mode 100644 index 0000000000000000000000000000000000000000..f28d1ade99101dfccde15114a74449e21275e835 GIT binary patch literal 14517 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 L<-}@43> ${D}${sysconfdir}/gtk-2.0/gtkrc } -CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc" - PACKAGE_ARCH = "all" -FILES_${PN} = "${datadir} ${sysconfdir}" +FILES_${PN} = "${datadir}" diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb index ecd28d1b688..4b9f245c3cc 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb @@ -1,7 +1,8 @@ -DESCRIPTION = "The OpenMoko Today2 vfolder files" +DESCRIPTION = "The Openmoko Today2 vfolder files" SECTION = "openmoko/misc" PV = "0.1.0+svnr${SRCREV}" -PR = "r1" +PR = "r3" +RCONFLICTS_${PN} = "matchbox-common" inherit openmoko2 diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb index 6b2d1b6ec77..efd281a95e7 100644 --- a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb +++ b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb @@ -1,6 +1,6 @@ -DESCRIPTION = "The OpenMoko Application Launcher" +DESCRIPTION = "The Openmoko Application Launcher" SECTION = "openmoko/pim" -DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib" +DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm" RDEPENDS = "libedata-cal openmoko-today2-folders" PV = "0.1.0+svnr${SRCREV}" PR = "r2" diff --git a/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb new file mode 100644 index 00000000000..5b3956ee236 --- /dev/null +++ b/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb @@ -0,0 +1,6 @@ +DESCRIPTION = "A World-Clock for Openmoko" +SECTION = "openmoko/tools" +DEPENDS = "libmokoui2 libjana" +PV = "0.1.0+svnr${SRCREV}" + +inherit openmoko2 -- 2.47.3