From a8eb9367e66886586db9b5ee8e2227d58c08940f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 1 Oct 2005 21:12:46 +0000 Subject: Apply e patches from org.oe.dev: * major efl/e17 update * fix for entrance problem * use cvs instead of viewcvs --- packages/e17/e-iconbar_20050810.bb | 16 --- packages/e17/e-iconbar_20050926.bb | 16 +++ packages/e17/e-modules_20050810.bb | 16 --- packages/e17/e-modules_20050926.bb | 16 +++ packages/e17/e-utils_20050810.bb | 14 --- packages/e17/e-utils_20050926.bb | 14 +++ packages/e17/e-wm/disable-splash.patch | 11 ++ packages/e17/e-wm/fix-configure.patch | 35 +++--- packages/e17/e-wm_0.16.999.015.bb | 47 +++++++ packages/e17/e-wm_20050810.bb | 34 ----- packages/e17/e-wm_20050926.bb | 36 ++++++ packages/e17/eclair_20050810.bb | 18 --- packages/e17/eclair_20050926.bb | 18 +++ packages/e17/engage_20050810.bb | 22 ---- packages/e17/engage_20050926.bb | 22 ++++ packages/e17/entice_20050810.bb | 19 --- packages/e17/entice_20050926.bb | 19 +++ packages/e17/entrance/config-db.patch | 101 +++++++-------- packages/e17/entrance/use-bash.patch | 9 +- packages/e17/entrance_20050810.bb | 38 ------ packages/e17/entrance_20050926.bb | 38 ++++++ packages/e17/evidence_20050810.bb | 42 ------- packages/e17/evidence_20050926.bb | 42 +++++++ packages/e17/examine_20050810.bb | 21 ---- packages/e17/examine_20050926.bb | 21 ++++ packages/efl/e/fix-configure.patch | 29 +++-- packages/efl/e_0.16.999.015.bb | 31 +++++ packages/efl/e_20050810.bb | 32 ----- packages/efl/e_20050926.bb | 34 +++++ packages/efl/ecore-fb_0.9.9.013.bb | 25 ---- packages/efl/ecore-fb_0.9.9.015.bb | 25 ++++ packages/efl/ecore-native_0.9.9.013.bb | 6 - packages/efl/ecore-native_0.9.9.015.bb | 6 + packages/efl/ecore-x11_0.9.9.013.bb | 24 ---- packages/efl/ecore-x11_0.9.9.015.bb | 24 ++++ packages/efl/ecore.inc | 11 +- packages/efl/ecore/configure.patch | 21 ++-- packages/efl/ecore/fix-tslib-configure.patch | 12 ++ packages/efl/edje-native_0.5.0.013.bb | 28 ----- packages/efl/edje-native_0.5.0.015.bb | 28 +++++ packages/efl/edje_0.5.0.013.bb | 13 -- packages/efl/edje_0.5.0.015.bb | 21 ++++ packages/efl/eet-native_0.9.10.013.bb | 7 -- packages/efl/eet-native_0.9.10.015.bb | 7 ++ packages/efl/eet_0.9.10.013.bb | 9 -- packages/efl/eet_0.9.10.015.bb | 9 ++ packages/efl/emotion_0.0.1.004.bb | 4 + packages/efl/engrave_20050810.bb | 17 --- packages/efl/engrave_20050926.bb | 17 +++ packages/efl/esmart-x11_0.9.0.004.bb | 7 ++ packages/efl/esmart/ecore-fix.patch | 10 ++ packages/efl/esmart/include-stdio.patch | 22 ++++ packages/efl/evas-fb_0.9.9.013.bb | 47 ------- packages/efl/evas-fb_0.9.9.015.bb | 47 +++++++ packages/efl/evas-native_0.9.9.013.bb | 4 - packages/efl/evas-native_0.9.9.015.bb | 4 + packages/efl/evas-x11_0.9.9.013.bb | 51 -------- packages/efl/evas-x11_0.9.9.015.bb | 51 ++++++++ packages/efl/evas.inc | 14 ++- packages/efl/evas/fix-configure.patch | 42 +++---- packages/efl/ewl/ecore-flags.patch | 146 ++++++++++++++++++++++ packages/efl/ewl/fix-ecore.patch | 11 ++ packages/efl/ewl/minmax.patch | 18 +++ packages/efl/ewl/no-examples.patch | 22 ++++ packages/efl/ewl_0.0.4.004.bb | 6 +- packages/efl/imlib2-fb_1.2.1.004.bb | 5 - packages/efl/imlib2-fb_1.2.1.006.bb | 5 + packages/efl/imlib2-native_1.2.1.004.bb | 7 -- packages/efl/imlib2-native_1.2.1.006.bb | 7 ++ packages/efl/imlib2-x11_1.2.1.004.bb | 7 -- packages/efl/imlib2-x11_1.2.1.006.bb | 7 ++ packages/elitaire/elitaire_0.0.4.bb | 12 -- packages/elitaire/elitaire_0.0.5.bb | 13 ++ packages/elitaire/files/fix-ewl-and-gettext.patch | 21 ---- packages/elitaire/files/math.patch | 14 +++ 75 files changed, 1035 insertions(+), 690 deletions(-) delete mode 100644 packages/e17/e-iconbar_20050810.bb create mode 100644 packages/e17/e-iconbar_20050926.bb delete mode 100644 packages/e17/e-modules_20050810.bb create mode 100644 packages/e17/e-modules_20050926.bb delete mode 100644 packages/e17/e-utils_20050810.bb create mode 100644 packages/e17/e-utils_20050926.bb create mode 100644 packages/e17/e-wm/disable-splash.patch create mode 100644 packages/e17/e-wm_0.16.999.015.bb delete mode 100644 packages/e17/e-wm_20050810.bb create mode 100644 packages/e17/e-wm_20050926.bb delete mode 100644 packages/e17/eclair_20050810.bb create mode 100644 packages/e17/eclair_20050926.bb delete mode 100644 packages/e17/engage_20050810.bb create mode 100644 packages/e17/engage_20050926.bb delete mode 100644 packages/e17/entice_20050810.bb create mode 100644 packages/e17/entice_20050926.bb delete mode 100644 packages/e17/entrance_20050810.bb create mode 100644 packages/e17/entrance_20050926.bb delete mode 100644 packages/e17/evidence_20050810.bb create mode 100644 packages/e17/evidence_20050926.bb delete mode 100644 packages/e17/examine_20050810.bb create mode 100644 packages/e17/examine_20050926.bb create mode 100644 packages/efl/e_0.16.999.015.bb delete mode 100644 packages/efl/e_20050810.bb create mode 100644 packages/efl/e_20050926.bb delete mode 100644 packages/efl/ecore-fb_0.9.9.013.bb create mode 100644 packages/efl/ecore-fb_0.9.9.015.bb delete mode 100644 packages/efl/ecore-native_0.9.9.013.bb create mode 100644 packages/efl/ecore-native_0.9.9.015.bb delete mode 100644 packages/efl/ecore-x11_0.9.9.013.bb create mode 100644 packages/efl/ecore-x11_0.9.9.015.bb create mode 100644 packages/efl/ecore/fix-tslib-configure.patch delete mode 100644 packages/efl/edje-native_0.5.0.013.bb create mode 100644 packages/efl/edje-native_0.5.0.015.bb delete mode 100644 packages/efl/edje_0.5.0.013.bb create mode 100644 packages/efl/edje_0.5.0.015.bb delete mode 100644 packages/efl/eet-native_0.9.10.013.bb create mode 100644 packages/efl/eet-native_0.9.10.015.bb delete mode 100644 packages/efl/eet_0.9.10.013.bb create mode 100644 packages/efl/eet_0.9.10.015.bb delete mode 100644 packages/efl/engrave_20050810.bb create mode 100644 packages/efl/engrave_20050926.bb create mode 100644 packages/efl/esmart/ecore-fix.patch create mode 100644 packages/efl/esmart/include-stdio.patch delete mode 100644 packages/efl/evas-fb_0.9.9.013.bb create mode 100644 packages/efl/evas-fb_0.9.9.015.bb delete mode 100644 packages/efl/evas-native_0.9.9.013.bb create mode 100644 packages/efl/evas-native_0.9.9.015.bb delete mode 100644 packages/efl/evas-x11_0.9.9.013.bb create mode 100644 packages/efl/evas-x11_0.9.9.015.bb create mode 100644 packages/efl/ewl/ecore-flags.patch create mode 100644 packages/efl/ewl/fix-ecore.patch create mode 100644 packages/efl/ewl/minmax.patch create mode 100644 packages/efl/ewl/no-examples.patch delete mode 100644 packages/efl/imlib2-fb_1.2.1.004.bb create mode 100644 packages/efl/imlib2-fb_1.2.1.006.bb delete mode 100644 packages/efl/imlib2-native_1.2.1.004.bb create mode 100644 packages/efl/imlib2-native_1.2.1.006.bb delete mode 100644 packages/efl/imlib2-x11_1.2.1.004.bb create mode 100644 packages/efl/imlib2-x11_1.2.1.006.bb delete mode 100644 packages/elitaire/elitaire_0.0.4.bb create mode 100644 packages/elitaire/elitaire_0.0.5.bb create mode 100644 packages/elitaire/files/math.patch (limited to 'packages') diff --git a/packages/e17/e-iconbar_20050810.bb b/packages/e17/e-iconbar_20050810.bb deleted file mode 100644 index f0ca322f96..0000000000 --- a/packages/e17/e-iconbar_20050810.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "An Iconbar for the Enlightenment Window Manager" -DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart-x11 imlib2-x11" -LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin " -CVSDATE = "${PV}" -PR = "r1" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/iconbar" -S = "${WORKDIR}/iconbar" - -inherit autotools - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/e-iconbar_20050926.bb b/packages/e17/e-iconbar_20050926.bb new file mode 100644 index 0000000000..f0ca322f96 --- /dev/null +++ b/packages/e17/e-iconbar_20050926.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "An Iconbar for the Enlightenment Window Manager" +DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart-x11 imlib2-x11" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin " +CVSDATE = "${PV}" +PR = "r1" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/iconbar" +S = "${WORKDIR}/iconbar" + +inherit autotools + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/e-modules_20050810.bb b/packages/e17/e-modules_20050810.bb deleted file mode 100644 index 9ab3330c97..0000000000 --- a/packages/e17/e-modules_20050810.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Enlightenment Window Manager Extra Modules" -DEPENDS = "ecore-x11 evas-x11 esmart-x11 edje eet e" -LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin " -CVSDATE = "${PV}" -PR = "r1" - -inherit autotools - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_modules" -S = "${WORKDIR}/e_modules" - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" diff --git a/packages/e17/e-modules_20050926.bb b/packages/e17/e-modules_20050926.bb new file mode 100644 index 0000000000..9ab3330c97 --- /dev/null +++ b/packages/e17/e-modules_20050926.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Enlightenment Window Manager Extra Modules" +DEPENDS = "ecore-x11 evas-x11 esmart-x11 edje eet e" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin " +CVSDATE = "${PV}" +PR = "r1" + +inherit autotools + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_modules" +S = "${WORKDIR}/e_modules" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" diff --git a/packages/e17/e-utils_20050810.bb b/packages/e17/e-utils_20050810.bb deleted file mode 100644 index 4d0ba6fa73..0000000000 --- a/packages/e17/e-utils_20050810.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Enlightenment Window Manager Utilities" -DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 e epsilon" -LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin " -CVSDATE = "${PV}" -PR = "r1" - -inherit autotools - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_utils" -S = "${WORKDIR}/e_utils" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" diff --git a/packages/e17/e-utils_20050926.bb b/packages/e17/e-utils_20050926.bb new file mode 100644 index 0000000000..4d0ba6fa73 --- /dev/null +++ b/packages/e17/e-utils_20050926.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Enlightenment Window Manager Utilities" +DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 e epsilon" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin " +CVSDATE = "${PV}" +PR = "r1" + +inherit autotools + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_utils" +S = "${WORKDIR}/e_utils" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" diff --git a/packages/e17/e-wm/disable-splash.patch b/packages/e17/e-wm/disable-splash.patch new file mode 100644 index 0000000000..152a0a2895 --- /dev/null +++ b/packages/e17/e-wm/disable-splash.patch @@ -0,0 +1,11 @@ +--- enlightenment-0.16.999.015/src/bin/e_config.c~ 2005-09-22 20:50:16.000000000 -0700 ++++ enlightenment-0.16.999.015/src/bin/e_config.c 2005-09-30 10:51:02.000000000 -0700 +@@ -377,7 +377,7 @@ + /* DEFAULT CONFIG */ + e_config = E_NEW(E_Config, 1); + e_config->config_version = E_CONFIG_FILE_VERSION; +- e_config->show_splash = 1; ++ e_config->show_splash = 0; + e_config->desktop_default_background = strdup(""); + e_config->desktop_default_name = strdup("Desktop %i, %i"); + e_config->menus_scroll_speed = 1000.0; diff --git a/packages/e17/e-wm/fix-configure.patch b/packages/e17/e-wm/fix-configure.patch index d2ee47e014..02560fd7ab 100644 --- a/packages/e17/e-wm/fix-configure.patch +++ b/packages/e17/e-wm/fix-configure.patch @@ -1,10 +1,6 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- e/configure.in~fix-configure.patch -+++ e/configure.in +diff -Nur e~/configure.in e/configure.in +--- e~/configure.in 2005-09-29 13:17:29.000000000 -0700 ++++ e/configure.in 2005-09-29 13:19:35.000000000 -0700 @@ -114,9 +114,7 @@ AC_PATH_XTRA AC_CHECK_HEADER(X11/X.h, @@ -16,8 +12,9 @@ ],[ AC_MSG_ERROR([Cannot find X headers and libraries.]) ] ---- e/src/bin/Makefile.am~fix-configure.patch -+++ e/src/bin/Makefile.am +diff -Nur e~/src/bin/Makefile.am e/src/bin/Makefile.am +--- e~/src/bin/Makefile.am 2005-09-29 13:17:29.000000000 -0700 ++++ e/src/bin/Makefile.am 2005-09-29 13:19:35.000000000 -0700 @@ -1,6 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(includedir) \ @@ -26,18 +23,20 @@ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ @e_cflags@ \ ---- e/src/lib/Makefile.am~fix-configure.patch -+++ e/src/lib/Makefile.am +diff -Nur e~/src/lib/Makefile.am e/src/lib/Makefile.am +--- e~/src/lib/Makefile.am 2005-09-29 13:17:29.000000000 -0700 ++++ e/src/lib/Makefile.am 2005-09-29 13:19:56.000000000 -0700 @@ -1,6 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(includedir) \ - -I$(top_srcdir)/src/bin \ +INCLUDES = -I$(top_srcdir)/src/bin \ - @ecore_cflags@ \ - @evas_cflags@ + @e_cflags@ ---- e/src/preload/Makefile.am~fix-configure.patch -+++ e/src/preload/Makefile.am + lib_LTLIBRARIES = libe.la +diff -Nur e~/src/preload/Makefile.am e/src/preload/Makefile.am +--- e~/src/preload/Makefile.am 2005-09-29 13:17:29.000000000 -0700 ++++ e/src/preload/Makefile.am 2005-09-29 13:19:35.000000000 -0700 @@ -2,7 +2,6 @@ INCLUDES = -I. \ @@ -46,9 +45,3 @@ -I$(top_srcdir)src/preload \ @x_cflags@ pkgdir = $(libdir)/enlightenment/preload ---- e/src/Makefile.am~fix-configure.patch -+++ e/src/Makefile.am -@@ -1,2 +1,2 @@ - MAINTAINERCLEANFILES = Makefile.in --SUBDIRS = bin modules lib preload -+SUBDIRS = bin modules preload diff --git a/packages/e17/e-wm_0.16.999.015.bb b/packages/e17/e-wm_0.16.999.015.bb new file mode 100644 index 0000000000..7c3aceb536 --- /dev/null +++ b/packages/e17/e-wm_0.16.999.015.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "E17 - the Enlightenment Window Mananger" +DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin " +CVSDATE = "${PV}" +PR = "r3" + +SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz \ + file://fix-configure.patch;patch=1 \ + file://remove-large-fonts.patch;patch=1 \ + file://disable-splash.patch;patch=1 \ + file://Xsession.d/98enlightenment \ + cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e/data/themes;date=20050926" +# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \ +# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \ +# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \ +# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry_focus.png?rev=1.1" + +S = "${WORKDIR}/enlightenment-${PV}" + +inherit autotools + +PROFILE = "LORES_PDA" +PROFILE_c7x0 = "HIRES_PDA" +PROFILE_tosa = "HIRES_PDA" +PROFILE_spitz = "HIRES_PDA" +PROFILE_akita = "HIRES_PDA" + +EXTRA_OECONF = "--with-profile=${PROFILE} \ + --with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR}" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" + +do_compile_prepend() { + mv "${WORKDIR}/themes/default_entry.edc" "${S}/data/themes/" + mv "${WORKDIR}/themes/images/focus.png" "${S}/data/themes/images/" + mv "${WORKDIR}/themes/images/entry.png" "${S}/data/themes/images/" + mv "${WORKDIR}/themes/images/entry_focus.png" "${S}/data/themes/images/" +} + +do_install_append() { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d +} diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb deleted file mode 100644 index c6cbee4cd9..0000000000 --- a/packages/e17/e-wm_20050810.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "E17 - the Enlightenment Window Mananger" -DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" -LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin " -CVSDATE = "${PV}" -PR = "r3" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \ - file://Xsession.d/98enlightenment \ - file://fix-configure.patch;patch=1 \ - file://add-menu-autoscroll-options.patch;patch=1 \ - file://remove-large-fonts.patch;patch=1" -S = "${WORKDIR}/e" - -inherit autotools - -PROFILE = "LORES_PDA" -PROFILE_c7x0 = "HIRES_PDA" -PROFILE_tosa = "HIRES_PDA" -PROFILE_spitz = "HIRES_PDA" -PROFILE_akita = "HIRES_PDA" - -EXTRA_OECONF = "--with-profile=${PROFILE} \ - --with-edje-cc=${STAGING_BINDIR}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR}" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" - -do_install_append() { - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d -} diff --git a/packages/e17/e-wm_20050926.bb b/packages/e17/e-wm_20050926.bb new file mode 100644 index 0000000000..4f53a6e990 --- /dev/null +++ b/packages/e17/e-wm_20050926.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "E17 - the Enlightenment Window Mananger" +DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin " +CVSDATE = "${PV}" +PR = "r3" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \ + file://Xsession.d/98enlightenment \ + file://fix-configure.patch;patch=1 \ + file://add-menu-autoscroll-options.patch;patch=1 \ + file://remove-large-fonts.patch;patch=1" +S = "${WORKDIR}/e" + +inherit autotools + +PROFILE = "LORES_PDA" +PROFILE_c7x0 = "HIRES_PDA" +PROFILE_tosa = "HIRES_PDA" +PROFILE_spitz = "HIRES_PDA" +PROFILE_akita = "HIRES_PDA" + +EXTRA_OECONF = "--with-profile=${PROFILE} \ + --with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR}" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" + +do_install_append() { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d +} diff --git a/packages/e17/eclair_20050810.bb b/packages/e17/eclair_20050810.bb deleted file mode 100644 index 7138f06f88..0000000000 --- a/packages/e17/eclair_20050810.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Eclair is the E17 multi media player" -SECTION = "e/apps" -DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emotion esmart-x11 libxml2 sqlite3 taglibc" -LICENSE = "MIT" -HOMEPAGE = "http://www.enlightenment.org" -MAINTAINER = "Justin Patrin " -CVSDATE = "${PV}" -PR = "r1" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/eclair" -S = "${WORKDIR}/eclair" - -inherit autotools - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" - diff --git a/packages/e17/eclair_20050926.bb b/packages/e17/eclair_20050926.bb new file mode 100644 index 0000000000..7138f06f88 --- /dev/null +++ b/packages/e17/eclair_20050926.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Eclair is the E17 multi media player" +SECTION = "e/apps" +DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emotion esmart-x11 libxml2 sqlite3 taglibc" +LICENSE = "MIT" +HOMEPAGE = "http://www.enlightenment.org" +MAINTAINER = "Justin Patrin " +CVSDATE = "${PV}" +PR = "r1" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/eclair" +S = "${WORKDIR}/eclair" + +inherit autotools + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" + diff --git a/packages/e17/engage_20050810.bb b/packages/e17/engage_20050810.bb deleted file mode 100644 index 077858d8eb..0000000000 --- a/packages/e17/engage_20050810.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Engage is the E17 icon dock" -DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e" -LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin " -PR = "r2" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage \ - file://no-local-includes.patch;patch=1" -S = "${WORKDIR}/engage" - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" - -do_prepsources () { - make clean distclean || true -} -addtask prepsources after do_fetch before do_unpack - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" - diff --git a/packages/e17/engage_20050926.bb b/packages/e17/engage_20050926.bb new file mode 100644 index 0000000000..077858d8eb --- /dev/null +++ b/packages/e17/engage_20050926.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Engage is the E17 icon dock" +DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin " +PR = "r2" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage \ + file://no-local-includes.patch;patch=1" +S = "${WORKDIR}/engage" + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +do_prepsources () { + make clean distclean || true +} +addtask prepsources after do_fetch before do_unpack + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" + diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb deleted file mode 100644 index 364e65cbbf..0000000000 --- a/packages/e17/entice_20050810.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Entice is the E17 picture viewer" -SECTION = "e/apps" -# can also depend on GIMP for editing -DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" -LICENSE = "MIT" -HOMEPAGE = "http://www.enlightenment.org" -MAINTAINER = "Justin Patrin " -CVSDATE = "${PV}" -PR = "r1" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entice" -S = "${WORKDIR}/entice" - -inherit autotools - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" - diff --git a/packages/e17/entice_20050926.bb b/packages/e17/entice_20050926.bb new file mode 100644 index 0000000000..364e65cbbf --- /dev/null +++ b/packages/e17/entice_20050926.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Entice is the E17 picture viewer" +SECTION = "e/apps" +# can also depend on GIMP for editing +DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" +LICENSE = "MIT" +HOMEPAGE = "http://www.enlightenment.org" +MAINTAINER = "Justin Patrin " +CVSDATE = "${PV}" +PR = "r1" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entice" +S = "${WORKDIR}/entice" + +inherit autotools + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" + diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch index 874231b95b..c909201882 100644 --- a/packages/e17/entrance/config-db.patch +++ b/packages/e17/entrance/config-db.patch @@ -1,61 +1,52 @@ ---- entrance/data/config/build_config.sh.in~ 2005-08-15 23:24:39.000000000 -0700 -+++ entrance/data/config/build_config.sh.in 2005-08-15 23:25:15.000000000 -0700 +diff -Nur entrance~/data/config/build_config.sh.in entrance/data/config/build_config.sh.in +--- entrance~/data/config/build_config.sh.in 2005-09-29 14:58:41.000000000 -0700 ++++ entrance/data/config/build_config.sh.in 2005-09-29 15:01:04.000000000 -0700 @@ -3,7 +3,7 @@ rm -f $DB # set auth to 1 for pam, 2 for shadow --edb_ed $DB add /entrance/auth int @auth_mode@ -+edb_ed $DB add /entrance/auth int 0 +-ecore_config $DB set /entrance/auth int @auth_mode@ ++ecore_config $DB set /entrance/auth int 0 # uncomment the below to enable experimental OpenGL hardware acceleration - #edb_ed $DB add /entrance/engine int 1 -@@ -18,30 +18,30 @@ - #edb_ed $DB add /entrance/fonts/0/str str "/usr/share/fonts/truetype/" - #edb_ed $DB add /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/" - edb_ed $DB add /entrance/greeting/before str "Welcome to " --edb_ed $DB add /entrance/greeting/after str "" -+edb_ed $DB add /entrance/greeting/after str " e17/OE" - edb_ed $DB add /entrance/session/count int 8 --edb_ed $DB add /entrance/session/0/session str "default" -+edb_ed $DB add /entrance/session/0/session str "/etc/X11/Sessions/Default" - edb_ed $DB add /entrance/session/0/title str "Default" - edb_ed $DB add /entrance/session/0/icon str "default.png" - edb_ed $DB add /entrance/session/1/icon str "enlightenment.png" - edb_ed $DB add /entrance/session/1/title str "Enlightenment" --edb_ed $DB add /entrance/session/1/session str "Enlightenment" --edb_ed $DB add /entrance/session/2/session str "kde" --edb_ed $DB add /entrance/session/2/title str "KDE" --edb_ed $DB add /entrance/session/2/icon str "kde.png" --edb_ed $DB add /entrance/session/3/session str "gnome" --edb_ed $DB add /entrance/session/3/title str "Gnome" --edb_ed $DB add /entrance/session/3/icon str "gnome.png" --edb_ed $DB add /entrance/session/4/session str "blackbox" --edb_ed $DB add /entrance/session/4/title str "Blackbox" --edb_ed $DB add /entrance/session/4/icon str "blackbox.png" --edb_ed $DB add /entrance/session/5/session str "sawfish" --edb_ed $DB add /entrance/session/5/title str "Sawfish" --edb_ed $DB add /entrance/session/5/icon str "default.png" --edb_ed $DB add /entrance/session/6/session str "xfce" --edb_ed $DB add /entrance/session/6/title str "XFce" --edb_ed $DB add /entrance/session/6/icon str "xfce.png" --edb_ed $DB add /entrance/session/7/session str "failsafe" -+edb_ed $DB add /entrance/session/2/session str "/etc/X11/Sessions/Enlightenment" -+edb_ed $DB add /entrance/session/2/icon str "enlightenment.png" -+edb_ed $DB add /entrance/session/2/title str "Enlightenment" -+edb_ed $DB add /entrance/session/3/session str "/etc/X11/Sessions/Enlightenment" -+edb_ed $DB add /entrance/session/3/icon str "enlightenment.png" -+edb_ed $DB add /entrance/session/3/title str "Enlightenment" -+edb_ed $DB add /entrance/session/4/session str "/etc/X11/Sessions/Enlightenment" -+edb_ed $DB add /entrance/session/4/icon str "enlightenment.png" -+edb_ed $DB add /entrance/session/4/title str "Enlightenment" -+edb_ed $DB add /entrance/session/5/session str "/etc/X11/Sessions/Enlightenment" -+edb_ed $DB add /entrance/session/5/icon str "enlightenment.png" -+edb_ed $DB add /entrance/session/5/title str "Enlightenment" -+edb_ed $DB add /entrance/session/6/session str "/etc/X11/Sessions/Enlightenment" -+edb_ed $DB add /entrance/session/6/icon str "enlightenment.png" -+edb_ed $DB add /entrance/session/6/title str "Enlightenment" -+edb_ed $DB add /entrance/session/1/session str "/etc/X11/Sessions/Enlightenment" -+edb_ed $DB add /entrance/session/7/session str "/etc/X11/Sessions/Failsafe" - edb_ed $DB add /entrance/session/7/title str "Failsafe" - edb_ed $DB add /entrance/session/7/icon str "failsafe.png" - edb_ed $DB add /entrance/system/reboot int 1 + #ecore_config $DB set /entrance/engine int 1 +@@ -18,32 +18,17 @@ + #ecore_config $DB set /entrance/fonts/0/str str "/usr/share/fonts/truetype/" + #ecore_config $DB set /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/" + ecore_config $DB set /entrance/greeting/before str "Welcome to" +-ecore_config $DB set /entrance/greeting/after str "" +-ecore_config $DB set /entrance/session/count int 8 +-ecore_config $DB set /entrance/session/0/session str "default" ++ecore_config $DB set /entrance/greeting/after str " e17/OE" ++ecore_config $DB set /entrance/session/count int 3 ++ecore_config $DB set /entrance/session/0/session str "/etc/X11/Sessions/Enlightenment" + ecore_config $DB set /entrance/session/0/title str "Default" + ecore_config $DB set /entrance/session/0/icon str "default.png" + ecore_config $DB set /entrance/session/1/icon str "enlightenment.png" + ecore_config $DB set /entrance/session/1/title str "Enlightenment" +-ecore_config $DB set /entrance/session/1/session str "Enlightenment" +-ecore_config $DB set /entrance/session/2/session str "kde" +-ecore_config $DB set /entrance/session/2/title str "KDE" +-ecore_config $DB set /entrance/session/2/icon str "kde.png" +-ecore_config $DB set /entrance/session/3/session str "gnome" +-ecore_config $DB set /entrance/session/3/title str "Gnome" +-ecore_config $DB set /entrance/session/3/icon str "gnome.png" +-ecore_config $DB set /entrance/session/4/session str "blackbox" +-ecore_config $DB set /entrance/session/4/title str "Blackbox" +-ecore_config $DB set /entrance/session/4/icon str "blackbox.png" +-ecore_config $DB set /entrance/session/5/session str "sawfish" +-ecore_config $DB set /entrance/session/5/title str "Sawfish" +-ecore_config $DB set /entrance/session/5/icon str "default.png" +-ecore_config $DB set /entrance/session/6/session str "xfce" +-ecore_config $DB set /entrance/session/6/title str "XFce" +-ecore_config $DB set /entrance/session/6/icon str "xfce.png" +-ecore_config $DB set /entrance/session/7/session str "failsafe" +-ecore_config $DB set /entrance/session/7/title str "Failsafe" +-ecore_config $DB set /entrance/session/7/icon str "failsafe.png" ++ecore_config $DB set /entrance/session/1/session str "/etc/X11/Sessions/Enlightenment" ++ecore_config $DB set /entrance/session/2/session str "/etc/X11/Sessions/Failsafe" ++ecore_config $DB set /entrance/session/2/title str "Failsafe" ++ecore_config $DB set /entrance/session/2/icon str "failsafe.png" + ecore_config $DB set /entrance/system/reboot int 1 + ecore_config $DB set /entrance/system/halt int 1 + ecore_config $DB set /entrance/user/remember int 1 diff --git a/packages/e17/entrance/use-bash.patch b/packages/e17/entrance/use-bash.patch index 4d3b2f4aae..5c6d1992c8 100644 --- a/packages/e17/entrance/use-bash.patch +++ b/packages/e17/entrance/use-bash.patch @@ -1,9 +1,10 @@ ---- entrance/src/client/entrance_session.c.~1.71.~ 2005-05-28 02:31:14.000000000 -0700 -+++ entrance/src/client/entrance_session.c 2005-08-15 21:45:53.000000000 -0700 -@@ -451,7 +451,7 @@ +diff -Nur entrance~/src/client/entrance_session.c entrance/src/client/entrance_session.c +--- entrance~/src/client/entrance_session.c 2005-09-29 15:03:26.000000000 -0700 ++++ entrance/src/client/entrance_session.c 2005-09-29 15:04:11.000000000 -0700 +@@ -470,7 +470,7 @@ + snprintf(buf, sizeof(buf), "%s/entrance_login %i", PACKAGE_BIN_DIR, (int) pid); } - _entrance_session_user_list_fix(e); - shell = strdup("/bin/sh"); + shell = strdup("/bin/bash"); /* this bypasses a race condition where entrance loses its x diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb deleted file mode 100644 index 1c27111f49..0000000000 --- a/packages/e17/entrance_20050810.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "Entrance is the Enlightenment login manager" -SECTION = "e/apps" -LICENSE = "MIT" -# can also use pam and crypt -DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common" -RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1" -HOMEPAGE = "http://www.enlightenment.org" -MAINTAINER = "Justin Patrin " -CVSDATE = "${PV}" -PR = "r9" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ - file://Xserver.patch;patch=1 \ - file://config-db.patch;patch=1 \ - file://allow-missing-xsession.patch;patch=1 \ - file://run-Xinit.patch;patch=1 \ - file://use-bash.patch;patch=1 \ - file://set-display-env.patch;patch=1 \ - file://Sessions" - -S = "${WORKDIR}/entrance" - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "entrance" -INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ - --with-xsession=/etc/X11/Xsession" - -FILES += "${datadir}" - -do_install_append() { - install -d ${D}/etc/X11/Xsession.d - install -d ${D}/etc/X11/Sessions - - install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions -} diff --git a/packages/e17/entrance_20050926.bb b/packages/e17/entrance_20050926.bb new file mode 100644 index 0000000000..1c27111f49 --- /dev/null +++ b/packages/e17/entrance_20050926.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Entrance is the Enlightenment login manager" +SECTION = "e/apps" +LICENSE = "MIT" +# can also use pam and crypt +DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common" +RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1" +HOMEPAGE = "http://www.enlightenment.org" +MAINTAINER = "Justin Patrin " +CVSDATE = "${PV}" +PR = "r9" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ + file://Xserver.patch;patch=1 \ + file://config-db.patch;patch=1 \ + file://allow-missing-xsession.patch;patch=1 \ + file://run-Xinit.patch;patch=1 \ + file://use-bash.patch;patch=1 \ + file://set-display-env.patch;patch=1 \ + file://Sessions" + +S = "${WORKDIR}/entrance" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "entrance" +INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --with-xsession=/etc/X11/Xsession" + +FILES += "${datadir}" + +do_install_append() { + install -d ${D}/etc/X11/Xsession.d + install -d ${D}/etc/X11/Sessions + + install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions +} diff --git a/packages/e17/evidence_20050810.bb b/packages/e17/evidence_20050810.bb deleted file mode 100644 index 0950b590c6..0000000000 --- a/packages/e17/evidence_20050810.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "evidence, an enlightenemt file manager" -LICENSE = "GPL" -SECTION = "e" -MAINTAINER = "Justin Patrin " -# can support dbus, avifile, libmpeg3 -DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg pcre curl taglib libvorbis libogg libxine-x11 emotion freetype" -RDEPENDS += "examine" -PR = "r0" -CVSDATE = "${PV}" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/evidence;module=evidence" -S = "${WORKDIR}/evidence" - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ - --enable-ecore \ - --enable-ecore-ipc \ - --enable-canvas-evas2 \ - --enable-edje \ - --enable-x \ - --enable-tree-view \ - --enable-icon-view \ - --enable-browser-view \ - --with-libxine=${STAGING_LIBDIR}" - -do_prepsources () { - make clean distclean || true -} -addtask prepsources after do_fetch before do_unpack - -do_compile_prepend() { - sed -i 's:LDFLAGS = :LDFLAGS = -L${STAGING_LIBDIR} :' ${S}/src/providers/vorbis/Makefile -} - -export EET_CONFIG = "${STAGING_BINDIR}/eet-config" -export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config" -export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config" -export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config" -export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*" - -inherit autotools pkgconfig binconfig diff --git a/packages/e17/evidence_20050926.bb b/packages/e17/evidence_20050926.bb new file mode 100644 index 0000000000..0950b590c6 --- /dev/null +++ b/packages/e17/evidence_20050926.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "evidence, an enlightenemt file manager" +LICENSE = "GPL" +SECTION = "e" +MAINTAINER = "Justin Patrin " +# can support dbus, avifile, libmpeg3 +DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg pcre curl taglib libvorbis libogg libxine-x11 emotion freetype" +RDEPENDS += "examine" +PR = "r0" +CVSDATE = "${PV}" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/evidence;module=evidence" +S = "${WORKDIR}/evidence" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --enable-ecore \ + --enable-ecore-ipc \ + --enable-canvas-evas2 \ + --enable-edje \ + --enable-x \ + --enable-tree-view \ + --enable-icon-view \ + --enable-browser-view \ + --with-libxine=${STAGING_LIBDIR}" + +do_prepsources () { + make clean distclean || true +} +addtask prepsources after do_fetch before do_unpack + +do_compile_prepend() { + sed -i 's:LDFLAGS = :LDFLAGS = -L${STAGING_LIBDIR} :' ${S}/src/providers/vorbis/Makefile +} + +export EET_CONFIG = "${STAGING_BINDIR}/eet-config" +export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config" +export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config" +export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config" +export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*" + +inherit autotools pkgconfig binconfig diff --git a/packages/e17/examine_20050810.bb b/packages/e17/examine_20050810.bb deleted file mode 100644 index 244bf2bcaf..0000000000 --- a/packages/e17/examine_20050810.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "examine, the program configurator" -DEPENDS = "virtual/ecore ewl" -LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin " -PR = "r0" -CVSDATE = "${PV}" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/examine" -S = "${WORKDIR}/examine" - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" - -inherit autotools pkgconfig binconfig - -do_prepsources () { - make clean distclean || true -} -addtask prepsources after do_fetch before do_unpack - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/examine_20050926.bb b/packages/e17/examine_20050926.bb new file mode 100644 index 0000000000..244bf2bcaf --- /dev/null +++ b/packages/e17/examine_20050926.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "examine, the program configurator" +DEPENDS = "virtual/ecore ewl" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin " +PR = "r0" +CVSDATE = "${PV}" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/examine" +S = "${WORKDIR}/examine" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +inherit autotools pkgconfig binconfig + +do_prepsources () { + make clean distclean || true +} +addtask prepsources after do_fetch before do_unpack + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/efl/e/fix-configure.patch b/packages/efl/e/fix-configure.patch index 9b328de16c..02560fd7ab 100644 --- a/packages/efl/e/fix-configure.patch +++ b/packages/efl/e/fix-configure.patch @@ -1,10 +1,6 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- e/configure.in~fix-configure.patch -+++ e/configure.in +diff -Nur e~/configure.in e/configure.in +--- e~/configure.in 2005-09-29 13:17:29.000000000 -0700 ++++ e/configure.in 2005-09-29 13:19:35.000000000 -0700 @@ -114,9 +114,7 @@ AC_PATH_XTRA AC_CHECK_HEADER(X11/X.h, @@ -16,8 +12,9 @@ ],[ AC_MSG_ERROR([Cannot find X headers and libraries.]) ] ---- e/src/bin/Makefile.am~fix-configure.patch -+++ e/src/bin/Makefile.am +diff -Nur e~/src/bin/Makefile.am e/src/bin/Makefile.am +--- e~/src/bin/Makefile.am 2005-09-29 13:17:29.000000000 -0700 ++++ e/src/bin/Makefile.am 2005-09-29 13:19:35.000000000 -0700 @@ -1,6 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(includedir) \ @@ -26,18 +23,20 @@ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ @e_cflags@ \ ---- e/src/lib/Makefile.am~fix-configure.patch -+++ e/src/lib/Makefile.am +diff -Nur e~/src/lib/Makefile.am e/src/lib/Makefile.am +--- e~/src/lib/Makefile.am 2005-09-29 13:17:29.000000000 -0700 ++++ e/src/lib/Makefile.am 2005-09-29 13:19:56.000000000 -0700 @@ -1,6 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(includedir) \ - -I$(top_srcdir)/src/bin \ +INCLUDES = -I$(top_srcdir)/src/bin \ - @ecore_cflags@ \ - @evas_cflags@ + @e_cflags@ ---- e/src/preload/Makefile.am~fix-configure.patch -+++ e/src/preload/Makefile.am + lib_LTLIBRARIES = libe.la +diff -Nur e~/src/preload/Makefile.am e/src/preload/Makefile.am +--- e~/src/preload/Makefile.am 2005-09-29 13:17:29.000000000 -0700 ++++ e/src/preload/Makefile.am 2005-09-29 13:19:35.000000000 -0700 @@ -2,7 +2,6 @@ INCLUDES = -I. \ diff --git a/packages/efl/e_0.16.999.015.bb b/packages/efl/e_0.16.999.015.bb new file mode 100644 index 0000000000..49b1b0b6bd --- /dev/null +++ b/packages/efl/e_0.16.999.015.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Enlightenment Window Mananger Library" +DEPENDS = "virtual/evas virtual/ecore edje eet embryo" +LICENSE = "MIT" +CVSDATE = "${PV}" +PR = "r1" + +inherit efl + +SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz" +S = "${WORKDIR}/enlightenment-${PV}" + +PROFILE = "LORES_PDA" +PROFILE_c7x0 = "HIRES_PDA" +PROFILE_tosa = "HIRES_PDA" +PROFILE_spitz = "HIRES_PDA" +PROFILE_akita = "HIRES_PDA" + +EXTRA_OECONF = "--with-profile=${PROFILE} \ + --with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR}" + +do_compile() { + oe_runmake -C src/lib +} + +headers = "E_Lib.h ../bin/e*.h" + +do_install() { + oe_runmake -C src/lib install DESTDIR=${D} +} diff --git a/packages/efl/e_20050810.bb b/packages/efl/e_20050810.bb deleted file mode 100644 index 8f4eacfc83..0000000000 --- a/packages/efl/e_20050810.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Enlightenment Window Mananger Library" -DEPENDS = "virtual/evas virtual/ecore edje eet embryo" -LICENSE = "MIT" -CVSDATE = "${PV}" -PR = "r1" - -inherit efl - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \ - file://fix-configure.patch;patch=1" -S = "${WORKDIR}/e" - -PROFILE = "LORES_PDA" -PROFILE_c7x0 = "HIRES_PDA" -PROFILE_tosa = "HIRES_PDA" -PROFILE_spitz = "HIRES_PDA" -PROFILE_akita = "HIRES_PDA" - -EXTRA_OECONF = "--with-profile=${PROFILE} \ - --with-edje-cc=${STAGING_BINDIR}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR}" - -do_compile() { - oe_runmake -C src/lib -} - -headers = "E_Lib.h ../bin/e*.h" - -do_install() { - oe_runmake -C src/lib install DESTDIR=${D} -} diff --git a/packages/efl/e_20050926.bb b/packages/efl/e_20050926.bb new file mode 100644 index 0000000000..eb2282c06b --- /dev/null +++ b/packages/efl/e_20050926.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Enlightenment Window Mananger Library" +DEPENDS = "virtual/evas virtual/ecore edje eet embryo" +LICENSE = "MIT" +CVSDATE = "${PV}" +PR = "r1" + +inherit efl + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \ + file://fix-configure.patch;patch=1" +S = "${WORKDIR}/e" + +PROFILE = "LORES_PDA" +PROFILE_c7x0 = "HIRES_PDA" +PROFILE_tosa = "HIRES_PDA" +PROFILE_spitz = "HIRES_PDA" +PROFILE_akita = "HIRES_PDA" + +EXTRA_OECONF = "--with-profile=${PROFILE} \ + --with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR}" + +do_compile() { + oe_runmake -C src/lib +} + +headers = "E_Lib.h ../bin/e*.h" + +do_install() { + oe_runmake -C src/lib install DESTDIR=${D} +} diff --git a/packages/efl/ecore-fb_0.9.9.013.bb b/packages/efl/ecore-fb_0.9.9.013.bb deleted file mode 100644 index 1f3db9ddfe..0000000000 --- a/packages/efl/ecore-fb_0.9.9.013.bb +++ /dev/null @@ -1,25 +0,0 @@ -include ecore.inc -PR = "r2" - -EXTRA_OECONF = "--enable-ecore-fb \ - --enable-ecore-job \ - --enable-ecore-file \ - --enable-poll \ - --enable-ecore-dbus \ - --enable-ecore-evas \ - --enable-ecore-evas-fb \ - --disable-ecore-evas-x \ - --disable-ecore-evas-gl \ - --enable-ecore-con \ - --enable-ecore-config \ - --enable-ecore-ipc \ - --enable-ecore-txt \ - --disable-ecore-x \ - --disable-curl \ - --without-curl-config \ - --enable-ecore-config \ - --disable-openssl" - -parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ - Ecore_Txt Ecore_Fb Ecore_Con \ - Ecore_Ipc Ecore_Evas Ecore_Config" diff --git a/packages/efl/ecore-fb_0.9.9.015.bb b/packages/efl/ecore-fb_0.9.9.015.bb new file mode 100644 index 0000000000..1f3db9ddfe --- /dev/null +++ b/packages/efl/ecore-fb_0.9.9.015.bb @@ -0,0 +1,25 @@ +include ecore.inc +PR = "r2" + +EXTRA_OECONF = "--enable-ecore-fb \ + --enable-ecore-job \ + --enable-ecore-file \ + --enable-poll \ + --enable-ecore-dbus \ + --enable-ecore-evas \ + --enable-ecore-evas-fb \ + --disable-ecore-evas-x \ + --disable-ecore-evas-gl \ + --enable-ecore-con \ + --enable-ecore-config \ + --enable-ecore-ipc \ + --enable-ecore-txt \ + --disable-ecore-x \ + --disable-curl \ + --without-curl-config \ + --enable-ecore-config \ + --disable-openssl" + +parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ + Ecore_Txt Ecore_Fb Ecore_Con \ + Ecore_Ipc Ecore_Evas Ecore_Config" diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb deleted file mode 100644 index 299470841c..0000000000 --- a/packages/efl/ecore-native_0.9.9.013.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ecore-fb_${PV}.bb -inherit native -# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it -# DEPENDS = "curl-native eet-native evas-native" -DEPENDS = "eet-native evas-native" -PROVIDES = "ecore-native" \ No newline at end of file diff --git a/packages/efl/ecore-native_0.9.9.015.bb b/packages/efl/ecore-native_0.9.9.015.bb new file mode 100644 index 0000000000..299470841c --- /dev/null +++ b/packages/efl/ecore-native_0.9.9.015.bb @@ -0,0 +1,6 @@ +include ecore-fb_${PV}.bb +inherit native +# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it +# DEPENDS = "curl-native eet-native evas-native" +DEPENDS = "eet-native evas-native" +PROVIDES = "ecore-native" \ No newline at end of file diff --git a/packages/efl/ecore-x11_0.9.9.013.bb b/packages/efl/ecore-x11_0.9.9.013.bb deleted file mode 100644 index b6b452cb71..0000000000 --- a/packages/efl/ecore-x11_0.9.9.013.bb +++ /dev/null @@ -1,24 +0,0 @@ -include ecore.inc -DEPENDS += "evas-x11" -PR = "r2" - -EXTRA_OECONF = "--enable-ecore-fb \ - --enable-ecore-job \ - --enable-ecore-file \ - --enable-ecore-dbus \ - --enable-ecore-evas-fb \ - --enable-ecore-evas-x \ - --disable-ecore-evas-gl \ - --enable-ecore-con \ - --enable-ecore-ipc \ - --enable-ecore-txt \ - --enable-ecore-x \ - --enable-ecore-config \ - --disable-openssl \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} " - -parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ - Ecore_Txt Ecore_Fb Ecore_Con \ - Ecore_Ipc Ecore_Evas Ecore_Config \ - Ecore_X" diff --git a/packages/efl/ecore-x11_0.9.9.015.bb b/packages/efl/ecore-x11_0.9.9.015.bb new file mode 100644 index 0000000000..b6b452cb71 --- /dev/null +++ b/packages/efl/ecore-x11_0.9.9.015.bb @@ -0,0 +1,24 @@ +include ecore.inc +DEPENDS += "evas-x11" +PR = "r2" + +EXTRA_OECONF = "--enable-ecore-fb \ + --enable-ecore-job \ + --enable-ecore-file \ + --enable-ecore-dbus \ + --enable-ecore-evas-fb \ + --enable-ecore-evas-x \ + --disable-ecore-evas-gl \ + --enable-ecore-con \ + --enable-ecore-ipc \ + --enable-ecore-txt \ + --enable-ecore-x \ + --enable-ecore-config \ + --disable-openssl \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} " + +parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ + Ecore_Txt Ecore_Fb Ecore_Con \ + Ecore_Ipc Ecore_Evas Ecore_Config \ + Ecore_X" diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc index 441d780a47..ffc9df6b92 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -10,7 +10,10 @@ PROVIDES += "virtual/ecore" inherit efl SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \ - file://configure.patch;patch=1" + file://configure.patch;patch=1 \ + file://fix-tslib-configure.patch;patch=1 \ + cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/ecore/m4;date=20050926" + S = "${WORKDIR}/ecore-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" @@ -20,6 +23,12 @@ libraries = "" headers = "" parts = "" +do_configure_prepend() { + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 +} + do_stage_append() { for p in ${parts}; do dir=`echo $p|tr A-Z a-z` diff --git a/packages/efl/ecore/configure.patch b/packages/efl/ecore/configure.patch index a9ae62743d..cd38cb7218 100644 --- a/packages/efl/ecore/configure.patch +++ b/packages/efl/ecore/configure.patch @@ -1,27 +1,22 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- ecore-0.9.9.013/configure.in~configure.patch -+++ ecore-0.9.9.013/configure.in -@@ -15,7 +15,6 @@ - AC_CHECK_SIZEOF(int, 4) +diff -Nur ecore-0.9.9.015~/configure.in ecore-0.9.9.015/configure.in +--- ecore-0.9.9.015~/configure.in 2005-09-26 16:59:23.000000000 -0700 ++++ ecore-0.9.9.015/configure.in 2005-09-26 17:01:02.000000000 -0700 +@@ -16,7 +16,6 @@ + AC_CHECK_SIZEOF(long, 4) AM_ENABLE_SHARED AM_PROG_LIBTOOL -AC_C___ATTRIBUTE__ if test "x${bindir}" = 'x${exec_prefix}/bin'; then if test "x${exec_prefix}" = "xNONE"; then -@@ -247,10 +246,8 @@ +@@ -262,9 +261,7 @@ AM_CONDITIONAL(BUILD_ECORE_X, true) AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module]) - BUILD_ECORE_X=1 + have_ecore_x="yes" - x_dir=${x_dir:-/usr/X11R6} - x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" x_ldflags=" "$ecore_x_libs; -+ x_libs="-lX11 -lXext"; ++ x_libs="-lX11 -lXext" ecore_x_libs="-lecore_x"; ],[ - AM_CONDITIONAL(BUILD_ECORE_X, false) diff --git a/packages/efl/ecore/fix-tslib-configure.patch b/packages/efl/ecore/fix-tslib-configure.patch new file mode 100644 index 0000000000..5a23f904dc --- /dev/null +++ b/packages/efl/ecore/fix-tslib-configure.patch @@ -0,0 +1,12 @@ +diff -Nur ecore-0.9.9.015~/configure.in ecore-0.9.9.015/configure.in +--- ecore-0.9.9.015~/configure.in 2005-09-27 17:22:38.000000000 -0700 ++++ ecore-0.9.9.015/configure.in 2005-09-27 17:23:40.000000000 -0700 +@@ -103,7 +102,7 @@ + tslib_libs="" + AC_CHECK_HEADER(tslib.h, + [ +- tslib_libs="-ltslib" ++ tslib_libs="-lts" + AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_X Module]) + ],[ + AC_MSG_RESULT("No tslib header found. No tslib support being built") diff --git a/packages/efl/edje-native_0.5.0.013.bb b/packages/efl/edje-native_0.5.0.013.bb deleted file mode 100644 index f99090969a..0000000000 --- a/packages/efl/edje-native_0.5.0.013.bb +++ /dev/null @@ -1,28 +0,0 @@ -include edje_${PV}.bb -PR = "r2" - -REAL_TARGET_SYS := ${TARGET_SYS} - -inherit native -DEPENDS = "evas-native ecore-native eet-native embryo-native imlib2-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" - -EXTRA_OECONF = "--with-fb-only \ - --with-evas-config=${STAGING_BINDIR}/evas-config-native \ - --with-ecore-config=${STAGING_BINDIR}/ecore-config-native \ - --with-eet-config=${STAGING_BINDIR}/eet-config-native \ - --with-embryo-config=${STAGING_BINDIR}/embryo-config-native \ - --with-imlib2-config=${STAGING_BINDIR}/imlib2-config-native " - -do_configure_prepend() { - sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c - sed -i 's:/usr/bin/cpp:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-cpp:' ${S}/src/bin/edje_cc_parse.c - sed -i 's:/usr/bin/gcc:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-gcc:' ${S}/src/bin/edje_cc_parse.c -} - -do_stage_append() { - edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir` - # could also use ${STAGING_DATADIR}/edje/include - install -d $edje_data_dir/include - install -m 0644 data/include/edje.inc $edje_data_dir/include -} diff --git a/packages/efl/edje-native_0.5.0.015.bb b/packages/efl/edje-native_0.5.0.015.bb new file mode 100644 index 0000000000..523c38ba46 --- /dev/null +++ b/packages/efl/edje-native_0.5.0.015.bb @@ -0,0 +1,28 @@ +include edje_${PV}.bb +PR = "r2" + +REAL_TARGET_SYS := ${TARGET_SYS} + +inherit native +DEPENDS = "evas-native ecore-native eet-native embryo-native imlib2-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" + +EXTRA_OECONF = "--with-fb-only \ + --with-evas-config=${STAGING_BINDIR}/evas-config-native \ + --with-ecore-config=${STAGING_BINDIR}/ecore-config-native \ + --with-eet-config=${STAGING_BINDIR}/eet-config-native \ + --with-embryo-config=${STAGING_BINDIR}/embryo-config-native \ + --with-imlib2-config=${STAGING_BINDIR}/imlib2-config-native " + +do_configure_prepend() { + sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c +# sed -i 's:/usr/bin/cpp:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-cpp:' ${S}/src/bin/edje_cc_parse.c +# sed -i 's:/usr/bin/gcc:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-gcc:' ${S}/src/bin/edje_cc_parse.c +} + +do_stage_append() { + edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir` + # could also use ${STAGING_DATADIR}/edje/include + install -d $edje_data_dir/include + install -m 0644 data/include/edje.inc $edje_data_dir/include +} diff --git a/packages/efl/edje_0.5.0.013.bb b/packages/efl/edje_0.5.0.013.bb deleted file mode 100644 index e08e4407d1..0000000000 --- a/packages/efl/edje_0.5.0.013.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Edje is a complex graphical design & layout library." -# can also install vim data files -DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2" -LICENSE = "MIT" -PR = "r1" - -inherit efl - -LEAD_SONAME = "libedje.so" - -FILES_${PN}-dev += "${bindir}" - -RDEPENDS_${PN}-dev += "cpp" \ No newline at end of file diff --git a/packages/efl/edje_0.5.0.015.bb b/packages/efl/edje_0.5.0.015.bb new file mode 100644 index 0000000000..3c3a4fdcc7 --- /dev/null +++ b/packages/efl/edje_0.5.0.015.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Edje is a complex graphical design & layout library." +# can also install vim data files +DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2" +LICENSE = "MIT" +PR = "r1" + +inherit efl + +SRC_URI += "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/edje/m4;date=20050926" + +LEAD_SONAME = "libedje.so" + +FILES_${PN}-dev += "${bindir}" + +RDEPENDS_${PN}-dev += "cpp" + +do_configure_prepend() { + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 +} diff --git a/packages/efl/eet-native_0.9.10.013.bb b/packages/efl/eet-native_0.9.10.013.bb deleted file mode 100644 index fa20c9fb30..0000000000 --- a/packages/efl/eet-native_0.9.10.013.bb +++ /dev/null @@ -1,7 +0,0 @@ -include eet_${PV}.bb -inherit native -DEPENDS = "zlib-native jpeg-native" - -do_stage_append() { - install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR} -} diff --git a/packages/efl/eet-native_0.9.10.015.bb b/packages/efl/eet-native_0.9.10.015.bb new file mode 100644 index 0000000000..fa20c9fb30 --- /dev/null +++ b/packages/efl/eet-native_0.9.10.015.bb @@ -0,0 +1,7 @@ +include eet_${PV}.bb +inherit native +DEPENDS = "zlib-native jpeg-native" + +do_stage_append() { + install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR} +} diff --git a/packages/efl/eet_0.9.10.013.bb b/packages/efl/eet_0.9.10.013.bb deleted file mode 100644 index c0f89b1064..0000000000 --- a/packages/efl/eet_0.9.10.013.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "EET is a tiny library designed to write an \ -arbitary set of chunks of data to a file and optionally compress \ -each chunk (very much like a zip file) and allow fast \ -random-access reading of the file later on." -DEPENDS = "zlib jpeg" -LICENSE = "BSD" -PR = "r1" - -inherit efl diff --git a/packages/efl/eet_0.9.10.015.bb b/packages/efl/eet_0.9.10.015.bb new file mode 100644 index 0000000000..c0f89b1064 --- /dev/null +++ b/packages/efl/eet_0.9.10.015.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "EET is a tiny library designed to write an \ +arbitary set of chunks of data to a file and optionally compress \ +each chunk (very much like a zip file) and allow fast \ +random-access reading of the file later on." +DEPENDS = "zlib jpeg" +LICENSE = "BSD" +PR = "r1" + +inherit efl diff --git a/packages/efl/emotion_0.0.1.004.bb b/packages/efl/emotion_0.0.1.004.bb index 3529db50e6..886f0e8b3f 100644 --- a/packages/efl/emotion_0.0.1.004.bb +++ b/packages/efl/emotion_0.0.1.004.bb @@ -10,3 +10,7 @@ inherit efl PACKAGES += "emotion-plugins" FILES_emotion-plugins = "${libdir}/xine/plugins/1.1.0/*.so ${libdir}/emotion/*.so" + +do_compile_prepend() { + find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g' +} \ No newline at end of file diff --git a/packages/efl/engrave_20050810.bb b/packages/efl/engrave_20050810.bb deleted file mode 100644 index 8ee284fb19..0000000000 --- a/packages/efl/engrave_20050810.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Engrave is an Edje Editing Library" -LICENSE = "MIT" -# also requires yacc and lex on host -DEPENDS = "virtual/evas virtual/ecore" - -inherit efl - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/engrave" -S = "${WORKDIR}/engrave" - -do_stage_append() { - for i in src/lib/engrave*.h - do - install -m 0644 $i ${STAGING_INCDIR} - done -} - diff --git a/packages/efl/engrave_20050926.bb b/packages/efl/engrave_20050926.bb new file mode 100644 index 0000000000..8ee284fb19 --- /dev/null +++ b/packages/efl/engrave_20050926.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Engrave is an Edje Editing Library" +LICENSE = "MIT" +# also requires yacc and lex on host +DEPENDS = "virtual/evas virtual/ecore" + +inherit efl + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/engrave" +S = "${WORKDIR}/engrave" + +do_stage_append() { + for i in src/lib/engrave*.h + do + install -m 0644 $i ${STAGING_INCDIR} + done +} + diff --git a/packages/efl/esmart-x11_0.9.0.004.bb b/packages/efl/esmart-x11_0.9.0.004.bb index a7c9f97584..7c6737dd55 100644 --- a/packages/efl/esmart-x11_0.9.0.004.bb +++ b/packages/efl/esmart-x11_0.9.0.004.bb @@ -1,6 +1,9 @@ include esmart.inc PR = "r2" +SRC_URI += "file://ecore-fix.patch;patch=1 \ + file://include-stdio.patch;patch=1" + myheaders = "esmart_container/Esmart_Container.h \ esmart_draggies/Esmart_Draggies.h \ esmart_file_dialog/Esmart_File_Dialog.h \ @@ -16,3 +19,7 @@ mylibraries = "esmart_container \ esmart_textarea \ esmart_thumb \ esmart_trans_x11" + +do_compile_prepend() { + find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g' +} \ No newline at end of file diff --git a/packages/efl/esmart/ecore-fix.patch b/packages/efl/esmart/ecore-fix.patch new file mode 100644 index 0000000000..94deff0b95 --- /dev/null +++ b/packages/efl/esmart/ecore-fix.patch @@ -0,0 +1,10 @@ +--- esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c~ 2004-11-10 07:18:23.000000000 -0800 ++++ esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c 2005-09-29 11:22:52.000000000 -0700 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/packages/efl/esmart/include-stdio.patch b/packages/efl/esmart/include-stdio.patch new file mode 100644 index 0000000000..20a490f421 --- /dev/null +++ b/packages/efl/esmart/include-stdio.patch @@ -0,0 +1,22 @@ +diff -Nur esmart-0.9.0.004~/src/bin/esmart_file_dialog_test.c esmart-0.9.0.004/src/bin/esmart_file_dialog_test.c +--- esmart-0.9.0.004~/src/bin/esmart_file_dialog_test.c 2005-09-29 14:33:09.000000000 -0700 ++++ esmart-0.9.0.004/src/bin/esmart_file_dialog_test.c 2005-09-29 14:33:48.000000000 -0700 +@@ -8,6 +8,7 @@ + * $ esmart_file_dialog_test /path/to/my_custom/theme.eet + * to test a custom theme you've written for it + */ ++#include + #include + #include + #include +diff -Nur esmart-0.9.0.004~/src/lib/esmart_trans_x11/esmart_trans_x11.c esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c +--- esmart-0.9.0.004~/src/lib/esmart_trans_x11/esmart_trans_x11.c 2005-09-29 14:33:09.000000000 -0700 ++++ esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c 2005-09-29 14:33:19.000000000 -0700 +@@ -4,6 +4,7 @@ + * + ***************************************************************************/ + ++#include + #include + #include "config.h" + #include diff --git a/packages/efl/evas-fb_0.9.9.013.bb b/packages/efl/evas-fb_0.9.9.013.bb deleted file mode 100644 index 492a0badb1..0000000000 --- a/packages/efl/evas-fb_0.9.9.013.bb +++ /dev/null @@ -1,47 +0,0 @@ -include evas.inc -DEPENDS = "freetype libpng jpeg eet" -PR = "r2" - -EXTRA_OECONF = "--enable-fb \ - --disable-directfb \ - --disable-buffer \ - --disable-software-qtopia \ - --disable-software-x11 \ - --disable-gl-x11 \ - --enable-image-loader-eet \ - --disable-image-loader-edb \ - --enable-image-loader-png \ - --enable-image-loader-jpeg \ - --enable-small-dither-mask \ - --enable-cpu-c \ - --enable-font-loader-eet \ - --enable-scale-sample \ - --enable-scale-smooth \ - --enable-convert-yuv \ - --disable-convert-8-rgb-332 \ - --disable-convert-8-rgb-666 \ - --disable-convert-8-rgb-232 \ - --disable-convert-8-rgb-222 \ - --disable-convert-8-rgb-221 \ - --disable-convert-8-rgb-121 \ - --disable-convert-8-rgb-111 \ - --enable-convert-16-rgb-565 \ - --disable-convert-16-rgb-555 \ - --disable-convert-16-rgb-444 \ - --disable-convert-16-rgb-ipq \ - --enable-convert-16-rgb-rot-0 \ - --disable-convert-16-rgb-rot-90 \ - --enable-convert-16-rgb-rot-270 \ - --disable-convert-24-rgb-888 \ - --disable-convert-24-bgr-888 \ - --disable-convert-32-rgb-8888 \ - --disable-convert-32-rgbx-8888 \ - --disable-convert-32-bgr-8888 \ - --disable-convert-32-bgrx-8888 \ - --disable-convert-32-rgb-rot-0 \ - --disable-convert-32-rgb-rot-90 \ - --disable-convert-32-rgb-rot-270" - -headers = "Evas_Engine_Buffer.h \ - Evas_Engine_FB.h \ - Evas.h" diff --git a/packages/efl/evas-fb_0.9.9.015.bb b/packages/efl/evas-fb_0.9.9.015.bb new file mode 100644 index 0000000000..492a0badb1 --- /dev/null +++ b/packages/efl/evas-fb_0.9.9.015.bb @@ -0,0 +1,47 @@ +include evas.inc +DEPENDS = "freetype libpng jpeg eet" +PR = "r2" + +EXTRA_OECONF = "--enable-fb \ + --disable-directfb \ + --disable-buffer \ + --disable-software-qtopia \ + --disable-software-x11 \ + --disable-gl-x11 \ + --enable-image-loader-eet \ + --disable-image-loader-edb \ + --enable-image-loader-png \ + --enable-image-loader-jpeg \ + --enable-small-dither-mask \ + --enable-cpu-c \ + --enable-font-loader-eet \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-yuv \ + --disable-convert-8-rgb-332 \ + --disable-convert-8-rgb-666 \ + --disable-convert-8-rgb-232 \ + --disable-convert-8-rgb-222 \ + --disable-convert-8-rgb-221 \ + --disable-convert-8-rgb-121 \ + --disable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ + --disable-convert-16-rgb-555 \ + --disable-convert-16-rgb-444 \ + --disable-convert-16-rgb-ipq \ + --enable-convert-16-rgb-rot-0 \ + --disable-convert-16-rgb-rot-90 \ + --enable-convert-16-rgb-rot-270 \ + --disable-convert-24-rgb-888 \ + --disable-convert-24-bgr-888 \ + --disable-convert-32-rgb-8888 \ + --disable-convert-32-rgbx-8888 \ + --disable-convert-32-bgr-8888 \ + --disable-convert-32-bgrx-8888 \ + --disable-convert-32-rgb-rot-0 \ + --disable-convert-32-rgb-rot-90 \ + --disable-convert-32-rgb-rot-270" + +headers = "Evas_Engine_Buffer.h \ + Evas_Engine_FB.h \ + Evas.h" diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb deleted file mode 100644 index 60bf7f6ae5..0000000000 --- a/packages/efl/evas-native_0.9.9.013.bb +++ /dev/null @@ -1,4 +0,0 @@ -include evas-fb_${PV}.bb -inherit native -DEPENDS = "freetype-native libpng-native jpeg-native eet-native" -PROVIDES = "evas-native" \ No newline at end of file diff --git a/packages/efl/evas-native_0.9.9.015.bb b/packages/efl/evas-native_0.9.9.015.bb new file mode 100644 index 0000000000..60bf7f6ae5 --- /dev/null +++ b/packages/efl/evas-native_0.9.9.015.bb @@ -0,0 +1,4 @@ +include evas-fb_${PV}.bb +inherit native +DEPENDS = "freetype-native libpng-native jpeg-native eet-native" +PROVIDES = "evas-native" \ No newline at end of file diff --git a/packages/efl/evas-x11_0.9.9.013.bb b/packages/efl/evas-x11_0.9.9.013.bb deleted file mode 100644 index 8e51a2a873..0000000000 --- a/packages/efl/evas-x11_0.9.9.013.bb +++ /dev/null @@ -1,51 +0,0 @@ -include evas.inc -DEPENDS += "x11 xext" -PR = "r3" - -EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-fb \ - --disable-directfb \ - --disable-buffer \ - --disable-software-qtopia \ - --enable-software-x11 \ - --disable-gl-x11 \ - --enable-image-loader-eet \ - --enable-image-loader-edb \ - --enable-image-loader-png \ - --enable-image-loader-jpeg \ - --enable-small-dither-mask \ - --enable-cpu-c \ - --enable-font-loader-eet \ - --enable-scale-sample \ - --enable-scale-smooth \ - --enable-convert-yuv \ - --disable-convert-8-rgb-332 \ - --disable-convert-8-rgb-666 \ - --disable-convert-8-rgb-232 \ - --disable-convert-8-rgb-222 \ - --disable-convert-8-rgb-221 \ - --disable-convert-8-rgb-121 \ - --disable-convert-8-rgb-111 \ - --enable-convert-16-rgb-565 \ - --disable-convert-16-rgb-555 \ - --disable-convert-16-rgb-444 \ - --disable-convert-16-rgb-ipq \ - --enable-convert-16-rgb-rot-0 \ - --disable-convert-16-rgb-rot-90 \ - --enable-convert-16-rgb-rot-270 \ - --disable-convert-24-rgb-888 \ - --disable-convert-24-bgr-888 \ - --disable-convert-32-rgb-8888 \ - --disable-convert-32-rgbx-8888 \ - --disable-convert-32-bgr-8888 \ - --disable-convert-32-bgrx-8888 \ - --disable-convert-32-rgb-rot-0 \ - --disable-convert-32-rgb-rot-90 \ - --disable-convert-32-rgb-rot-270" - -headers = "Evas_Engine_Software_X11.h \ - Evas_Engine_Buffer.h \ - Evas_Engine_FB.h \ - Evas.h" - diff --git a/packages/efl/evas-x11_0.9.9.015.bb b/packages/efl/evas-x11_0.9.9.015.bb new file mode 100644 index 0000000000..68b0c1c860 --- /dev/null +++ b/packages/efl/evas-x11_0.9.9.015.bb @@ -0,0 +1,51 @@ +include evas.inc +DEPENDS += "x11 xext freetype" +PR = "r3" + +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-fb \ + --disable-directfb \ + --disable-buffer \ + --disable-software-qtopia \ + --enable-software-x11 \ + --disable-gl-x11 \ + --enable-image-loader-eet \ + --enable-image-loader-edb \ + --enable-image-loader-png \ + --enable-image-loader-jpeg \ + --enable-small-dither-mask \ + --enable-cpu-c \ + --enable-font-loader-eet \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-yuv \ + --disable-convert-8-rgb-332 \ + --disable-convert-8-rgb-666 \ + --disable-convert-8-rgb-232 \ + --disable-convert-8-rgb-222 \ + --disable-convert-8-rgb-221 \ + --disable-convert-8-rgb-121 \ + --disable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ + --disable-convert-16-rgb-555 \ + --disable-convert-16-rgb-444 \ + --disable-convert-16-rgb-ipq \ + --enable-convert-16-rgb-rot-0 \ + --disable-convert-16-rgb-rot-90 \ + --enable-convert-16-rgb-rot-270 \ + --disable-convert-24-rgb-888 \ + --disable-convert-24-bgr-888 \ + --disable-convert-32-rgb-8888 \ + --disable-convert-32-rgbx-8888 \ + --disable-convert-32-bgr-8888 \ + --disable-convert-32-bgrx-8888 \ + --disable-convert-32-rgb-rot-0 \ + --disable-convert-32-rgb-rot-90 \ + --disable-convert-32-rgb-rot-270" + +headers = "Evas_Engine_Software_X11.h \ + Evas_Engine_Buffer.h \ + Evas_Engine_FB.h \ + Evas.h" + diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 521ecb9912..14d5cd3e32 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -9,17 +9,27 @@ PROVIDES += "virtual/evas" inherit efl +export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" + SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ - file://pkg.m4" + cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/evas/m4;date=20050926" + S = "${WORKDIR}/evas-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" EXTRA_OECONF = "" +do_configure_prepend() { + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 +} + do_configure () { - install -m 0644 ${WORKDIR}/pkg.m4 acinclude.m4 autotools_do_configure + #find ${S} -type f | xargs sed -i 's:@FREETYPE_CFLAGS@:-I${STAGING_INCDIR}/freetype2:' + #find ${S} -name Makefile | xargs sed -i 's:--tag=CC:-lfreetype --tag=CC:' } headers = "" diff --git a/packages/efl/evas/fix-configure.patch b/packages/efl/evas/fix-configure.patch index cc7462e72c..acd50c0282 100644 --- a/packages/efl/evas/fix-configure.patch +++ b/packages/efl/evas/fix-configure.patch @@ -1,11 +1,7 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- evas-0.9.9.013/configure.in~fix-configure -+++ evas-0.9.9.013/configure.in -@@ -157,9 +157,7 @@ +diff -Nur evas-0.9.9.015~/configure.in evas-0.9.9.015/configure.in +--- evas-0.9.9.015~/configure.in 2005-09-28 15:12:03.000000000 -0700 ++++ evas-0.9.9.015/configure.in 2005-09-28 15:13:05.000000000 -0700 +@@ -152,9 +152,7 @@ [ AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true) AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend]) @@ -16,7 +12,7 @@ ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load" ], [ -@@ -221,7 +219,7 @@ +@@ -216,7 +214,7 @@ X11/X.h, [AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, true) AC_DEFINE(BUILD_ENGINE_SOFTWARE_XCB, 1, [Software XCB Rendering Backend]) @@ -25,20 +21,20 @@ xcb_cflags="${x_cflags:--I${x_includes:-$x_dir/include}} $XCB_CFLAGS $XCB_ICCCM_CFLAGS" xcb_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} $XCB_LIBS $XCB_ICCCM_LIBS" ENGINE_SOFTWARE_XCB_PRG="evas_software_xcb_test evas_software_xcb_perf_test evas_software_xcb_perf_load"], -@@ -433,10 +431,10 @@ - AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) - AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) - AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) -- x_dir=${x_dir:-/usr/X11R6}; -+ x_dir=${x_dir:-}; - x_cflags=${x_cflags:--I$x_dir/include} - x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" -- gl_cflags="-I/usr/include" -+ gl_cflags="" - gl_libs="-lGL -lGLU -lpthread" - gl_dir="" - ENGINE_GL_X11_PRG="evas_gl_x11_test" -@@ -490,7 +488,7 @@ +@@ -430,10 +428,10 @@ + AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) + AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) + AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) +- x_dir=${x_dir:-/usr/X11R6}; ++ x_dir=${x_dir:-}; + x_cflags=${x_cflags:--I$x_dir/include} + x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" +- gl_cflags="-I/usr/include" ++ gl_cflags="" + gl_libs="-lGL -lGLU -lpthread" + gl_dir="" + ENGINE_GL_X11_PRG="evas_gl_x11_test" +@@ -496,7 +494,7 @@ AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend]) AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true) AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support]) diff --git a/packages/efl/ewl/ecore-flags.patch b/packages/efl/ewl/ecore-flags.patch new file mode 100644 index 0000000000..9c4f5afc78 --- /dev/null +++ b/packages/efl/ewl/ecore-flags.patch @@ -0,0 +1,146 @@ +diff -Nur ewl-0.0.4.004~/src/lib/ewl_config.c ewl-0.0.4.004/src/lib/ewl_config.c +--- ewl-0.0.4.004~/src/lib/ewl_config.c 2005-09-29 18:02:24.000000000 -0700 ++++ ewl-0.0.4.004/src/lib/ewl_config.c 2005-09-29 18:03:10.000000000 -0700 +@@ -210,8 +210,8 @@ + + cc = ewl_config_int_get("/ewl/theme/color_classes/count"); + prop = ecore_config_get("/ewl/theme/color_classes/count"); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + for (i = 0; i < cc; i++) { + char *name; +@@ -221,8 +221,8 @@ + "/ewl/theme/color_classes/%d/name", i); + name = ewl_config_str_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + if (name) { + int r, g, b, a; +@@ -233,85 +233,85 @@ + "/ewl/theme/color_classes/%d/r", i); + r = ewl_config_int_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + snprintf(key, PATH_MAX, + "/ewl/theme/color_classes/%d/g", i); + g = ewl_config_int_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + snprintf(key, PATH_MAX, + "/ewl/theme/color_classes/%d/b", i); + b = ewl_config_int_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + snprintf(key, PATH_MAX, + "/ewl/theme/color_classes/%d/a", i); + a = ewl_config_int_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + snprintf(key, PATH_MAX, + "/ewl/theme/color_classes/%d/r2", i); + r2 = ewl_config_int_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + snprintf(key, PATH_MAX, + "/ewl/theme/color_classes/%d/g2", i); + g2 = ewl_config_int_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + snprintf(key, PATH_MAX, + "/ewl/theme/color_classes/%d/b2", i); + b2 = ewl_config_int_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + snprintf(key, PATH_MAX, + "/ewl/theme/color_classes/%d/a2", i); + a2 = ewl_config_int_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + snprintf(key, PATH_MAX, + "/ewl/theme/color_classes/%d/r3", i); + r3 = ewl_config_int_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + snprintf(key, PATH_MAX, + "/ewl/theme/color_classes/%d/g3", i); + g3 = ewl_config_int_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + snprintf(key, PATH_MAX, + "/ewl/theme/color_classes/%d/b3", i); + b3 = ewl_config_int_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + snprintf(key, PATH_MAX, + "/ewl/theme/color_classes/%d/a3", i); + a3 = ewl_config_int_get(key); + prop = ecore_config_get(key); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + + edje_color_class_set(name, r, g, b, a, + r2, g2, b2, a2, +@@ -389,8 +389,8 @@ + + for(i = 0; keys[i] != NULL; i++) { + prop = ecore_config_get(keys[i]); +- prop->flags &= ~PF_MODIFIED; +- prop->flags |= PF_SYSTEM; ++ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED; ++ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM; + } + + ecore_config_listen("ewl_debug_enable", "/ewl/debug/enable", diff --git a/packages/efl/ewl/fix-ecore.patch b/packages/efl/ewl/fix-ecore.patch new file mode 100644 index 0000000000..7a514a1740 --- /dev/null +++ b/packages/efl/ewl/fix-ecore.patch @@ -0,0 +1,11 @@ +diff -Nur ewl-0.0.4.004~/src/lib/Ewl.h ewl-0.0.4.004/src/lib/Ewl.h +--- ewl-0.0.4.004~/src/lib/Ewl.h.in 2005-09-29 17:44:59.000000000 -0700 ++++ ewl-0.0.4.004/src/lib/Ewl.h.in 2005-09-29 17:46:57.000000000 -0700 +@@ -257,6 +257,7 @@ + #include + #include + #include ++#include + #include + + #include diff --git a/packages/efl/ewl/minmax.patch b/packages/efl/ewl/minmax.patch new file mode 100644 index 0000000000..cd8723e9a3 --- /dev/null +++ b/packages/efl/ewl/minmax.patch @@ -0,0 +1,18 @@ +diff -Nur ewl-0.0.4.004~/src/lib/Ewl.h.in ewl-0.0.4.004/src/lib/Ewl.h.in +--- ewl-0.0.4.004~/src/lib/Ewl.h.in 2005-09-29 18:26:11.000000000 -0700 ++++ ewl-0.0.4.004/src/lib/Ewl.h.in 2005-09-29 18:26:55.000000000 -0700 +@@ -254,6 +254,14 @@ + extern"C" { + #endif + ++#ifndef MAX ++#define MAX(a, b) (a > b ? a : b) ++#endif ++ ++#ifndef MIN ++#define MIN(a, b) (a < b ? a : b) ++#endif ++ + #include + #include + #include diff --git a/packages/efl/ewl/no-examples.patch b/packages/efl/ewl/no-examples.patch new file mode 100644 index 0000000000..402c50894c --- /dev/null +++ b/packages/efl/ewl/no-examples.patch @@ -0,0 +1,22 @@ +diff -Nur ewl-0.0.4.004~/src/Makefile.am ewl-0.0.4.004/src/Makefile.am +--- ewl-0.0.4.004~/src/Makefile.am 2005-09-29 18:21:52.000000000 -0700 ++++ ewl-0.0.4.004/src/Makefile.am 2005-09-29 18:22:17.000000000 -0700 +@@ -1,5 +1,5 @@ + +-SUBDIRS = lib bin ++SUBDIRS = lib + + MAINTAINERCLEANFILES = Makefile.in + +diff -Nur ewl-0.0.4.004~/src/Makefile.in ewl-0.0.4.004/src/Makefile.in +--- ewl-0.0.4.004~/src/Makefile.in 2005-09-29 18:21:52.000000000 -0700 ++++ ewl-0.0.4.004/src/Makefile.in 2005-09-29 18:22:07.000000000 -0700 +@@ -108,7 +108,7 @@ + ewl_media_include = @ewl_media_include@ + requirements = @requirements@ + +-SUBDIRS = lib bin ++SUBDIRS = lib + + MAINTAINERCLEANFILES = Makefile.in + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb index 0205de4216..85b85e0c05 100644 --- a/packages/efl/ewl_0.0.4.004.bb +++ b/packages/efl/ewl_0.0.4.004.bb @@ -8,7 +8,11 @@ PR = "r1" inherit efl -SRC_URI += "file://ewl-configure.patch;patch=1" +SRC_URI += "file://ewl-configure.patch;patch=1 \ + file://fix-ecore.patch;patch=1 \ + file://ecore-flags.patch;patch=1 \ + file://no-examples.patch;patch=1 \ + file://minmax.patch;patch=1" do_stage_append() { for i in src/lib/ewl_*.h diff --git a/packages/efl/imlib2-fb_1.2.1.004.bb b/packages/efl/imlib2-fb_1.2.1.004.bb deleted file mode 100644 index 09fecdaf8b..0000000000 --- a/packages/efl/imlib2-fb_1.2.1.004.bb +++ /dev/null @@ -1,5 +0,0 @@ -include imlib2.inc - -EXTRA_OECONF = "--without-x \ - --disable-mmx" - diff --git a/packages/efl/imlib2-fb_1.2.1.006.bb b/packages/efl/imlib2-fb_1.2.1.006.bb new file mode 100644 index 0000000000..09fecdaf8b --- /dev/null +++ b/packages/efl/imlib2-fb_1.2.1.006.bb @@ -0,0 +1,5 @@ +include imlib2.inc + +EXTRA_OECONF = "--without-x \ + --disable-mmx" + diff --git a/packages/efl/imlib2-native_1.2.1.004.bb b/packages/efl/imlib2-native_1.2.1.004.bb deleted file mode 100644 index 6f8ebe477a..0000000000 --- a/packages/efl/imlib2-native_1.2.1.004.bb +++ /dev/null @@ -1,7 +0,0 @@ -include imlib2.inc -inherit native -PROVIDES = "imlib2-native" -DEPENDS = "freetype-native libpng-native jpeg-native" - -EXTRA_OECONF = "--disable-mmx \ - --without-x" diff --git a/packages/efl/imlib2-native_1.2.1.006.bb b/packages/efl/imlib2-native_1.2.1.006.bb new file mode 100644 index 0000000000..6f8ebe477a --- /dev/null +++ b/packages/efl/imlib2-native_1.2.1.006.bb @@ -0,0 +1,7 @@ +include imlib2.inc +inherit native +PROVIDES = "imlib2-native" +DEPENDS = "freetype-native libpng-native jpeg-native" + +EXTRA_OECONF = "--disable-mmx \ + --without-x" diff --git a/packages/efl/imlib2-x11_1.2.1.004.bb b/packages/efl/imlib2-x11_1.2.1.004.bb deleted file mode 100644 index 165321355c..0000000000 --- a/packages/efl/imlib2-x11_1.2.1.004.bb +++ /dev/null @@ -1,7 +0,0 @@ -include imlib2.inc -DEPENDS += "x11 xext" - -EXTRA_OECONF = "--disable-mmx \ - --with-x \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR}" diff --git a/packages/efl/imlib2-x11_1.2.1.006.bb b/packages/efl/imlib2-x11_1.2.1.006.bb new file mode 100644 index 0000000000..165321355c --- /dev/null +++ b/packages/efl/imlib2-x11_1.2.1.006.bb @@ -0,0 +1,7 @@ +include imlib2.inc +DEPENDS += "x11 xext" + +EXTRA_OECONF = "--disable-mmx \ + --with-x \ + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR}" diff --git a/packages/elitaire/elitaire_0.0.4.bb b/packages/elitaire/elitaire_0.0.4.bb deleted file mode 100644 index 5891fba9ae..0000000000 --- a/packages/elitaire/elitaire_0.0.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "EFL-based solitaire" -DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 ewl" -LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin " -PR = "r0" - -SRC_URI = "http://www.mowem.de/elitaire/elitaire-0.0.4.tar.bz2 \ - file://fix-ewl-and-gettext.patch;patch=1" - -inherit autotools pkgconfig binconfig - diff --git a/packages/elitaire/elitaire_0.0.5.bb b/packages/elitaire/elitaire_0.0.5.bb new file mode 100644 index 0000000000..ac3aebebbf --- /dev/null +++ b/packages/elitaire/elitaire_0.0.5.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "EFL-based solitaire" +DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 ewl" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin " +PR = "r0" + +SRC_URI = "http://www.mowem.de/elitaire/elitaire-${PV}.tar.bz2 \ + file://fix-ewl-and-gettext.patch;patch=1 \ + file://math.patch;patch=1" + +inherit autotools pkgconfig binconfig + diff --git a/packages/elitaire/files/fix-ewl-and-gettext.patch b/packages/elitaire/files/fix-ewl-and-gettext.patch index f84ec06d34..f572124f94 100644 --- a/packages/elitaire/files/fix-ewl-and-gettext.patch +++ b/packages/elitaire/files/fix-ewl-and-gettext.patch @@ -1,24 +1,3 @@ -diff -Nur elitaire-0.0.4~/src/Eli_App.h elitaire-0.0.4/src/Eli_App.h ---- elitaire-0.0.4~/src/Eli_App.h 2005-08-18 19:02:30.000000000 -0700 -+++ elitaire-0.0.4/src/Eli_App.h 2005-08-18 19:02:40.000000000 -0700 -@@ -3,7 +3,7 @@ - #include - #include - #include --#include -+#include - #include"ewl_context_menu.h" - #include"Elitaire.h" - -diff -Nur elitaire-0.0.4~/src/ewl_context_menu.c elitaire-0.0.4/src/ewl_context_menu.c ---- elitaire-0.0.4~/src/ewl_context_menu.c 2005-08-18 19:02:30.000000000 -0700 -+++ elitaire-0.0.4/src/ewl_context_menu.c 2005-08-18 19:02:40.000000000 -0700 -@@ -1,4 +1,4 @@ --#include -+#include - #include"ewl_context_menu.h" - - void ewl_context_menu_expand_cb(Ewl_Widget *w, void *ev_data , diff -Nur elitaire-0.0.4~/src/intl.h elitaire-0.0.4/src/intl.h --- elitaire-0.0.4~/src/intl.h 2005-08-18 19:02:30.000000000 -0700 +++ elitaire-0.0.4/src/intl.h 2005-08-18 19:06:05.000000000 -0700 diff --git a/packages/elitaire/files/math.patch b/packages/elitaire/files/math.patch new file mode 100644 index 0000000000..550507f370 --- /dev/null +++ b/packages/elitaire/files/math.patch @@ -0,0 +1,14 @@ +--- elitaire-0.0.4/src/Elitaire.h~ 2005-08-15 06:32:32.000000000 -0700 ++++ elitaire-0.0.4/src/Elitaire.h 2005-09-29 19:19:25.000000000 -0700 +@@ -3,6 +3,11 @@ + #include + #include + #include"intl.h" ++#include ++ ++#ifndef ABS ++#define ABS(x) ((x) >= 0 ? (x) : -(x)) ++#endif + + struct Elitaire{ + -- cgit 1.2.3-korg