diff options
Diffstat (limited to 'packages/openmoko2')
33 files changed, 524 insertions, 87 deletions
diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb index 007131659a..6e5383af83 100644 --- a/packages/openmoko2/libmokojournal2_svn.bb +++ b/packages/openmoko2/libmokojournal2_svn.bb @@ -1,10 +1,11 @@ SECTION = "openmoko/libs" DEPENDS = "eds-dbus" PV = "0.1.0+svn${SVNREV}" -PR = "r1" +PR = "r2" -inherit openmoko2 +inherit openmoko2 lib_package do_stage() { autotools_stage_all } + diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb index bfeb22fd7b..03159cc864 100644 --- a/packages/openmoko2/libmokopanelui2_svn.bb +++ b/packages/openmoko2/libmokopanelui2_svn.bb @@ -1,11 +1,10 @@ SECTION = "openmoko/libs" -DEPENDS = "gtk+" -PV = "0.1.0+svn${SVNREV}" -PR = "r1" +DEPENDS = "gtk+ matchbox-panel-2" +PV = "0.3.0+svn${SVNREV}" +PR = "r0" inherit openmoko2 do_stage() { autotools_stage_all } - diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb index 86372ae274..50c3928670 100644 --- a/packages/openmoko2/libmokoui2_svn.bb +++ b/packages/openmoko2/libmokoui2_svn.bb @@ -1,14 +1,15 @@ SECTION = "openmoko/libs" DEPENDS = "gtk+" PV = "0.1.0+svn${SVNREV}" -PR = "r1" +PR = "r2" inherit openmoko2 +do_configure_prepend() { + touch gtk-doc.make +} + do_stage() { autotools_stage_all } - - - diff --git a/packages/openmoko2/moko-gtk-engine_svn.bb b/packages/openmoko2/moko-gtk-engine_svn.bb new file mode 100644 index 0000000000..38bc691c8e --- /dev/null +++ b/packages/openmoko2/moko-gtk-engine_svn.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Moko GTK+ theme engine" +SECTION = "openmoko/libs" +PV = "0.1.0+svn${SVNREV}" +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/packages/openmoko2/openmoko-terminal2/.mtn2git_empty b/packages/openmoko2/neod/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/openmoko2/openmoko-terminal2/.mtn2git_empty +++ b/packages/openmoko2/neod/.mtn2git_empty diff --git a/packages/openmoko2/neod/htc.patch b/packages/openmoko2/neod/htc.patch new file mode 100644 index 0000000000..0ced894a45 --- /dev/null +++ b/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/packages/openmoko2/neod/ipaq.patch b/packages/openmoko2/neod/ipaq.patch new file mode 100644 index 0000000000..19b61ab1f5 --- /dev/null +++ b/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/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb index 4d6115ae93..6e6c3b6019 100644 --- a/packages/openmoko2/neod_svn.bb +++ b/packages/openmoko2/neod_svn.bb @@ -2,6 +2,22 @@ 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" +PR = "r1" inherit openmoko2 gconf + +SRC_URI += "file://htc.patch;patch=1 \ + file://ipaq.patch;patch=1" + +EXTRA_OECONF_fic-gta01 = "--with-platform=neo1973" +EXTRA_OECONF_fic-gta02 = "--with-platform=neo1973" +EXTRA_OECONF_a780 = "--with-platform=ezx" +EXTRA_OECONF_a1200 = "--with-platform=ezx" +EXTRA_OECONF_e680 = "--with-platform=ezx" +EXTRA_OECONF_rokre2 = "--with-platform=ezx" +EXTRA_OECONF_rokre6 = "--with-platform=ezx" +EXTRA_OECONF_magician = "--with-platform=htc" +EXTRA_OECONF_hx4700 = "--with-platform=ipaq" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + diff --git a/packages/openmoko2/openmoko-appmanager2_svn.bb b/packages/openmoko2/openmoko-appmanager2_svn.bb new file mode 100644 index 0000000000..8faf5fd1f9 --- /dev/null +++ b/packages/openmoko2/openmoko-appmanager2_svn.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "The OpenMoko Application Manager" +SECTION = "openmoko/applications" +DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm" +PV = "0.1.0+svn${SVNREV}" +PR = "r0" + +inherit openmoko2 diff --git a/packages/openmoko2/openmoko-browser2_svn.bb b/packages/openmoko2/openmoko-browser2_svn.bb new file mode 100644 index 0000000000..edfeca7702 --- /dev/null +++ b/packages/openmoko2/openmoko-browser2_svn.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "The OpenMoko Webbrowser" +SECTION = "openmoko/apps" +DEPENDS += "intltool libmokoui2 check webkit-gtk" +PV = "0.0.1+svn${SVNREV}" +PR = "r0" + +inherit openmoko2 diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb index f54a23de18..0cf7f763cb 100644 --- a/packages/openmoko2/openmoko-common2_svn.bb +++ b/packages/openmoko2/openmoko-common2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Common files for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r3" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb new file mode 100644 index 0000000000..14a71d423a --- /dev/null +++ b/packages/openmoko2/openmoko-dates2_svn.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "The OpenMoko Calendar" +SECTION = "openmoko/pim" +DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus" +RDEPENDS = "libedata-cal" +PV = "0.1.0+svn${SVNREV}" + +inherit openmoko2 + +SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http" +S = "${WORKDIR}/jana/" + +EXTRA_OECONF = "--with-frontend=openmoko" + +do_configure_prepend() { + touch gtk-doc.make +} + diff --git a/packages/openmoko2/openmoko-dialer2/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmoko2/openmoko-dialer2/.mtn2git_empty diff --git a/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch b/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch new file mode 100644 index 0000000000..5969726857 --- /dev/null +++ b/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/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index 672f5d8cb1..b7a728521b 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -1,9 +1,8 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/pim" -DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 gstreamer" -RDEPENDS = "gst-meta-audio" +DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio" PV = "0.1.0+svn${SVNREV}" -PR = "r2" +PR = "r5" inherit openmoko2 diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb index 3655f8977b..97d598b7cc 100644 --- a/packages/openmoko2/openmoko-feedreader2_svn.bb +++ b/packages/openmoko2/openmoko-feedreader2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Feed Reader" SECTION = "openmoko/apps" -DEPENDS += "libmrss check webkit-gtk" +DEPENDS += "libmokoui2 libmrss check webkit-gtk" PV = "0.0.1+svn${SVNREV}" PR = "r0" diff --git a/packages/openmoko2/openmoko-firststart2_svn.bb b/packages/openmoko2/openmoko-firststart2_svn.bb new file mode 100644 index 0000000000..5b24d17d5e --- /dev/null +++ b/packages/openmoko2/openmoko-firststart2_svn.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "The OpenMoko First Start Wizard" +SECTION = "openmoko/apps" +DEPENDS += "libmokoui2 libglade" +PV = "0.1.0+svn${SVNREV}" +PR = "r0" + +inherit openmoko2 + +FILES_${PN} += "${datadir}" diff --git a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb new file mode 100644 index 0000000000..723042da94 --- /dev/null +++ b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution, QVGA edition" +SECTION = "openmoko/base" +PV = "0.1.0+svn${SVNREV}" +PR = "r0" + +inherit openmoko2 + +SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http" +S = "${WORKDIR}/icons" + +pkg_postinst_${PN} () { + if [ "x$D" != "x" ]; then + exit 1 + fi + gtk-update-icon-cache -q /usr/share/icons/openmoko-standard +} + +do_configure_prepend () { + cd ${S} + # + # don't include 36x36 and 128x128 icons, 32x32 and 48x48 stock icons + # + sed -i -e "/\(36\|128\)/d" -e "/\(32\|48\)\/stock/d" configure.ac + cd openmoko-standard + sed -i -e "s/\(36x36\|128x128\) //g" Makefile.am + sed -i "/^SUBDIRS=/s/ stock//" {32x32,48x48}/Makefile.am + # + # rescale stock icons to 22x22 + # + for png in $(ls */stock/*.png | sed "s,.*/,," | sort | uniq); do + svg=scalable/stock/$(basename $png .png).svg + out=22x22/stock/$png + if [ -f $svg ]; then + # + # if there are vector graphics, rerender + # + rsvg -w 22 -h 22 $svg $out + else + # + # otherwise rescale biggest existing bitmap + # + png=$(echo */stock/$png | sed "s/.* //") + convert -scale 22x22 $png $out + fi + done + # + # register the rescaled icons with automake + # + cd 22x22/stock + sed -i "/^icons_DATA/s/=.*/= $(echo *.png)/" Makefile.am + cd ${S} +} + +PACKAGE_ARCH = "all" diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb new file mode 100644 index 0000000000..e353bcbaa7 --- /dev/null +++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "A media player for OpenMoko" +SECTION = "openmoko/tools" +DEPENDS = "libmokoui2 expat gstreamer libspiff" +RDEPENDS = "gst-meta-audio" +PV = "0.1.0+svn${SVNREV}" +PR = "r1" + +inherit openmoko2 + +FILES_${PN} += "${datadir}/openmoko-mediaplayer" diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 046f59b3d9..b1f9dae38d 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -1,19 +1,20 @@ -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" +PR = "r33" SRC_URI = "file://etc" S = ${WORKDIR} 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}${sysconfdir} + cp -R ${S}/etc/* ${D}${sysconfdir} + rm -fR ${D}${sysconfdir}/.svn + rm -fR ${D}${sysconfdir}/matchbox/.svn + chmod -R 755 ${D}${sysconfdir}/ } pkg_postinst_openmoko-session2 () { @@ -31,3 +32,6 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire } PACKAGE_ARCH = "all" + +CONFFILES_${PN} = "${sysconfdir}/matchbox/session" + diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index b2867047b1..558f55ee87 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -7,6 +7,6 @@ openmoko-dialer & matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & 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-clock --titlebar & + --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock,keyboard --titlebar & exec neod diff --git a/packages/openmoko2/openmoko-sound-system2/.mtn2git_empty b/packages/openmoko2/openmoko-sound-system2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmoko2/openmoko-sound-system2/.mtn2git_empty diff --git a/packages/openmoko2/openmoko-sound-system2/pulseaudio b/packages/openmoko2/openmoko-sound-system2/pulseaudio new file mode 100755 index 0000000000..76daacd3ae --- /dev/null +++ b/packages/openmoko2/openmoko-sound-system2/pulseaudio @@ -0,0 +1,46 @@ +#!/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 the audio server..." + # FIXME once alsa/shm permissions have been fixed, supply --system + pulseaudio --resample-method=trivial -D -nF /etc/pulse/session + echo $prog +} + +stop() { + # Stop daemons. + echo -n "Shutting down $prog: " + killall pulseaudio + echo "done" +} + +# 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/packages/openmoko2/openmoko-sound-system2/session b/packages/openmoko2/openmoko-sound-system2/session new file mode 100644 index 0000000000..dfef83d934 --- /dev/null +++ b/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 fragment_size=2048 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_openmoko.wav +load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav +load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav + diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb new file mode 100644 index 0000000000..35bfe66318 --- /dev/null +++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb @@ -0,0 +1,33 @@ +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 \ +" +RREPLACES = "openmoko-sound-system" +RPROVIDES = "openmoko-sound-system" +PR = "r1" + +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/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb new file mode 100644 index 0000000000..0693b9bb8a --- /dev/null +++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Standard sound theme for the OpenMoko distribution" +SECTION = "openmoko/base" +RREPLACES = "openmoko-sound-theme-standard" +RPROVIDES = "openmoko-sound-theme-standard" +PV = "0.1+svnr${SRCREV}" +PR = "r1" + +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_openmoko.wav; do + cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/ + done +} + +FILES_${PN} = "${datadir}" + diff --git a/packages/openmoko2/openmoko-tasks2_svn.bb b/packages/openmoko2/openmoko-tasks2_svn.bb new file mode 100644 index 0000000000..866a1896e0 --- /dev/null +++ b/packages/openmoko2/openmoko-tasks2_svn.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "The OpenMoko Agenda" +SECTION = "openmoko/pim" +DEPENDS = "dbus-glib eds-dbus libmokoui2" +RDEPENDS = "libedata-cal" +PV = "0.1.0+svn${SVNREV}" +PR = "r0" + +inherit openmoko2 + +SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http" +S = "${WORKDIR}/trunk" + +EXTRA_OECONF = "--enable-omoko --disable-gtk" diff --git a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop deleted file mode 100644 index 2777736039..0000000000 --- a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Terminal -Comment=Command Line Interface Terminal -Exec=mrxvt -Icon=openmoko-terminal -Terminal=false -Type=Application -Categories=GTK;Application;PIM;Office -MimeType=text/x-vcard; -SingleInstance=false -StartupNotify=true diff --git a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png Binary files differdeleted file mode 100644 index 56e8e59628..0000000000 --- a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png +++ /dev/null diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb deleted file mode 100644 index 84bd470f7a..0000000000 --- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "The OpenMoko Command Line Console" -SECTION = "openmoko/applications" -RDEPENDS += "mrxvt" -PR = "r2" - -RCONFLICTS = "openmoko-terminal" -RREPLACES = "openmoko-terminal" - -inherit openmoko2 - -SRC_URI = "file://openmoko-terminal.png \ - file://openmoko-terminal.desktop" - -do_install() { - install -d ${D}${datadir}/pixmaps - install -d ${D}${datadir}/applications - install -m 0644 ${WORKDIR}/openmoko-terminal.png ${D}${datadir}/pixmaps/ - install -m 0644 ${WORKDIR}/openmoko-terminal.desktop ${D}${datadir}/applications/ -} - -pkg_postinst_${PN}() { - if [ "x$D" != "x" ]; then - exit 1 - fi - echo "adding font defaults to system-wide mrxvtrc..." - cat <<EOF >> ${sysconfdir}/mrxvt/mrxvtrc -# -# ---------------------------------- FONTS ----------------------------------- # -# -Mrxvt.xft: 1 -Mrxvt.xftFont: Bitstream Vera Sans Mono -Mrxvt.xftSize: 8 -Mrxvt.xftAntialias: 1 - -# Don't load a multi-char font. This will reduce the line space if your multi -# char font has different dimensions than the regular font. You might need to -# comment it out if you want to use XIM and non-english fonts. -Mrxvt.xftNomFont: 1 - -# Font to use for tab bar / menus. This need not be mono-spaced ;). -Mrxvt.xftPFont: Bitstream Vera Sans -Mrxvt.xftPSize: 8 -EOF - -} diff --git a/packages/openmoko2/openmoko-terminal2_svn.bb b/packages/openmoko2/openmoko-terminal2_svn.bb new file mode 100644 index 0000000000..f90e99e9f1 --- /dev/null +++ b/packages/openmoko2/openmoko-terminal2_svn.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "The OpenMoko Command Line Console" +SECTION = "openmoko/applications" +DEPENDS = "vte libmokoui2" +RDEPENDS = "ttf-liberation-mono" +PV = "2.1.0+${SVNREV}" +PR = "r2" + +inherit openmoko2 diff --git a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb new file mode 100644 index 0000000000..6ac1c3fca4 --- /dev/null +++ b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, QVGA edition" +SECTION = "openmoko/base" +RCONFLICTS = "openmoko-theme-standard" +RPROVIDES = "openmoko-theme-standard-2" +PV = "0.1.0+${SVNREV}" +PR = "r0" + +inherit openmoko2 + +SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2-qvga;proto=http" +S = "${WORKDIR}/openmoko-standard-2-qvga" + +do_install() { + find ${WORKDIR} -name ".svn" | xargs rm -rf + install -d ${D}${datadir}/themes/openmoko-standard-2/gtk-2.0 + cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/ + rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/ + + install -d ${D}${sysconfdir}/gtk-2.0 + echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc +} + +CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc" + +PACKAGE_ARCH = "all" +FILES_${PN} = "${datadir} ${sysconfdir}" diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb index bbeba4420f..ec3b4f702e 100644 --- a/packages/openmoko2/openmoko-theme-standard2_svn.bb +++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" SECTION = "openmoko/base" RCONFLICTS = "openmoko-theme-standard" -PV = "0.1.0+svnr${SRCDATE}" -PR = "r2" +PV = "0.1.0+${SVNREV}" +PR = "r4" inherit openmoko2 @@ -15,11 +15,7 @@ do_install() { cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/ rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/ - install -d ${D}${sysconfdir}/gtk-2.0 - echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc } -CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc" - PACKAGE_ARCH = "all" -FILES_${PN} = "${datadir} ${sysconfdir}" +FILES_${PN} = "${datadir}" |