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

22 files changed, 200 insertions, 45 deletions

diff --git a/classes/binconfig.oeclass b/classes/binconfig.oeclass
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/classes/binconfig.oeclass
diff --git a/classes/native.oeclass b/classes/native.oeclass
index e69de29bb2..49e70a5c94 100644
--- a/classes/native.oeclass
+++ b/classes/native.oeclass
@@ -0,0 +1,38 @@
+inherit base
+
+PACKAGES = ""
+
+TARGET_ARCH = "${BUILD_ARCH}"
+TARGET_OS = "${BUILD_OS}"
+TARGET_VENDOR = "${BUILD_VENDOR}"
+TARGET_PREFIX = "${BUILD_PREFIX}"
+TARGET_CC_ARCH = "${BUILD_CC_ARCH}"
+
+HOST_ARCH = "${BUILD_ARCH}"
+HOST_OS = "${BUILD_OS}"
+HOST_VENDOR = "${BUILD_VENDOR}"
+HOST_PREFIX = "${BUILD_PREFIX}"
+HOST_CC_ARCH = "${BUILD_CC_ARCH}"
+
+CPPFLAGS = "${BUILD_CPPFLAGS}"
+CFLAGS = "${BUILD_CFLAGS}"
+CXXFLAGS = "${BUILD_CFLAGS}"
+LDFLAGS = "${BUILD_LDFLAGS}"
+
+prefix = "${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}"
+exec_prefix = "${prefix}"
+bindir = "${STAGING_BINDIR}"
+sbindir = "${STAGING_BINDIR}"
+libdir = "${STAGING_LIBDIR}"
+includedir = "${STAGING_INCDIR}"
+oldincludedir = "${includedir}"
+sysconfdir = "${STAGING_DIR}/etc"
+datadir = "${STAGING_DATADIR}"
+
+do_stage () {
+	oe_runmake install
+}
+
+do_install () {
+	true
+}
diff --git a/ecore/ecore-native_cvs.oe b/ecore/ecore-native_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/ecore/ecore-native_cvs.oe
diff --git a/ecore/ecore_cvs.oe b/ecore/ecore_cvs.oe
index 92b747f83c..dd17e302d0 100644
--- a/ecore/ecore_cvs.oe
+++ b/ecore/ecore_cvs.oe
@@ -11,7 +11,7 @@ PR = "r1"
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/ecore"
 S = "${WORKDIR}/ecore"
 
-inherit autotools
+inherit autotools binconfig
 
 export EDB_CONFIG = "${STAGING_BINDIR}/edb-config"
 export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
@@ -42,9 +42,4 @@ do_stage () {
 	done
 	install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
 	install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
-	cat ecore-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}/ecore-config
-	chmod u+x ${STAGING_BINDIR}/ecore-config
 }
diff --git a/edb/edb-native_cvs.oe b/edb/edb-native_cvs.oe
index e5899d41b1..bf6dde0ca5 100644
--- a/edb/edb-native_cvs.oe
+++ b/edb/edb-native_cvs.oe
@@ -3,6 +3,7 @@ inherit native
 DEPENDS = "zlib-native"
 
 do_stage () {
-	oe_libinstall -C src libedb ${libdir}/
-	install -m 0755 tools/.libs/edb_ed ${bindir}/
+	install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR}
+        oe_libinstall -C src libedb ${STAGING_LIBDIR}/
+        install -m 0644 ${S}/src/Edb.h ${STAGING_INCDIR}/
 }
diff --git a/edb/edb_cvs.oe b/edb/edb_cvs.oe
index b75218db78..4a6adaa9bb 100644
--- a/edb/edb_cvs.oe
+++ b/edb/edb_cvs.oe
@@ -8,7 +8,7 @@ PV = "${CVSDATE}"
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/edb"
 S = "${WORKDIR}/edb"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig binconfig
 
 EXTRA_OECONF = "--disable-gtk \
 		--disable-ncurses"
@@ -16,9 +16,4 @@ EXTRA_OECONF = "--disable-gtk \
 do_stage () {
 	oe_libinstall -C src libedb ${STAGING_LIBDIR}/
 	install -m 0644 ${S}/src/Edb.h ${STAGING_INCDIR}/
-	cat edb-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}/edb-config
-	chmod u+x ${STAGING_BINDIR}/edb-config
 }
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
 }
