[oe-commits] org.oe.dev massive E revamp. all shiny and new. no more binconfig madness, no longer
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 04:03:42 UTC 2007
massive E revamp. all shiny and new. no more binconfig madness, no longer
m4 patch madness, much less hackish and fragile. all hail pkgconfig
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 1104edc7ee9e5974aaa2548351d0a4a6d35e6df4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1104edc7ee9e5974aaa2548351d0a4a6d35e6df4
Files:
1
packages/efl1
packages/efl1/ecore
packages/efl1/epsilon
packages/efl1/evas
packages/efl1/ecore/add-tslib-support.patch
packages/efl1/ecore/configure-abstract-sockets.patch
packages/efl1/ecore/configure.patch
packages/efl1/ecore/ecore_kernel_input_header.patch
packages/efl1/ecore/fix-directfb-include.patch
packages/efl1/ecore/fix-tslib-configure.patch
packages/efl1/ecore/remove-bad-code.patch
packages/efl1/ecore-native_0.9.9.038.bb
packages/efl1/ecore.inc
packages/efl1/ecore_0.9.9.038.bb
packages/efl1/edb_cvs.bb
packages/efl1/edje-native_0.5.0.038.bb
packages/efl1/edje_0.5.0.038.bb
packages/efl1/eet-native_0.9.10.038.bb
packages/efl1/eet_0.9.10.038.bb
packages/efl1/efreet_0.0.3.002.bb
packages/efl1/embryo-native_0.9.1.038.bb
packages/efl1/embryo_0.9.1.038.bb
packages/efl1/emotion_0.0.1.006.bb
packages/efl1/engrave_cvs.bb
packages/efl1/enhance_cvs.bb
packages/efl1/epeg_0.9.0.009.bb
packages/efl1/epsilon/compile-fix.patch
packages/efl1/epsilon/server-is-not-client.patch
packages/efl1/epsilon_0.3.0.009.bb
packages/efl1/esmart_0.9.0.009.bb
packages/efl1/etk_0.1.0.003.bb
packages/efl1/evas/fix-configure.patch
packages/efl1/evas/pagesize.patch
packages/efl1/evas-native_0.9.9.038.bb
packages/efl1/evas.inc
packages/efl1/evas_0.9.9.038.bb
packages/efl1/ewl_0.5.1.009.bb
packages/efl1/exml_cvs.bb
packages/efl1/imlib2_1.4.0.001.bb
Diffs:
#
# mt diff -r3c408cdc814f6456e73cbb6e07b74651ceacad32 -r1104edc7ee9e5974aaa2548351d0a4a6d35e6df4
#
#
#
# add_dir "packages/efl1"
#
# add_dir "packages/efl1/ecore"
#
# add_dir "packages/efl1/epsilon"
#
# add_dir "packages/efl1/evas"
#
# add_file "packages/efl1/ecore/add-tslib-support.patch"
# content [0d3c1c5311a8d754df6794dc134ba5b15db6b069]
#
# add_file "packages/efl1/ecore/configure-abstract-sockets.patch"
# content [c647c0397238578213f29a1fe0a9b088b095bfae]
#
# add_file "packages/efl1/ecore/configure.patch"
# content [f8d751202a5cfede1100f0216eba1146e5980a43]
#
# add_file "packages/efl1/ecore/ecore_kernel_input_header.patch"
# content [7114f88744c1bd98b34977406cd8bfe35c267e49]
#
# add_file "packages/efl1/ecore/fix-directfb-include.patch"
# content [ace9bbb9aa7d85dd76dcc17078c9ae589eae7422]
#
# add_file "packages/efl1/ecore/fix-tslib-configure.patch"
# content [65ef5da7f58c4dca70d0962468f9628ad783bb51]
#
# add_file "packages/efl1/ecore/remove-bad-code.patch"
# content [ae94124de72f1e906a38e84ba9a0967d3c47b405]
#
# add_file "packages/efl1/ecore-native_0.9.9.038.bb"
# content [a6c082e1855fe38962b17d575b31619fd89ddc28]
#
# add_file "packages/efl1/ecore.inc"
# content [7442e1e7c41e107a54a20b3aa6f342a6576b7c82]
#
# add_file "packages/efl1/ecore_0.9.9.038.bb"
# content [5ec84c54a07f1dbee07b88b733bf261c33ece218]
#
# add_file "packages/efl1/edb_cvs.bb"
# content [b4eb4df3b61b65bfc5847d0d2bdfc4324f6343f0]
#
# add_file "packages/efl1/edje-native_0.5.0.038.bb"
# content [53e76aba99247f77e3a535e1d4d6ee804334404e]
#
# add_file "packages/efl1/edje_0.5.0.038.bb"
# content [0d2e945fe7b8505afe353cad7ca2ed6f7096470e]
#
# add_file "packages/efl1/eet-native_0.9.10.038.bb"
# content [f60f5da7e746b8614fcb291b30edb7b94829642d]
#
# add_file "packages/efl1/eet_0.9.10.038.bb"
# content [57ecdea84d245936f9cde5253c4877f45b99976e]
#
# add_file "packages/efl1/efreet_0.0.3.002.bb"
# content [06512c3c5add76dd392ef2824b1b901502bb2fd6]
#
# add_file "packages/efl1/embryo-native_0.9.1.038.bb"
# content [f2f729cd85d73754a2338098b1ac297cd419b558]
#
# add_file "packages/efl1/embryo_0.9.1.038.bb"
# content [a3587d78d26ddbb3c8a173e62c94c46037bc6873]
#
# add_file "packages/efl1/emotion_0.0.1.006.bb"
# content [e968107e2e2b7742689cdb7e268c34018e252ffa]
#
# add_file "packages/efl1/engrave_cvs.bb"
# content [27cbe98d887b025aa8f8db65a39f02449f32c9e0]
#
# add_file "packages/efl1/enhance_cvs.bb"
# content [8e6a6c4d69706cf1da23145efdfdab1f582322e8]
#
# add_file "packages/efl1/epeg_0.9.0.009.bb"
# content [0c01a5880d104a4e291b47214ec08c7083489c0a]
#
# add_file "packages/efl1/epsilon/compile-fix.patch"
# content [7231d9429dbd8ffbbfc2238583a692126f439eaa]
#
# add_file "packages/efl1/epsilon/server-is-not-client.patch"
# content [992ef01323fb41656789d95727a447e92d542898]
#
# add_file "packages/efl1/epsilon_0.3.0.009.bb"
# content [aa9190166eb760d831ba5160bb3490f8cd4236c9]
#
# add_file "packages/efl1/esmart_0.9.0.009.bb"
# content [c389709e369d7d5abcc1ea9ac78639079cfa3d99]
#
# add_file "packages/efl1/etk_0.1.0.003.bb"
# content [874ac1e333ce9f41ebbe6ef5b46ae8e988187303]
#
# add_file "packages/efl1/evas/fix-configure.patch"
# content [038b5c06de3db84675386207352adefc073bc947]
#
# add_file "packages/efl1/evas/pagesize.patch"
# content [4a76f777e20c0d4920cd72ee5116ffa3c1ed7791]
#
# add_file "packages/efl1/evas-native_0.9.9.038.bb"
# content [6af2e197ee9a6722c719178eb81b88c2d36485ed]
#
# add_file "packages/efl1/evas.inc"
# content [6017e94718de8094aa8b5883c55927c7c943c226]
#
# add_file "packages/efl1/evas_0.9.9.038.bb"
# content [7eaec22e49034f8359743fd48383d6b2274731b7]
#
# add_file "packages/efl1/ewl_0.5.1.009.bb"
# content [0bd38ec9b5462014c2bc7f61ce423f70373bbe32]
#
# add_file "packages/efl1/exml_cvs.bb"
# content [164cb4bc367489b0658e4db9c45909c7001aad94]
#
# add_file "packages/efl1/imlib2_1.4.0.001.bb"
# content [b020b08a41d3be7b6799b0cec84e1bdf2daf2963]
#
============================================================
--- packages/efl1/ecore/add-tslib-support.patch 0d3c1c5311a8d754df6794dc134ba5b15db6b069
+++ packages/efl1/ecore/add-tslib-support.patch 0d3c1c5311a8d754df6794dc134ba5b15db6b069
@@ -0,0 +1,104 @@
+
+#
+# tslib support for ecore, (C) Michael 'Mickey' Lauer <mickey at Vanille.de>
+#
+
+--- ecore/src/lib/ecore_fb/ecore_fb.c~add-tslib-support.patch
++++ ecore/src/lib/ecore_fb/ecore_fb.c
+@@ -4,6 +4,13 @@
+ #include "Ecore_Fb.h"
+ #include "ecore_private.h"
+
++
++#ifdef HAVE_TSLIB
++#include <tslib.h>
++#include <errno.h>
++#endif
++
++
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdio.h>
+@@ -77,6 +84,11 @@
+ unsigned char z;
+ };
+
++#ifdef HAVE_TSLIB
++struct tsdev *_ecore_fb_tslib_tsdev = NULL;
++struct ts_sample _ecore_fb_tslib_event;
++#endif
++
+ static void _ecore_fb_size_get(int *w, int *h);
+ static int _ecore_fb_ts_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
+ static int _ecore_fb_kbd_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
+@@ -269,10 +281,39 @@
+ ecore_fb_init(const char *name __UNUSED__)
+ {
+ int prev_flags;
++#ifdef HAVE_TSLIB
++ char *tslib_tsdevice = NULL;
++#endif
+
+ _ecore_fb_init_count++;
+ if (_ecore_fb_init_count > 1) return _ecore_fb_init_count;
++#ifdef HAVE_TSLIB
++ if ( ( tslib_tsdevice = getenv("TSLIB_TSDEVICE") ) != NULL )
++ {
++ printf( "ECORE_FB: TSLIB_TSDEVICE = '%s'\n", tslib_tsdevice );
++ _ecore_fb_tslib_tsdev = ts_open( tslib_tsdevice, 1 ); /* 1 = nonblocking, 0 = blocking */
++
++ if ( !_ecore_fb_tslib_tsdev )
++ {
++ printf( "ECORE_FB: Can't ts_open (%s)\n", strerror( errno ) );
++ return 0;
++ }
++
++ if ( ts_config( _ecore_fb_tslib_tsdev ) )
++ {
++ printf( "ECORE_FB: Can't ts_config (%s)\n", strerror( errno ) );
++ return 0;
++ }
++ _ecore_fb_ts_fd = ts_fd( _ecore_fb_tslib_tsdev );
++ if ( _ecore_fb_ts_fd < 0 )
++ {
++ printf( "ECORE_FB: Can't open touchscreen (%s)\n", strerror( errno ) );
++ return 0;
++ }
++ }
++#else
+ _ecore_fb_ts_fd = open("/dev/touchscreen/0", O_RDONLY);
++#endif
+ if (_ecore_fb_ts_fd >= 0)
+ {
+ prev_flags = fcntl(_ecore_fb_ts_fd, F_GETFL);
+@@ -790,7 +831,21 @@
+ char *ptr;
+ double t;
+ int did_triple = 0;
+-
++
++#ifdef HAVE_TSLIB
++ if ( _ecore_fb_ts_apply_cal )
++ num = ts_read_raw( _ecore_fb_tslib_tsdev, &_ecore_fb_tslib_event, 1 );
++ else
++ num = ts_read( _ecore_fb_tslib_tsdev, &_ecore_fb_tslib_event, 1 );
++ if ( num != 1 )
++ {
++ return 1; /* no more samples at this time */
++ }
++ x = _ecore_fb_tslib_event.x;
++ y = _ecore_fb_tslib_event.y;
++ pressure = _ecore_fb_tslib_event.pressure;
++ v = 1; /* loop, there might be more samples */
++#else
+ ptr = (char *)&(_ecore_fb_ts_event);
+ ptr += _ecore_fb_ts_event_byte_count;
+ num = sizeof(Ecore_Fb_Ts_Event) - _ecore_fb_ts_event_byte_count;
+@@ -811,6 +866,7 @@
+ y = _ecore_fb_ts_event.y;
+ }
+ pressure = _ecore_fb_ts_event.pressure;
++#endif
+ /* add event to queue */
+ /* always add a move event */
+ if ((pressure) || (prev_pressure))
============================================================
--- packages/efl1/ecore/configure-abstract-sockets.patch c647c0397238578213f29a1fe0a9b088b095bfae
+++ packages/efl1/ecore/configure-abstract-sockets.patch c647c0397238578213f29a1fe0a9b088b095bfae
@@ -0,0 +1,16 @@
+Index: ecore-0.9.9.038/configure.in
+===================================================================
+--- ecore-0.9.9.038.orig/configure.in
++++ ecore-0.9.9.038/configure.in
+@@ -541,10 +541,7 @@ AC_ARG_ENABLE(abstract-sockets,
+ [ want_abstract_sockets="yes"]
+ )
+ if test "x$want_abstract_sockets" = "xyes"; then
+- AC_ABSTRACT_SOCKET_TEST(
+- [AC_DEFINE(HAVE_ABSTRACT_SOCKETS, 1, [Have abstract sockets namespace])],
+- []
+- )
++ HAVE_ABSTRACT_SOCKETS = 1
+ fi
+
+ ECORE_CHECK_MODULE([Con], [yes])
============================================================
--- packages/efl1/ecore/configure.patch f8d751202a5cfede1100f0216eba1146e5980a43
+++ packages/efl1/ecore/configure.patch f8d751202a5cfede1100f0216eba1146e5980a43
@@ -0,0 +1,21 @@
+--- ecore-0.9.9.036/configure.in.bak 2006-11-13 14:01:10.000000000 -0800
++++ ecore-0.9.9.036/configure.in 2006-11-13 14:02:15.000000000 -0800
+@@ -16,7 +16,6 @@
+ AC_CHECK_SIZEOF(long, 4)
+ AM_ENABLE_SHARED
+ AM_PROG_LIBTOOL
+-AC_C___ATTRIBUTE__
+
+ if test "x${bindir}" = 'xNONE'; then
+ if test "x${prefix}" = "xNONE"; then
+@@ -200,9 +199,7 @@
+ AM_CONDITIONAL(BUILD_ECORE_X, true)
+ AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module])
+ 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_libs="-lX11 -lXext"
+ ecore_x_libs="-lecore_x $x_libs";
+ ],[
+ AM_CONDITIONAL(BUILD_ECORE_X, false)
============================================================
--- packages/efl1/ecore/ecore_kernel_input_header.patch 7114f88744c1bd98b34977406cd8bfe35c267e49
+++ packages/efl1/ecore/ecore_kernel_input_header.patch 7114f88744c1bd98b34977406cd8bfe35c267e49
@@ -0,0 +1,23 @@
+Index: ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c
+===================================================================
+--- ecore-0.9.9.036.orig/src/lib/ecore_fb/ecore_fb_li.c 2006-09-05 01:36:43.000000000 +0100
++++ ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c 2006-12-02 21:55:54.000000000 +0000
+@@ -1,6 +1,18 @@
+ #include "Ecore_Fb.h"
+ #include "ecore_fb_private.h"
+
++struct input_absinfo {
++ __s32 value;
++ __s32 minimum;
++ __s32 maximum;
++ __s32 fuzz;
++ __s32 flat;
++};
++
++
++#define EV_SYN 0x00
++#define EV_PWR 0x16
++#define EV_FF_STATUS 0x17
+
+ /* Copyright (C) Brad Hards (1999-2002).
+ * this macro is used to tell if "bit" is set in "array"
============================================================
--- packages/efl1/ecore/fix-directfb-include.patch ace9bbb9aa7d85dd76dcc17078c9ae589eae7422
+++ packages/efl1/ecore/fix-directfb-include.patch ace9bbb9aa7d85dd76dcc17078c9ae589eae7422
@@ -0,0 +1,13 @@
+Index: ecore-0.9.9.038/src/lib/ecore_directfb/Ecore_DirectFB.h
+===================================================================
+--- ecore-0.9.9.038.orig/src/lib/ecore_directfb/Ecore_DirectFB.h
++++ ecore-0.9.9.038/src/lib/ecore_directfb/Ecore_DirectFB.h
+@@ -23,7 +23,7 @@
+ #endif
+
+ #include <Ecore_Data.h>
+-#include <directfb.h>
++#include <directfb/directfb.h>
+
+
+ #ifdef __cplusplus
============================================================
--- packages/efl1/ecore/fix-tslib-configure.patch 65ef5da7f58c4dca70d0962468f9628ad783bb51
+++ packages/efl1/ecore/fix-tslib-configure.patch 65ef5da7f58c4dca70d0962468f9628ad783bb51
@@ -0,0 +1,19 @@
+Index: ecore-0.9.9.038/configure.in
+===================================================================
+--- ecore-0.9.9.038.orig/configure.in
++++ ecore-0.9.9.038/configure.in
+@@ -1,4 +1,4 @@
+-dnl Process this file with autoconf to produce a configure script.
++<dnl Process this file with autoconf to produce a configure script.
+
+ AC_INIT(configure.in)
+ AC_CANONICAL_BUILD
+@@ -321,7 +321,7 @@ tslib_libs=""
+ if test "x$have_ecore_fb" = "xyes" ; then
+ AC_CHECK_HEADER(tslib.h,
+ [
+- tslib_libs="-ltslib"
++ tslib_libs="-lts"
+ AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
+ ]
+ )
============================================================
--- packages/efl1/ecore/remove-bad-code.patch ae94124de72f1e906a38e84ba9a0967d3c47b405
+++ packages/efl1/ecore/remove-bad-code.patch ae94124de72f1e906a38e84ba9a0967d3c47b405
@@ -0,0 +1,36 @@
+Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h
+===================================================================
+--- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_private.h
++++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h
+@@ -19,8 +19,8 @@
+ #define kernel_ulong_t unsigned long
+ #define BITS_PER_LONG 32
+ #include <linux/input.h>
+- #undef kernel_ulong_t <-added
+- #undef BITS_PER_LONG <-added
++ #undef kernel_ulong_t
++ #undef BITS_PER_LONG
+ #else
+ #include <linux/input.h>
+ #endif
+Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c
+===================================================================
+--- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_li.c
++++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c
+@@ -1,6 +1,6 @@
+ #include "Ecore_Fb.h"
+ #include "ecore_fb_private.h"
+-
++/*
+ struct input_absinfo {
+ __s32 value;
+ __s32 minimum;
+@@ -8,7 +8,7 @@ struct input_absinfo {
+ __s32 fuzz;
+ __s32 flat;
+ };
+-
++*/
+
+ #define EV_SYN 0x00
+ #define EV_PWR 0x16
============================================================
--- packages/efl1/ecore-native_0.9.9.038.bb a6c082e1855fe38962b17d575b31619fd89ddc28
+++ packages/efl1/ecore-native_0.9.9.038.bb a6c082e1855fe38962b17d575b31619fd89ddc28
@@ -0,0 +1,28 @@
+require ecore.inc
+inherit native
+DEPENDS = "eet-native evas-native"
+
+EXTRA_OECONF = "\
+ --enable-ecore-txt \
+ --disable-ecore-x-xcb \
+ --enable-ecore-x \
+ --enable-ecore-job \
+ --enable-ecore-directfb \
+ --enable-ecore-fb \
+ --enable-ecore-evas \
+ --disable-ecore-evas-gl \
+ --disable-ecore-evas-xrender \
+ --disable-ecore-evas-dfb \
+ --disable-openssl \
+ --enable-abstract-sockets \
+ --enable-ecore-con \
+ --enable-ecore-ipc \
+ --enable-ecore-dbus \
+ --enable-ecore-file \
+ --enable-inotify \
+ --disable-poll \
+ --disable-curl \
+ --disable-ecore-desktop \
+ --x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR} "
+
============================================================
--- packages/efl1/ecore.inc 7442e1e7c41e107a54a20b3aa6f342a6576b7c82
+++ packages/efl1/ecore.inc 7442e1e7c41e107a54a20b3aa6f342a6576b7c82
@@ -0,0 +1,52 @@
+DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \
+foundation libraries. It makes makes doing selections, drag and drop, event loops, \
+timeouts and idle handlers fast, optimized, and convenient."
+LICENSE = "MIT"
+DEPENDS = "curl dbus directfb eet evas tslib"
+# optional
+# DEPENDS += "openssl iconv"
+
+inherit efl1
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
+ file://configure-abstract-sockets.patch;patch=1 \
+ file://fix-tslib-configure.patch;patch=1 \
+ file://fix-directfb-include.patch;patch=1"
+
+S = "${WORKDIR}/ecore-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
+
+EXTRA_OECONF = "<override me>"
+
+do_stage() {
+ autotools_stage_all
+}
+
+PACKAGES += "\
+ ${PN}-con \
+ ${PN}-config \
+ ${PN}-dbus \
+ ${PN}-desktop \
+ ${PN}-directfb \
+ ${PN}-evas \
+ ${PN}-fb \
+ ${PN}-file \
+ ${PN}-ipc \
+ ${PN}-job \
+ ${PN}-txt \
+ ${PN}-x \
+ "
+FILES_${PN} = "${libdir}/libecore.so*"
+FILES_${PN}-con = "${libdir}/libecore_con.so*"
+FILES_${PN}-config = "${libdir}/libecore_config.so*"
+FILES_${PN}-dbus = "${libdir}/libecore_dbus.so*"
+FILES_${PN}-desktop = "${libdir}/libecore_desktop.so*"
+FILES_${PN}-directfb = "${libdir}/libecore_directfb.so*"
+FILES_${PN}-evas = "${libdir}/libecore_evas.so*"
+FILES_${PN}-fb = "${libdir}/libecore_fb.so*"
+FILES_${PN}-file = "${libdir}/libecore_file.so*"
+FILES_${PN}-ipc = "${libdir}/libecore_ipc.so*"
+FILES_${PN}-job = "${libdir}/libecore_job.so*"
+FILES_${PN}-txt = "${libdir}/libecore_txt.so*"
+FILES_${PN}-x = "${libdir}/libecore_x.so*"
+
============================================================
--- packages/efl1/ecore_0.9.9.038.bb 5ec84c54a07f1dbee07b88b733bf261c33ece218
+++ packages/efl1/ecore_0.9.9.038.bb 5ec84c54a07f1dbee07b88b733bf261c33ece218
@@ -0,0 +1,26 @@
+require ecore.inc
+PR = "r1"
+
+EXTRA_OECONF = "\
+ --enable-ecore-txt \
+ --disable-ecore-x-xcb \
+ --enable-ecore-x \
+ --enable-ecore-job \
+ --enable-ecore-directfb \
+ --enable-ecore-fb \
+ --enable-ecore-evas \
+ --disable-ecore-evas-gl \
+ --enable-ecore-evas-xrender \
+ --enable-ecore-evas-dfb \
+ -%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list