diff options
-rw-r--r-- | classes/e.bbclass | 6 | ||||
-rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 7 | ||||
-rw-r--r-- | packages/e17/e-utils_svn.bb | 12 | ||||
-rw-r--r-- | packages/e17/edje-editor_svn.bb | 8 | ||||
-rw-r--r-- | packages/e17/enna_svn.bb | 4 | ||||
-rw-r--r-- | packages/e17/examine_svn.bb | 13 | ||||
-rw-r--r-- | packages/e17/exhibit_svn.bb | 2 | ||||
-rw-r--r-- | packages/e17/expedite_svn.bb | 8 | ||||
-rw-r--r-- | packages/e17/exquisite_svn.bb | 2 | ||||
-rw-r--r-- | packages/e17/rage_svn.bb | 7 | ||||
-rw-r--r-- | packages/freesmartphone/fso-gpsd_git.bb | 11 |
11 files changed, 28 insertions, 52 deletions
diff --git a/classes/e.bbclass b/classes/e.bbclass index 14199aaf0d..7166e729b5 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -1,5 +1,7 @@ HOMEPAGE = "http://www.enlightenment.org" SECTION = "e/apps" +SRCNAME ?= "${PN}" + SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=${SRCNAME};proto=http" S = "${WORKDIR}/${SRCNAME}" @@ -10,6 +12,10 @@ do_prepsources () { } addtask prepsources after do_fetch before do_unpack +do_configure_append() { + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g +} + export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config" export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 75a6aeca91..e6a0994465 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -43,6 +43,7 @@ SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-frameworkd ?= "248637c1264624aa08de40c2bbea96c418e0702e" +SRCREV_pn-fso-gpsd ?= "a79873ad595d7b524727daf06810a130fe002277" SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" @@ -191,7 +192,7 @@ SRCREV_pn-zhone ?= "be3d72c6e5f5c0733df7064a616f8e39c1c12f2b" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "35727" +EFL_SRCREV ?= "35984" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eet-native ?= "${EFL_SRCREV}" @@ -249,7 +250,3 @@ SRCREV_pn-e-wm ?= "${EFL_SRCREV}" SRCREV_pn-enna ?= "${EFL_SRCREV}" SRCREV_pn-exquisite ?= "${EFL_SRCREV}" SRCREV_pn-rage ?= "${EFL_SRCREV}" - -# Illume module -# Use EFL_SRCREV again when E does not segfault -SRCREV_pn-illume ?= "35866" diff --git a/packages/e17/e-utils_svn.bb b/packages/e17/e-utils_svn.bb deleted file mode 100644 index f90a118cdf..0000000000 --- a/packages/e17/e-utils_svn.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Enlightenment Window Manager Utilities" -DEPENDS = "eet evas ecore edje esmart ewl engrave" -LICENSE = "MIT BSD" -PV = "0.0.0+svnr${SRCREV}" -PR = "r1" - -inherit e - -SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD;module=e_utils;proto=http" -S = "${WORKDIR}/e_utils" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" diff --git a/packages/e17/edje-editor_svn.bb b/packages/e17/edje-editor_svn.bb index 4cbbf19e9e..44e0158d6b 100644 --- a/packages/e17/edje-editor_svn.bb +++ b/packages/e17/edje-editor_svn.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Edje-Editor is just that." +SECTION = "x11/devel" LICENSE = "MIT BSD" DEPENDS = "etk" +SRCNAME = "edje_editor" + PV = "0.0.0+svnr${SRCREV}" PR = "r1" inherit e -SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=edje_editor;proto=http" -S = "${WORKDIR}/edje_editor" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" +FILES_${PN} += "${datadir}" diff --git a/packages/e17/enna_svn.bb b/packages/e17/enna_svn.bb index 6bfabbdee5..d365d63435 100644 --- a/packages/e17/enna_svn.bb +++ b/packages/e17/enna_svn.bb @@ -11,6 +11,4 @@ inherit e SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/MISC;module=enna;proto=http" S = "${WORKDIR}/enna" -do_configure_prepend() { - autopoint -} +FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug" diff --git a/packages/e17/examine_svn.bb b/packages/e17/examine_svn.bb deleted file mode 100644 index 223d29ca25..0000000000 --- a/packages/e17/examine_svn.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Examine, the program configurator" -LICENSE = "MIT BSD" -DEPENDS = "ewl" -PV = "0.0.1+svnr${SRCREV}" -PR = "r1" - -SRCNAME = "examine" - -inherit e - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/exhibit_svn.bb b/packages/e17/exhibit_svn.bb index 6ec34d6ff9..2035bc193e 100644 --- a/packages/e17/exhibit_svn.bb +++ b/packages/e17/exhibit_svn.bb @@ -4,6 +4,4 @@ DEPENDS = "evas ecore epsilon edje eet etk efreet" PV = "0.1.1+svnr${SRCREV}" PR = "r1" -SRCNAME = "exhibit" - inherit e diff --git a/packages/e17/expedite_svn.bb b/packages/e17/expedite_svn.bb index 2f3ef20e16..1337487623 100644 --- a/packages/e17/expedite_svn.bb +++ b/packages/e17/expedite_svn.bb @@ -3,9 +3,9 @@ DEPENDS = "eet evas" RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png" LICENSE = "MIT BSD" PV = "0.6.0+svnr${SRCREV}" -PR = "r1" +PR = "r0" -inherit autotools +inherit e EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ @@ -24,8 +24,4 @@ EXTRA_OECONF = "\ --disable-software-sdl \ " -do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g -} - FILES_${PN} += "${datadir}" diff --git a/packages/e17/exquisite_svn.bb b/packages/e17/exquisite_svn.bb index 4c0a5678c8..4777226df5 100644 --- a/packages/e17/exquisite_svn.bb +++ b/packages/e17/exquisite_svn.bb @@ -4,8 +4,6 @@ DEPENDS = "eet evas ecore embryo edje" PV = "0.0.1+svnr${SRCREV}" PR = "r1" -SRCNAME = "exquisite" - inherit e EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" diff --git a/packages/e17/rage_svn.bb b/packages/e17/rage_svn.bb index d351ffd2a4..526744e681 100644 --- a/packages/e17/rage_svn.bb +++ b/packages/e17/rage_svn.bb @@ -1,12 +1,9 @@ DESCRIPTION = "Rage is a media center application based on EFL" -AUTHOR = "Carsten 'The Rasterman' Heitzler" +AUTHOR = "Carsten 'The Rasterman' Haitzler" HOMEPAGE = "http://www.rasterman.com" LICENSE = "MIT BSD" DEPENDS = "evas ecore edje" SECTION = "x11/multimedia" PV = "0.3.0.042+svnr${SRCREV}" -inherit autotools - -SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=rage;proto=http" -S = "${WORKDIR}/rage" +inherit e diff --git a/packages/freesmartphone/fso-gpsd_git.bb b/packages/freesmartphone/fso-gpsd_git.bb new file mode 100644 index 0000000000..2f99ea9760 --- /dev/null +++ b/packages/freesmartphone/fso-gpsd_git.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "gspd compatibility layer for frameworkd" +LICENSE = "GPL" +SECTION = "network" +DEPENDS = "dbus-glib" +PV = "0.5+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/fso-gpsd.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +inherit autotools |