5 files changed, 107 insertions, 15 deletions
diff --git a/packages/e17/expedite/.mtn2git_empty b/packages/e17/expedite/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/e17/expedite/.mtn2git_empty
diff --git a/packages/e17/expedite/hack-disable-opengl.patch b/packages/e17/expedite/hack-disable-opengl.patch
new file mode 100644
index 0000000000..7d368d320d
--- /dev/null
+++ b/packages/e17/expedite/hack-disable-opengl.patch
@@ -0,0 +1,87 @@
+Index: expedite/configure.in
+===================================================================
+--- expedite.orig/configure.in
++++ expedite/configure.in
+@@ -47,24 +47,11 @@
+ PKG_CHECK_MODULES([EVAS], evas)
+ 
+ dnl OpenGL GLEW
+-PKG_CHECK_EXISTS(evas-opengl-glew,
+-  [
+-    AC_DEFINE(HAVE_EVAS_OPENGL_GLEW, 1, [Evas GL Glew Engine Support])
+-    have_opengl_glew="yes"
+-    glew_libs="-lglew32 -lgdi32"
+-  ],
+-  [ have_opengl_glew="no" ]
+-)
++have_opengl_glew="no"
+ AM_CONDITIONAL(BUILD_OPENGL_GLEW, test "x$have_opengl_glew" = "xyes")
+ 
+ dnl OpenGL X11
+-PKG_CHECK_EXISTS(evas-opengl-x11,
+-  [
+-    AC_DEFINE(HAVE_EVAS_OPENGL_X11, 1, [Evas GL X11 Engine Support])
+-    have_opengl_x11="yes"
+-  ],
+-  [ have_opengl_x11="no" ]
+-)
++have_opengl_x11="no"
+ AM_CONDITIONAL(BUILD_OPENGL_X11, test "x$have_opengl_x11" = "xyes")
+ 
+ dnl Software X11
+@@ -109,49 +96,23 @@
+ 
+ # TODO: Check availability of libs
+ dnl DirectDraw
+-PKG_CHECK_EXISTS(evas-software-ddraw,
+-  [
+-    AC_DEFINE(HAVE_EVAS_SOFTWARE_DDRAW, 1, [Evas Software DirectDraw Engine Support])
+-    have_software_ddraw="yes"
+-    ddraw_libs="-lddraw -ldxguid"
+-  ],
+-  [ have_software_ddraw="no" ]
+-)
++have_software_ddraw="no"
+ AM_CONDITIONAL(BUILD_SOFTWARE_DDRAW, test "x$have_software_ddraw" = "xyes")
+ 
+ # TODO: Check availability of libs
+ dnl 16bit DirectDraw
+-PKG_CHECK_EXISTS(evas-software-16-ddraw,
+-  [
+-    AC_DEFINE(HAVE_EVAS_SOFTWARE_16_DDRAW, 1, [Evas Software 16bit DirectDraw Engine Support])
+-    have_software_16_ddraw="yes"
+-    ddraw_libs="-lddraw -ldxguid"
+-  ],
+-  [ have_software_16_ddraw="no" ]
+-)
++have_software_16_ddraw="no"
+ AM_CONDITIONAL(BUILD_SOFTWARE_16_DDRAW, test "x$have_software_16_ddraw" = "xyes")
+ 
+ # TODO: Check availability of libs
+ dnl Direct3D
+-PKG_CHECK_EXISTS(evas-direct3d,
+-  [
+-    AC_DEFINE(HAVE_EVAS_DIRECT3D, 1, [Evas Direct3D Engine Support])
+-    have_direct3d="yes"
+-    d3d_libs="-ld3d9 -ld3dx9d"
+-  ],
+-  [ have_direct3d="no" ]
+-)
++have_direct3d="no"
+ AM_CONDITIONAL(BUILD_DIRECT3D, test "x$have_direct3d" = "xyes")
+ 
+ dnl Software SDL
+-PKG_CHECK_EXISTS(evas-software-sdl,
+-  [
+-    AC_DEFINE(HAVE_EVAS_SOFTWARE_SDL, 1, [Evas Software SDL Engine Support])
+-    have_software_sdl="yes"
+-  ],
+-  [ have_direct3d="no" ]
+-)
+-AM_CONDITIONAL(BUILD_SOFTWARE_SDL, test "x$have_software_sdl" = "xyes")
++have_software_sdl="no"
++AM_CONDITIONAL(BUILD_SOFTWARE_SDL, test "x$have_software_sdl" = "xyes")
++
+ 
+ if test "x$have_software_x11" = "xyes" -o "x$have_software_16_x11" = "xyes" -o "x$have_xrender_x11" = "xyes" -o "x$have_opengl_x11" = "xyes"; then
+   AC_PATH_XTRA
diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb
index 9d8a7d6070..7eae0ea9a4 100644
--- a/packages/e17/expedite_cvs.bb
+++ b/packages/e17/expedite_cvs.bb
@@ -1,15 +1,19 @@
-DESCRIPTION = "Expedite is a comprehensive benchmarking suite for evas"
-DEPENDS = "evas"
+DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
+DEPENDS = "eet evas"
+RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
 LICENSE = "MIT"
-PV = "0.0.0+cvs${SRCDATE}"
+PV = "0.6.0+cvs${SRCDATE}"
 PR = "r0"
 
-inherit e
+inherit autotools
 
-SRC_URI = "${E_CVS};module=e17/apps/expedite"
+SRC_URI = "${E_CVS};module=e17/apps/expedite \
+           file://hack-disable-opengl.patch;patch=1"
 S = "${WORKDIR}/${PN}"
 
 do_configure_append() {
         find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
 }
 
+FILES_${PN} += "${datadir}"
+
diff --git a/packages/e17/rage_0.2.0.003.bb b/packages/e17/rage_0.2.0.003.bb
deleted file mode 100644
index ab527e214b..0000000000
--- a/packages/e17/rage_0.2.0.003.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "rage is a media center application based on EFL"
-AUTHOR = "Carsten 'The Rasterman' Heitzler"
-HOMEPAGE = "http://www.rasterman.com"
-LICENSE = "GPL"
-DEPENDS = "evas ecore edje"
-SECTION = "x11/multimedia"
-
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/rage-${PV}.tar.gz"
-
-inherit e
diff --git a/packages/e17/rage_0.2.0.005.bb b/packages/e17/rage_0.2.0.005.bb
new file mode 100644
index 0000000000..e5b5032b10
--- /dev/null
+++ b/packages/e17/rage_0.2.0.005.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Rage is a media center application based on EFL"
+AUTHOR = "Carsten 'The Rasterman' Heitzler"
+HOMEPAGE = "http://www.rasterman.com"
+LICENSE = "GPL"
+DEPENDS = "evas ecore edje"
+SECTION = "x11/multimedia"
+
+SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/rage-${PV}.tar.gz"
+
+inherit autotools
+