diff options
Diffstat (limited to 'recipes/shr')
26 files changed, 38 insertions, 49 deletions
diff --git a/recipes/shr/alsa-scenarii-shr_git.bb b/recipes/shr/alsa-scenarii-shr_git.bb index 97b4393459..97b84984b6 100644 --- a/recipes/shr/alsa-scenarii-shr_git.bb +++ b/recipes/shr/alsa-scenarii-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Package for the different scenarios used by Openmoko" SECTION = "openmoko/base" -PV = "1.0+gitr${SRCREV}" -PR = "r1" +PV = "1.0+gitr${SRCPV}" +PR = "r2" COMPATIBLE_MACHINE = "(om-gta01|om-gta02|om-3d7k)" @@ -21,5 +21,5 @@ PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" FILES_${PN} += "${datadir}/shr" CONFFILES_${PN} += "${datadir}/shr/scenarii/*" -RPROVIDES_${PN} = "openmoko-alsa-scenarios" +RPROVIDES_${PN} = "openmoko-alsa-scenarios virtual/alsa-scenarios" diff --git a/recipes/shr/e-wm-config-illume-shr_git.bb b/recipes/shr/e-wm-config-illume-shr_git.bb index 64bd23fe90..36154cef8e 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 = "r6" inherit e diff --git a/recipes/shr/e-wm-menu-shr_git.bb b/recipes/shr/e-wm-menu-shr_git.bb index 94529e335a..1deef919fd 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}" RPROVIDES_${PN} = "e-wm-menu" 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 293edaeba3..07508c9fbb 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 = "r3" RPROVIDES_${PN} = "e-wm-sysactions" diff --git a/recipes/shr/e-wm-theme-illume-niebiee_git.bb b/recipes/shr/e-wm-theme-illume-niebiee_git.bb index bd3412d0ff..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 0c59feb876..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 5c3d65825e..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-niebiee_git.bb b/recipes/shr/elementary-theme-niebiee_git.bb index f58257d48c..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 48cbc615fa..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-shr_git.bb b/recipes/shr/etk-theme-shr_git.bb index d146765c94..3a324e9728 100644 --- a/recipes/shr/etk-theme-shr_git.bb +++ b/recipes/shr/etk-theme-shr_git.bb @@ -1,22 +1,8 @@ DESCRIPTION = "etk SHR theme" -SECTION = "e/utils" -DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "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" -S = "${WORKDIR}/git/etk/${PN}" - -do_compile() { - ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/default.edc -o ${S}/default.edj -} - -do_install() { - install -d ${D}${datadir}/etk/themes/ - install -m 0644 ${S}/default.edj ${D}${datadir}/etk/themes/ -} - -FILES_${PN} = "${datadir}/etk/themes/default.edj" - - +require etk-theme.inc diff --git a/recipes/shr/frameworkd-config-shr_git.bb b/recipes/shr/frameworkd-config-shr_git.bb index 0727091f0b..c1d15b18c3 100644 --- a/recipes/shr/frameworkd-config-shr_git.bb +++ b/recipes/shr/frameworkd-config-shr_git.bb @@ -4,8 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al." SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -SRCREV_FORMAT = "gitrFSO_REV-SHR_REV" -PV = "0.9.5.9+${SRCREV}" +SRCREV_FORMAT = "FSO_REV-SHR_REV" +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/libframeworkd-phonegui-efl2_git.bb b/recipes/shr/libframeworkd-phonegui-efl2_git.bb index 207658f807..cb1feade68 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 = "r1" 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 f8adabf415..c4181cf345 100644 --- a/recipes/shr/libframeworkd-phonegui-efl_git.bb +++ b/recipes/shr/libframeworkd-phonegui-efl_git.bb @@ -3,8 +3,10 @@ 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.2+gitr${SRCREV}" -PR = "r33" +PV = "0.0.3+gitr${SRCPV}" +PR = "r35" + +require libframeworkd-phonegui-efl-theme.inc inherit pkgconfig autotools autotools_stage @@ -14,6 +16,7 @@ S = "${WORKDIR}/git/${PN}" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" do_configure_prepend() { + sed -i "s|^filesdir = \$(datadir)/libframeworkd-phonegui-efl/|filesdir = \$(datadir)/libframeworkd-phonegui-efl.${PN}|g" data/Makefile.am autopoint --force } 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/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/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 1206d635d5..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-splash-theme-dontpanic_git.bb b/recipes/shr/shr-splash-theme-dontpanic_git.bb index 4bf41fbd29..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 773d4f16db..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-niebiee_git.bb b/recipes/shr/shr-splash-theme-niebiee_git.bb index 40a0973f2b..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 865e18fce7..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_git.bb b/recipes/shr/shr-splash_git.bb index 1ce7373e82..9bf4ca12df 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 = "r4" RRECOMMENDS_${PN} += "\ virtual/shr-splash-theme" 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 c6947cf3ca..65bea25739 100644 --- a/recipes/shr/shr-today_git.bb +++ b/recipes/shr/shr-today_git.bb @@ -2,13 +2,13 @@ DESCRIPTION = "python-elementary and opimd based lock and today screen for the S HOMEPAGE = "http://wiki.github.com/slyon/today" SHR_RELEASE ?= "shr" LICENSE ?= "GPL" -RDEPENDS = "python-elementary python-dbus python-edbus python-ecore" +RDEPENDS = "python-edje python-dbus python-edbus python-ecore" SECTION = "x11/applications" -PV = "0.0.1-gitr${SRCREV}" -PR = "r0" +PV = "0.0.1+gitr${SRCPV}" +PR = "r2" -inherit setuptools +inherit distutils SRC_URI = "git://github.com/slyon/today.git;protocol=http" S = "${WORKDIR}/git" |