Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/31 17:47:35+02:00 uni-frankfurt.de!mickey
fix meta-e

2004/07/31 14:10:13+02:00 uni-frankfurt.de!mickey
the E Widget Library now builds

2004/07/31 13:52:36+02:00 uni-frankfurt.de!mickey
edje now builds (insert applause.wav here)

2004/07/31 04:15:52+02:00 uni-frankfurt.de!mickey
fix prefix and exec-prefix bug

2004/07/31 04:15:16+02:00 uni-frankfurt.de!mickey
migrate enlightenment (and friends) to binconfig.oeclass

2004/07/31 04:12:47+02:00 uni-frankfurt.de!mickey
add binconfig.oeclass. This class cleans up the situation with packages utilizing foo-config scripts to gather cflags and libs etc. This class does a) eliminate the need for boiler plate code in the .oe files and b) differentiates between native and non-native packages which previously stepped on each other's toe because both kinds of packages wanted to install their foo-configs into STAGING_DIR. native packages now use foo-config-native. this class has been tested w/ the enlightenment stuff (evas,eet,edb,etox,imlib2,freetype,edje). please migrate .oe packages to it when you have a chance.

2004/07/31 02:43:44+02:00 uni-frankfurt.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/31 01:27:45+02:00 uni-frankfurt.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/30 17:44:51+02:00 uni-frankfurt.de!mickey
on the way to edje-native: complete edb-native and add ecore-native

BKrev: 410bbff3H9FfStU2Nxq1H1ECuGhU-Q

3 files changed, 26 insertions, 8 deletions

diff --git a/edje/edje-native_cvs.oe b/edje/edje-native_cvs.oe
index e69de29bb2..81c5377ce7 100644
--- a/edje/edje-native_cvs.oe
+++ b/edje/edje-native_cvs.oe
@@ -0,0 +1,22 @@
+include edje_${PV}.oe
+inherit native
+DEPENDS = "freetype-native evas-native ecore-native embryo-native eet-native edb-native imlib2-native"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/edje"
+
+EXTRA_OECONF = "--enable-fb-only"
+
+export EDB_CONFIG = "${STAGING_BINDIR}/edb-config-native"
+export EET_CONFIG = "${STAGING_BINDIR}/eet-config-native"
+export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config-native"
+export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config-native"
+export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config-native"
+export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config-native"
+export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config-native"
+
+do_stage() {
+	for i in edje edje_ls edje_cc
+	do
+		install -m 0755 src/bin/$i ${STAGING_BINDIR}
+	done
+}
+
diff --git a/edje/edje/fix-hardcoded-imlib2-config.patch b/edje/edje/fix-hardcoded-imlib2-config.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/edje/edje/fix-hardcoded-imlib2-config.patch
diff --git a/edje/edje_cvs.oe b/edje/edje_cvs.oe
index 7c9cf67728..7178c392b9 100644
--- a/edje/edje_cvs.oe
+++ b/edje/edje_cvs.oe
@@ -1,13 +1,14 @@
 DESCRIPTION = "edje is a complex graphical design & layout library."
-DEPENDS = "freetype evas ecore embryo eet edb"
+DEPENDS = "freetype evas ecore embryo eet edb edje-native"
 SECTION = "libs"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PV = "${CVSDATE}"
 
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/edje"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/edje \
+	   file://fix-hardcoded-imlib2-config.patch;patch=1"
 S = "${WORKDIR}/edje"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig binconfig
 
 export EDB_CONFIG = "${STAGING_BINDIR}/edb-config"
 export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
@@ -23,9 +24,4 @@ do_stage () {
 	oe_libinstall -C src/lib libedje ${STAGING_LIBDIR}/
 	oe_libinstall -C src/lib libedje_edit ${STAGING_LIBDIR}/
 	install -m 0644 ${S}/src/lib/Edje.h ${STAGING_INCDIR}/
-	cat edje-config | sed -e 's,/usr/include,${STAGING_INCDIR},g; \
-				      s,/usr/lib,${STAGING_LIBDIR},g; \
-				      s,/usr/bin,${STAGING_BINDIR},g; \
-				      s,/usr,${STAGING_LIBDIR}/..,g;' > ${STAGING_BINDIR}/edje-config
-	chmod u+x ${STAGING_BINDIR}/edje-config
 }