diff --git a/eet/eet-native_cvs.oe b/eet/eet-native_cvs.oe
index e69de29bb2..bed5979c81 100644
--- a/eet/eet-native_cvs.oe
+++ b/eet/eet-native_cvs.oe
@@ -0,0 +1,9 @@
+include eet_${PV}.oe
+inherit native
+DEPENDS = "zlib-native"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/eet"
+
+do_stage () {
+        oe_libinstall -C src/lib libeet ${STAGING_LIBDIR}/
+        install -m 0644 ${S}/src/lib/Eet.h ${STAGING_INCDIR}/
+}
diff --git a/eet/eet_cvs.oe b/eet/eet_cvs.oe
index 762704a4f0..908d600794 100644
--- a/eet/eet_cvs.oe
+++ b/eet/eet_cvs.oe
@@ -11,14 +11,9 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/
 	   file://flags.patch;patch=1"
 S = "${WORKDIR}/eet"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig binconfig
 
 do_stage () {
 	oe_libinstall -C src/lib libeet ${STAGING_LIBDIR}/
 	install -m 0644 ${S}/src/lib/Eet.h ${STAGING_INCDIR}/
-	cat eet-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}/eet-config
-	chmod u+x ${STAGING_BINDIR}/eet-config
 }
diff --git a/embryo/embryo-native_cvs.oe b/embryo/embryo-native_cvs.oe
index e69de29bb2..354f8b92de 100644
--- a/embryo/embryo-native_cvs.oe
+++ b/embryo/embryo-native_cvs.oe
@@ -0,0 +1,7 @@
+include embryo_${PV}.oe
+inherit native
+
+do_stage () {
+	oe_libinstall -C src/lib libembryo ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/src/lib/Embryo.h ${STAGING_INCDIR}/
+}
diff --git a/embryo/embryo_cvs.oe b/embryo/embryo_cvs.oe
index 767793d86c..e5d66faee2 100644
--- a/embryo/embryo_cvs.oe
+++ b/embryo/embryo_cvs.oe
@@ -10,14 +10,9 @@ PV = "${CVSDATE}"
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/embryo"
 S = "${WORKDIR}/embryo"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig binconfig
 
 do_stage () {
 	oe_libinstall -C src/lib libembryo ${STAGING_LIBDIR}/
 	install -m 0644 ${S}/src/lib/Embryo.h ${STAGING_INCDIR}/
-	cat embryo-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}/embryo-config
-	chmod u+x ${STAGING_BINDIR}/embryo-config
 }
diff --git a/etox/etox_cvs.oe b/etox/etox_cvs.oe
index e69de29bb2..d0f505e8b1 100644
--- a/etox/etox_cvs.oe
+++ b/etox/etox_cvs.oe
@@ -0,0 +1,16 @@
+DESCRIPTION = "Etox is a type setting and text layout library based on Evas. \
+Etox helps you when it comes to displaying, moving, resizing, layering, \
+clipping, aligning and coloring fonts in different styles, and more."
+SECTION = "libs"
+DEPENDS = "edb evas ecore"
+PV = "${CVSDATE}"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/etox"
+S = "${WORKDIR}/etox"
+
+inherit autotools pkgconfig binconfig
+
+do_stage () {
+	oe_libinstall -C src libetox ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/src/Etox.h ${STAGING_INCDIR}/
+}
diff --git a/evas/evas-native_cvs.oe b/evas/evas-native_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/evas/evas-native_cvs.oe
diff --git a/evas/evas_cvs.oe b/evas/evas_cvs.oe
index 67b651611b..6be924f8de 100644
--- a/evas/evas_cvs.oe
+++ b/evas/evas_cvs.oe
@@ -14,7 +14,7 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/
            file://pkg.m4"
 S = "${WORKDIR}/evas"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig binconfig
 
 EXTRA_OECONF = "--enable-fb			\
 		--disable-directfb		\
@@ -74,15 +74,9 @@ headers = "Evas_Engine_Buffer.h \
 # Evas_Engine_Software_X11.h
 # Evas_Engine_Software_Qtopia.h \
 
-
 do_stage () {
 	for i in ${headers}; do
 		install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
 	done
 	oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
-	cat evas-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}/evas-config
-	chmod u+x ${STAGING_BINDIR}/evas-config
 }
