diff options
304 files changed, 1269 insertions, 319 deletions
diff --git a/contrib/patchwork/pw-am.sh b/contrib/patchwork/pw-am.sh index 1c64aa5d64..4707c99a4f 100755 --- a/contrib/patchwork/pw-am.sh +++ b/contrib/patchwork/pw-am.sh @@ -9,7 +9,7 @@ for patchnumber in $@; do - wget -nv http://patchwork.openembedded.org/patch/$patchnumber/mbox/ -O pw-am-$patchnumber.patch + wget -nv http://patchwork.dev.bearstech.com/patch/$patchnumber/mbox/ -O pw-am-$patchnumber.patch git am -s pw-am-$patchnumber.patch rm pw-am-$patchnumber.patch done diff --git a/recipes/alsa/alsa-scenario_0.2.bb b/recipes/alsa/alsa-scenario_0.2.bb index 3b4cf79f93..bf88cb5959 100644 --- a/recipes/alsa/alsa-scenario_0.2.bb +++ b/recipes/alsa/alsa-scenario_0.2.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "alsa-lib ncurses" PR = "r0" -PE = "1" +PE = "2" SRC_URI = "http://slimlogic.co.uk/pub/downloads/libscenario/scenario-lib-0.2.0.tar.bz2" diff --git a/recipes/alsa/alsa-scenario_git.bb b/recipes/alsa/alsa-scenario_git.bb index edc77d2bbc..8bc8ef6fe1 100644 --- a/recipes/alsa/alsa-scenario_git.bb +++ b/recipes/alsa/alsa-scenario_git.bb @@ -3,9 +3,9 @@ HOMEPAGE = "http://opensource.wolfsonmicro.com/node/22" SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "alsa-lib ncurses" -PV = "0.2+gitr${SRCREV}" +PV = "0.2+gitr${SRCPV}" PR = "r0" -PE = "1" +PE = "2" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/avahi/mango-lassi_git.bb b/recipes/avahi/mango-lassi_git.bb index c2250d8781..b0131d3136 100644 --- a/recipes/avahi/mango-lassi_git.bb +++ b/recipes/avahi/mango-lassi_git.bb @@ -2,7 +2,8 @@ ESCRIPTION = "Input sharing, the avahi way" DEPENDS = "avahi-ui libglade libnotify" SRCREV = "73638817126a68d62f1233f6e6859ce75a259e93" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http" diff --git a/recipes/blipomoko/blipomoko_git.bb b/recipes/blipomoko/blipomoko_git.bb index 82f190a73c..22a34077ce 100644 --- a/recipes/blipomoko/blipomoko_git.bb +++ b/recipes/blipomoko/blipomoko_git.bb @@ -8,7 +8,7 @@ SECTION = "x11/applications" SRC_URI = "git://github.com/dos1/blipomoko.git;protocol=http" S = "${WORKDIR}/git" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PR = "r0" inherit distutils diff --git a/recipes/blktool/blktool_4.bb b/recipes/blktool/blktool_4.bb index e658e3256f..8375f4dd5b 100644 --- a/recipes/blktool/blktool_4.bb +++ b/recipes/blktool/blktool_4.bb @@ -1,8 +1,11 @@ DESCRIPTION = "Display or change block device settings" LICENSE = "GPLv2" +DEPENDS = "glib-2.0" +PR = "r2" + SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz" S = "${WORKDIR}/${PN}-${PV}.orig" -inherit autotools
\ No newline at end of file +inherit pkgconfig autotools diff --git a/recipes/bt-configure/bt-configure_git.bb b/recipes/bt-configure/bt-configure_git.bb index 226faa9b98..1bc9d8520f 100644 --- a/recipes/bt-configure/bt-configure_git.bb +++ b/recipes/bt-configure/bt-configure_git.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "python python-pygtk bluez4" -PV = "1.0.0+gitr${SRCREV}" +PV = "1.0.0+gitr${SRCPV}" PR = "r1" ARCH_bt-configure = "all" diff --git a/recipes/clutter/clutter-gtk-0.6_git.bb b/recipes/clutter/clutter-gtk-0.6_git.bb index 89f2592bfc..9575c110d0 100644 --- a/recipes/clutter/clutter-gtk-0.6_git.bb +++ b/recipes/clutter/clutter-gtk-0.6_git.bb @@ -1,6 +1,6 @@ require clutter-gtk.inc -PV = "0.6.0+git${SRCREV}" +PV = "0.6.0+gitr${SRCPV}" DEPENDS += "clutter-0.6" diff --git a/recipes/clutter/clutter-gtk-0.8_git.bb b/recipes/clutter/clutter-gtk-0.8_git.bb index 3fb0cff8aa..f0e3c61e1f 100644 --- a/recipes/clutter/clutter-gtk-0.8_git.bb +++ b/recipes/clutter/clutter-gtk-0.8_git.bb @@ -1,6 +1,6 @@ require clutter-gtk.inc -PV = "0.8.0+git${SRCREV}" +PV = "0.8.0+gitr${SRCPV}" DEPENDS += "clutter" diff --git a/recipes/clutter/clutter-gtk.inc b/recipes/clutter/clutter-gtk.inc index bbecee548c..9d0efc9ac4 100644 --- a/recipes/clutter/clutter-gtk.inc +++ b/recipes/clutter/clutter-gtk.inc @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" DEPENDS = "gtk+" +PE = "1" FILESPATH = "${FILE_DIRNAME}/clutter-gtk" diff --git a/recipes/clutter/clutter-gtk_git.bb b/recipes/clutter/clutter-gtk_git.bb index a3e3767f90..75b443b529 100644 --- a/recipes/clutter/clutter-gtk_git.bb +++ b/recipes/clutter/clutter-gtk_git.bb @@ -1,6 +1,6 @@ require clutter-gst.inc -PV = "0.9.0+git${SRCREV}" +PV = "0.9.0+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git" diff --git a/recipes/clutter/moblin-proto_git.bb b/recipes/clutter/moblin-proto_git.bb index 3f61f496c5..b6667f512a 100644 --- a/recipes/clutter/moblin-proto_git.bb +++ b/recipes/clutter/moblin-proto_git.bb @@ -1,8 +1,8 @@ DEPENDS = "clutter-box2d" -PV = "0.0+gitr${SRCREV}" -PR = "r1" -PE = "1" +PV = "0.0+gitr${SRCPV}" +PR = "r0" +PE = "2" SRC_URI = "git://git.moblin.org/repos/users/pippin/prototype.git/;protocol=http \ file://paths.patch;patch=1" diff --git a/recipes/connman/connman.inc b/recipes/connman/connman.inc index eb7aa1ab52..5b2f0cc409 100644 --- a/recipes/connman/connman.inc +++ b/recipes/connman/connman.inc @@ -54,7 +54,7 @@ python populate_packages_prepend() { PACKAGES_DYNAMIC = "${PN}-plugin-*" -PACKAGES += "${PN}-scripts" +PACKAGES += "${PN}-scripts ${PN}-test-utils" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ @@ -64,6 +64,8 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${libdir}/bonobo/servers \ ${datadir}/dbus-1/system-services/*" +FILES_${PN}-test-utils += "${libdir}/connman/test/*" + FILES_${PN}-scripts += "${libdir}/connman/scripts" FILES_${PN}-dbg += "${libdir}/connman/*/.debug" FILES_${PN}-dev += "${libdir}/connman/*/*.la" diff --git a/recipes/connman/connman_git.bb b/recipes/connman/connman_git.bb index 523d39ba2f..c0cb890e20 100644 --- a/recipes/connman/connman_git.bb +++ b/recipes/connman/connman_git.bb @@ -20,12 +20,14 @@ EXTRA_OECONF = " \ --enable-fake \ " +EXTRA_OECONF_append_shr += "--disable-tools" + require connman.inc SRCREV = "1a94db417ecaba20a609ff4b4431a3f67c5dcbc6" PV = "0.42+git" -PR = "r0" +PR = "r2" PR_append = ".gitr${SRCREV}" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/connman/files/shr/connman b/recipes/connman/files/shr/connman new file mode 100755 index 0000000000..708b1b4cd1 --- /dev/null +++ b/recipes/connman/files/shr/connman @@ -0,0 +1,42 @@ +#!/bin/sh + +DAEMON="/usr/sbin/connmand -I usb0" +PIDFILE=/var/run/connmand.pid +DESC="Connection Manager" + +if [ -f /etc/default/connman ] ; then + . /etc/default/connman +fi + +set -e + +do_start() { + $DAEMON +} + +do_stop() { + start-stop-daemon --stop --name connmand --quiet +} + +case "$1" in + start) + echo "Starting $DESC" + do_start + ;; + stop) + echo "Stopping $DESC" + do_stop + ;; + restart|force-reload) + echo "Restarting $DESC" + do_stop + sleep 1 + do_start + ;; + *) + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes/disko/disko_git.bb b/recipes/disko/disko_git.bb index 10b57ecbe4..d8d9f17213 100644 --- a/recipes/disko/disko_git.bb +++ b/recipes/disko/disko_git.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Disko is an application framework, that can be used to develop GUI applications for embedded devices. It is closely connected to the DirectFB" LICENSE = "GPL" -PV = "1.6.1+gitr${SRCREV}" +PV = "1.6.1+gitr${SRCPV}" +PE = "1" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/dri/glamo-dri-tests_git.bb b/recipes/dri/glamo-dri-tests_git.bb index 81e0146e90..0e6d731bb2 100644 --- a/recipes/dri/glamo-dri-tests_git.bb +++ b/recipes/dri/glamo-dri-tests_git.bb @@ -1,6 +1,6 @@ DEPENDS = "libdrm virtual/libx11 libxext" -PV = "1.0.0+gitr${SRCREV}" +PV = "1.0.0+gitr${SRCPV}" SRC_URI = "git://git.bitwiz.org.uk/glamo-dri-tests.git;protocol=git;branch=master" diff --git a/recipes/e17/e-wm/Add-press-delay-support-to-illume.patch b/recipes/e17/e-wm/Add-press-delay-support-to-illume.patch new file mode 100644 index 0000000000..b01c35beff --- /dev/null +++ b/recipes/e17/e-wm/Add-press-delay-support-to-illume.patch @@ -0,0 +1,152 @@ +>From 7b4ed34a4d0ea7576d5b54ef580b30e16f802444 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Trevi=C3=B1o=20-=203v1n0?= <mail@3v1n0.net> +Date: Tue, 9 Jun 2009 01:33:33 +0200 +Subject: [PATCH 2/2] Add press delay support to illume + Use the e_fm2 single_click_delay option in illume e_fm2 to allow to + configure from the launcher settings a click delay to prevent + un-wanted clicks + +--- + src/modules/illume/e_cfg.c | 58 +++++++++++++++++++++++++++++++++++++++- + src/modules/illume/e_cfg.h | 1 + + src/modules/illume/e_mod_win.c | 1 + + 3 files changed, 59 insertions(+), 1 deletions(-) + +diff --git a/src/modules/illume/e_cfg.c b/src/modules/illume/e_cfg.c +index 7ae6213..3b52918 100644 +--- a/src/modules/illume/e_cfg.c ++++ b/src/modules/illume/e_cfg.c +@@ -42,6 +42,7 @@ e_cfg_init(E_Module *m) + E_CONFIG_VAL(conf_edd, Illume_Cfg, launcher.mode, INT); + E_CONFIG_VAL(conf_edd, Illume_Cfg, launcher.icon_size, INT); + E_CONFIG_VAL(conf_edd, Illume_Cfg, launcher.single_click, INT); ++ E_CONFIG_VAL(conf_edd, Illume_Cfg, launcher.single_click_delay, INT); + + E_CONFIG_VAL(conf_edd, Illume_Cfg, power.auto_suspend, INT); + E_CONFIG_VAL(conf_edd, Illume_Cfg, power.auto_suspend_delay, INT); +@@ -80,6 +81,7 @@ e_cfg_init(E_Module *m) + illume_cfg->launcher.mode = 0; + illume_cfg->launcher.icon_size = 120; + illume_cfg->launcher.single_click = 1; ++ illume_cfg->launcher.single_click_delay = 150; + + illume_cfg->power.auto_suspend = 1; + illume_cfg->power.auto_suspend_delay = 1; +@@ -170,6 +172,14 @@ _e_cfg_launcher_change(void *data, Evas_Object *obj, void *event_info) { + _e_cfg_launcher_change_timer = ecore_timer_add(0.5, _e_cfg_launcher_change_timeout, data); + } + ++Evas_Object *delay_label, *delay_slider; ++static void ++_e_cfg_launcher_click_change(void *data, Evas_Object *obj, void *event_info) { ++ e_widget_disabled_set(delay_label, !illume_cfg->launcher.single_click); ++ e_widget_disabled_set(delay_slider, !illume_cfg->launcher.single_click); ++ _e_cfg_launcher_change(data, obj, event_info); ++} ++ + static void * + _e_cfg_launcher_create(E_Config_Dialog *cfd) + { // alloc cfd->cfdata +@@ -179,6 +189,7 @@ _e_cfg_launcher_create(E_Config_Dialog *cfd) + static void + _e_cfg_launcher_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) + { // free cfd->cfdata ++ _e_mod_win_cfg_update(); // Reload on exit (to apply the slider value) + } + + static Evas_Object * +@@ -221,7 +232,16 @@ _e_cfg_launcher_ui(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata) + frame = e_widget_framelist_add(e, "Launch Action", 0); + o = e_widget_check_add(e, "Single press", &(illume_cfg->launcher.single_click)); + e_widget_framelist_object_append(frame, o); +- evas_object_smart_callback_add(o, "changed", _e_cfg_launcher_change, NULL); ++ evas_object_smart_callback_add(o, "changed", _e_cfg_launcher_click_change, NULL); ++ o = e_widget_label_add(e, "Press delay:"); ++ delay_label = o; ++ e_widget_disabled_set(o, !illume_cfg->launcher.single_click); ++ e_widget_framelist_object_append(frame, o); ++ o = e_widget_slider_add(e, 1, 0, "%1.0f ms", 0, 350, 1, 0, NULL, &(illume_cfg->launcher.single_click_delay), 150); ++ delay_slider = o; ++ //evas_object_smart_callback_add(o, "changed", _e_cfg_launcher_change, NULL); //works ?? ++ e_widget_disabled_set(o, !illume_cfg->launcher.single_click); ++ e_widget_framelist_object_append(frame, o); + e_widget_list_object_append(list, frame, 1, 0, 0.0); // fill, expand, align + + return list; +@@ -1374,6 +1394,40 @@ _dbcb_launcher_single_click_set(E_DBus_Object *obj, DBusMessage *msg) + return reply; + } + ++// illume_cfg->launcher.single_click_delay ++static DBusMessage * ++_dbcb_launcher_single_click_delay_get(E_DBus_Object *obj, DBusMessage *msg) ++{ ++ DBusMessage *reply; ++ DBusMessageIter iter; ++ ++ reply = dbus_message_new_method_return(msg); ++ dbus_message_iter_init_append(reply, &iter); ++ dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &(illume_cfg->launcher.single_click_delay)); ++ return reply; ++} ++ ++static DBusMessage * ++_dbcb_launcher_single_click_delay_set(E_DBus_Object *obj, DBusMessage *msg) ++{ ++ DBusMessageIter iter; ++ DBusMessage *reply; ++ int val; ++ ++ dbus_message_iter_init(msg, &iter); ++ dbus_message_iter_get_basic(&iter, &(val)); ++ if (val >= 0) ++ { ++ illume_cfg->launcher.single_click_delay = val; ++ _e_cfg_launcher_change(NULL, NULL, NULL); ++ return dbus_message_new_method_return(msg); ++ } ++ reply = dbus_message_new_error(msg, ++ "org.enlightenment.DBus.InvalidArgument", ++ "Parameter must be greater than 0"); ++ return reply; ++} ++ + // e_config->screensaver_timeout 0(off)-3600 + static DBusMessage * + _dbcb_screensaver_timeout_get(E_DBus_Object *obj, DBusMessage *msg) +@@ -1967,6 +2021,8 @@ static const DB_Method methods[] = + {"LauncherIconSizeSet", "i", "", _dbcb_launcher_icon_size_set}, + {"LauncherSingleClickGet", "", "i", _dbcb_launcher_single_click_get}, + {"LauncherSingleClickSet", "i", "", _dbcb_launcher_single_click_set}, ++ {"LauncherSingleClickDelayGet", "", "i", _dbcb_launcher_single_click_delay_get}, ++ {"LauncherSingleClickDelaySet", "i", "", _dbcb_launcher_single_click_delay_set}, + {"ScreensaverTimeoutGet", "", "i", _dbcb_screensaver_timeout_get}, + {"ScreensaverTimeoutSet", "i", "", _dbcb_screensaver_timeout_set}, + {"AutosuspendTimeoutGet", "", "i", _dbcb_autosuspend_timeout_get}, +diff --git a/src/modules/illume/e_cfg.h b/src/modules/illume/e_cfg.h +index 4350ca0..e3b2080 100644 +--- a/src/modules/illume/e_cfg.h ++++ b/src/modules/illume/e_cfg.h +@@ -14,6 +14,7 @@ struct _Illume_Cfg + int mode; + int icon_size; + int single_click; ++ int single_click_delay; + } launcher; + + struct { +diff --git a/src/modules/illume/e_mod_win.c b/src/modules/illume/e_mod_win.c +index ec873ec..40fa13d 100644 +--- a/src/modules/illume/e_mod_win.c ++++ b/src/modules/illume/e_mod_win.c +@@ -992,6 +992,7 @@ _apps_fm_config(Evas_Object *o) + fmc.view.open_dirs_in_place = 1; + fmc.view.selector = 0; + fmc.view.single_click = illume_cfg->launcher.single_click; ++ fmc.view.single_click_delay = illume_cfg->launcher.single_click_delay; + fmc.view.no_subdir_jump = 1; + fmc.icon.extension.show = 0; + fmc.icon.icon.w = illume_cfg->launcher.icon_size * e_scale / 2.0; +-- +1.6.3.rc0 + diff --git a/recipes/e17/e-wm/e_fm2-avoid-invalid-clicks-2.patch b/recipes/e17/e-wm/e_fm2-avoid-invalid-clicks-2.patch new file mode 100644 index 0000000000..5101034a88 --- /dev/null +++ b/recipes/e17/e-wm/e_fm2-avoid-invalid-clicks-2.patch @@ -0,0 +1,84 @@ +diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c +index 7b58e56..a47b26c 100644 +--- a/src/bin/e_fm.c ++++ b/src/bin/e_fm.c +@@ -389,7 +389,7 @@ static int _e_fm2_cb_live_timer(void *data); + static int _e_fm2_theme_edje_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group); + static int _e_fm2_theme_edje_icon_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group); + +-static void _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers, unsigned int timestamp); ++static void _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, void *evas_event); + + static void _e_fm2_client_spawn(void); + static E_Fm2_Client *_e_fm2_client_get(void); +@@ -6331,11 +6331,24 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event) + + /* FIXME: prototype */ + static void +-_e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers, unsigned int timestamp) ++_e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, void *evas_event) + { ++ Evas_Event_Mouse_Down *ed = NULL; ++ Evas_Event_Mouse_Up *eu = NULL; ++ Evas_Modifier *modifiers; + int multi_sel = 0, range_sel = 0, sel_change = 0; + static unsigned int down_timestamp = 0; + ++ if (!evas_event) return; ++ ++ if (!up) { ++ ed = evas_event; ++ modifiers = ed->modifiers; ++ } else { ++ eu = evas_event; ++ modifiers = eu->modifiers; ++ } ++ + if (ic->sd->config->selection.windows_modifiers) + { + if (evas_key_modifier_is_set(modifiers, "Shift")) +@@ -6446,11 +6459,16 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers, unsigne + (ic->sd->config->view.single_click) + ) + { +- if (!up && ic->sd->config->view.single_click_delay) +- down_timestamp = timestamp; +- if (up) { +- if ((timestamp - down_timestamp) > ic->sd->config->view.single_click_delay) +- evas_object_smart_callback_call(ic->sd->obj, "selected", NULL); ++ if (ed && ic->sd->config->view.single_click_delay) ++ down_timestamp = ed->timestamp; ++ ++ if (eu && (eu->timestamp - down_timestamp) > ic->sd->config->view.single_click_delay) { ++ int icon_pos_x = ic->x + ic->sd->x - ic->sd->pos.x; ++ int icon_pos_y = ic->y + ic->sd->y - ic->sd->pos.y; ++ ++ if (eu->output.x >= icon_pos_x && eu->output.x <= (icon_pos_x + ic->w) && ++ eu->output.y >= icon_pos_y && eu->output.y <= (icon_pos_y + ic->h)) ++ evas_object_smart_callback_call(ic->sd->obj, "selected", NULL); + } + } + } +@@ -6492,11 +6510,11 @@ _e_fm2_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf + ic->drag.dnd = 0; + ic->drag.src = 1; + } +- _e_fm2_mouse_1_handler(ic, 0, ev->modifiers, ev->timestamp); ++ _e_fm2_mouse_1_handler(ic, 0, ev); + } + else if (ev->button == 3) + { +- if (!ic->selected) _e_fm2_mouse_1_handler(ic, 0, ev->modifiers, ev->timestamp); ++ if (!ic->selected) _e_fm2_mouse_1_handler(ic, 0, ev); + _e_fm2_icon_menu(ic, ic->sd->obj, ev->timestamp); + } + } +@@ -6516,7 +6534,7 @@ _e_fm2_cb_icon_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info) + if ((ev->button == 1) && (!ic->drag.dnd)) + { + if (!(ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)) +- _e_fm2_mouse_1_handler(ic, 1, ev->modifiers, ev->timestamp); ++ _e_fm2_mouse_1_handler(ic, 1, ev); + ic->drag.start = 0; + ic->drag.dnd = 0; + ic->drag.src = 0; diff --git a/recipes/e17/e-wm/e_fm2-single-click-delay-support.patch b/recipes/e17/e-wm/e_fm2-single-click-delay-support.patch new file mode 100644 index 0000000000..369b6d5df1 --- /dev/null +++ b/recipes/e17/e-wm/e_fm2-single-click-delay-support.patch @@ -0,0 +1,100 @@ +>From bb0df2798a630ece5ff19704831a6b170d0df274 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Trevi=C3=B1o=20-=203v1n0?= <mail@3v1n0.net> +Date: Tue, 9 Jun 2009 00:24:05 +0200 +Subject: [PATCH 1/2] e_fm2 single-click delay support + This patch allows to set a delay to select an item in the e_fm2 if + it is using the single-click mode. Thanks to this, it could be needed + a longer pressure to select an item in the file-manager; useful for + embedded/touch-based systems. + +--- + src/bin/e_fm.c | 20 +++++++++++++------- + src/bin/e_fm.h | 1 + + 2 files changed, 14 insertions(+), 7 deletions(-) + +diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c +index 07f9a2c..7b58e56 100644 +--- a/src/bin/e_fm.c ++++ b/src/bin/e_fm.c +@@ -389,7 +389,7 @@ static int _e_fm2_cb_live_timer(void *data); + static int _e_fm2_theme_edje_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group); + static int _e_fm2_theme_edje_icon_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group); + +-static void _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers); ++static void _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers, unsigned int timestamp); + + static void _e_fm2_client_spawn(void); + static E_Fm2_Client *_e_fm2_client_get(void); +@@ -894,6 +894,7 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path) + sd->config->view.open_dirs_in_place = 1; + sd->config->view.selector = 1; + sd->config->view.single_click = 0; ++ sd->config->view.single_click_delay = 0; + sd->config->view.no_subdir_jump = 0; + sd->config->icon.icon.w = 128; + sd->config->icon.icon.h = 128; +@@ -6330,9 +6331,10 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event) + + /* FIXME: prototype */ + static void +-_e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers) ++_e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers, unsigned int timestamp) + { + int multi_sel = 0, range_sel = 0, sel_change = 0; ++ static unsigned int down_timestamp = 0; + + if (ic->sd->config->selection.windows_modifiers) + { +@@ -6444,8 +6446,12 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, Evas_Modifier *modifiers) + (ic->sd->config->view.single_click) + ) + { +- if (up) +- evas_object_smart_callback_call(ic->sd->obj, "selected", NULL); ++ if (!up && ic->sd->config->view.single_click_delay) ++ down_timestamp = timestamp; ++ if (up) { ++ if ((timestamp - down_timestamp) > ic->sd->config->view.single_click_delay) ++ evas_object_smart_callback_call(ic->sd->obj, "selected", NULL); ++ } + } + } + +@@ -6486,11 +6492,11 @@ _e_fm2_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf + ic->drag.dnd = 0; + ic->drag.src = 1; + } +- _e_fm2_mouse_1_handler(ic, 0, ev->modifiers); ++ _e_fm2_mouse_1_handler(ic, 0, ev->modifiers, ev->timestamp); + } + else if (ev->button == 3) + { +- if (!ic->selected) _e_fm2_mouse_1_handler(ic, 0, ev->modifiers); ++ if (!ic->selected) _e_fm2_mouse_1_handler(ic, 0, ev->modifiers, ev->timestamp); + _e_fm2_icon_menu(ic, ic->sd->obj, ev->timestamp); + } + } +@@ -6510,7 +6516,7 @@ _e_fm2_cb_icon_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info) + if ((ev->button == 1) && (!ic->drag.dnd)) + { + if (!(ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)) +- _e_fm2_mouse_1_handler(ic, 1, ev->modifiers); ++ _e_fm2_mouse_1_handler(ic, 1, ev->modifiers, ev->timestamp); + ic->drag.start = 0; + ic->drag.dnd = 0; + ic->drag.src = 0; +diff --git a/src/bin/e_fm.h b/src/bin/e_fm.h +index 1bbd7c4..170dfb9 100644 +--- a/src/bin/e_fm.h ++++ b/src/bin/e_fm.h +@@ -71,6 +71,7 @@ struct _E_Fm2_Config + unsigned char always_order; + unsigned char link_drop; + unsigned char fit_custom_pos; ++ unsigned int single_click_delay; + } view; + /* display of icons */ + struct { +-- +1.6.3.rc0 + diff --git a/recipes/e17/e-wm/illume-flow.patch b/recipes/e17/e-wm/illume-flow.patch new file mode 100644 index 0000000000..df719cc8ea --- /dev/null +++ b/recipes/e17/e-wm/illume-flow.patch @@ -0,0 +1,76 @@ +Index: e/src/modules/illume/e_kbd_int.c +=================================================================== +--- e/src/modules/illume/e_kbd_int.c (revision 1) ++++ e/src/modules/illume/e_kbd_int.c (working copy) +@@ -440,6 +440,16 @@ + static void + _e_kbd_int_stroke_handle(E_Kbd_Int *ki, int dir) + { ++ /* If the keyboard direction is RTL switch dir 3 and 1 ++ * i.e, make forward backwards and the other way around */ ++ if (ki->layout.direction == E_KBD_INT_DIRECTION_RTL) ++ { ++ if (dir == 3) ++ dir = 1; ++ else if (dir == 1) ++ dir = 3; ++ } ++ + if (dir == 4) // up + { + _e_kbd_int_layout_next(ki); +@@ -897,6 +907,10 @@ + if (!f) return; + ki->layout.directory = ecore_file_dir_get(layout); + ki->layout.file = eina_stringshare_add(layout); ++ ++ /* Make the default direction LTR */ ++ ki->layout.direction = E_KBD_INT_DIRECTION_LTR; ++ + while (fgets(buf, sizeof(buf), f)) + { + int len; +@@ -924,6 +938,17 @@ + sscanf(buf, "%*s %i\n", &(ki->layout.fuzz)); + continue; + } ++ if (!strcmp(str, "direction")) ++ { ++ char direction[4]; ++ sscanf(buf, "%*s %3s\n", direction); ++ /* If rtl mark as rtl, otherwise make it ltr */ ++ if (!strcmp(direction, "rtl")) ++ ki->layout.direction = E_KBD_INT_DIRECTION_RTL; ++ else ++ ki->layout.direction = E_KBD_INT_DIRECTION_LTR; ++ continue; ++ } + if (!strcmp(str, "key")) + { + ky = calloc(1, sizeof(E_Kbd_Int_Key)); +Index: e/src/modules/illume/e_kbd_int.h +=================================================================== +--- e/src/modules/illume/e_kbd_int.h (revision 1) ++++ e/src/modules/illume/e_kbd_int.h (working copy) +@@ -15,6 +15,13 @@ + E_KBD_INT_TYPE_PASSWORD = (1 << 6) + } E_Kbd_Int_Type; + ++/* The natural text direction of the keyboard */ ++typedef enum _E_kbd_Int_Direction ++{ ++ E_KBD_INT_DIRECTION_LTR = (1 << 0), ++ E_KBD_INT_DIRECTION_RTL = (1 << 1) ++} E_Kbd_Int_Direction; ++ + typedef struct _E_Kbd_Int E_Kbd_Int; + typedef struct _E_Kbd_Int_Key E_Kbd_Int_Key; + typedef struct _E_Kbd_Int_Key_State E_Kbd_Int_Key_State; +@@ -34,6 +41,7 @@ + const char *file; + int w, h; + int fuzz; ++ int direction; + E_Kbd_Int_Type type; + Eina_List *keys; + E_Kbd_Int_Key *pressed; diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index b4e35b6890..0d86575550 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -12,13 +12,15 @@ SRC_URI += "\ file://applications.menu \ file://gsm-segfault-fix.patch;patch=1;maxrev=37617 \ file://fix-profiles.diff;patch=1;maxrev=39889 \ + file://illume-flow.patch;patch=0;maxrev=43852 \ file://drop-illume-keyboards.patch;patch=1 \ " SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch;patch=1" - -SRC_URI_append_shr = " \ - file://illume-disable-screensaver.patch;patch=1 \ +SRC_URI_append_shr = " file://illume-disable-screensaver.patch;patch=1 \ + file://e_fm2-single-click-delay-support.patch;patch=1;maxrev=41127 \ + file://Add-press-delay-support-to-illume.patch;patch=1;maxrev=41128 \ + file://e_fm2-avoid-invalid-clicks-2.patch;patch=1;maxrev=41127 \ file://wizard-module-skipping.patch;patch=1 \ " diff --git a/recipes/e17/illume-keyboards-shr_git.bb b/recipes/e17/illume-keyboards-shr_git.bb index 0b3f95bf34..109dc51a54 100644 --- a/recipes/e17/illume-keyboards-shr_git.bb +++ b/recipes/e17/illume-keyboards-shr_git.bb @@ -3,7 +3,7 @@ SECTION = "x11/data" SRC_URI = "git://git.shr-project.org/repo/illume-keyboards.git;protocol=http;branch=master" S = "${WORKDIR}/git" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" PE = "1" PR = "r1" diff --git a/recipes/efl1/e-wm-illume-dict-pl_git.bb b/recipes/efl1/e-wm-illume-dict-pl_git.bb index a5cf1938c4..edb1058989 100644 --- a/recipes/efl1/e-wm-illume-dict-pl_git.bb +++ b/recipes/efl1/e-wm-illume-dict-pl_git.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Polish dictionary for Illume keyboard" SECTION = "x11/data" -PV = "1.0-gitr${SRCREV}" +PV = "1.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/efl1/emotion_svn.bb b/recipes/efl1/emotion_svn.bb index c5733be8a1..ce0d2c4baa 100644 --- a/recipes/efl1/emotion_svn.bb +++ b/recipes/efl1/emotion_svn.bb @@ -3,7 +3,7 @@ LICENSE = "MIT BSD" # we no longer build the libxine backend, since the gstreamer backend seems more promising DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base" PV = "0.1.0.042+svnr${SRCPV}" -PR = "r4" +PR = "r5" inherit efl @@ -12,3 +12,7 @@ EXTRA_OECONF = "--disable-xine --enable-gstreamer --with-edje-cc=${STAGING_BINDI PACKAGES =+ "emotion-backend-gstreamer" FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so" RRECOMMENDS_${PN} = "emotion-backend-gstreamer" + +do_compile_append() { + sed -i "s/${@"${PKG_CONFIG_SYSROOT_DIR}".replace('/','\/')}\/usr\/local\/lib/\$\{libdir\}/" ${S}/emotion.pc +} diff --git a/recipes/freesmartphone/libeflvala_git.bb b/recipes/efl1/libeflvala_git.bb index 9040bbd10a..68c2897ff4 100644 --- a/recipes/freesmartphone/libeflvala_git.bb +++ b/recipes/efl1/libeflvala_git.bb @@ -3,8 +3,9 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "vala-native glib-2.0 dbus dbus-glib eina eet evas ecore edje elementary" -PV = "0.0.1.0+gitr${SRCREV}" +PV = "0.0.1.0+gitr${SRCPV}" PR = "r0" +PE = "1" SRC_URI = "${FREESMARTPHONE_GIT}/libeflvala;protocol=git;branch=master" S = "${WORKDIR}/git" diff --git a/recipes/efl1/libefso_svn.bb b/recipes/efl1/libefso_svn.bb index d9bc651908..14b6d9f17e 100644 --- a/recipes/efl1/libefso_svn.bb +++ b/recipes/efl1/libefso_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "EFL FSO wrapper library" SECTION = "e/libs" LICENSE = "GPLv2" -DEPENDS = "ecore edbus" +DEPENDS = "ecore edbus efreet" PV = "0.0.1+svnr${SRCPV}" SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=libefso" diff --git a/recipes/ezx/ezx-gen-blob_svn.bb b/recipes/ezx/ezx-gen-blob_svn.bb index 5841407ce3..45e92556a5 100644 --- a/recipes/ezx/ezx-gen-blob_svn.bb +++ b/recipes/ezx/ezx-gen-blob_svn.bb @@ -5,7 +5,8 @@ HOMEPAGE = "http://people.openezx.org/wyrm/gen-blob" LICENSE = "GPL" PROVIDES = "virtual/bootloader" DEPENDS = "virtual/kernel" -PV = "1.0.0+${SRCREV}" +PV = "1.0.0+svnr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "\ diff --git a/recipes/fbreader/fbreader_0.8.2a.bb b/recipes/fbreader/fbreader_0.8.2a.bb index 7d6a2b044c..490d8b52d6 100644 --- a/recipes/fbreader/fbreader_0.8.2a.bb +++ b/recipes/fbreader/fbreader_0.8.2a.bb @@ -4,7 +4,7 @@ SECTION = "x11/utils" PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv" -PR = "r5" +PR = "r6" # The RESOLUTION is defined at compile time which makes # this package MACHINE specific. @@ -23,6 +23,9 @@ SRC_URI_append_akita = "\ SRC_URI_append_htcuniversal = "\ file://zaurus-VGA.patch;patch=1" +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" + # Set the defaults READER_RESOLUTION = "240x320" READER_ARCH = "openzaurus" diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index cdb3f7ee16..b9ed44247f 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -7,6 +7,8 @@ LICENSE = "LGPL" ARM_INSTRUCTION_SET = "arm" +PE = "2" + DEPENDS = "zlib libogg libvorbis libtheora faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" RSUGGESTS = "mplayer" diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb index b80fa8893b..609b792f65 100644 --- a/recipes/ffmpeg/ffmpeg_0.5.bb +++ b/recipes/ffmpeg/ffmpeg_0.5.bb @@ -2,7 +2,6 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" -PE = "1" PR = "r5" DEFAULT_PREFERENCE = "1" diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb index 1cfc3e2f89..3cf2aed398 100644 --- a/recipes/ffmpeg/ffmpeg_git.bb +++ b/recipes/ffmpeg/ffmpeg_git.bb @@ -2,8 +2,7 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" -PE = "1" -PV = "0.5.0+${PR}+gitr${SRCREV}" +PV = "0.5.0+${PR}+gitr${SRCPV}" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index 5cb365678b..388777e186 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -4,7 +4,6 @@ DEPENDS += "schroedinger libgsm" SRCREV = "20701" -PE = "1" PV = "0.5.0+${PR}+svnr${SRCPV}" PR = "r0" diff --git a/recipes/ffmpeg/omapfbplay-xv_git.bb b/recipes/ffmpeg/omapfbplay-xv_git.bb index 3e676e92bb..11c5db087f 100644 --- a/recipes/ffmpeg/omapfbplay-xv_git.bb +++ b/recipes/ffmpeg/omapfbplay-xv_git.bb @@ -3,7 +3,8 @@ DEPENDS = "libxv bzip2 lame ffmpeg virtual/kernel" LICENSE = "MIT" PR = "r1" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" SRCREV = "e66bf25df1f1ff085e6db102b282d90e7ceff4bf" SRC_URI = "git://git.mansr.com/omapfbplay;protocol=git \ diff --git a/recipes/ffmpeg/omapfbplay_git.bb b/recipes/ffmpeg/omapfbplay_git.bb index afc3b2aa36..881cd5b2c6 100644 --- a/recipes/ffmpeg/omapfbplay_git.bb +++ b/recipes/ffmpeg/omapfbplay_git.bb @@ -4,7 +4,8 @@ LICENSE = "MIT" PR = "r18" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" SRCREV = "26df4208b57ccb0f0ca101ae4ddb92c956a0ecc0" SRC_URI = "git://git.mansr.com/${PN};protocol=git \ diff --git a/recipes/freesmartphone/dbus-hlid_git.bb b/recipes/freesmartphone/dbus-hlid_git.bb index 508cf874c6..b0a5f629bc 100644 --- a/recipes/freesmartphone/dbus-hlid_git.bb +++ b/recipes/freesmartphone/dbus-hlid_git.bb @@ -4,7 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" DEPENDS = "vala-native dbus dbus-glib" LICENSE = "GPL" -PV = "1.0.1+gitr${SRCREV}" +PV = "1.0.1+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/dbus-hlid.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch b/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch new file mode 100644 index 0000000000..4dc5dd3a84 --- /dev/null +++ b/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch @@ -0,0 +1,27 @@ +--- a/framework/subsystems/oeventsd/fso_triggers.py 2009-07-12 13:44:53.000000000 +0200 ++++ b/framework/subsystems/oeventsd/fso_triggers.py 2009-07-12 13:42:43.000000000 +0200 +@@ -197,8 +197,7 @@ + class IncomingMessageTrigger(DBusTrigger): + #============================================================================# + """ +- A custom dbus trigger for org.freesmartphone.GSM.SIM.IncomingStoredMessage +- TODO: change to opimd interface ++ A custom dbus trigger for org.freesmartphone.PIM.Messages.IncomingMessage + """ + + function_name = 'IncomingMessage' +@@ -207,10 +206,10 @@ + bus = dbus.SystemBus() + super(IncomingMessageTrigger, self).__init__( + bus, +- 'org.freesmartphone.ogsmd', +- '/org/freesmartphone/GSM/Device', +- 'org.freesmartphone.GSM.SIM', +- 'IncomingStoredMessage' ++ 'org.freesmartphone.opimd', ++ '/org/freesmartphone/PIM/Messages', ++ 'org.freesmartphone.PIM.Messages', ++ 'IncomingMessage' + ) + def on_signal(self, index): + logger.info("Receive IncomingMessage on index = %s" % index) diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb index 130fe55231..9059c608ca 100644 --- a/recipes/freesmartphone/frameworkd_git.bb +++ b/recipes/freesmartphone/frameworkd_git.bb @@ -1,11 +1,12 @@ DESCRIPTION = "The reference implementation of the freesmartphone.org framework APIs" HOMEPAGE = "http://www.freesmartphone.org" -AUTHOR = "FreeSmartphone.Org Development Team" +AUTHOR = "freesmartphone.org Development Team" SECTION = "console/network" -DEPENDS = "python-cython-native python-pyrex-native" +#DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -PV = "0.9.5.9+gitr${SRCREV}" +PV = "0.9.5.9+gitr${SRCPV}" PR = "r0" +PE = "1" inherit distutils update-rc.d @@ -16,6 +17,8 @@ SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ file://frameworkd \ file://frameworkd.conf \ " +SRC_URI_append_shr = "file://oeventsd-use-opimd-signals.patch;patch=1" + S = "${WORKDIR}/git" do_configure_append() { @@ -55,6 +58,8 @@ RDEPENDS_${PN} += "\ RRECOMMENDS_${PN} += "\ alsa-utils-amixer \ python-gst \ + python-phoneutils \ + python-vobject \ ppp \ " diff --git a/recipes/freesmartphone/fso-abyss_git.bb b/recipes/freesmartphone/fso-abyss_git.bb index 4a9126e75c..d4ed6027fc 100644 --- a/recipes/freesmartphone/fso-abyss_git.bb +++ b/recipes/freesmartphone/fso-abyss_git.bb @@ -4,7 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" DEPENDS = "vala-native dbus dbus-glib libgsm0710mux" LICENSE = "GPL" -PV = "0.9.0+gitr${SRCREV}" +PV = "0.9.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "\ diff --git a/recipes/freesmartphone/fso-apm_git.bb b/recipes/freesmartphone/fso-apm_git.bb index bb36e7f7fb..8fab71e45e 100644 --- a/recipes/freesmartphone/fso-apm_git.bb +++ b/recipes/freesmartphone/fso-apm_git.bb @@ -3,9 +3,10 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" HOMEPAGE = "http://www.freesmartphone.org" SECTION = "console" LICENSE = "GPLv2" +PE = "1" DEPENDS = "vala-native" RCONFLICTS = "apm" -PV = "2.0.0+gitr${SRCREV}" +PV = "2.0.0+gitr${SRCPV}" PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/fso-gpsd_git.bb b/recipes/freesmartphone/fso-gpsd_git.bb index cde1bb65e3..80aba302ba 100644 --- a/recipes/freesmartphone/fso-gpsd_git.bb +++ b/recipes/freesmartphone/fso-gpsd_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "freesmartphone.org gpsd compatibility daemon" LICENSE = "GPL" SECTION = "network" DEPENDS = "dbus-glib" -PV = "0.8+gitr${SRCREV}" +PV = "0.8+gitr${SRCPV}" +PE = "1" PR = "r2" SRC_URI = "\ diff --git a/recipes/freesmartphone/fso-gsm0710muxd_git.bb b/recipes/freesmartphone/fso-gsm0710muxd_git.bb index 5ce1d1e846..e859be26ff 100644 --- a/recipes/freesmartphone/fso-gsm0710muxd_git.bb +++ b/recipes/freesmartphone/fso-gsm0710muxd_git.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gs SECTION = "console/network" DEPENDS = "dbus dbus-glib" LICENSE = "GPL" -PV = "0.9.3.1+gitr${SRCREV}" +PV = "0.9.3.1+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/fso-monitord_git.bb b/recipes/freesmartphone/fso-monitord_git.bb index 80668015c3..52cc77972b 100644 --- a/recipes/freesmartphone/fso-monitord_git.bb +++ b/recipes/freesmartphone/fso-monitord_git.bb @@ -3,7 +3,8 @@ AUTHOR = "freesmartphone.org development team" SECTION = "console/network" DEPENDS = "vala-native dbus dbus-glib" LICENSE = "GPL" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/fso-monitord.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/fso-sounds.bb b/recipes/freesmartphone/fso-sounds.bb index 3277692c57..7fa1a393d9 100644 --- a/recipes/freesmartphone/fso-sounds.bb +++ b/recipes/freesmartphone/fso-sounds.bb @@ -1,7 +1,8 @@ DESCRIPTION = "A set of notification sounds" LICENSE = "CC" SECTION = "multimedia" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" +PE = "1" PR = "r2" SRC_URI = "\ diff --git a/recipes/freesmartphone/fso-specs_git.bb b/recipes/freesmartphone/fso-specs_git.bb index b346fb54cb..14c7f1f2be 100644 --- a/recipes/freesmartphone/fso-specs_git.bb +++ b/recipes/freesmartphone/fso-specs_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Michael 'Mickey' Lauer" HOMEPAGE = "http://docs.freesmartphone.org" LICENSE = "BSD" SECTION = "devel/specifications" -PV = "0.0.1-gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" +PE = "1" PR = "r2" SRC_URI = "${FREESMARTPHONE_GIT}/specs.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/fso-term_git.bb b/recipes/freesmartphone/fso-term_git.bb index acb20cdb05..79f042ad41 100644 --- a/recipes/freesmartphone/fso-term_git.bb +++ b/recipes/freesmartphone/fso-term_git.bb @@ -4,7 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" DEPENDS = "dbus dbus-glib readline libfsoframework" LICENSE = "GPL" -PV = "0.0.0.0+gitr${SRCREV}" +PV = "0.0.0.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "\ diff --git a/recipes/freesmartphone/fsodatad_git.bb b/recipes/freesmartphone/fsodatad_git.bb index de13bedc0a..cb2913291c 100644 --- a/recipes/freesmartphone/fsodatad_git.bb +++ b/recipes/freesmartphone/fsodatad_git.bb @@ -1,6 +1,6 @@ require cornucopia.inc inherit fso-plugin PR = "${INC_PR}.0" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" DEPENDS += "libxml2 mobile-broadband-provider-info" diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb index 2516c89aff..7dc1b4fdd3 100644 --- a/recipes/freesmartphone/fsodeviced_git.bb +++ b/recipes/freesmartphone/fsodeviced_git.bb @@ -4,7 +4,7 @@ inherit fso-plugin DEPENDS += "alsa-lib libcanberra libfsoresource" RDEPENDS += "libcanberra-alsa" RRECOMMENDS += "fso-alsa-data" -PV = "0.9.0+gitr${SRCREV}" +PV = "0.9.0+gitr${SRCPV}" PE = "1" PR = "${INC_PR}.6" diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb index 9186ab990b..0d627baa47 100644 --- a/recipes/freesmartphone/fsogsmd_git.bb +++ b/recipes/freesmartphone/fsogsmd_git.bb @@ -1,6 +1,7 @@ require cornucopia.inc inherit fso-plugin PR = "${INC_PR}.0" -PV = "0.2.0+gitr${SRCREV}" +PV = "0.2.0+gitr${SRCPV}" +PE = "1" DEPENDS += "libfsoresource libgsm0710mux" diff --git a/recipes/freesmartphone/fsolocationd_git.bb b/recipes/freesmartphone/fsolocationd_git.bb index a70bf596f5..2046be7a93 100644 --- a/recipes/freesmartphone/fsolocationd_git.bb +++ b/recipes/freesmartphone/fsolocationd_git.bb @@ -1,6 +1,7 @@ require cornucopia.inc inherit fso-plugin PR = "${INC_PR}.0" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" +PE = "1" DEPENDS += "libfsotransport libfsoresource" diff --git a/recipes/freesmartphone/fsomusicd_git.bb b/recipes/freesmartphone/fsomusicd_git.bb index 0081298909..443d45ef89 100644 --- a/recipes/freesmartphone/fsomusicd_git.bb +++ b/recipes/freesmartphone/fsomusicd_git.bb @@ -1,6 +1,6 @@ require cornucopia.inc DEPENDS += "gstreamer" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "${INC_PR}.0" RDEPENDS += "\ diff --git a/recipes/freesmartphone/fsonetworkd_git.bb b/recipes/freesmartphone/fsonetworkd_git.bb index 002624fc2b..14b62a991d 100644 --- a/recipes/freesmartphone/fsonetworkd_git.bb +++ b/recipes/freesmartphone/fsonetworkd_git.bb @@ -1,5 +1,6 @@ require cornucopia.inc inherit fso-plugin DEPENDS += "libnl2" -PV = "0.1.0.0+gitr${SRCREV}" +PV = "0.1.0.0+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/fsotimed_git.bb b/recipes/freesmartphone/fsotimed_git.bb index 3c789ad46c..65874de626 100644 --- a/recipes/freesmartphone/fsotimed_git.bb +++ b/recipes/freesmartphone/fsotimed_git.bb @@ -1,4 +1,5 @@ require cornucopia.inc inherit fso-plugin -PV = "0.1.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/fsousaged_git.bb b/recipes/freesmartphone/fsousaged_git.bb index a7e4a1c0ee..d14b233ff6 100644 --- a/recipes/freesmartphone/fsousaged_git.bb +++ b/recipes/freesmartphone/fsousaged_git.bb @@ -1,4 +1,5 @@ require cornucopia.inc inherit fso-plugin -PV = "0.9.0.1+gitr${SRCREV}" +PV = "0.9.0.1+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/gsmd2_git.bb b/recipes/freesmartphone/gsmd2_git.bb index 4d25aa94e9..8f14bc9141 100644 --- a/recipes/freesmartphone/gsmd2_git.bb +++ b/recipes/freesmartphone/gsmd2_git.bb @@ -4,7 +4,8 @@ AUTHOR = "Ixonos Team" SECTION = "console/network" DEPENDS = "dbus dbus-glib" LICENSE = "GPL" -PV = "0.1.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/illume-theme-freesmartphone_git.bb b/recipes/freesmartphone/illume-theme-freesmartphone_git.bb index 1351674a18..c9f50f503c 100644 --- a/recipes/freesmartphone/illume-theme-freesmartphone_git.bb +++ b/recipes/freesmartphone/illume-theme-freesmartphone_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Illume theme for the freesmartphone.org project" HOMEPAGE = "http://illume.projects.openmoko.org/" LICENSE = "MIT/BSD" DEPENDS = "edje-native eet-native" -PV = "0.1.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/libframeworkd-glib_git.bb b/recipes/freesmartphone/libframeworkd-glib_git.bb index bce8312fcb..965f099ed5 100644 --- a/recipes/freesmartphone/libframeworkd-glib_git.bb +++ b/recipes/freesmartphone/libframeworkd-glib_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "freesmartphone.org API glib wrapper" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "dbus-glib" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/libframeworkd-glib.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/libfso-glib_git.bb b/recipes/freesmartphone/libfso-glib_git.bb index f7e49cb89d..d9e4372686 100644 --- a/recipes/freesmartphone/libfso-glib_git.bb +++ b/recipes/freesmartphone/libfso-glib_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Didier 'Ptitjes" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "vala-native vala-dbus-binding-tool-native dbus-glib glib-2.0 fso-specs" -PV = "0.2.2+gitr${SRCREV}" +PV = "0.2.2+gitr${SRCPV}" +PE = "1" PR = "r0" inherit autotools_stage pkgconfig vala diff --git a/recipes/freesmartphone/libfsobasics_git.bb b/recipes/freesmartphone/libfsobasics_git.bb index 3a268105d7..ef83a5d041 100644 --- a/recipes/freesmartphone/libfsobasics_git.bb +++ b/recipes/freesmartphone/libfsobasics_git.bb @@ -1,5 +1,6 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" -PV = "0.8.2.0+gitr${SRCREV}" +PV = "0.8.2.0+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/libfsoframework_git.bb b/recipes/freesmartphone/libfsoframework_git.bb index 5840cdbfbc..c78e924118 100644 --- a/recipes/freesmartphone/libfsoframework_git.bb +++ b/recipes/freesmartphone/libfsoframework_git.bb @@ -1,6 +1,7 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" DEPENDS += "libfsobasics alsa-lib" -PV = "0.2.0.0+gitr${SRCREV}" +PV = "0.2.0.0+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.1" diff --git a/recipes/freesmartphone/libfsoresource_git.bb b/recipes/freesmartphone/libfsoresource_git.bb index 40b536f293..8374decfc8 100644 --- a/recipes/freesmartphone/libfsoresource_git.bb +++ b/recipes/freesmartphone/libfsoresource_git.bb @@ -1,5 +1,6 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org dbus resource library" DEPENDS += "libfso-glib" -PV = "0.1.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/libfsotransport_git.bb b/recipes/freesmartphone/libfsotransport_git.bb index a87fe6cf49..29f3e60ffb 100644 --- a/recipes/freesmartphone/libfsotransport_git.bb +++ b/recipes/freesmartphone/libfsotransport_git.bb @@ -1,4 +1,5 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org transport library" -PV = "0.9.4+gitr${SRCREV}" +PV = "0.9.4+gitr${SRCPV}" +PE = "1" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/libgsm0710_git.bb b/recipes/freesmartphone/libgsm0710_git.bb index 78050c40f5..c748c7aaf0 100644 --- a/recipes/freesmartphone/libgsm0710_git.bb +++ b/recipes/freesmartphone/libgsm0710_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "A GSM 07.10 Protocol Engine" LICENSE = "GPL" SECTION = "devel" -PV = "1.2.0+gitr${SRCREV}" +PV = "1.2.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/libgsm0710.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/libgsm0710mux_git.bb b/recipes/freesmartphone/libgsm0710mux_git.bb index 69446879c3..40adaaa836 100644 --- a/recipes/freesmartphone/libgsm0710mux_git.bb +++ b/recipes/freesmartphone/libgsm0710mux_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" LICENSE = "GPL" SECTION = "devel" DEPENDS = "glib-2.0 libgsm0710 libfsotransport" -PV = "0.9.0+gitr${SRCREV}" +PV = "0.9.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "\ diff --git a/recipes/freesmartphone/libpersistence_git.bb b/recipes/freesmartphone/libpersistence_git.bb index 8f6aafd42a..ab46850854 100644 --- a/recipes/freesmartphone/libpersistence_git.bb +++ b/recipes/freesmartphone/libpersistence_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Jürg Billeter, Michael 'Mickey' Lauer" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "libgee" -PV = "0.1.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "\ diff --git a/recipes/freesmartphone/mickeydbus_git.bb b/recipes/freesmartphone/mickeydbus_git.bb index 229ff7f1fd..ad2d356944 100644 --- a/recipes/freesmartphone/mickeydbus_git.bb +++ b/recipes/freesmartphone/mickeydbus_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" HOMEPAGE = "http://www.freesmartphone.org" SECTION = "console/network" LICENSE = "GPLv2" -PV = "0.9.2+gitr${SRCREV}" +PV = "0.9.2+gitr${SRCPV}" +PE = "1" PR = "r2" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/mickeyterm_git.bb b/recipes/freesmartphone/mickeyterm_git.bb index 276eeb55ab..a66290b00e 100644 --- a/recipes/freesmartphone/mickeyterm_git.bb +++ b/recipes/freesmartphone/mickeyterm_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" HOMEPAGE = "http://www.freesmartphone.org" SECTION = "console/network" LICENSE = "GPLv2" -PV = "2.9.1+gitr${SRCREV}" +PV = "2.9.1+gitr${SRCPV}" +PE = "1" PR = "r3" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/multicat_git.bb b/recipes/freesmartphone/multicat_git.bb index c9344390ed..d31c38668b 100644 --- a/recipes/freesmartphone/multicat_git.bb +++ b/recipes/freesmartphone/multicat_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" HOMEPAGE = "http://www.freesmartphone.org" SECTION = "console" LICENSE = "GPLv2" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/opimd-utils_git.bb b/recipes/freesmartphone/opimd-utils_git.bb index 5031ae5c13..726bfa865d 100644 --- a/recipes/freesmartphone/opimd-utils_git.bb +++ b/recipes/freesmartphone/opimd-utils_git.bb @@ -1,27 +1,48 @@ DESCRIPTION = "Test scripts for freesmartphone.org opimd interface" HOMEPAGE = "http://freesmartphone.org" +SHR_RELEASE ?= "shr" LICENSE ?= "GPL" +RDEPENDS = "python-elementary python-dbus python-codecs python-shell python python-core python-edbus frameworkd" SECTION = "x11/application" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.3+gitr${SRCPV}" PR = "r0" +PE = "1" inherit setuptools -SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http" -S = "${WORKDIR}/git" +PACKAGES =+ "\ + ${PN}-cli \ + ${PN}-notes \ + ${PN}-data \ +" -RDEPENDS = "\ - python-elementary \ - python-edbus \ - python-codecs \ - python-shell \ - \ +RDEPENDS_${PN} = "\ + ${PN}-data \ shr-settings \ - shr-theme \ - frameworkd \ pyphonelog \ + shr-theme \ +" + +RDEPENDS_${PN}-notes = "\ + ${PN}-data \ +" + +RRECOMMENDS_${PN} = "\ + ${PN}-notes \ + ${PN}-cli \ " +PACKAGE_ARCH_${PN}-cli = "all" +PACKAGE_ARCH_${PN}-data = "all" +PACKAGE_ARCH_${PN}-notes = "all" + +SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http" +S = "${WORKDIR}/git" FILES_${PN} += "${sysconfdir}/X11/Xsession.d/89opimd-notifier" FILES_${PN} += "${prefix}/share/applications/" -FILES_${PN} += "${prefix}/share/pixmaps/opimd-utils/" +FILES_${PN} += "${prefix}/share/pixmaps/" +FILES_${PN}-data += "${prefix}/share/pixmaps/opimd-utils/" +FILES_${PN}-cli += "${prefix}/bin/opimd-cli" +FILES_${PN}-notes += "${prefix}/bin/opimd-notes" +FILES_${PN}-notes += "${prefix}/share/pixmaps/opimd-notes.png" +FILES_${PN}-notes += "${prefix}/share/applications/opimd-notes.desktop" diff --git a/recipes/freesmartphone/pycd_git.bb b/recipes/freesmartphone/pycd_git.bb index 3ed2b75292..449cc2268d 100644 --- a/recipes/freesmartphone/pycd_git.bb +++ b/recipes/freesmartphone/pycd_git.bb @@ -3,7 +3,8 @@ AUTHOR = "Jan Luebbe <jluebbe@debian.org>" HOMEPAGE = "http://www.freesmartphone.org" SECTION = "console/network" LICENSE = "GPLv2" -PV = "0.1+gitr${SRCREV}" +PV = "0.1+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" diff --git a/recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb b/recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb index ebae18b628..145672ffe7 100644 --- a/recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb +++ b/recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Vala DBus Binding Tool" SECTION = "console" LICENSE = "GPLv2" DEPENDS = "vala-native libgee-native intltool-native libxml2-native" -PV = "0.1.0+gitr${SRCREV}" +PV = "0.1.0+gitr${SRCPV}" +PE = "1" SRC_URI = "${FREESMARTPHONE_GIT}/vala-dbus-binding-tool.git;protocol=git;branch=master" S = "${WORKDIR}/git" diff --git a/recipes/freesmartphone/zhone_git.bb b/recipes/freesmartphone/zhone_git.bb index 0fcc25c5f6..dba47be911 100644 --- a/recipes/freesmartphone/zhone_git.bb +++ b/recipes/freesmartphone/zhone_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "A phone UI based on the freesmartphone.org framework" LICENSE = "GPL" SECTION = "x11" DEPENDS = "edje-native python-pyrex-native python-cython-native" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" +PE = "1" PR = "r12" SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \ diff --git a/recipes/gnuradio/gnuradio-libusb-compat.inc b/recipes/gnuradio/gnuradio-libusb-compat.inc index 8a0ca54726..2cbc735cc3 100644 --- a/recipes/gnuradio/gnuradio-libusb-compat.inc +++ b/recipes/gnuradio/gnuradio-libusb-compat.inc @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "GPLv3" DEPENDS = "virtual/libusb0 guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy" INC_PR = "r7" +PE = "1" inherit distutils-base autotools autotools_stage pkgconfig diff --git a/recipes/gnuradio/gnuradio.inc b/recipes/gnuradio/gnuradio.inc index d1d0c12fea..3ef62875ff 100644 --- a/recipes/gnuradio/gnuradio.inc +++ b/recipes/gnuradio/gnuradio.inc @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "GPLv3" DEPENDS = "virtual/libusb0 guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy" INC_PR = "r7" +PE = "1" inherit distutils-base autotools autotools_stage pkgconfig diff --git a/recipes/gnuradio/gnuradio_git.bb b/recipes/gnuradio/gnuradio_git.bb index 03dfdb25e6..ed98ade6ee 100644 --- a/recipes/gnuradio/gnuradio_git.bb +++ b/recipes/gnuradio/gnuradio_git.bb @@ -9,7 +9,7 @@ DEPENDS += " gsl " SRCREV = "bf7ad4d17514aba9fc5209bc916ce37482f77eaa" PR = "${INC_PR}.2" -PV = "3.2.1-${PR}+gitr${SRCREV}" +PV = "3.2.1-${PR}+gitr${SRCPV}" EXTRA_OECONF += "--with-boost=${STAGING_DIR_TARGET}/usr CXXFLAGS=-DBOOST_SP_USE_PTHREADS --disable-usrp2 --disable-usrp2-firmware --with-fusb-tech=libusb1" diff --git a/recipes/gpe-icons/gpe-icons.inc b/recipes/gpe-icons/gpe-icons.inc new file mode 100644 index 0000000000..0c23814b41 --- /dev/null +++ b/recipes/gpe-icons/gpe-icons.inc @@ -0,0 +1,36 @@ +SECTION = "gpe" +RDEPENDS += "gdk-pixbuf-loader-png" + +inherit update-alternatives + +INC_PR = "r3" + +ALTERNATIVE_NAME = "gpe-pixmaps" +ALTERNATIVE_LINK = "${datadir}/gpe/pixmaps" +ALTERNATIVE_PATH = "${datadir}/gpe/pixmaps.${PN}" +ALTERNATIVE_PRIORITY ?= 1 + +pkg_postinst() { + if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then + echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!" + echo "warn: It will be replaced with link managed by update-alternatives" + echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old." + echo "warn: It should be empty but probably isn't!" + echo "warn: Check what's left there and remove it manually." + mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old + fi + pixmap_dirs_root="${datadir}/gpe/" + cd ${pixmap_dirs_root} + for pixmap_dir in pixmaps.*; do + if [ "${pixmap_dir}"x == "pixmaps.${PN}"x ] ; then + continue; + fi + for pixmap in `find ${pixmap_dir}`; do + pixmap_target=`echo ${pixmap} | sed "s/${pixmap_dir}/pixmaps.${PN}/g"`; + if [ ! -e ${pixmap_target} ] ; then + cp -ra ${pixmap} ${pixmap_target}; + echo "${pixmap} merged"; + fi; + done + done +} diff --git a/recipes/gpe-icons/gpe-icons_0.25.bb b/recipes/gpe-icons/gpe-icons_0.25.bb index 6276e9510b..ac1e9fccd4 100644 --- a/recipes/gpe-icons/gpe-icons_0.25.bb +++ b/recipes/gpe-icons/gpe-icons_0.25.bb @@ -7,9 +7,14 @@ RDEPENDS = "gdk-pixbuf-loader-png" inherit gpe -PR = "r1" +PR = "${INC_PR}.0" #only icons present in the package PACKAGE_ARCH = "all" FILES_${PN} = "${datadir}/gpe" +do_configure_prepend() { + sed -i "s| \$(DESTDIR)\$(PREFIX)/share/gpe/pixmaps/| \$(DESTDIR)\$(PREFIX)/share/gpe/pixmaps.${PN}/|g" Makefile +} + +require gpe-icons.inc diff --git a/recipes/gpe-icons/gpe-theme-neo_git.bb b/recipes/gpe-icons/gpe-theme-neo_git.bb new file mode 100644 index 0000000000..192c8a7d8e --- /dev/null +++ b/recipes/gpe-icons/gpe-theme-neo_git.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "nEo GPE theme - a very fast, high contrast GPE theme" +SECTION = "gpe" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" +RDEPENDS = "gdk-pixbuf-loader-png gpe-filemanager gpe-sketchbook" +RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo icon-theme-neo" +LICENSE = "unknown" + +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" +PR = "${INC_PR}.0" + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" + +S = "${WORKDIR}/git/gpe/theme-neo/pixmaps" + +require gpe-icons.inc + +do_install() { + install -d ${D}${datadir}/gpe/ + install -d ${D}${datadir}/gpe/pixmaps.${PN}/ + cp -r ${S}/* "${D}${datadir}/gpe/pixmaps.${PN}/" +} + +FILES_${PN} = "${datadir}/gpe/pixmaps.${PN}/" + diff --git a/recipes/gpephone/addressbook_0.1.bb b/recipes/gpephone/addressbook_0.1.bb index 21fd95fe66..8121651187 100644 --- a/recipes/gpephone/addressbook_0.1.bb +++ b/recipes/gpephone/addressbook_0.1.bb @@ -3,6 +3,7 @@ DESCRIPTION = "LiPS address book" SECTION = "gpe" PRIORITY = "optional" PR = "r0" +PE = "1" DEPENDS = "gtk+ libgpewidget libgpephone dbus-glib libabenabler libiac libim" diff --git a/recipes/gpephone/addressbook_svn.bb b/recipes/gpephone/addressbook_svn.bb index cb913bc663..3faaeba654 100644 --- a/recipes/gpephone/addressbook_svn.bb +++ b/recipes/gpephone/addressbook_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "LiPS address book" SECTION = "gpe" PRIORITY = "optional" PR = "r0" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/almmgrd_svn.bb b/recipes/gpephone/almmgrd_svn.bb index 70d02ff018..3186b0f3aa 100644 --- a/recipes/gpephone/almmgrd_svn.bb +++ b/recipes/gpephone/almmgrd_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpephone" PRIORITY = "required" LICENSE = "LiPS" DEPENDS = "glib-2.0 libiac sqlite3 libcalenabler2 libalmmgr" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/calendar2_svn.bb b/recipes/gpephone/calendar2_svn.bb index c066fc77c0..ea4392f9bb 100644 --- a/recipes/gpephone/calendar2_svn.bb +++ b/recipes/gpephone/calendar2_svn.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Calendar application for GPE Phone Edition" LICENSE = "LiPS" SECTION = "gpe" PRIORITY = "optional" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r1" DEPENDS = "gtk+ libgpewidget libgpephone libgemwidget dbus-glib libcalenabler2 libiac" diff --git a/recipes/gpephone/contact_svn.bb b/recipes/gpephone/contact_svn.bb index ef4d2707ab..c3915ff86a 100644 --- a/recipes/gpephone/contact_svn.bb +++ b/recipes/gpephone/contact_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ libgpephone dbus-glib libabenabler2 librecord2 libgemwidget" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone autotools diff --git a/recipes/gpephone/dialer_svn.bb b/recipes/gpephone/dialer_svn.bb index 7b1b883652..135c4ef43b 100644 --- a/recipes/gpephone/dialer_svn.bb +++ b/recipes/gpephone/dialer_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ libgpephone libgemwidget" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone autotools diff --git a/recipes/gpephone/firewall_svn.bb b/recipes/gpephone/firewall_svn.bb index 6c3ed64b26..ae452b5200 100644 --- a/recipes/gpephone/firewall_svn.bb +++ b/recipes/gpephone/firewall_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "Cellphone firewall tool" SECTION = "gpe" PRIORITY = "optional" PR = "r1" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/gpe-applauncher_0.10.bb b/recipes/gpephone/gpe-applauncher_0.10.bb index 7167b42071..804a019b87 100644 --- a/recipes/gpephone/gpe-applauncher_0.10.bb +++ b/recipes/gpephone/gpe-applauncher_0.10.bb @@ -3,6 +3,7 @@ DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" PR = "r1" +PE = "1" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" diff --git a/recipes/gpephone/gpe-applauncher_0.11.bb b/recipes/gpephone/gpe-applauncher_0.11.bb index 4934cdeaf2..4c87008d69 100644 --- a/recipes/gpephone/gpe-applauncher_0.11.bb +++ b/recipes/gpephone/gpe-applauncher_0.11.bb @@ -3,6 +3,7 @@ DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" PR = "r2" +PE = "1" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" diff --git a/recipes/gpephone/gpe-applauncher_0.7.bb b/recipes/gpephone/gpe-applauncher_0.7.bb index 349330047b..e2ee0c4108 100644 --- a/recipes/gpephone/gpe-applauncher_0.7.bb +++ b/recipes/gpephone/gpe-applauncher_0.7.bb @@ -3,6 +3,7 @@ DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" PR = "r1" +PE = "1" DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-client" diff --git a/recipes/gpephone/gpe-applauncher_0.8.bb b/recipes/gpephone/gpe-applauncher_0.8.bb index 641511ad5b..19f8fb3e77 100644 --- a/recipes/gpephone/gpe-applauncher_0.8.bb +++ b/recipes/gpephone/gpe-applauncher_0.8.bb @@ -3,6 +3,7 @@ DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" PR = "r0" +PE = "1" DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings" diff --git a/recipes/gpephone/gpe-applauncher_0.9.bb b/recipes/gpephone/gpe-applauncher_0.9.bb index fbc47bd091..1649c26d3f 100644 --- a/recipes/gpephone/gpe-applauncher_0.9.bb +++ b/recipes/gpephone/gpe-applauncher_0.9.bb @@ -3,6 +3,7 @@ DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" PR = "r0" +PE = "1" DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client" diff --git a/recipes/gpephone/gpe-applauncher_svn.bb b/recipes/gpephone/gpe-applauncher_svn.bb index 3087088ab8..1d4c6990ed 100644 --- a/recipes/gpephone/gpe-applauncher_svn.bb +++ b/recipes/gpephone/gpe-applauncher_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "A cellphone application launcher." SECTION = "gpe" PRIORITY = "optional" PR = "r1" -PV = "0.11+svnr-${SRCREV}" +PV = "0.11+svnr${SRCPV}" +PE = "1" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/libabenabler2_1.0.bb b/recipes/gpephone/libabenabler2_1.0.bb index ce8470274d..8d2a43cae9 100644 --- a/recipes/gpephone/libabenabler2_1.0.bb +++ b/recipes/gpephone/libabenabler2_1.0.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 librecord2 gconf sqlite3" PR = "r1" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libabenabler2_svn.bb b/recipes/gpephone/libabenabler2_svn.bb index 004ba3ec46..fae28a4c80 100644 --- a/recipes/gpephone/libabenabler2_svn.bb +++ b/recipes/gpephone/libabenabler2_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "glib-2.0 librecord2 gconf sqlite3" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libabenabler_0.1.bb b/recipes/gpephone/libabenabler_0.1.bb index c76d8f469b..91620a9a87 100644 --- a/recipes/gpephone/libabenabler_0.1.bb +++ b/recipes/gpephone/libabenabler_0.1.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 librecord liblipsevent libim sqlite3" PR = "r1" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/recipes/gpephone/libabenabler_1.0.bb b/recipes/gpephone/libabenabler_1.0.bb index c76d8f469b..91620a9a87 100644 --- a/recipes/gpephone/libabenabler_1.0.bb +++ b/recipes/gpephone/libabenabler_1.0.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 librecord liblipsevent libim sqlite3" PR = "r1" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/recipes/gpephone/libabenabler_svn.bb b/recipes/gpephone/libabenabler_svn.bb index 4468c3580e..f7b28c5b8a 100644 --- a/recipes/gpephone/libabenabler_svn.bb +++ b/recipes/gpephone/libabenabler_svn.bb @@ -4,7 +4,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 librecord liblipsevent libim sqlite3" PR = "r0" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/libalmmgr_svn.bb b/recipes/gpephone/libalmmgr_svn.bb index cbae037109..c3bb36c9ce 100644 --- a/recipes/gpephone/libalmmgr_svn.bb +++ b/recipes/gpephone/libalmmgr_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "glib-2.0 libiac" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libcalenabler2_svn.bb b/recipes/gpephone/libcalenabler2_svn.bb index e3bf129ab1..d42c60b6b7 100644 --- a/recipes/gpephone/libcalenabler2_svn.bb +++ b/recipes/gpephone/libcalenabler2_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "glib-2.0 sqlite3 libical libalmmgr" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" diff --git a/recipes/gpephone/libgemwidget_0.1.bb b/recipes/gpephone/libgemwidget_0.1.bb index 0b670e485d..5198bedbf6 100644 --- a/recipes/gpephone/libgemwidget_0.1.bb +++ b/recipes/gpephone/libgemwidget_0.1.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ libiac libgpephone" PR = "r1" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libgemwidget_1.0.bb b/recipes/gpephone/libgemwidget_1.0.bb index a9f02cd245..27b6336b76 100644 --- a/recipes/gpephone/libgemwidget_1.0.bb +++ b/recipes/gpephone/libgemwidget_1.0.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ libiac libgpephone gnome-vfs libxdamage libxcomposite libgpewidget" PR = "r0" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libgemwidget_svn.bb b/recipes/gpephone/libgemwidget_svn.bb index f4e2e350d8..c5ed24af6b 100644 --- a/recipes/gpephone/libgemwidget_svn.bb +++ b/recipes/gpephone/libgemwidget_svn.bb @@ -3,7 +3,8 @@ LICENSE = "LiPS" SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ libiac libgpephone gnome-vfs libxdamage libxcomposite libgpewidget" -PV = "1.0+svnr-${SRCREV}" +PV = "1.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libgpephone_0.3.bb b/recipes/gpephone/libgpephone_0.3.bb index 9a78fd9947..26e19a4142 100644 --- a/recipes/gpephone/libgpephone_0.3.bb +++ b/recipes/gpephone/libgpephone_0.3.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ gtk-doc dbus-glib" PR = "r1" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libgpephone_0.4.bb b/recipes/gpephone/libgpephone_0.4.bb index 690b3eded6..b74f857d5f 100644 --- a/recipes/gpephone/libgpephone_0.4.bb +++ b/recipes/gpephone/libgpephone_0.4.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ gtk-doc dbus-glib" PR = "r0" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libgpephone_svn.bb b/recipes/gpephone/libgpephone_svn.bb index ce960ac3cc..219e64fb8f 100644 --- a/recipes/gpephone/libgpephone_svn.bb +++ b/recipes/gpephone/libgpephone_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "Base library for GPE phone environment." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ gtk-doc dbus-glib" -PV = "0.4+svnr-${SRCREV}" +PV = "0.4+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libiac2_svn.bb b/recipes/gpephone/libiac2_svn.bb index 7ae0c7b693..d0a449dfb8 100644 --- a/recipes/gpephone/libiac2_svn.bb +++ b/recipes/gpephone/libiac2_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ gtk-doc dbus-glib" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libiac_0.1.bb b/recipes/gpephone/libiac_0.1.bb index 5d522b7f54..6905969c89 100644 --- a/recipes/gpephone/libiac_0.1.bb +++ b/recipes/gpephone/libiac_0.1.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ gtk-doc" PR = "r2" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libiac_1.0.bb b/recipes/gpephone/libiac_1.0.bb index 940b1ecc31..3f13fbf5e9 100644 --- a/recipes/gpephone/libiac_1.0.bb +++ b/recipes/gpephone/libiac_1.0.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ gtk-doc" PR = "r1" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libiac_svn.bb b/recipes/gpephone/libiac_svn.bb index 0cd1d6487d..a9abef2865 100644 --- a/recipes/gpephone/libiac_svn.bb +++ b/recipes/gpephone/libiac_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ gtk-doc" -PV = "1.0+svnr-${SRCREV}" +PV = "1.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libim2_svn.bb b/recipes/gpephone/libim2_svn.bb index 510877ce3e..1dec41915a 100644 --- a/recipes/gpephone/libim2_svn.bb +++ b/recipes/gpephone/libim2_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "LiPS instant messenger library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 librecord2 libabenabler2 liblipsevent2 telepathy-glib telepathy-mission-control" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r1" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/liblipsevent2_svn.bb b/recipes/gpephone/liblipsevent2_svn.bb index 5d2330c671..5345c5a472 100644 --- a/recipes/gpephone/liblipsevent2_svn.bb +++ b/recipes/gpephone/liblipsevent2_svn.bb @@ -3,7 +3,8 @@ LICENSE = "LiPS" SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libmsgenabler2_svn.bb b/recipes/gpephone/libmsgenabler2_svn.bb index a294dc93b7..f6d154b32f 100644 --- a/recipes/gpephone/libmsgenabler2_svn.bb +++ b/recipes/gpephone/libmsgenabler2_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "LiPS message backend library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 dbus-glib librecord2 liblipsevent2 telepathy-mission-control libgsmd-lips" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/libmsgenabler_1.0.bb b/recipes/gpephone/libmsgenabler_1.0.bb index bde6a2fd6b..98d8da96fc 100644 --- a/recipes/gpephone/libmsgenabler_1.0.bb +++ b/recipes/gpephone/libmsgenabler_1.0.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 dbus-glib librecord sqlite3" PR = "r2" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" diff --git a/recipes/gpephone/libmsgenabler_svn.bb b/recipes/gpephone/libmsgenabler_svn.bb index c8672e143e..d37e519093 100644 --- a/recipes/gpephone/libmsgenabler_svn.bb +++ b/recipes/gpephone/libmsgenabler_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "LiPS message backend library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 dbus-glib librecord sqlite3" -PV = "1.0+svnr-${SRCREV}" +PV = "1.0+svnr${SRCPV}" +PE = "1" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/librecord2_0.1.bb b/recipes/gpephone/librecord2_0.1.bb index 532cc267ff..ba8e5ca48e 100644 --- a/recipes/gpephone/librecord2_0.1.bb +++ b/recipes/gpephone/librecord2_0.1.bb @@ -4,6 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 e2fsprogs-libs sqlite3" PR = "r0" +PE = "1" GPE_TARBALL_SUFFIX = "bz2" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/librecord2_svn.bb b/recipes/gpephone/librecord2_svn.bb index 378032dabf..790081120e 100644 --- a/recipes/gpephone/librecord2_svn.bb +++ b/recipes/gpephone/librecord2_svn.bb @@ -4,7 +4,8 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "glib-2.0 e2fsprogs-libs sqlite3" PR = "r0" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/libsettings_0.3.bb b/recipes/gpephone/libsettings_0.3.bb index 3c9794edc2..740ee6cb7c 100644 --- a/recipes/gpephone/libsettings_0.3.bb +++ b/recipes/gpephone/libsettings_0.3.bb @@ -4,6 +4,7 @@ PRIORITY = "required" LICENSE = "LiPS" DEPENDS = "glib-2.0 gconf" PR = "r1" +PE = "1" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libsettings_svn.bb b/recipes/gpephone/libsettings_svn.bb index 770fe8cce6..aa55352cd6 100644 --- a/recipes/gpephone/libsettings_svn.bb +++ b/recipes/gpephone/libsettings_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpe/libs" PRIORITY = "required" LICENSE = "LiPS" DEPENDS = "glib-2.0 gconf" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/libtapi_svn.bb b/recipes/gpephone/libtapi_svn.bb index 68e578728a..29bc40cf2d 100644 --- a/recipes/gpephone/libtapi_svn.bb +++ b/recipes/gpephone/libtapi_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "LiPS telephony library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ libglade libgsmd" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libvoc_svn.bb b/recipes/gpephone/libvoc_svn.bb index 3389c7d10a..eaec6d2f51 100644 --- a/recipes/gpephone/libvoc_svn.bb +++ b/recipes/gpephone/libvoc_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "LiPS voice call library." SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ libglade libgsmd" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" PR = "r0" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/machined_svn.bb b/recipes/gpephone/machined_svn.bb index 0c5ccfff51..1f1bc01246 100644 --- a/recipes/gpephone/machined_svn.bb +++ b/recipes/gpephone/machined_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpephone" PRIORITY = "required" LICENSE = "GPL" DEPENDS = "glib-2.0 dbus-glib gtk+" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/ptim-engine_1.0.bb b/recipes/gpephone/ptim-engine_1.0.bb index e1cd76ae30..ecf0103b04 100644 --- a/recipes/gpephone/ptim-engine_1.0.bb +++ b/recipes/gpephone/ptim-engine_1.0.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers" PR = "r0" +PE = "1" inherit gpephone pkgconfig autotools @@ -17,4 +18,4 @@ FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la" do_stage () { autotools_stage_all -}
\ No newline at end of file +} diff --git a/recipes/gpephone/ptim-engine_svn.bb b/recipes/gpephone/ptim-engine_svn.bb index 281ee72c26..8f9bf66854 100644 --- a/recipes/gpephone/ptim-engine_svn.bb +++ b/recipes/gpephone/ptim-engine_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpephone" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" PR = "r1" DEFAULT_PREFERENCE = "-1" @@ -20,4 +21,4 @@ FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la" do_stage () { autotools_stage_all -}
\ No newline at end of file +} diff --git a/recipes/gpephone/ptim-headers_1.0.bb b/recipes/gpephone/ptim-headers_1.0.bb index 2ed36458e4..5c54cd78d1 100644 --- a/recipes/gpephone/ptim-headers_1.0.bb +++ b/recipes/gpephone/ptim-headers_1.0.bb @@ -3,6 +3,7 @@ SECTION = "gpephone" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+" +PE = "1" inherit gpephone pkgconfig autotools @@ -12,4 +13,4 @@ S = "${WORKDIR}/imheaders-${PV}" do_stage () { autotools_stage_all -}
\ No newline at end of file +} diff --git a/recipes/gpephone/ptim-headers_svn.bb b/recipes/gpephone/ptim-headers_svn.bb index 4384feccbd..fc4eae920a 100644 --- a/recipes/gpephone/ptim-headers_svn.bb +++ b/recipes/gpephone/ptim-headers_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpephone" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/ptim-helper_1.0.bb b/recipes/gpephone/ptim-helper_1.0.bb index 4d5609e6a2..1a885b4fd4 100644 --- a/recipes/gpephone/ptim-helper_1.0.bb +++ b/recipes/gpephone/ptim-helper_1.0.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers" PR = "r1" +PE = "1" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/ptim-helper_svn.bb b/recipes/gpephone/ptim-helper_svn.bb index 71b004e92b..ed7b207ab4 100644 --- a/recipes/gpephone/ptim-helper_svn.bb +++ b/recipes/gpephone/ptim-helper_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpephone" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/ptim-manager_1.0.bb b/recipes/gpephone/ptim-manager_1.0.bb index c0955a2176..a58cf78e5d 100644 --- a/recipes/gpephone/ptim-manager_1.0.bb +++ b/recipes/gpephone/ptim-manager_1.0.bb @@ -4,6 +4,7 @@ PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers libiac" PR = "r0" +PE = "1" inherit gpephone pkgconfig autotools @@ -24,4 +25,4 @@ do_install_append () { do_stage () { autotools_stage_all -}
\ No newline at end of file +} diff --git a/recipes/gpephone/ptim-manager_svn.bb b/recipes/gpephone/ptim-manager_svn.bb index da0f4e6af4..ed9303b38d 100644 --- a/recipes/gpephone/ptim-manager_svn.bb +++ b/recipes/gpephone/ptim-manager_svn.bb @@ -3,7 +3,8 @@ SECTION = "gpephone" PRIORITY = "optional" LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers libiac" -PV = "0.1+svnr-${SRCREV}" +PV = "0.1+svnr${SRCPV}" +PE = "1" PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/quickdial_svn.bb b/recipes/gpephone/quickdial_svn.bb index 2a52510d86..b111fe1ded 100644 --- a/recipes/gpephone/quickdial_svn.bb +++ b/recipes/gpephone/quickdial_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "Quickdial application and backend" SECTION = "gpe" PRIORITY = "optional" PR = "r0" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gpephone/useen_svn.bb b/recipes/gpephone/useen_svn.bb index 1a180683a7..1dd4a6584d 100644 --- a/recipes/gpephone/useen_svn.bb +++ b/recipes/gpephone/useen_svn.bb @@ -3,7 +3,8 @@ DESCRIPTION = "Useen tool" SECTION = "gpe" PRIORITY = "optional" PR = "r0" -PV = "0.0+svnr-${SRCREV}" +PV = "0.0+svnr${SRCPV}" +PE = "1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gstreamer/gst-omapfb_1.0.bb b/recipes/gstreamer/gst-omapfb_1.0.bb index f00ac7f523..4c2d3aefb5 100644 --- a/recipes/gstreamer/gst-omapfb_1.0.bb +++ b/recipes/gstreamer/gst-omapfb_1.0.bb @@ -6,7 +6,8 @@ inherit autotools DEPENDS = "gstreamer virtual/libx11 virtual/kernel" SRCREV = "6f0b1cb50d1c67c3a3db2f11246256060ac871de" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" SRC_URI = "git://github.com/felipec/${PN}.git;protocol=git \ file://0001-Implement-XOverlay-and-I420-to-422-colorspace-conver.patch;patch=1" diff --git a/recipes/gstreamer/gst-player_svn.bb b/recipes/gstreamer/gst-player_svn.bb index c44213bfa8..e75b0ffde5 100644 --- a/recipes/gstreamer/gst-player_svn.bb +++ b/recipes/gstreamer/gst-player_svn.bb @@ -8,8 +8,9 @@ SRC_URI = "svn://gstplayer.googlecode.com/svn;module=trunk;proto=http" S = "${WORKDIR}/trunk/gstplayer" -PV = "svnr${SRCREV}" -PR = "r2" +PE = "1" +PV = "1.0.0+svnr${SRCPV}" +PR = "r0" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/recipes/gtk-webcore/midori.inc b/recipes/gtk-webcore/midori.inc index a7ed936da3..fc2df36f4a 100644 --- a/recipes/gtk-webcore/midori.inc +++ b/recipes/gtk-webcore/midori.inc @@ -3,6 +3,8 @@ LICENSE = "GPLv2" DEPENDS = "webkit-gtk libsoup-2.4 libsexy" +PE = "1" + inherit autotools gtk-icon-cache pkgconfig SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz" diff --git a/recipes/gtk-webcore/midori_0.0.8.bb b/recipes/gtk-webcore/midori_0.0.8.bb index 23d0179375..01fc94867c 100644 --- a/recipes/gtk-webcore/midori_0.0.8.bb +++ b/recipes/gtk-webcore/midori_0.0.8.bb @@ -3,6 +3,8 @@ LICENSE = "GPLv2" DEPENDS = "webkit-gtk libsexy" +PE = "1" + inherit autotools pkgconfig SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ diff --git a/recipes/gtk-webcore/midori_git.bb b/recipes/gtk-webcore/midori_git.bb index e1e2ecf99d..2ba33139aa 100644 --- a/recipes/gtk-webcore/midori_git.bb +++ b/recipes/gtk-webcore/midori_git.bb @@ -4,7 +4,7 @@ DEPENDS += "python-native python-docutils-native" # increment PR every time SRCREV is updated! PR = "r2" -PV = "0.1.7+${PR}+gitr${SRCREV}" +PV = "0.1.7+${PR}+gitr${SRCPV}" SRC_URI = "git://git.xfce.org/apps/midori;protocol=git \ file://waf \ diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc index b618094395..efd64c6209 100644 --- a/recipes/gypsy/gypsy.inc +++ b/recipes/gypsy/gypsy.inc @@ -1,7 +1,7 @@ DESCRIPTION = "GPS Controlling Daemon" LICENSE = "GPL" SECTION = "x11" -DEPENDS = "glib-2.0 dbus-glib bluez-libs libxslt-native" +DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native" inherit autotools pkgconfig diff --git a/recipes/hal/ohm_git.bb b/recipes/hal/ohm_git.bb index ffdbb07b88..af2377e436 100644 --- a/recipes/hal/ohm_git.bb +++ b/recipes/hal/ohm_git.bb @@ -8,8 +8,8 @@ SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \ file://fix_configure.patch;patch=1" SRCREV = "edfe25d49d67884bf004de7ae0724c162bb5e65e" -PV = "0.1.2+${PR}+gitr${SRCREV}" -PE = "1" +PV = "0.1.2+${PR}+gitr${SRCPV}" +PE = "2" S = "${WORKDIR}/git" diff --git a/recipes/imagemagick/files/fix_open_file.patch b/recipes/imagemagick/files/fix_open_file.patch new file mode 100644 index 0000000000..8374e1e551 --- /dev/null +++ b/recipes/imagemagick/files/fix_open_file.patch @@ -0,0 +1,12 @@ +diff -rup ImageMagick-6.3.5.orig/magick/delegate.c ImageMagick-6.3.5/magick/delegate.c +--- ImageMagick-6.3.5.orig/magick/delegate.c 2009-10-15 18:40:06.000000000 +0200 ++++ ImageMagick-6.3.5/magick/delegate.c 2009-10-15 18:23:10.000000000 +0200 +@@ -769,7 +769,7 @@ static void CopyDelegateFile(const char + /* + Copy source file to destination. + */ +- destination_file=open(destination,O_WRONLY | O_BINARY | O_CREAT); ++ destination_file=open(destination, O_BINARY | O_CREAT, O_WRONLY); + if (destination_file == -1) + return; + source_file=open(source,O_RDONLY | O_BINARY); diff --git a/recipes/imagemagick/imagemagick-native_6.3.5-10.bb b/recipes/imagemagick/imagemagick-native_6.3.5-10.bb index b03e18e9c1..4f84f8ce1f 100644 --- a/recipes/imagemagick/imagemagick-native_6.3.5-10.bb +++ b/recipes/imagemagick/imagemagick-native_6.3.5-10.bb @@ -1,3 +1,5 @@ require imagemagick_${PV}.bb DEPENDS ="libtool-native" inherit native + +SRC_URI_append = " file://fix_open_file.patch;patch=1" diff --git a/recipes/iphone/gcc-iphone-cross_git.bb b/recipes/iphone/gcc-iphone-cross_git.bb index ea351cf0bf..f9e1b45b49 100644 --- a/recipes/iphone/gcc-iphone-cross_git.bb +++ b/recipes/iphone/gcc-iphone-cross_git.bb @@ -1,6 +1,7 @@ DESCRIPTION = "GCC for iPhone" DEPENDS = "iphone-sdks" -PV = "4.2.1+git${SRCREV}" +PV = "4.2.1+gitr${SRCPV}" +PE = "1" INHIBIT_DEFAULT_DEPS = "1" diff --git a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index 8baffd24c7..d746177d56 100644 --- a/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb +++ b/recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" SRCDATE = "20050404" -PR = "r23" +PR = "r24" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ file://ipkg-utils-fix.patch;patch=1 \ @@ -19,6 +19,9 @@ SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ S = "${WORKDIR}/ipkg-utils" +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" + INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py ipkg-list-fields" do_compile() { diff --git a/recipes/libgdbus/libgdbus_git.bb b/recipes/libgdbus/libgdbus_git.bb index b780af37fe..c594f9aadd 100644 --- a/recipes/libgdbus/libgdbus_git.bb +++ b/recipes/libgdbus/libgdbus_git.bb @@ -3,8 +3,8 @@ SECTION = "libs" HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php" LICENSE = "GPL LGPL" DEPENDS = "glib-2.0 dbus" -PE = "1" -PV = "0.2+gitr${SRCREV}" +PE = "2" +PV = "0.2+gitr${SRCPV}" SRC_URI = "git://git.moblin.org/repos/projects/libgdbus.git;protocol=http" S = "${WORKDIR}/git" diff --git a/recipes/libgee/libgee_git.bb b/recipes/libgee/libgee_git.bb index ead93741ce..48f6ced76d 100644 --- a/recipes/libgee/libgee_git.bb +++ b/recipes/libgee/libgee_git.bb @@ -4,7 +4,8 @@ HOMEPAGE = "http://live.gnome.org/Libgee" SECTION = "libs" DEPENDS = "glib-2.0" LICENSE = "LGPL" -PV = "0.5.0+gitr${SRCREV}" +PV = "0.5.0+gitr${SRCPV}" +PE = "1" SRC_URI = "\ git://git.gnome.org/libgee;protocol=git;branch=master \ diff --git a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb index 07e3af9a40..4124d582b6 100644 --- a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb +++ b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb @@ -3,6 +3,8 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" +PR = "r1" + DEFAULT_PREFERENCE = "-1" SRC_URI = "\ @@ -24,6 +26,10 @@ EXTRA_OECONF = "\ --enable-threads \ " +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" + + do_stage() { oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR} install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/ diff --git a/recipes/libnl/libnl2_git.bb b/recipes/libnl/libnl2_git.bb index 9e2c3d7ecc..f98a075049 100644 --- a/recipes/libnl/libnl2_git.bb +++ b/recipes/libnl/libnl2_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" SECTION = "libs/network" LICENSE = "LGPL" HOMEPAGE = "http://people.suug.ch/~tgr/libnl" -PV = "1.0+gitr${SRCREV}" +PV = "1.0+gitr${SRCPV}" +PE = "1" PR = "r1" inherit autotools diff --git a/recipes/libopie/libopie2.inc b/recipes/libopie/libopie2.inc index a5a5cef0bd..c9cba7bfef 100644 --- a/recipes/libopie/libopie2.inc +++ b/recipes/libopie/libopie2.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://opie.handhelds.org" SECTION = "opie/libs" LICENSE = "LGPL" I18N_FILES = "libopiecore2.ts libopiesecurity2.ts" -DEPENDS = "libqpe-opie libpcap sqlite3 bluez-libs" +DEPENDS = "libqpe-opie libpcap sqlite3 bluez4" PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2" S = "${WORKDIR}/libopie2" diff --git a/recipes/libpcap/libpcap.inc b/recipes/libpcap/libpcap.inc index 4468a4b89e..165971acb5 100644 --- a/recipes/libpcap/libpcap.inc +++ b/recipes/libpcap/libpcap.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Network Packet Capture Library" HOMEPAGE = "http://www.tcpdump.org/" SECTION = "libs/network" LICENSE = "BSD" -DEPENDS = "bluez-libs flex-native bison-native" +DEPENDS = "bluez4 flex-native bison-native" PR = "r1" diff --git a/recipes/libsdl/libsdl-mixer_1.2.11.bb b/recipes/libsdl/libsdl-mixer_1.2.11.bb index ee0ba454ba..108f52112f 100644 --- a/recipes/libsdl/libsdl-mixer_1.2.11.bb +++ b/recipes/libsdl/libsdl-mixer_1.2.11.bb @@ -15,7 +15,7 @@ export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" inherit autotools_stage -EXTRA_OECONF = "--disable-music-mp3" +EXTRA_OECONF = "--disable-music-mp3 --disable-music-flac" # although we build smpeg... need to find out how # to deal with optional dependencies diff --git a/recipes/libsynthesis/libsynthesis_git.bb b/recipes/libsynthesis/libsynthesis_git.bb index 3571a75a9f..869276ae8f 100644 --- a/recipes/libsynthesis/libsynthesis_git.bb +++ b/recipes/libsynthesis/libsynthesis_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Synthesis SyncML Engine" SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" LICENSE = "LGPLv2.1" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r1" DEPENDS = "libpcre" diff --git a/recipes/libxml/libxml2-native.inc b/recipes/libxml/libxml2-native.inc index 3f67152ca1..603f48d196 100644 --- a/recipes/libxml/libxml2-native.inc +++ b/recipes/libxml/libxml2-native.inc @@ -1,26 +1,21 @@ DESCRIPTION = "GNOME XML library" DEPENDS = "python-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}" +PR = "r3" SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz" S = "${WORKDIR}/libxml2-${PV}" -inherit autotools native pkgconfig distutils-native-base +inherit distutils-base autotools native pkgconfig -do_configure_prepend () { - EXTRA_LIBXML2_OECONF="\ - --with-python=${PYTHON_DIR} \ - --without-debug \ - --without-legacy \ - --with-catalog \ - --without-docbook \ - --with-c14n \ - " -} - -do_configure (){ - autotools_do_configure ${EXTRA_LIBXML2_OECONF} -} +EXTRA_OECONF = "\ + --with-python=${STAGING_INCDIR}/${PYTHON_MAJMIN} \ + --without-debug \ + --without-legacy \ + --without-catalog \ + --without-docbook \ + --with-c14n \ +" do_stage () { oe_runmake install diff --git a/recipes/linux/linux-davinci_2.6.30.bb b/recipes/linux/linux-davinci_2.6.30.bb index 63c87e820b..679f6819a7 100644 --- a/recipes/linux/linux-davinci_2.6.30.bb +++ b/recipes/linux/linux-davinci_2.6.30.bb @@ -10,7 +10,8 @@ DEFAULT_PREFERENCE = "1" SRCREV = "5212151f26e688416faac9f6f33ddd958f7de96c" # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc -PV = "2.6.30-${PR}+gitr${SRCREV}" +PV = "2.6.30-${PR}+gitr${SRCPV}" +PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \ file://defconfig" diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb index 05b8eba45e..572d4400de 100644 --- a/recipes/linux/linux-davinci_git.bb +++ b/recipes/linux/linux-davinci_git.bb @@ -18,11 +18,12 @@ SRCREV_dm6467-evm = "7b2683fd0168df1576fcea947ef9f63e905de807" SRCREV_dm6467t-evm = "7b2683fd0168df1576fcea947ef9f63e905de807" # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc -PV_dm355-evm = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCREV}" -PV_dm365-evm = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCREV}" -PV_dm6446-evm = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCREV}" -PV_dm6467-evm = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCREV}" -PV_dm6467t-evm = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCREV}" +PE = "1" +PV_dm355-evm = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCPV}" +PV_dm365-evm = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCPV}" +PV_dm6446-evm = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCPV}" +PV_dm6467-evm = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCPV}" +PV_dm6467t-evm = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCPV}" BRANCH_dm355-evm = "r28" BRANCH_dm365-evm = "r28" @@ -45,9 +46,9 @@ SRCREV_da850-omapl138-evm = "b306b47248ef6b4e5927a6baa2849ff434c12ddb" SRCREV_hawkboard = "b306b47248ef6b4e5927a6baa2849ff434c12ddb" # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc -PV_da830-omapl137-evm = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCREV}" -PV_da850-omapl138-evm = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCREV}" -PV_hawkboard = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCREV}" +PV_da830-omapl137-evm = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCPV}" +PV_da850-omapl138-evm = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCPV}" +PV_hawkboard = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCPV}" SRC_URI_append_da830-omapl137-evm = "git://arago-project.org/git/people/sekhar/linux-omapl1.git;protocol=git;branch=${BRANCH}" SRC_URI_append_da850-omapl138-evm = "git://arago-project.org/git/people/sekhar/linux-omapl1.git;protocol=git;branch=${BRANCH}" diff --git a/recipes/linux/linux-eten_2.6.28-rc4+git.bb b/recipes/linux/linux-eten_2.6.28-rc4+git.bb index 0d3dac86c6..a5508371ec 100644 --- a/recipes/linux/linux-eten_2.6.28-rc4+git.bb +++ b/recipes/linux/linux-eten_2.6.28-rc4+git.bb @@ -9,7 +9,8 @@ KERNEL_RELEASE = "2.6.28-rc4" KERNEL_VERSION = "${KERNEL_RELEASE}" # See http://wiki.openembedded.net/index.php/Versioning_Policy -PV = "2.6.27+${KERNEL_RELEASE}+${PR}+gitr${SRCREV}" +PV = "2.6.27+${KERNEL_RELEASE}+${PR}+gitr${SRCPV}" +PE = "1" PR = "r2" SRC_URI = "\ diff --git a/recipes/linux/linux-kirkwood_2.6.29.5.bb b/recipes/linux/linux-kirkwood_2.6.29.5.bb index f503829211..576c851ccb 100644 --- a/recipes/linux/linux-kirkwood_2.6.29.5.bb +++ b/recipes/linux/linux-kirkwood_2.6.29.5.bb @@ -7,8 +7,9 @@ require linux.inc # Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc PV = "2.6.29.5" -PR_append = "+gitr${SRCREV}" -#PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}" +PR_append = "+gitr${SRCPV}" +PE = "1" +#PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCPV}" SRCREV = "70deca35020a5dc3bd3c228bd46852cab77a7f6b" SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \ diff --git a/recipes/linux/linux-msm7xxxx_git.bb b/recipes/linux/linux-msm7xxxx_git.bb index 8c533e10a5..20dafb645d 100644 --- a/recipes/linux/linux-msm7xxxx_git.bb +++ b/recipes/linux/linux-msm7xxxx_git.bb @@ -1,9 +1,10 @@ require linux.inc -PV = "2.6.25+${PR}+gitr${SRCREV}" -PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}" -PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}" -PV_htcdream = "2.6.29+${PR}+gitr${SRCREV}" +PV = "2.6.25+${PR}+gitr${SRCPV}" +PE = "1" +PV_htcraphael = "2.6.27+${PR}+gitr${SRCPV}" +PV_htcdiamond = "2.6.27+${PR}+gitr${SRCPV}" +PV_htcdream = "2.6.29+${PR}+gitr${SRCPV}" PR = "r13" COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond|htcblackstone|htcdream" diff --git a/recipes/linux/linux-neuros_2.6.15.bb b/recipes/linux/linux-neuros_2.6.15.bb index f103d2c35f..c5453ec3b3 100644 --- a/recipes/linux/linux-neuros_2.6.15.bb +++ b/recipes/linux/linux-neuros_2.6.15.bb @@ -2,6 +2,7 @@ PV = "2.6.15-torfu" PR = "r5" +PE = "2" COMPATIBLE_MACHINE = "(neuros-osd)" diff --git a/recipes/linux/linux-neuros_git.bb b/recipes/linux/linux-neuros_git.bb index 9228ec24c8..449868bf9f 100644 --- a/recipes/linux/linux-neuros_git.bb +++ b/recipes/linux/linux-neuros_git.bb @@ -4,8 +4,8 @@ DESCRIPTION = "Linux kernel for Neuros OSD devices" SRCREV = "465f0ba12501e1c4e048f0a3ca8182404aeb66fc" -PV = "2.6.30+2.6.31rc5-${PR}+gitr${SRCREV}" -PE = "1" +PV = "2.6.30+2.6.31rc5-${PR}+gitr${SRCPV}" +PE = "2" COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)" diff --git a/recipes/linux/linux-omap-pm_2.6.28.bb b/recipes/linux/linux-omap-pm_2.6.28.bb index b09b31c62b..4111abb845 100644 --- a/recipes/linux/linux-omap-pm_2.6.28.bb +++ b/recipes/linux/linux-omap-pm_2.6.28.bb @@ -7,7 +7,8 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| SRCREV = "fe30e75b8c0b91b259fcea781b859e594ba21ae9" -PV = "2.6.28-pm3+gitr${SRCREV}" +PV = "2.6.28-pm3+gitr${SRCPV}" +PE = "1" PR = "r7" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git;protocol=git;branch=pm-2.6.28 \ diff --git a/recipes/linux/linux-omap-pm_2.6.29.bb b/recipes/linux/linux-omap-pm_2.6.29.bb index 9112c7dd8a..b63dc6b543 100644 --- a/recipes/linux/linux-omap-pm_2.6.29.bb +++ b/recipes/linux/linux-omap-pm_2.6.29.bb @@ -8,6 +8,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| SRCREV = "e63cf0710a4fb639d91d3e8b05aa485fbfa381b3" PV = "2.6.29" +PE = "1" MACHINE_KERNEL_PR_append = "-pm2+gitr${SRCREV}" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git;protocol=git;branch=pm-2.6.29 \ diff --git a/recipes/linux/linux-omap-pm_git.bb b/recipes/linux/linux-omap-pm_git.bb index 574e0a3ca6..354956953c 100644 --- a/recipes/linux/linux-omap-pm_git.bb +++ b/recipes/linux/linux-omap-pm_git.bb @@ -9,7 +9,8 @@ DEFAULT_PREFERENCE = "-1" SRCREV = "7c5cb7862d32cb344be7831d466535d5255e35ac" -PV = "2.6.30+2.6.31rc1-pm1+gitr${SRCREV}" +PV = "2.6.30+2.6.31rc1-pm1+gitr${SRCPV}" +PE = "1" FILESPATHPKG_prepend = "linux-omap-pm-2.6.31:" diff --git a/recipes/linux/linux-omap2_git.bb b/recipes/linux/linux-omap2_git.bb index dcb8139486..4111387cf1 100644 --- a/recipes/linux/linux-omap2_git.bb +++ b/recipes/linux/linux-omap2_git.bb @@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848" PV = "2.6.26" -#PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" +#PV = "2.6.26+2.6.27-rc1+${PR}+gitr${SRCPV}" PR = "r64" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ diff --git a/recipes/linux/linux-omap_2.6.31.bb b/recipes/linux/linux-omap_2.6.31.bb index 0fb9988ed8..8985075984 100644 --- a/recipes/linux/linux-omap_2.6.31.bb +++ b/recipes/linux/linux-omap_2.6.31.bb @@ -12,7 +12,8 @@ DEFAULT_PREFERENCE_omap5912osk = "1" SRCREV = "945044d157dd63c6af0f2ed40a5346382af94eb4" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -#PV = "2.6.30+2.6.31-rc8+gitr${SRCREV}" +#PV = "2.6.30+2.6.31-rc8+gitr${SRCPV}" +PE = "1" PV = "2.6.31" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ diff --git a/recipes/linux/linux-omap_git.bb b/recipes/linux/linux-omap_git.bb index 7690b4d381..7ae5e0b4bf 100644 --- a/recipes/linux/linux-omap_git.bb +++ b/recipes/linux/linux-omap_git.bb @@ -12,7 +12,7 @@ SRCREV = "945044d157dd63c6af0f2ed40a5346382af94eb4" FILESPATHPKG_prepend = "linux-omap-2.6.31:" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -#PV = "2.6.30+2.6.31-rc8+gitr${SRCREV}" +#PV = "2.6.30+2.6.31-rc8+gitr${SRCPV}" PV = "2.6.31" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ diff --git a/recipes/linux/linux-omapzoom_git.bb b/recipes/linux/linux-omapzoom_git.bb index 60d4e8e062..ad5d996495 100644 --- a/recipes/linux/linux-omapzoom_git.bb +++ b/recipes/linux/linux-omapzoom_git.bb @@ -7,8 +7,9 @@ COMPATIBLE_MACHINE = "omapzoom" SRCREV = "26d16dad66b1d3955d8958938f9de5f2e0fce7fb" -#PV = "2.6.27+2.6.28-rc8+${PR}+gitr${SRCREV}" -PV = "2.6.27.10-${PR}+gitr${SRCREV}" +#PV = "2.6.27+2.6.28-rc8+${PR}+gitr${SRCPV}" +PE = "1" +PV = "2.6.27.10-${PR}+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.omapzoom.org/repo/omapkernel.git;protocol=git \ diff --git a/recipes/linux/linux-openmoko-2.6.24_git.bb b/recipes/linux/linux-openmoko-2.6.24_git.bb index 99e478c3d6..06693f5f65 100644 --- a/recipes/linux/linux-openmoko-2.6.24_git.bb +++ b/recipes/linux/linux-openmoko-2.6.24_git.bb @@ -7,7 +7,8 @@ KERNEL_RELEASE = "2.6.24" KERNEL_VERSION = "${KERNEL_RELEASE}" OEV = "oe5" -PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" +PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "\ diff --git a/recipes/linux/linux-openmoko-2.6.28_git.bb b/recipes/linux/linux-openmoko-2.6.28_git.bb index 0b779384d9..5613c24a30 100644 --- a/recipes/linux/linux-openmoko-2.6.28_git.bb +++ b/recipes/linux/linux-openmoko-2.6.28_git.bb @@ -7,7 +7,8 @@ KERNEL_RELEASE = "2.6.28" KERNEL_VERSION = "${KERNEL_RELEASE}" OEV = "oe2" -PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" +PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "\ diff --git a/recipes/linux/linux-openmoko-2.6.31_git.bb b/recipes/linux/linux-openmoko-2.6.31_git.bb index 301ac6b863..f7706bd74a 100644 --- a/recipes/linux/linux-openmoko-2.6.31_git.bb +++ b/recipes/linux/linux-openmoko-2.6.31_git.bb @@ -7,7 +7,7 @@ KERNEL_RELEASE = "2.6.31" KERNEL_VERSION = "${KERNEL_RELEASE}" OEV = "oe1" -PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" +PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" PR = "r5" SRC_URI = "\ diff --git a/recipes/linux/linux-openmoko-devel_git.bb b/recipes/linux/linux-openmoko-devel_git.bb index fb9c4f0498..b94d202f1c 100644 --- a/recipes/linux/linux-openmoko-devel_git.bb +++ b/recipes/linux/linux-openmoko-devel_git.bb @@ -7,7 +7,8 @@ KERNEL_RELEASE = "2.6.29" KERNEL_VERSION = "${KERNEL_RELEASE}" OEV = "oe1" -PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" +PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "\ diff --git a/recipes/linux/linux-openmoko-shr-devel_git.bb b/recipes/linux/linux-openmoko-shr-devel_git.bb index 2a61a95443..a0b209d02f 100644 --- a/recipes/linux/linux-openmoko-shr-devel_git.bb +++ b/recipes/linux/linux-openmoko-shr-devel_git.bb @@ -7,7 +7,7 @@ KERNEL_RELEASE = "2.6.29" KERNEL_VERSION = "2.6.29-rc3" OMV = "oe11" -PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCREV}" +PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCPV}" PR = "r6" SRC_URI = "\ diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb index e02cc6f135..36cc8f8919 100644 --- a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb +++ b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb @@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.29" KERNEL_VERSION = "2.6.29-rc3-drm" OMV = "oe15" -PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCREV}" +PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCPV}" PR = "r4" SRC_URI = "\ diff --git a/recipes/linux/linux-replicant_git.bb b/recipes/linux/linux-replicant_git.bb index 7919694dfc..894e30882f 100644 --- a/recipes/linux/linux-replicant_git.bb +++ b/recipes/linux/linux-replicant_git.bb @@ -1,9 +1,10 @@ require linux.inc -PV = "2.6.25+${PR}+gitr${SRCREV}" -PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}" -PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}" -PV_htcdream = "2.6.29+${PR}+gitr${SRCREV}" +PV = "2.6.25+${PR}+gitr${SRCPV}" +PE = "2" +PV_htcraphael = "2.6.27+${PR}+gitr${SRCPV}" +PV_htcdiamond = "2.6.27+${PR}+gitr${SRCPV}" +PV_htcdream = "2.6.29+${PR}+gitr${SRCPV}" PR = "r13" COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond|htcblackstone|htcdream" diff --git a/recipes/linux/linux-xilinx-slab_git.bb b/recipes/linux/linux-xilinx-slab_git.bb index 2900ad9516..104d4b5724 100644 --- a/recipes/linux/linux-xilinx-slab_git.bb +++ b/recipes/linux/linux-xilinx-slab_git.bb @@ -8,7 +8,7 @@ LICENSE = "GPL" SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c" PR = "r3" -PV = "2.6.25+2.6.26+${PR}+gitr${SRCREV}" +PV = "2.6.25+2.6.26+${PR}+gitr${SRCPV}" PE = "1" COMPATIBLE_MACHINE = "xilinx-ml403" diff --git a/recipes/linux/linux-xo_git.bb b/recipes/linux/linux-xo_git.bb index 37e95208e9..b533249457 100644 --- a/recipes/linux/linux-xo_git.bb +++ b/recipes/linux/linux-xo_git.bb @@ -4,7 +4,8 @@ DESCRIPTION = "Linux kernel for XO laptop (aka OLPC)" SRCREV = "28f4cb6e780db078a09c765595e0ee84fda20f88" -PV = "2.6.22+gitr${SRCREV}" +PV = "2.6.22+gitr${SRCPV}" +PE = "1" PR = "r0" COMPATIBLE_MACHINE = "xo" diff --git a/recipes/linux/openezx-kernel_git.bb b/recipes/linux/openezx-kernel_git.bb index 64fac44558..1b960ecc62 100644 --- a/recipes/linux/openezx-kernel_git.bb +++ b/recipes/linux/openezx-kernel_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "OpenEZX 2.6 Linux Development Kernel for the Motorola EZX GSM pho AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>" HOMEPAGE = "http://www.openezx.org" KV = "2.6.29+2.6.30rc2" -PV = "${KV}+gitr${SRCREV}" +PV = "${KV}+gitr${SRCPV}" +PE = "1" PR = "r3" require linux.inc diff --git a/recipes/madbufferfly/madbutterfly_git.bb b/recipes/madbufferfly/madbutterfly_git.bb index a0f31691f8..54c99fa283 100644 --- a/recipes/madbufferfly/madbutterfly_git.bb +++ b/recipes/madbufferfly/madbutterfly_git.bb @@ -3,7 +3,8 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "BSD" DEPENDS = "cairo pango" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" +PE = "1" SRC_URI = "git://git.gitorious.org/madbutterfly/mainline.git;protocol=git \ file://001_makefile.am_bugs.patch;patch=1" diff --git a/recipes/matchbox2/matchbox-panel-2_svn.bb b/recipes/matchbox2/matchbox-panel-2_svn.bb index a2a807f28a..ae3b122899 100644 --- a/recipes/matchbox2/matchbox-panel-2_svn.bb +++ b/recipes/matchbox2/matchbox-panel-2_svn.bb @@ -7,7 +7,7 @@ DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" RDEPENDS_${PN} = "matchbox-panel-2-icon-theme" PACKAGE_ARCH = "${MACHINE_ARCH}" PV = "2.0+svnr${SRCPV}" -PR = "r0" +PR = "r1" inherit autotools_stage pkgconfig @@ -19,6 +19,8 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ " S = "${WORKDIR}/${PN}" +TARGET_CFLAGS += "-Wno-error" + EXTRA_OECONF = "--disable-static --program-transform-name='s/$/-2/'" EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" diff --git a/recipes/mesa/mesa-common-old.inc b/recipes/mesa/mesa-common-old.inc index 8fc2044bef..a88a07f019 100644 --- a/recipes/mesa/mesa-common-old.inc +++ b/recipes/mesa/mesa-common-old.inc @@ -1,4 +1,5 @@ SECTION = "x11" +PE = "2" SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ file://mklib-rpath-link.patch;patch=1" diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc index ccfe504d54..fc530a2569 100644 --- a/recipes/mesa/mesa-common.inc +++ b/recipes/mesa/mesa-common.inc @@ -5,6 +5,7 @@ HOMEPAGE = "http://mesa3d.org" LICENSE = "MIT" INC_PR = "r7" +PE = "2" SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 " diff --git a/recipes/mesa/mesa-dri_7.2.bb b/recipes/mesa/mesa-dri_7.2.bb index 93568432bc..34ab1696c8 100644 --- a/recipes/mesa/mesa-dri_7.2.bb +++ b/recipes/mesa/mesa-dri_7.2.bb @@ -5,7 +5,6 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" -PE = "1" PR = "${INC_PR}.0" # most of our targets do not have DRI so will use mesa-xlib diff --git a/recipes/mesa/mesa-dri_7.4.bb b/recipes/mesa/mesa-dri_7.4.bb index 93568432bc..34ab1696c8 100644 --- a/recipes/mesa/mesa-dri_7.4.bb +++ b/recipes/mesa/mesa-dri_7.4.bb @@ -5,7 +5,6 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" -PE = "1" PR = "${INC_PR}.0" # most of our targets do not have DRI so will use mesa-xlib diff --git a/recipes/mesa/mesa-dri_7.6.bb b/recipes/mesa/mesa-dri_7.6.bb index 0eed2ef8d4..f69303a1c5 100644 --- a/recipes/mesa/mesa-dri_7.6.bb +++ b/recipes/mesa/mesa-dri_7.6.bb @@ -8,7 +8,6 @@ DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 \ " -PE = "1" PR = "${INC_PR}.0" # most of our targets do not have DRI so will use mesa-xlib diff --git a/recipes/mesa/mesa-xlib_7.6.bb b/recipes/mesa/mesa-xlib_7.6.bb index 3085e8d0ff..2581d03fe2 100644 --- a/recipes/mesa/mesa-xlib_7.6.bb +++ b/recipes/mesa/mesa-xlib_7.6.bb @@ -9,7 +9,6 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 \ " -PE = "1" PR = "${INC_PR}.0" EXTRA_OECONF += "--disable-gallium --with-driver=xlib" diff --git a/recipes/mesa/mesa_6.0.1.bb b/recipes/mesa/mesa_6.0.1.bb index d8c857fef7..dd4e07e80f 100644 --- a/recipes/mesa/mesa_6.0.1.bb +++ b/recipes/mesa/mesa_6.0.1.bb @@ -3,6 +3,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ file://Make-config.patch;patch=1 \ file://mklib.patch;patch=1" S = "${WORKDIR}/Mesa-${PV}" +PE = "2" LICENSE = "LGPL" # gcc-3.4 blows up in gtktext with -frename-registers on arm-linux CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}" diff --git a/recipes/mesa/mesa_6.4.1+cvs20060101.bb b/recipes/mesa/mesa_6.4.1+cvs20060101.bb index 0e9f99684f..7eb52b2579 100644 --- a/recipes/mesa/mesa_6.4.1+cvs20060101.bb +++ b/recipes/mesa/mesa_6.4.1+cvs20060101.bb @@ -2,6 +2,7 @@ SECTION = "unknown" SRCDATE = "20060101" PV = "6.4.1+cvs${SRCDATE}" +PE = "2" SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE} \ file://mklib-rpath-link.patch;patch=1" diff --git a/recipes/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/recipes/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb index 65fab979b1..6fbe51ccc6 100644 --- a/recipes/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +++ b/recipes/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Mobile Broadband Service Provider Database" SECTION = "network" LICENSE = "CCPD" -PV = "gitr${SRCREV}" +PV = "1.0.0+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "git://git.gnome.org/mobile-broadband-provider-info;protocol=git" diff --git a/recipes/moblin/json-glib_0.6.2.bb b/recipes/moblin/json-glib_0.6.2.bb index 822ddad7e5..c81b07a38d 100644 --- a/recipes/moblin/json-glib_0.6.2.bb +++ b/recipes/moblin/json-glib_0.6.2.bb @@ -1,6 +1,7 @@ SRC_URI = "http://folks.o-hand.com/~ebassi/sources/json-glib-0.6.2.tar.gz" PR = "r0" +PE = "1" DEPENDS = "glib-2.0" diff --git a/recipes/moblin/json-glib_git.bb b/recipes/moblin/json-glib_git.bb index 0522df1f1f..7945824da6 100644 --- a/recipes/moblin/json-glib_git.bb +++ b/recipes/moblin/json-glib_git.bb @@ -1,6 +1,7 @@ HOMEPAGE = "http://live.gnome.org/JsonGlib" SRC_URI = "git://github.com/ebassi/${PN}.git;protocol=git" -PV = "0.6.2+git${SRCREV}" +PV = "0.6.2+gitr${SRCPV}" +PE = "1" PR = "r0" S = "${WORKDIR}/git" diff --git a/recipes/moblin/libccss_git.bb b/recipes/moblin/libccss_git.bb index e622d9f9bf..900524b0ed 100644 --- a/recipes/moblin/libccss_git.bb +++ b/recipes/moblin/libccss_git.bb @@ -1,5 +1,6 @@ SRC_URI = "git://anongit.freedesktop.org/git/ccss.git;protocol=git" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" DEPENDS = "glib-2.0 cairo librsvg libsoup-2.4" diff --git a/recipes/moblin/librest_git.bb b/recipes/moblin/librest_git.bb index 0576c0dd8d..52f649375e 100644 --- a/recipes/moblin/librest_git.bb +++ b/recipes/moblin/librest_git.bb @@ -1,7 +1,7 @@ SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" -SRCREV="18bce68c8e54032f2d7e78a8484ac892ba3ebd5a" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r1" DEPENDS = "libsoup-2.4" diff --git a/recipes/moblin/moblin-menus_git.bb b/recipes/moblin/moblin-menus_git.bb index ae60573649..5b779a8c81 100644 --- a/recipes/moblin/moblin-menus_git.bb +++ b/recipes/moblin/moblin-menus_git.bb @@ -1,7 +1,8 @@ SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \ file://configurefix.patch;patch=1" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r1" S = "${WORKDIR}/git" diff --git a/recipes/moblin/mojito_git.bb b/recipes/moblin/mojito_git.bb index f9104a9371..e9b3cf0972 100644 --- a/recipes/moblin/mojito_git.bb +++ b/recipes/moblin/mojito_git.bb @@ -1,6 +1,7 @@ SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r3" DEPENDS = "libsoup-2.4 gconf librest glib-2.0 twitter-glib sqlite3 gnome-keyring" diff --git a/recipes/moblin/twitter-glib_git.bb b/recipes/moblin/twitter-glib_git.bb index 791cace092..1c65f33a40 100644 --- a/recipes/moblin/twitter-glib_git.bb +++ b/recipes/moblin/twitter-glib_git.bb @@ -1,6 +1,7 @@ HOMEPAGE = "http://live.gnome.org/TwitterGlib" SRC_URI = "git://github.com/ebassi/${PN}.git;protocol=git" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" DEPENDS = "glib-2.0 gtk+ json-glib" diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb index aa01cc7c20..984227bd7b 100644 --- a/recipes/mplayer/mplayer_git.bb +++ b/recipes/mplayer/mplayer_git.bb @@ -41,7 +41,7 @@ ARM_INSTRUCTION_SET = "ARM" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PV = "0.0+1.0rc2+gitr${SRCREV}" +PV = "0.0+1.0rc2+gitr${SRCPV}" PR = "r15" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_om-gta02 = "1" diff --git a/recipes/mux/mux_git.bb b/recipes/mux/mux_git.bb index a6596b99ac..e149559a45 100644 --- a/recipes/mux/mux_git.bb +++ b/recipes/mux/mux_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "GTK+ widgets for moblin" SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" LICENSE = "LGPLv2.1" -PV = "0.0+git${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" LICENSE = "LGPLv2.1" diff --git a/recipes/netbase/netbase/om-gta01/interfaces b/recipes/netbase/netbase/om-gta01/interfaces index 56c485ef75..e595239758 100644 --- a/recipes/netbase/netbase/om-gta01/interfaces +++ b/recipes/netbase/netbase/om-gta01/interfaces @@ -16,14 +16,15 @@ iface eth1 inet dhcp # Ethernet/RNDIS gadget (g_ether) # ... or on host side, usbnet and random hwaddr -allow-hotplug usb0 +auto usb0 iface usb0 inet static address 192.168.0.202 netmask 255.255.255.0 network 192.168.0.0 - gateway 192.168.0.200 + up route add default gw 192.168.0.200 metric 8 up echo nameserver 208.67.222.222 >> /etc/resolv.conf up echo nameserver 208.67.220.220 >> /etc/resolv.conf + down route del default gw 192.168.0.200 metric 8 # Bluetooth networking iface bnep0 inet dhcp diff --git a/recipes/netbase/netbase/om-gta02/interfaces b/recipes/netbase/netbase/om-gta02/interfaces index ceedfc59c2..08bd3bb074 100644 --- a/recipes/netbase/netbase/om-gta02/interfaces +++ b/recipes/netbase/netbase/om-gta02/interfaces @@ -16,14 +16,15 @@ iface eth1 inet dhcp # Ethernet/RNDIS gadget (g_ether) # ... or on host side, usbnet and random hwaddr -allow-hotplug usb0 +auto usb0 iface usb0 inet static address 192.168.0.202 netmask 255.255.255.0 network 192.168.0.0 - gateway 192.168.0.200 - up echo nameserver 208.67.222.222 >> /etc/resolv.conf + up route add default gw 192.168.0.200 metric 8 + up echo nameserver 208.67.222.222 > /etc/resolv.conf up echo nameserver 208.67.220.220 >> /etc/resolv.conf + down route del default gw 192.168.0.200 metric 8 # Bluetooth networking iface bnep0 inet dhcp diff --git a/recipes/neuros-public/neuros-app-photoalbum_git.bb b/recipes/neuros-public/neuros-app-photoalbum_git.bb index a17fdb55a6..81dabca283 100644 --- a/recipes/neuros-public/neuros-app-photoalbum_git.bb +++ b/recipes/neuros-public/neuros-app-photoalbum_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros photoalbum app" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r1" inherit qt4e diff --git a/recipes/neuros-public/neuros-app-vplayer_git.bb b/recipes/neuros-public/neuros-app-vplayer_git.bb index 5bb2d8008c..2d80785f94 100644 --- a/recipes/neuros-public/neuros-app-vplayer_git.bb +++ b/recipes/neuros-public/neuros-app-vplayer_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros videoplayer app" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r1" inherit qt4e diff --git a/recipes/neuros-public/neuros-lib-gui_git.bb b/recipes/neuros-public/neuros-lib-gui_git.bb index 2c46dcc843..ccadf0e74a 100644 --- a/recipes/neuros-public/neuros-lib-gui_git.bb +++ b/recipes/neuros-public/neuros-lib-gui_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros lib-gui" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r1" inherit qt4e diff --git a/recipes/neuros-public/neuros-lib-widgets_git.bb b/recipes/neuros-public/neuros-lib-widgets_git.bb index 6718880583..2857b98079 100644 --- a/recipes/neuros-public/neuros-lib-widgets_git.bb +++ b/recipes/neuros-public/neuros-lib-widgets_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros qt-plugins" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r3" inherit qt4e diff --git a/recipes/neuros-public/neuros-mainmenu_git.bb b/recipes/neuros-public/neuros-mainmenu_git.bb index a8aca3124c..f1bb262e9f 100644 --- a/recipes/neuros-public/neuros-mainmenu_git.bb +++ b/recipes/neuros-public/neuros-mainmenu_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros window manager" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r2" inherit qt4e diff --git a/recipes/neuros-public/neuros-nwm_git.bb b/recipes/neuros-public/neuros-nwm_git.bb index 258842afa4..bbe40b0059 100644 --- a/recipes/neuros-public/neuros-nwm_git.bb +++ b/recipes/neuros-public/neuros-nwm_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros window manager" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r7" inherit qt4e update-rc.d diff --git a/recipes/neuros-public/neuros-qt-plugins_git.bb b/recipes/neuros-public/neuros-qt-plugins_git.bb index 416639ba6e..6b3ecf496a 100644 --- a/recipes/neuros-public/neuros-qt-plugins_git.bb +++ b/recipes/neuros-public/neuros-qt-plugins_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros qt-plugins" LICENSE = "GPL" -PV = "0.0+${PR}+gitr${SRCREV}" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "1" PR = "r4" inherit qt4e diff --git a/recipes/openbsc/openbsc_git.bb b/recipes/openbsc/openbsc_git.bb index f2fa2099ac..d3c2205a90 100644 --- a/recipes/openbsc/openbsc_git.bb +++ b/recipes/openbsc/openbsc_git.bb @@ -5,7 +5,8 @@ HOMEPAGE = "http://openbsc.gnumonks.org" RDEPENDS = "libdbd-sqlite3" SRC_URI = "git://bs11-abis.gnumonks.org/openbsc.git;protocol=git" -PV = "0.0.1.0+gitr${SRCREV}" +PV = "0.0.1.0+gitr${SRCPV}" +PE = "1" S = "${WORKDIR}/git/openbsc" diff --git a/recipes/openmoko-3rdparty/advancedcaching_git.bb b/recipes/openmoko-3rdparty/advancedcaching_git.bb index d9379333f8..2c2e14c61a 100644 --- a/recipes/openmoko-3rdparty/advancedcaching_git.bb +++ b/recipes/openmoko-3rdparty/advancedcaching_git.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://www.opkg.org/package_268.html" RDEPENDS = "python-pygtk python-html python-image python-netclient python-misc python-sqlite3 python-mime python-json" -PV = "0.1.2+gitr${SRCREV}" +PV = "0.1.2+gitr${SRCPV}" SRC_URI = "git://github.com/webhamster/advancedcaching.git;protocol=git;branch=master" diff --git a/recipes/openmoko-3rdparty/calc_git.bb b/recipes/openmoko-3rdparty/calc_git.bb index 9914d23717..e64bf655a4 100644 --- a/recipes/openmoko-3rdparty/calc_git.bb +++ b/recipes/openmoko-3rdparty/calc_git.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" RDEPENDS = "python-elementary python python-edbus" SECTION = "x11/application" SRCREV ?= "1c17792094eb" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/openmoko-projects/om-locations_git.bb b/recipes/openmoko-projects/om-locations_git.bb index 4d2b5aa7f3..0c18d82657 100644 --- a/recipes/openmoko-projects/om-locations_git.bb +++ b/recipes/openmoko-projects/om-locations_git.bb @@ -4,7 +4,8 @@ SECTION = "openmoko/applications" LICENSE = "GPL" DEPENDS = "eet evas edje ecore edbus etk" RDEPENDS_${PN} = "diversity-daemon" -PV = "0.2+gitr${SRCREV}" +PV = "0.2+gitr${SRCPV}" +PE = "1" PR = "r1.04" SRC_URI = "git://git.openmoko.org/git/om-locations.git;protocol=git" diff --git a/recipes/openmoko-projects/paroli_git.bb b/recipes/openmoko-projects/paroli_git.bb index 4b4c9add4a..09c95c63c6 100644 --- a/recipes/openmoko-projects/paroli_git.bb +++ b/recipes/openmoko-projects/paroli_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Paroli" SECTION = "x11" LICENSE = "GPL" -PV = "0.2.1+gitr${SRCREV}" +PV = "0.2.1+gitr${SRCPV}" PE = "1" PR = "r0" diff --git a/recipes/openmoko-projects/tichy_git.bb b/recipes/openmoko-projects/tichy_git.bb index 4a1ffb500e..80ee4f161b 100644 --- a/recipes/openmoko-projects/tichy_git.bb +++ b/recipes/openmoko-projects/tichy_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Python applets manager" SECTION = "x11" LICENSE = "GPL" DEPENDS += "python-pygame virtual/libsdl libsdl-image python-dbus python-pygobject" -PV = "0.2+gitr${SRCREV}" +PV = "0.2+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "git://git.openmoko.org/git/tichy.git;protocol=git" diff --git a/recipes/openmoocow/openmoocow_git.bb b/recipes/openmoocow/openmoocow_git.bb index ab53313a3f..1071f2afac 100644 --- a/recipes/openmoocow/openmoocow_git.bb +++ b/recipes/openmoocow/openmoocow_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.srcf.ucam.org/~taw27/openmoko/openmoocow/" AUTHOR = "Thomas White" LICENSE = "GPLv3" SECTION = "applications/games" -PV = "0.0.3+gitr${SRCREV}" +PV = "0.0.3+gitr${SRCPV}" PR = "r1" SRC_URI = "git://git.bitwiz.org.uk/openmoocow.git;protocol=git;branch=master" diff --git a/recipes/packagekit/packagekit_0.5.2.bb b/recipes/packagekit/packagekit_0.5.2.bb new file mode 100644 index 0000000000..5cc4d9ecb8 --- /dev/null +++ b/recipes/packagekit/packagekit_0.5.2.bb @@ -0,0 +1,60 @@ +DESCRIPTION = "PackageKit package management abstraction" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ python cppunit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" +RDEPENDS_${PN} = "${IPKG_VARIANT}" + +inherit gnome autotools_stage + +SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \ + " + +PR = "r0" +PE = "2" + +S = "${WORKDIR}/PackageKit-${PV}" + +EXTRA_OECONF = "--with-security-framework=dummy \ + --with-default-backend=opkg \ + --enable-opkg \ + --enable-dummy \ + --disable-networkmanager \ + --disable-connman \ + --disable-tests \ + --disable-qt \ + --disable-gstreamer-plugin \ + --disable-local \ + --disable-strict \ + ac_cv_path_XMLTO=no \ + " + + +do_configure_prepend() { + mkdir -p m4 + echo "EXTRA_DIST=" > gtk-doc.make + sed -i -e s:0\.1\.5:0\.1\.6:g configure.ac +} + +do_configure_append() { + for i in $(find . -name Makefile) ; do + sed -i -e s:${STAGING_DIR_NATIVE}::g \ + -e s:${bindir}/mkdir:${STAGING_BINDIR_NATIVE}/mkdir:g \ + -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \ + $i + done +} + + +PACKAGES =+ "${PN}-website" +FILES_${PN}-website = "${datadir}/PackageKit/website" + +PACKAGES =+ "${PN}-python" +FILES_${PN}-python = "${libdir}/python*" + +PACKAGES =+ "${PN}-gtkmodule" +FILES_${PN}-gtkmodule = "${libdir}/gtk-2.0/*/*.so" + +FILES_${PN} += "${libdir}/packagekit-backend/*.so ${libdir}/pm-utils ${datadir}/dbus-1/system-services/ ${datadir}/PolicyKit ${datadir}/PackageKit" +FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so ${libdir}/gtk-2.0/*/.debug" +FILES_${PN}-dev += "${libdir}/packagekit-backend/*a ${libdir}/gtk-2.0/*/*a" diff --git a/recipes/pidgin/msn-pecan_git.bb b/recipes/pidgin/msn-pecan_git.bb index dba7fd77dc..3e724f01ec 100644 --- a/recipes/pidgin/msn-pecan_git.bb +++ b/recipes/pidgin/msn-pecan_git.bb @@ -4,7 +4,7 @@ SECTION = "x11/network" LICENSE="GPL-2" RDEPENDS="pidgin" DEPENDS="pidgin" -PV="0.0.1+gitr${SRCREV}" +PV="0.0.1+gitr${SRCPV}" PR="r0" inherit pkgconfig diff --git a/recipes/pingus/pingus_0.7.2.bb b/recipes/pingus/pingus_0.7.2.bb index 10f99bae0e..7ece33cfdb 100644 --- a/recipes/pingus/pingus_0.7.2.bb +++ b/recipes/pingus/pingus_0.7.2.bb @@ -7,6 +7,9 @@ PR = "r2" ARM_INSTRUCTION_SET = "arm" +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}" + inherit scons SRC_URI = "\ diff --git a/recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch b/recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch new file mode 100644 index 0000000000..1005d78689 --- /dev/null +++ b/recipes/pulseaudio/files/libcanberra-increase-buffer-size.patch @@ -0,0 +1,13 @@ +Index: libcanberra-0.14/src/alsa.c +=================================================================== +--- libcanberra-0.14.orig/src/alsa.c ++++ libcanberra-0.14/src/alsa.c +@@ -272,7 +272,7 @@ + return translate_error(ret); + } + +-#define BUFSIZE (16*1024) ++#define BUFSIZE (128*1024) + + static void* thread_func(void *userdata) { + struct outstanding *out = userdata; diff --git a/recipes/pulseaudio/libcanberra_0.14.bb b/recipes/pulseaudio/libcanberra_0.14.bb index f9388e17cf..85dca9a3fe 100644 --- a/recipes/pulseaudio/libcanberra_0.14.bb +++ b/recipes/pulseaudio/libcanberra_0.14.bb @@ -5,12 +5,13 @@ DEPENDS = "alsa-lib gstreamer gtk+ libvorbis pulseaudio" SECTION = "libs/multimedia" AUTHOR = "Lennart Poettering" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" -PR = "r1" +PR = "r2" inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" -SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ + file://libcanberra-increase-buffer-size.patch;patch=1" EXTRA_OECONF = "\ --enable-alsa \ diff --git a/recipes/pulseaudio/libcanberra_0.17.bb b/recipes/pulseaudio/libcanberra_0.17.bb index a0b63069f1..def42e6d0a 100644 --- a/recipes/pulseaudio/libcanberra_0.17.bb +++ b/recipes/pulseaudio/libcanberra_0.17.bb @@ -5,12 +5,13 @@ DEPENDS = "alsa-lib gstreamer gtk+ libtool libvorbis" SECTION = "libs/multimedia" AUTHOR = "Lennart Poettering" HOMEPAGE = "http://0pointer.de/lennart/projects/libcanberra" -PR = "r2" +PR = "r3" inherit autotools_stage vala AUTOTOOLS_STAGE_PKGCONFIG = "1" -SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/libcanberra/libcanberra-${PV}.tar.gz \ + file://libcanberra-increase-buffer-size.patch;patch=1" EXTRA_OECONF = "\ --enable-alsa \ diff --git a/recipes/pyphonelog/pyphonelog_git.bb b/recipes/pyphonelog/pyphonelog_git.bb index e106653c45..fafdffaf88 100644 --- a/recipes/pyphonelog/pyphonelog_git.bb +++ b/recipes/pyphonelog/pyphonelog_git.bb @@ -8,7 +8,7 @@ RDEPENDS += "python python-pygtk python-sqlite3 python-phoneutils" inherit distutils S = "${WORKDIR}/git" -PV = "0.17.0+gitr${SRCREV}" +PV = "0.17.0+gitr${SRCPV}" PR = "r0" SRC_URI = "git://shr.bearstech.com/repo/pyphonelog.git;protocol=http" FILES_${PN} += "${datadir}/applications/phonelog.desktop \ diff --git a/recipes/python/python-phoneutils_git.bb b/recipes/python/python-phoneutils_git.bb index c616a2beed..af79b98bf7 100644 --- a/recipes/python/python-phoneutils_git.bb +++ b/recipes/python/python-phoneutils_git.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" DEPENDS = "libphone-utils python-cython-native python-pyrex-native" RDEPENDS = "libphone-utils" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r2" SRC_URI = "git://git.shr-project.org/repo/libphone-utils.git;protocol=http;branch=master" diff --git a/recipes/python/python-pycrypto_2.0.1.bb b/recipes/python/python-pycrypto_2.0.1.bb index 7300bbd60b..a9f3f52e9e 100644 --- a/recipes/python/python-pycrypto_2.0.1.bb +++ b/recipes/python/python-pycrypto_2.0.1.bb @@ -5,6 +5,7 @@ DEPENDS = "gmp" SRCNAME = "pycrypto" LICENSE = "pycrypto" PR = "ml1" +PE = "1" SRC_URI = "http://www.amk.ca/files/python/crypto/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/recipes/python/python-pycrypto_git.bb b/recipes/python/python-pycrypto_git.bb index 9e6eecbebd..28fce0d4f9 100644 --- a/recipes/python/python-pycrypto_git.bb +++ b/recipes/python/python-pycrypto_git.bb @@ -6,7 +6,8 @@ SRCNAME = "pycrypto" LICENSE = "pycrypto" PR = "ml0" -PV = "2.0.1+gitr${SRCREV}" +PV = "2.0.1+gitr${SRCPV}" +PE = "1" SRC_URI = "git://git.pycrypto.org:9419/crypto/pycrypto-2.x.git;protocol=git;branch=master" S = "${WORKDIR}/git" diff --git a/recipes/python/python-pyrtc_git.bb b/recipes/python/python-pyrtc_git.bb index af3bcfd5e4..d367cad9ba 100644 --- a/recipes/python/python-pyrtc_git.bb +++ b/recipes/python/python-pyrtc_git.bb @@ -6,7 +6,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" LICENSE = "GPLv2" SRCNAME = "pyrtc" DEPENDS = "python-cython-native" -PV = "1.0.0+gitr${SRCREV}" +PV = "1.0.0+gitr${SRCPV}" +PE = "1" PR = "ml1" SRC_URI = "git://git.freesmartphone.org/python-helpers.git;protocol=git;branch=master" diff --git a/recipes/resolvconf/resolvconf_1.45.bb b/recipes/resolvconf/resolvconf_1.45.bb new file mode 100644 index 0000000000..2c210ef1ec --- /dev/null +++ b/recipes/resolvconf/resolvconf_1.45.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Resolvconf is a framework for keeping track of the system's \ +information about currently available nameservers. It sets \ +itself up as the intermediary between programs that supply \ +nameserver information and programs that need nameserver \ +information." +SECTION = "console/network" +LICENSE = "GPL" +AUTHOR = "Thomas Hood" +HOMEPAGE = "http://packages.debian.org/resolvconf" +DEPENDS = "bash" +RDEPENDS = "bash" + +SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" + +do_compile () { + : +} + +do_install () { + install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface + install -d ${D}${mandir}/man8 ${D}${docdir}/${P} + cp -pPR etc/* ${D}${sysconfdir}/ + install -m 0755 bin/resolvconf ${D}${base_sbindir}/ + install -m 0644 README ${D}${docdir}/${P}/ + install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/ +} + +PACKAGE_ARCH = "all" + diff --git a/recipes/rt-tests/rt-tests_0.28.bb b/recipes/rt-tests/rt-tests_0.28.bb index 4915146538..14df5ddfc7 100644 --- a/recipes/rt-tests/rt-tests_0.28.bb +++ b/recipes/rt-tests/rt-tests_0.28.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Real-time tests, such as cyclictest, for real-time linux PREEMPT HOMEPAGE = "http://rt.wiki.kernel.org/index.php/Cyclictest" LICENSE = "GPL" PR = "r1" +PE = "1" SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/tglx/rt-tests/rt-tests-${PV}.tar.bz2" diff --git a/recipes/rt-tests/rt-tests_git.bb b/recipes/rt-tests/rt-tests_git.bb index fbb07911c6..b6b6e4406b 100644 --- a/recipes/rt-tests/rt-tests_git.bb +++ b/recipes/rt-tests/rt-tests_git.bb @@ -5,7 +5,8 @@ PR = "r0" SRCREV = "42ab9e7cd259fae674dc2b2aa2962caaf8f09409" -PV = "0.51+${PR}+gitr${SRCREV}" +PV = "0.51+${PR}+gitr${SRCPV}" +PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tglx/rt-tests;protocol=git" diff --git a/recipes/sdr/dttsp_svn.bb b/recipes/sdr/dttsp_svn.bb index ac49779a76..ad6079fa3c 100644 --- a/recipes/sdr/dttsp_svn.bb +++ b/recipes/sdr/dttsp_svn.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Software Radio Core" LICENSE = "GPLv3" DEPENDS = "fftwf jack" -PV = "${SRCREV}" +PV = "1.0.0+svnr${SRCPV}" +PE = "1" SRCREV = "241" SRC_URI = "svn://206.216.146.154/svn/repos_sdr_linux/branches/ab2kt;module=dttsp-ng" diff --git a/recipes/sdr/sdrshell_svn.bb b/recipes/sdr/sdrshell_svn.bb index 1641aa5668..30d7241f49 100644 --- a/recipes/sdr/sdrshell_svn.bb +++ b/recipes/sdr/sdrshell_svn.bb @@ -6,7 +6,8 @@ DEPENDS = "dttsp" inherit qmake qt3x11 SRCREV = "57" -PV = "${SRCREV}" +PV = "1.0.0+svnr${SRCPV}" +PE = "1" SRC_URI = "svn://sdr-shell.googlecode.com/svn/branches;module=sdr-shell-v2;proto=http \ file://gcc-43-fix.patch;patch=1;pnum=0" diff --git a/recipes/serial-utils/pty-forward-native.bb b/recipes/serial-utils/pty-forward-native.bb index c613276645..0c1239f20d 100644 --- a/recipes/serial-utils/pty-forward-native.bb +++ b/recipes/serial-utils/pty-forward-native.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Receive a forwarded serial from serial-forward and provide a PTY" AUTHOR = "Holger 'Zecke' Freyther" LICENSE = "GPL" SECTION = "console/network" -PV = "1.0.1+gitr${SRCREV}" +PV = "1.0.1+gitr${SRCPV}" +PE = "1" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git" diff --git a/recipes/serial-utils/serial-forward.bb b/recipes/serial-utils/serial-forward.bb index b03fc597dd..6da2d0df0c 100644 --- a/recipes/serial-utils/serial-forward.bb +++ b/recipes/serial-utils/serial-forward.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Forward a serial using TCP/IP" AUTHOR = "Holger 'Zecke' Freyther'" LICENSE = "GPL" SECTION = "console/devel" -PV = "1.0.1+gitr${SRCREV}" +PV = "1.0.1+gitr${SRCPV}" +PE = "1" PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git/;protocol=git" diff --git a/recipes/shr/alsa-scenarii-shr_git.bb b/recipes/shr/alsa-scenarii-shr_git.bb index dff37cc083..97b84984b6 100644 --- a/recipes/shr/alsa-scenarii-shr_git.bb +++ b/recipes/shr/alsa-scenarii-shr_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Package for the different scenarios used by Openmoko" SECTION = "openmoko/base" -PV = "1.0+gitr${SRCREV}" +PV = "1.0+gitr${SRCPV}" PR = "r2" COMPATIBLE_MACHINE = "(om-gta01|om-gta02|om-3d7k)" diff --git a/recipes/shr/e-wm-config-illume-shr_git.bb b/recipes/shr/e-wm-config-illume-shr_git.bb index 1a368c6fe5..76ce8d3071 100644 --- a/recipes/shr/e-wm-config-illume-shr_git.bb +++ b/recipes/shr/e-wm-config-illume-shr_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR config" SECTION = "e/utils" DEPENDS = "eet" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r7" inherit e diff --git a/recipes/shr/e-wm-menu-shr_git.bb b/recipes/shr/e-wm-menu-shr_git.bb index 0c8d75ae3a..3bbfa61dc7 100644 --- a/recipes/shr/e-wm-menu-shr_git.bb +++ b/recipes/shr/e-wm-menu-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "illume SHR applications.menu config" SECTION = "e/utils" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r1" RCONFLICTS_${PN} = "e-wm-menu" diff --git a/recipes/shr/e-wm-sysactions-shr_git.bb b/recipes/shr/e-wm-sysactions-shr_git.bb index 6c46ed8558..d2e987eef9 100644 --- a/recipes/shr/e-wm-sysactions-shr_git.bb +++ b/recipes/shr/e-wm-sysactions-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "illume SHR sysactions config" SECTION = "e/utils" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r4" RPROVIDES_${PN} = "e-wm-sysactions" diff --git a/recipes/shr/e-wm-theme-illume-gry_git.bb b/recipes/shr/e-wm-theme-illume-gry_git.bb index 35da5231f0..e993cb6e37 100644 --- a/recipes/shr/e-wm-theme-illume-gry_git.bb +++ b/recipes/shr/e-wm-theme-illume-gry_git.bb @@ -6,7 +6,7 @@ DEPENDS = "edje-native" RRECOMMENDS = "elementary-theme-gry" LICENCE = "unknown" -PV = "0.3-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.3-${EFL_SRCREV}+gitr${SRCPV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-neo_git.bb b/recipes/shr/e-wm-theme-illume-neo_git.bb index ed6adf71c0..10a5016758 100644 --- a/recipes/shr/e-wm-theme-illume-neo_git.bb +++ b/recipes/shr/e-wm-theme-illume-neo_git.bb @@ -7,7 +7,7 @@ RDEPENDS = "e-wm" RRECOMMENDS = "elementary-theme-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" LICENCE = "unknown" -PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-niebiee_git.bb b/recipes/shr/e-wm-theme-illume-niebiee_git.bb index 9dfee0b293..76aaf6d23b 100644 --- a/recipes/shr/e-wm-theme-illume-niebiee_git.bb +++ b/recipes/shr/e-wm-theme-illume-niebiee_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Extremely blue Illume theme - Niebiee" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-shr_git.bb b/recipes/shr/e-wm-theme-illume-shr_git.bb index 2c63be670b..af126dc92e 100644 --- a/recipes/shr/e-wm-theme-illume-shr_git.bb +++ b/recipes/shr/e-wm-theme-illume-shr_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR theme" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r6" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-sixteen_git.bb b/recipes/shr/e-wm-theme-illume-sixteen_git.bb index da8895d97f..f164f0fc24 100644 --- a/recipes/shr/e-wm-theme-illume-sixteen_git.bb +++ b/recipes/shr/e-wm-theme-illume-sixteen_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR theme" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/elementary-theme-gry_git.bb b/recipes/shr/elementary-theme-gry_git.bb index 655f377cab..2b1dfaab3c 100644 --- a/recipes/shr/elementary-theme-gry_git.bb +++ b/recipes/shr/elementary-theme-gry_git.bb @@ -6,7 +6,7 @@ DEPENDS = "edje-native" RRECOMMENDS = "e-wm-theme-illume-gry" LICENSE = "unknown" -PV = "0.8-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.8-${EFL_SRCREV}+gitr${SRCPV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ diff --git a/recipes/shr/elementary-theme-neo_git.bb b/recipes/shr/elementary-theme-neo_git.bb index 2c1f2f7831..4701c220c6 100644 --- a/recipes/shr/elementary-theme-neo_git.bb +++ b/recipes/shr/elementary-theme-neo_git.bb @@ -6,7 +6,7 @@ DEPENDS = "edje-native" RRECOMMENDS = "e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" -PV = "0.2.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.2.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r3" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ diff --git a/recipes/shr/elementary-theme-niebiee_git.bb b/recipes/shr/elementary-theme-niebiee_git.bb index 0c99635fc2..1736ad9a7a 100644 --- a/recipes/shr/elementary-theme-niebiee_git.bb +++ b/recipes/shr/elementary-theme-niebiee_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Extremely blue elementary theme - Niebiee" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/elementary-theme-sixteen_git.bb b/recipes/shr/elementary-theme-sixteen_git.bb index d1045e6498..4eb43af767 100644 --- a/recipes/shr/elementary-theme-sixteen_git.bb +++ b/recipes/shr/elementary-theme-sixteen_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "elementary SHR theme" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/etk-theme-neo_git.bb b/recipes/shr/etk-theme-neo_git.bb index 2279af0e04..2c68bd29da 100644 --- a/recipes/shr/etk-theme-neo_git.bb +++ b/recipes/shr/etk-theme-neo_git.bb @@ -4,7 +4,7 @@ AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" -PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" PR = "r2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/etk-theme-shr_git.bb b/recipes/shr/etk-theme-shr_git.bb index e05fa56ee4..3a324e9728 100644 --- a/recipes/shr/etk-theme-shr_git.bb +++ b/recipes/shr/etk-theme-shr_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "etk SHR theme" LICENSE = "MIT BSD" -PV = "1.1.1-${EFL_SRCREV}+gitr${SRCREV}" +PV = "1.1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/frameworkd-config-shr_git.bb b/recipes/shr/frameworkd-config-shr_git.bb index 3be7ceb9ac..c1d15b18c3 100644 --- a/recipes/shr/frameworkd-config-shr_git.bb +++ b/recipes/shr/frameworkd-config-shr_git.bb @@ -5,7 +5,7 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" SRCREV_FORMAT = "FSO_REV-SHR_REV" -PV = "0.9.5.9+gitr${SRCREV}" +PV = "0.9.5.9+gitr${SRCPV}" PR = "r7" SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master;name=FSO_REV \ diff --git a/recipes/shr/gtk-theme-neo_git.bb b/recipes/shr/gtk-theme-neo_git.bb index 6415b6a6ec..66caabf1cc 100644 --- a/recipes/shr/gtk-theme-neo_git.bb +++ b/recipes/shr/gtk-theme-neo_git.bb @@ -5,7 +5,7 @@ RDEPENDS += "icon-theme-neo" RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" -PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" PR = "r3" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/icon-theme-neo_git.bb b/recipes/shr/icon-theme-neo_git.bb index 1b6c8ae7e2..438ac238c9 100644 --- a/recipes/shr/icon-theme-neo_git.bb +++ b/recipes/shr/icon-theme-neo_git.bb @@ -6,7 +6,7 @@ RDEPENDS = "e-wm" RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo" LICENSE = "unknown" -PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb b/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb index 27dc47bac3..7f7f6b4fe1 100644 --- a/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb +++ b/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb @@ -5,7 +5,7 @@ RDEPENDS = "libframeworkd-phonegui-efl" RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" LICENSE = "unknown" -PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}" +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" PR = "r2" require libframeworkd-phonegui-efl-theme.inc diff --git a/recipes/shr/libframeworkd-phonegui-efl2_git.bb b/recipes/shr/libframeworkd-phonegui-efl2_git.bb index 551abb1dd2..4d6f2c2eef 100644 --- a/recipes/shr/libframeworkd-phonegui-efl2_git.bb +++ b/recipes/shr/libframeworkd-phonegui-efl2_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "frameworkd EFL phonegui 2" SECTION = "e/apps" DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r2" SRC_URI = "git://shr.bearstech.com/repo/libframeworkd-phonegui-efl2.git;protocol=http;branch=master" diff --git a/recipes/shr/libframeworkd-phonegui-efl_git.bb b/recipes/shr/libframeworkd-phonegui-efl_git.bb index 5d0d099a9a..aa2070c2c7 100644 --- a/recipes/shr/libframeworkd-phonegui-efl_git.bb +++ b/recipes/shr/libframeworkd-phonegui-efl_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "e/apps" DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary" -PV = "0.0.3+gitr${SRCREV}" +PV = "0.0.3+gitr${SRCPV}" PR = "r36" require libframeworkd-phonegui-efl-theme.inc diff --git a/recipes/shr/libframeworkd-phonegui_git.bb b/recipes/shr/libframeworkd-phonegui_git.bb index 50b546512a..aa1f107555 100644 --- a/recipes/shr/libframeworkd-phonegui_git.bb +++ b/recipes/shr/libframeworkd-phonegui_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Frameworkd phonegui library" HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "libs" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r10" DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libphone-utils" diff --git a/recipes/shr/libmodulo_git.bb b/recipes/shr/libmodulo_git.bb index 2e05d7218f..029f928d53 100644 --- a/recipes/shr/libmodulo_git.bb +++ b/recipes/shr/libmodulo_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Modulo is a lightweight component container that supports Inversion Of Control, also commonly called Dependency Injection" SECTION = "libs" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r1" inherit autotools autotools_stage pkgconfig vala diff --git a/recipes/shr/libphone-ui-shr_git.bb b/recipes/shr/libphone-ui-shr_git.bb index c297fe3640..08320fe5d2 100644 --- a/recipes/shr/libphone-ui-shr_git.bb +++ b/recipes/shr/libphone-ui-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR default module for the Phone UI daemon" SECTION = "e/apps" DEPENDS += " dbus-glib libframeworkd-glib libphone-ui etk evas ecore edje edje-native elementary" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r4" SRC_URI = "git://shr.bearstech.com/repo/libphone-ui-shr.git;protocol=http;branch=master" diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb index 41e159b57e..84b04c5a60 100644 --- a/recipes/shr/libphone-ui_git.bb +++ b/recipes/shr/libphone-ui_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A generic framework for phone ui" HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "libs" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r0" DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libphone-utils alsa-lib" diff --git a/recipes/shr/libphone-utils_git.bb b/recipes/shr/libphone-utils_git.bb index 7cf26ffec1..e0a2e2c110 100644 --- a/recipes/shr/libphone-utils_git.bb +++ b/recipes/shr/libphone-utils_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "phone-utils library" SECTION = "libs" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r2" DEPENDS="glib-2.0" diff --git a/recipes/shr/ologicd_git.bb b/recipes/shr/ologicd_git.bb index 58b82dd0ff..105199a582 100644 --- a/recipes/shr/ologicd_git.bb +++ b/recipes/shr/ologicd_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "" SECTION = "libs" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r0" inherit autotools diff --git a/recipes/shr/phonefsod_git.bb b/recipes/shr/phonefsod_git.bb index 06e6999667..2103122068 100644 --- a/recipes/shr/phonefsod_git.bb +++ b/recipes/shr/phonefsod_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += " dbus-glib libframeworkd-glib sqlite3 shr-specs" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r4" SRC_URI = "git://git.shr-project.org/repo/phonefsod.git;protocol=http;branch=master" diff --git a/recipes/shr/phoneui-apps_git.bb b/recipes/shr/phoneui-apps_git.bb index a6e3e17aee..a1916df4a0 100644 --- a/recipes/shr/phoneui-apps_git.bb +++ b/recipes/shr/phoneui-apps_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += "dbus-glib" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r0" inherit pkgconfig autotools diff --git a/recipes/shr/phoneuid_git.bb b/recipes/shr/phoneuid_git.bb index 6bf4eb828a..603a1d1609 100644 --- a/recipes/shr/phoneuid_git.bb +++ b/recipes/shr/phoneuid_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += " dbus-glib libframeworkd-glib libphone-ui sqlite3 shr-specs" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r5" RREPLACES_${PN} = "shr-today" diff --git a/recipes/shr/shr-config_git.bb b/recipes/shr/shr-config_git.bb index b0927442ce..b1fddd8246 100644 --- a/recipes/shr/shr-config_git.bb +++ b/recipes/shr/shr-config_git.bb @@ -4,7 +4,7 @@ AUTHOR = "Sebastian Spaeth (see AUTHORS)" LICENSE = "GPLv2" DEPENDS = "vala-native elementary libeflvala" SECTION = "x11/application" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r5" EXTRA_OECONF="--enable-vapidir=${STAGING_DATADIR}/vala/vapi" diff --git a/recipes/shr/shr-contacts_git.bb b/recipes/shr/shr-contacts_git.bb index 1b9a383130..6cfb87f43b 100644 --- a/recipes/shr/shr-contacts_git.bb +++ b/recipes/shr/shr-contacts_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r6" inherit pkgconfig autotools diff --git a/recipes/shr/shr-dialer_git.bb b/recipes/shr/shr-dialer_git.bb index 796b96592b..f4813141e4 100644 --- a/recipes/shr/shr-dialer_git.bb +++ b/recipes/shr/shr-dialer_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r9" inherit pkgconfig autotools diff --git a/recipes/shr/shr-installer_git.bb b/recipes/shr/shr-installer_git.bb index ca5eb59b0f..331c0f1e6a 100644 --- a/recipes/shr/shr-installer_git.bb +++ b/recipes/shr/shr-installer_git.bb @@ -5,7 +5,7 @@ LICENSE ?= "GPL" RDEPENDS = "python-elementary python-dbus python-core python-edbus packagekit" SECTION = "x11/application" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r0" inherit setuptools diff --git a/recipes/shr/shr-messages_git.bb b/recipes/shr/shr-messages_git.bb index 6fc0694c29..b821545fac 100644 --- a/recipes/shr/shr-messages_git.bb +++ b/recipes/shr/shr-messages_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r8" inherit pkgconfig autotools diff --git a/recipes/shr/shr-settings_git.bb b/recipes/shr/shr-settings_git.bb index 96c16ed4e7..9ff39660c0 100644 --- a/recipes/shr/shr-settings_git.bb +++ b/recipes/shr/shr-settings_git.bb @@ -5,7 +5,7 @@ LICENSE ?= "GPL" RDEPENDS = "python-elementary python-dbus python-codecs python-shell python-pyrtc python python-core python-edbus dbus-x11 frameworkd python-phoneutils python-pexpect" SECTION = "x11/application" PE = "1" -PV = "0.1.1+gitr${SRCREV}" +PV = "0.1.1+gitr${SRCPV}" PR = "r8" inherit setuptools diff --git a/recipes/shr/shr-specs_git.bb b/recipes/shr/shr-specs_git.bb index 0276ce81ce..bc29ee5e27 100644 --- a/recipes/shr/shr-specs_git.bb +++ b/recipes/shr/shr-specs_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The SHR DBus API Specification" HOMEPAGE = "http://shr-project.org/" LICENSE = "BSD" SECTION = "devel/specifications" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-specs.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-dontpanic_git.bb b/recipes/shr/shr-splash-theme-dontpanic_git.bb index 9c653acdc4..f80df61f67 100644 --- a/recipes/shr/shr-splash-theme-dontpanic_git.bb +++ b/recipes/shr/shr-splash-theme-dontpanic_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - DON'T PANIC theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2+gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r6" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-handy_git.bb b/recipes/shr/shr-splash-theme-handy_git.bb index 94e2d18878..3890a7f383 100644 --- a/recipes/shr/shr-splash-theme-handy_git.bb +++ b/recipes/shr/shr-splash-theme-handy_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - handy theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2+gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r3" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-logo_git.bb b/recipes/shr/shr-splash-theme-logo_git.bb index ecb603b9d7..7403ae43c9 100644 --- a/recipes/shr/shr-splash-theme-logo_git.bb +++ b/recipes/shr/shr-splash-theme-logo_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - SHR logo theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "0.1+gitr${SRCREV}" +PV = "0.1+gitr${SRCPV}" PR = "r1" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-niebiee_git.bb b/recipes/shr/shr-splash-theme-niebiee_git.bb index dfc8524ceb..e16cfa3fb4 100644 --- a/recipes/shr/shr-splash-theme-niebiee_git.bb +++ b/recipes/shr/shr-splash-theme-niebiee_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - extremely blue Niebiee theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2+gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-simple_git.bb b/recipes/shr/shr-splash-theme-simple_git.bb index f132c1d7aa..97ef436e6c 100644 --- a/recipes/shr/shr-splash-theme-simple_git.bb +++ b/recipes/shr/shr-splash-theme-simple_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - simple SHR theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2+gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r6" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-tux_git.bb b/recipes/shr/shr-splash-theme-tux_git.bb index 6f846461b3..743dacd2b4 100644 --- a/recipes/shr/shr-splash-theme-tux_git.bb +++ b/recipes/shr/shr-splash-theme-tux_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - SHR Tux theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "0.1+gitr${SRCREV}" +PV = "0.1+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash_git.bb b/recipes/shr/shr-splash_git.bb index a63b47f102..21bdad376c 100644 --- a/recipes/shr/shr-splash_git.bb +++ b/recipes/shr/shr-splash_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2+gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r5" DEPENDS = "virtual/shr-splash-theme" RRECOMMENDS = "virtual/shr-splash-theme" diff --git a/recipes/shr/shr-theme-gtk-e17lookalike_git.bb b/recipes/shr/shr-theme-gtk-e17lookalike_git.bb index 9a8c8e2d49..04ab37dc63 100644 --- a/recipes/shr/shr-theme-gtk-e17lookalike_git.bb +++ b/recipes/shr/shr-theme-gtk-e17lookalike_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A gtk theme that looks like e17" LICENSE = "MIT BSD" -PV = "0.1.1+gitr${SRCREV}" +PV = "0.1.1+gitr${SRCPV}" PR = "r5" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-theme_git.bb b/recipes/shr/shr-theme_git.bb index 54803107a4..704072f8af 100644 --- a/recipes/shr/shr-theme_git.bb +++ b/recipes/shr/shr-theme_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Standard icon theme for the SHR distribution" HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/data" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r2" inherit autotools diff --git a/recipes/shr/shr-today_git.bb b/recipes/shr/shr-today_git.bb index 64393068a7..65bea25739 100644 --- a/recipes/shr/shr-today_git.bb +++ b/recipes/shr/shr-today_git.bb @@ -5,7 +5,7 @@ LICENSE ?= "GPL" RDEPENDS = "python-edje python-dbus python-edbus python-ecore" SECTION = "x11/applications" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r2" inherit distutils diff --git a/recipes/shr/shr-wizard_git.bb b/recipes/shr/shr-wizard_git.bb index ec63fb13fc..33bac9d234 100644 --- a/recipes/shr/shr-wizard_git.bb +++ b/recipes/shr/shr-wizard_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org" LICENSE = "GPL" RDEPENDS = "python-elementary shr-settings python-phoneutils e-wm python-dbus python-edbus" SECTION = "x11/application" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.0.0+gitr${SRCPV}" PR = "r1" inherit autotools diff --git a/recipes/tasks/task-boot.bb b/recipes/tasks/task-boot.bb index 04c55357a8..bc25088d53 100644 --- a/recipes/tasks/task-boot.bb +++ b/recipes/tasks/task-boot.bb @@ -14,7 +14,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" # Make sure we build the kernel -DEPENDS = "virtual/kernel" +DEPENDS = "virtual/kernel virtual/update-alternatives-native" # # minimal set of packages - needed to boot diff --git a/recipes/ti/gstreamer-ti_svn.bb b/recipes/ti/gstreamer-ti_svn.bb index de09d36caa..57e1b409e9 100644 --- a/recipes/ti/gstreamer-ti_svn.bb +++ b/recipes/ti/gstreamer-ti_svn.bb @@ -3,7 +3,8 @@ DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly" SRCREV = "459" # Again, no '.' in PWD allowed :( -PV = "svnr${SRCREV}" +PE = "1" +PV = "svnr${SRCPV}" PR = "r37" GST_TI_RC_SCRIPT_omap3 = "gstreamer-ti-omap3530-rc.sh" diff --git a/recipes/ti/ti-dmai.inc b/recipes/ti/ti-dmai.inc index c52e46aaf1..d2fb3cadf3 100644 --- a/recipes/ti/ti-dmai.inc +++ b/recipes/ti/ti-dmai.inc @@ -15,6 +15,7 @@ SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=${BRANCH};proto=https;us S = "${WORKDIR}/${BRANCH}/davinci_multimedia_application_interface" # Yes, the xdc stuff still breaks with a '.' in PWD -PV = "svnr${SRCREV}" +PE = "1" +PV = "svnr${SRCPV}" INHIBIT_PACKAGE_STRIP = "1" diff --git a/recipes/toscoterm/toscoterm_git.bb b/recipes/toscoterm/toscoterm_git.bb index 9826c9e9d1..ce71492e5d 100644 --- a/recipes/toscoterm/toscoterm_git.bb +++ b/recipes/toscoterm/toscoterm_git.bb @@ -3,7 +3,8 @@ SECTION = "x11/applications" LICENSE = "GPLv3" DEPENDS = "vte" HOMEPAGE = "https://projetos.ossystems.com.br/projects/show/toscoterm" -PV = "0.0+gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r3" SRC_URI = "git://projetos.ossystems.com.br/git/toscoterm.git;protocol=git" diff --git a/recipes/tzdata/tzdata_2009r.bb b/recipes/tzdata/tzdata_2009r.bb new file mode 100644 index 0000000000..17c2dd4f0c --- /dev/null +++ b/recipes/tzdata/tzdata_2009r.bb @@ -0,0 +1,3 @@ +require tzdata.inc +SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" +PR = "${INC_PR}.0" diff --git a/recipes/u-boot/u-boot-omap3_git.bb b/recipes/u-boot/u-boot-omap3_git.bb index b8f95f5744..27c8314655 100644 --- a/recipes/u-boot/u-boot-omap3_git.bb +++ b/recipes/u-boot/u-boot-omap3_git.bb @@ -4,9 +4,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${M SRCREV = "08d7fdcce5dde5c2dc968fac5b2facf17cbabb5" -PV = "2008.10+${PR}+gitr${SRCREV}" -PR ="r2" -PE = "1" +PV = "2008.10+${PR}+gitr${SRCPV}" +PR ="r0" +PE = "2" SRC_URI = "git://www.sakoman.net/git/u-boot-omap3.git;branch=common;protocol=git \ " diff --git a/recipes/u-boot/u-boot-omap3pandora_git.bb b/recipes/u-boot/u-boot-omap3pandora_git.bb index 773eb18ea2..19d402e47c 100644 --- a/recipes/u-boot/u-boot-omap3pandora_git.bb +++ b/recipes/u-boot/u-boot-omap3pandora_git.bb @@ -7,9 +7,9 @@ SRCREV = "c71d8dbe09d69feda7e57745bd3909727d3cc33f" PROVIDES = "u-boot" -PV = "pandora+${PR}+gitr${SRCREV}" +PV = "pandora+${PR}+gitr${SRCPV}" PR ="r4" -PE = "1" +PE = "2" SRC_URI = "git://git.openpandora.org/pandora-u-boot.git;branch=master;protocol=git \ " diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc index 2045007e72..23810ea2a4 100644 --- a/recipes/uclibc/uclibc.inc +++ b/recipes/uclibc/uclibc.inc @@ -3,6 +3,7 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" INC_PR = "r32" +PE = "1" # # For now, we will skip building of a gcc package if it is a uclibc one # and our build is not a uclibc one, and we skip a glibc one if our build diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb index af0c650190..051e344413 100644 --- a/recipes/uclibc/uclibc_git.bb +++ b/recipes/uclibc/uclibc_git.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.30" SRCREV="b364abfd3f728894120996d5da2565614132708f" -PV = "${UCLIBC_BASE}+gitr${SRCREV}" +PV = "${UCLIBC_BASE}+gitr${SRCPV}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb index b1bb497d05..a978025a1e 100644 --- a/recipes/uclibc/uclibc_nptl.bb +++ b/recipes/uclibc/uclibc_nptl.bb @@ -7,8 +7,8 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.30" -SRCREV="b3b9101a9c495f52c06cb2de27fcf45e6e5f0bf9" -PV = "${UCLIBC_BASE}+gitr${SRCREV}" +SRCREV="b3d31460fbf188997c7337296a61409529f7c974" +PV = "${UCLIBC_BASE}+gitr${SRCPV}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. diff --git a/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb b/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb index 40534b4bb4..455831cf1f 100644 --- a/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb +++ b/recipes/update-alternatives/update-alternatives-cworth-native_0.99.154.bb @@ -3,6 +3,8 @@ inherit native PROVIDES += "virtual/update-alternatives-native" +PR = "${INC_PR}.0" + do_stage () { install -d ${sbindir} \ ${libdir}/opkg/alternatives diff --git a/recipes/update-alternatives/update-alternatives-cworth.inc b/recipes/update-alternatives/update-alternatives-cworth.inc index f23bfe8bb4..2d8fd42c0c 100644 --- a/recipes/update-alternatives/update-alternatives-cworth.inc +++ b/recipes/update-alternatives/update-alternatives-cworth.inc @@ -1,7 +1,8 @@ LICENSE = "GPL" SECTION = "base" -SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')}" +SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://update-alternatives.use.last.patch;patch=1" S = "${WORKDIR}/ipkg/C" PACKAGE_ARCH = "all" -PR = "r1" +INC_PR = "r3" diff --git a/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch b/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch new file mode 100644 index 0000000000..7bd5bd268b --- /dev/null +++ b/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch @@ -0,0 +1,34 @@ +diff -uNr C.orig/update-alternatives C/update-alternatives +--- C.orig/update-alternatives 2003-03-28 17:39:45.000000000 +0100 ++++ C/update-alternatives 2009-09-17 16:46:59.000000000 +0200 +@@ -97,8 +97,8 @@ + + ## path=`sed -ne "1!p" $ad/$name | sort -nr -k2 | head -1 | sed 's/ .*//'` + ## busybox safe: +- path=`sed -ne "1!p" $ad/$name | sed -e "s/\(.*\) \(.*\)/\2 \1/g" | sort -nr | head -n 1 | sed 's/[^ ]* //'` +- if [ -z "$path" ]; then ++ prio=`sed -ne "1!p" $ad/$name | sed -e "s/\(.*\) \(.*\)/\2 \1/g" | sort -nr | head -n 1 | sed 's/ [^ ]*$//'` ++ if [ -z "$prio" ]; then + echo "update-alternatives: removing $link as no more alternatives exist for it" + rm $ad/$name + if [ -L $link ]; then +@@ -107,11 +107,19 @@ + return 0 + fi + ++ ## find last line with highest priority ++ path=`grep "${prio}$" $ad/$name | tail -n 1 | sed 's/ [^ ]*$//'` ++ + if [ ! -e $link -o -L $link ]; then + local link_dir=`dirname $link` + if [ ! -d $link_dir ]; then + mkdir -p $link_dir + fi ++ if [ -h $link -a -d $link ]; then ++ # if $link exists and the target is directory, than ln -sf $path $link, doesn't replace link to that directory, but creates new link inside ++ echo "update-alternatives: Removing $link" ++ rm -f $link ++ fi + ln -sf $path $link + echo "update-alternatives: Linking $link to $path" + else diff --git a/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb b/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb index 6cab1e55ec..b95d6d5ff2 100644 --- a/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb +++ b/recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb @@ -2,6 +2,8 @@ require update-alternatives-cworth.inc RPROVIDES_${PN} = "update-alternatives" +PR="${INC_PR}.0" + do_install () { install -d ${D}${sbindir} \ ${D}${sysconfdir}/alternatives \ diff --git a/recipes/usbmode/usbmode.bb b/recipes/usbmode/usbmode.bb new file mode 100644 index 0000000000..f68fc759b3 --- /dev/null +++ b/recipes/usbmode/usbmode.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Freerunner USB Mode Control Program" +RDEPENDS += "python python-pygtk" +LICENSE = "GPL" +HOMEPAGE = http://techiem2.net/index.php?/archives/10-Freerunner-USB-Mode-Control-Program.html" +SECTION = "x11/games" +PV = "1.0" + +SRC_URI = "\ + http://www.techiem2.net/files/usbmode.tar.gz \ +" + +S = "${WORKDIR}" + +do_install() { + install -d ${D}${bindir} + install -d ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/usbmode.desktop ${D}${datadir}/applications + install -m 0755 ${S}/usbmode.py ${D}${bindir}/usbmode.py +} + +FILES_${PN} = "${bindir}/usbmode.py ${datadir}/applications/usbmode.desktop" + diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 8129c53e0d..14661764b7 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system." SECTION = "base" LICENSE = "GPL" -DEPENDS = "udev zlib ncurses virtual/libintl" +DEPENDS = "blktool udev zlib ncurses virtual/libintl" inherit autotools_stage AUTOTOOLS_STAGE_PKGCONFIG = "1" diff --git a/recipes/vagalume/files/index.theme b/recipes/vagalume/files/index.theme new file mode 100644 index 0000000000..453acf0586 --- /dev/null +++ b/recipes/vagalume/files/index.theme @@ -0,0 +1,8 @@ +[Icon Theme] +Name=Vagalume +Comment=Vagalume icons +Directories=scalable/actions + +[scalable/actions] +Size=48 +Type=Scalable diff --git a/recipes/vagalume/vagalume_0.7.1.bb b/recipes/vagalume/vagalume_0.7.1.bb index 5b29ae17b6..6ef0d19829 100644 --- a/recipes/vagalume/vagalume_0.7.1.bb +++ b/recipes/vagalume/vagalume_0.7.1.bb @@ -2,13 +2,20 @@ DESCRIPTION = "Last.fm client" AUTHOR = "agarcia@igalia.com" HOMEPAGE = "http://vagalume.igalia.com/" SECTION = "x11" -DEPENDS = "gtk+ gstreamer" +DEPENDS = "gtk+ gstreamer curl gst-plugins-good ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}" +RDEPENDS = "curl gst-plugin-autodetect gst-plugin-audioconvert gst-plugin-alsa librsvg-gtk ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)}" RRECOMMENDS = "dbus-x11" +PR = "r2" SRC_URI = "http://vagalume.igalia.com/files/source/vagalume_${PV}.orig.tar.gz\ + file://index.theme \ " S = "${WORKDIR}/vagalume-${PV}.orig" inherit autotools FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" + +do_install_append() { + install -m 0644 ${WORKDIR}/index.theme ${D}${datadir}/vagalume/icons/hicolor +} diff --git a/recipes/vala-terminal/vala-terminal_git.bb b/recipes/vala-terminal/vala-terminal_git.bb index 5bc4c79cb2..953d3431b0 100644 --- a/recipes/vala-terminal/vala-terminal_git.bb +++ b/recipes/vala-terminal/vala-terminal_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "A lightweight Terminal Emulator based on libvte, written in Vala." SECTION = "x11/applications" DEPENDS = "vala-native vte" -PV = "1.1.1+gitr${SRCREV}" +PV = "1.1.1+gitr${SRCPV}" +PE = "1" PR = "r0" inherit autotools diff --git a/recipes/vlc/vlc-davinci_0.8.6h.bb b/recipes/vlc/vlc-davinci_0.8.6h.bb index 71520bbb9b..4477330c0c 100644 --- a/recipes/vlc/vlc-davinci_0.8.6h.bb +++ b/recipes/vlc/vlc-davinci_0.8.6h.bb @@ -8,7 +8,8 @@ SRCREV = "e712a114e04a1070f1afdf31ec668cb28eda513c" PR = "r6" -PV = "0.8.6h+${PR}+gitr${SRCREV}" +PV = "0.8.6h+${PR}+gitr${SRCPV}" +PE = "1" DEPENDS = "codec-engine dbus libxml2 gnutls tremor faad2 ffmpeg flac \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" diff --git a/recipes/webkit/webkit-efl_git.bb b/recipes/webkit/webkit-efl_git.bb index 6dca9e049c..b23a4a869c 100644 --- a/recipes/webkit/webkit-efl_git.bb +++ b/recipes/webkit/webkit-efl_git.bb @@ -4,7 +4,7 @@ DEPENDS = "icu flex gst-plugins-base gstreamer jpeg libpng libxml2 pango \ libsoup-2.4 eina ecore evas edje cairo fontconfig freetype curl \ sqlite3 libxslt gperf-native libxt" -PV = "1.1.11+gitr${SRCREV}" +PV = "0.1+gitr${SRCPV}" PR = "r1" SRC_URI = "git://gitorious.org/webkit-efl/webkit-efl.git;protocol=git;branch=master" diff --git a/recipes/x-load/x-load-omap3pandora_git.bb b/recipes/x-load/x-load-omap3pandora_git.bb index 05dfc2073c..531a2abea7 100644 --- a/recipes/x-load/x-load-omap3pandora_git.bb +++ b/recipes/x-load/x-load-omap3pandora_git.bb @@ -8,9 +8,9 @@ SRCREV = "b3646a83f9e67ec9a2de3182fd254557fd6ad9aa" PROVIDES = "x-load" -PV = "1.42+${PR}+gitr${SRCREV}" +PV = "1.42+${PR}+gitr${SRCPV}" PR ="r2" -PE = "1" +PE = "2" SRC_URI = "git://git.openpandora.org/pandora-x-loader.git;branch=master;protocol=git" diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb index 0e0e603cb8..ceee39a877 100644 --- a/recipes/x-load/x-load_git.bb +++ b/recipes/x-load/x-load_git.bb @@ -7,9 +7,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE SRCREV = "319b26586fafb86f919f514bcd175838aaab96b3" -PV = "1.42+${PR}+gitr${SRCREV}" -PR ="r8" -PE = "1" +PV = "1.42+${PR}+gitr${SRCPV}" +PR ="r0" +PE = "2" SRC_URI = "git://gitorious.org/x-load-omap3/mainline.git;branch=master;protocol=git" diff --git a/recipes/xorg-driver/xf86-video-omapfb_git.bb b/recipes/xorg-driver/xf86-video-omapfb_git.bb index cc68163df4..89cb729379 100644 --- a/recipes/xorg-driver/xf86-video-omapfb_git.bb +++ b/recipes/xorg-driver/xf86-video-omapfb_git.bb @@ -3,8 +3,8 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- OMAP display driver" SRCREV = "5317aae587a2bf48f07a8c06bfaf7bcbfd23bafc" -PV = "0.1.1+${PR}+gitr${SRCREV}" -PE = "1" +PV = "0.1.1+${PR}+gitr${SRCPV}" +PE = "2" SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \ " diff --git a/recipes/xorg-lib/libxcalibrate_git.bb b/recipes/xorg-lib/libxcalibrate_git.bb index fadaf933ec..efff1a8505 100644 --- a/recipes/xorg-lib/libxcalibrate_git.bb +++ b/recipes/xorg-lib/libxcalibrate_git.bb @@ -5,8 +5,8 @@ LICENSE = "BSD-X" DEPENDS = "virtual/libx11 calibrateproto libxext" PR = "r0" -PV = "0.0+${PR}+gitr${SRCREV}" -PE = "2" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "3" SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git" diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb index 1b5ca6388f..ca6dae5fc5 100644 --- a/recipes/xorg-lib/pixman_git.bb +++ b/recipes/xorg-lib/pixman_git.bb @@ -5,7 +5,7 @@ LICENSE = "X11" PV = "0.17.3" PR = "r4" -PR_append = "+gitr${SRCREV}" +PR_append = "+gitr${SRCPV}" SRCREV = "c97b1e803fc214e9880eaeff98410c8fa37f9ddc" diff --git a/recipes/xorg-proto/calibrateproto_git.bb b/recipes/xorg-proto/calibrateproto_git.bb index 6f5414fb1a..8709acd11c 100644 --- a/recipes/xorg-proto/calibrateproto_git.bb +++ b/recipes/xorg-proto/calibrateproto_git.bb @@ -3,8 +3,8 @@ require xorg-proto-common.inc DESCRIPTION = "Touchscreen calibration protocol" PR = "r0" -PV = "0.0+${PR}+gitr${SRCREV}" -PE = "2" +PV = "0.0+${PR}+gitr${SRCPV}" +PE = "3" SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git" S = "${WORKDIR}/git" diff --git a/recipes/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/recipes/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb index 614848f3e3..40b6fe8c3f 100644 --- a/recipes/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb +++ b/recipes/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb @@ -9,8 +9,8 @@ DEPENDS += "libxkbfile libxcalibrate" RDEPENDS_${PN} = "xserver-security-policy" PROVIDES = "virtual/xserver" -PE = "1" -PV = "1.3.0.0+gitr${SRCREV}" +PE = "2" +PV = "1.3.0.0+gitr${SRCPV}" PR = "r3" COMPATIBLE_HOST = "arm.*-linux" |