diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /ecore | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'ecore')
-rw-r--r-- | ecore/ecore-native_cvs.bb | 19 | ||||
-rw-r--r-- | ecore/ecore_cvs.bb | 0 | ||||
-rw-r--r-- | ecore/files/no-x-test.patch | 54 |
3 files changed, 0 insertions, 73 deletions
diff --git a/ecore/ecore-native_cvs.bb b/ecore/ecore-native_cvs.bb deleted file mode 100644 index 197dbb21f5..0000000000 --- a/ecore/ecore-native_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -include ecore_${PV}.bb -LICENSE = "MIT" -inherit native -DEPENDS = "edb-native eet-native evas-native freetype-native" - -export EDB_CONFIG = "${STAGING_BINDIR}/edb-config-native" -export EET_CONFIG = "${STAGING_BINDIR}/eet-config-native" -export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config-native" -export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config-native" - -do_stage () { - for p in ${parts}; do - dir=`echo $p|tr A-Z a-z` - install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/ - oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/ - done - install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/ecore/ecore_cvs.bb b/ecore/ecore_cvs.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/ecore/ecore_cvs.bb +++ /dev/null diff --git a/ecore/files/no-x-test.patch b/ecore/files/no-x-test.patch deleted file mode 100644 index cd56049bcb..0000000000 --- a/ecore/files/no-x-test.patch +++ /dev/null @@ -1,54 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- ecore/src/bin/ecore_test.c~no-x-test.patch -+++ ecore/src/bin/ecore_test.c -@@ -581,7 +581,7 @@ - - #ifdef BUILD_ECORE_EVAS - /* choose: TEST_X, TEST_FB */ --#define TEST_X -+#define TEST_FB - - /**** ECORE_EVAS TEST CODE */ - ---- ecore/src/bin/ecore_evas_test_app.c~no-x-test.patch -+++ ecore/src/bin/ecore_evas_test_app.c -@@ -21,33 +21,10 @@ - - /* create an evas */ - if (!ecore_evas_init()) return -1; -- if ((argc > 1) && (!strcmp(argv[1], "-fb"))) -+ if ( argv > 1 ) - ee = ecore_evas_fb_new(NULL, 0, 240, 320); -- else if ((argc > 1) && (!strcmp(argv[1], "-x"))) -- ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320); --#if HAVE_ECORE_EVAS_GL -- else if ((argc > 1) && (!strcmp(argv[1], "-gl"))) -- ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 240, 320); --#endif -- else if ((argc > 1) && (!strcmp(argv[1], "-h"))) -- { -- printf("%s -x Test ecore_evas in X (default)\n" -- "%s -gl Test ecore_evas in X GL\n" -- "%s -fb Test ecore_evas in the Framebuffer\n" -- "%s -h Display this help\n", -- argv[0], argv[0], argv[0], argv[0]); -- ecore_evas_shutdown(); -- ecore_shutdown(); -- return 0; -- } -- else --#ifdef BUILD_ECORE_X -- ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320); --#else --#ifdef BUILD_ECORE_FB -+ else - ee = ecore_evas_fb_new(NULL, 270, 240, 320); --#endif --#endif - if (!ee) return -1; - ecore_evas_callback_delete_request_set(ee, app_delete_request); - ecore_evas_callback_resize_set(ee, app_resize); |