diff --git a/ewl/ewl_cvs.oe b/ewl/ewl_cvs.oe
index e69de29bb2..1ef4b580a6 100644
--- a/ewl/ewl_cvs.oe
+++ b/ewl/ewl_cvs.oe
@@ -0,0 +1,15 @@
+DESCRIPTION = "The Enlightened Widget Library, \
+a simple-to-use general purpose widget library based on the Evas canvas."
+SECTION = "libs"
+DEPENDS = "edb evas ecore etox edje"
+PV = "${CVSDATE}"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/ewl"
+S = "${WORKDIR}/ewl"
+
+inherit autotools binconfig
+
+do_stage () {
+	oe_libinstall -C src libewl ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/src/Ewl.h ${STAGING_INCDIR}/
+}
diff --git a/freetype/freetype-native_2.1.8.oe b/freetype/freetype-native_2.1.8.oe
index e69de29bb2..aadca5c0f4 100644
--- a/freetype/freetype-native_2.1.8.oe
+++ b/freetype/freetype-native_2.1.8.oe
@@ -0,0 +1,22 @@
+DESCRIPTION = "Freetype font rendering library"
+
+SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
+	   file://${FILESDIR}/configure.patch;patch=1"
+
+inherit autotools pkgconfig native binconfig
+DEPENDS = "patcher-native"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/freetype-${PV}"
+S = "${WORKDIR}/freetype-${PV}"
+PACKAGES = ""
+
+do_configure () {
+	(cd builds/unix && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+do_stage () {
+	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
+	cp -a ${S}/include/*.h ${STAGING_INCDIR}
+	install -d ${STAGING_INCDIR}/freetype2
+	cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/
+}
diff --git a/freetype/freetype_2.1.8.oe b/freetype/freetype_2.1.8.oe
index 4f21467fcc..f8c7415cba 100644
--- a/freetype/freetype_2.1.8.oe
+++ b/freetype/freetype_2.1.8.oe
@@ -6,7 +6,7 @@ SRC_URI = "ftp://ftp.freetype.org/freetype/freetype2/freetype-${PV}.tar.bz2 \
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += " ${bindir}"
 
-inherit autotools  pkgconfig
+inherit autotools pkgconfig binconfig
 
 LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
@@ -26,8 +26,5 @@ do_stage () {
 	cp -a ${S}/include/*.h ${STAGING_INCDIR}
 	install -d ${STAGING_INCDIR}/freetype2
 	cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/
-
-	sed -e 's,${prefix},${STAGING_LIBDIR}/..,' < builds/unix/freetype-config > ${STAGING_BINDIR}/freetype-config
-	chmod u+x ${STAGING_BINDIR}/freetype-config
 }
 
diff --git a/imlib2/imlib2-native_1.1.0.oe b/imlib2/imlib2-native_1.1.0.oe
index e69de29bb2..b748ec062d 100644
--- a/imlib2/imlib2-native_1.1.0.oe
+++ b/imlib2/imlib2-native_1.1.0.oe
@@ -0,0 +1,15 @@
+include imlib2_${PV}.oe
+inherit native
+DEPENDS = "freetype-native x11-native xext-native"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/imlib2-${PV}"
+
+do_configure () {
+        rm -f ${S}/libltdl/acinclude.m4
+        autotools_do_configure
+}
+
+do_stage () {
+        oe_libinstall -a -so -C src libImlib2 ${STAGING_LIBDIR}/
+        install -m 0644 ${S}/src/Imlib2.h ${STAGING_INCDIR}/
+}
diff --git a/imlib2/imlib2_1.1.0.oe b/imlib2/imlib2_1.1.0.oe
index e69de29bb2..258b0eb779 100644
--- a/imlib2/imlib2_1.1.0.oe
+++ b/imlib2/imlib2_1.1.0.oe
@@ -0,0 +1,30 @@
+DESCRIPTION = "A graphic library for file loading, saving, rendering, and \
+manipulation."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+DEPENDS = "freetype x11 xext"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/enlightenment/imlib2-${PV}.tar.gz \
+	   file://cross.patch;patch=1 \
+	   file://gcc34.patch;patch=1 \
+	   file://pkglibdir.patch;patch=1 \
+	   file://autofoo.patch;patch=1"
+S = "${WORKDIR}/imlib2-${PV}"
+
+inherit autotools pkgconfig binconfig
+
+# FIXME: enable mmx for archs that support it, or patch imlib's
+# configure script to check and see if it can compile assembly
+# that uses mmx instructions.
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR} \
+		--x-libraries=${STAGING_LIBDIR} \
+		--disable-mmx"
+
+do_configure () {
+	rm -f ${S}/libltdl/acinclude.m4
+	autotools_do_configure
+}
+
+do_stage () {
+	oe_libinstall -a -so -C src libImlib2 ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/src/Imlib2.h ${STAGING_INCDIR}/
+}
diff --git a/meta/meta-e.oe b/meta/meta-e.oe
index e69de29bb2..dc7a60ed89 100644
--- a/meta/meta-e.oe
+++ b/meta/meta-e.oe
@@ -0,0 +1,13 @@
+DESCRIPTION = "Meta-package for the Enlightenment Palmtop Environment (Codename: EpiCenter)"
+PACKAGES = "e e-libs e-base"
+
+ALLOW_EMPTY = 1
+
+task-elibs = "evas edb ecore eet embryo edje etox ewl"
+task-ebase = ""
+
+RDEPENDS_elibs = "${task-elibs}"
+DEPENDS += "${task-elibs}"
+
+RDEPENDS_ebase = "${task-ebase}"
+DEPENDS += "${task-ebase"