Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/17 14:37:32+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/05/17 14:37:17+02:00 utwente.nl!koen
linux-x86_2.6.11.6.bb:  as requested on IRC by dmit

2005/05/17 13:57:46+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/17 13:57:36+02:00 uni-frankfurt.de!mickeyl
fix python-pygtk2

2005/05/17 13:54:50+02:00 utwente.nl!koen
evas-x11_0.9.9.004.bb, evas-x11-fb_0.9.9.004.bb:  fix parsing + maintainer field

BKrev: 4289e60dP3QdD6EiUB51bBhMpHNqlQ

8 files changed, 191 insertions, 84 deletions

diff --git a/packages/evas/evas-x11-fb_0.9.9.004.bb b/packages/evas/evas-x11-fb_0.9.9.004.bb
index e69de29bb2..487826af70 100644
--- a/packages/evas/evas-x11-fb_0.9.9.004.bb
+++ b/packages/evas/evas-x11-fb_0.9.9.004.bb
@@ -0,0 +1,86 @@
+DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
+anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
+down to using normal X11 primitives such as pixmaps, lines and rectangles if \
+your CPU or graphics hardware are too slow."
+LICENSE = "BSD"
+HOMEPAGE = "http://www.enlightenment.org"
+MAINTAINER = "Nigel Kostiuck <emte@labotomy.net>"
+SECTION = "efl/libs"
+PRIORITY = "optional"
+DEPENDS = "libpng jpeg edb eet freetype"
+PR = "2"
+
+SRC_URI = "http://enlightenment.freedesktop.org/fetch.php?file=evas-0.9.9.004.tar.gz" 
+S = "${WORKDIR}/evas"
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--enable-fb			\
+		--disable-directfb		\
+		--disable-buffer		\
+		--disable-software-qtopia	\
+		--with-x			\
+		--enable-software-x11		\
+		--disable-gl-x11		\
+		--enable-image-loader-eet	\
+		--enable-image-loader-edb	\
+		--enable-image-loader-png	\
+		--enable-image-loader-jpeg	\
+		--enable-small-dither-mask	\
+		--enable-cpu-c			\
+		--enable-font-loader-eet	\
+		--enable-scale-sample		\
+		--enable-scale-smooth		\
+		--enable-convert-yuv		\
+		--disable-convert-8-rgb-332	\
+		--disable-convert-8-rgb-666	\
+		--disable-convert-8-rgb-232	\
+		--disable-convert-8-rgb-222	\
+		--disable-convert-8-rgb-221	\
+		--disable-convert-8-rgb-121	\
+		--disable-convert-8-rgb-111	\
+		--enable-convert-16-rgb-565	\
+		--disable-convert-16-rgb-555	\
+		--disable-convert-16-rgb-444	\
+		--disable-convert-16-rgb-ipq	\
+		--enable-convert-16-rgb-rot-0	\
+		--disable-convert-16-rgb-rot-90	\
+		--enable-convert-16-rgb-rot-270	\
+		--disable-convert-24-rgb-888	\
+		--disable-convert-24-bgr-888	\
+		--disable-convert-32-rgb-8888	\
+		--disable-convert-32-rgbx-8888	\
+		--disable-convert-32-bgr-8888	\
+		--disable-convert-32-bgrx-8888	\
+		--disable-convert-32-rgb-rot-0	\
+		--disable-convert-32-rgb-rot-90	\
+		--disable-convert-32-rgb-rot-270"
+
+do_configure () {
+	install -m 0644 ${WORKDIR}/pkg.m4 acinclude.m4
+	autotools_do_configure
+}
+
+headers = "Evas_Engine_Buffer.h \
+           Evas_Engine_FB.h \
+           Evas.h"
+
+# Don't install these headers or subsequent libraries will include support for it:
+# Evas_Engine_DirectFB.h \
+# Evas_Engine_GL_X11.h \
+# Evas_Engine_Software_Win32_GDI.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}/
+}
+
+PACKAGES += "evas-examples"
+
+FILES_${PN} = "${libdir}/libevas*.so*"
+FILES_${PN}-dev += "${bindir}/evas-config ${libdir}/pkgconfig"
+FILES_${PN}-examples = "${bindir}/evas_fb_test ${datadir}"
diff --git a/packages/evas/evas-x11_0.9.9.004.bb b/packages/evas/evas-x11_0.9.9.004.bb
index e69de29bb2..5f8b7376cc 100644
--- a/packages/evas/evas-x11_0.9.9.004.bb
+++ b/packages/evas/evas-x11_0.9.9.004.bb
@@ -0,0 +1,86 @@
+DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
+anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
+down to using normal X11 primitives such as pixmaps, lines and rectangles if \
+your CPU or graphics hardware are too slow."
+LICENSE = "BSD"
+HOMEPAGE = "http://www.enlightenment.org"
+MAINTAINER = "Nigel Kostiuck <emte@labotomy.net>"
+SECTION = "efl/libs"
+PRIORITY = "optional"
+DEPENDS = "libpng jpeg edb eet freetype"
+PR = "2"
+
+SRC_URI = "http://enlightenment.freedesktop.org/fetch.php?file=evas-0.9.9.004.tar.gz" 
+S = "${WORKDIR}/evas"
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--disable-fb			\
+		--disable-directfb		\
+		--disable-buffer		\
+		--disable-software-qtopia	\
+		--with-x			\
+		--enable-software-x11		\
+		--disable-gl-x11		\
+		--enable-image-loader-eet	\
+		--enable-image-loader-edb	\
+		--enable-image-loader-png	\
+		--enable-image-loader-jpeg	\
+		--enable-small-dither-mask	\
+		--enable-cpu-c			\
+		--enable-font-loader-eet	\
+		--enable-scale-sample		\
+		--enable-scale-smooth		\
+		--enable-convert-yuv		\
+		--disable-convert-8-rgb-332	\
+		--disable-convert-8-rgb-666	\
+		--disable-convert-8-rgb-232	\
+		--disable-convert-8-rgb-222	\
+		--disable-convert-8-rgb-221	\
+		--disable-convert-8-rgb-121	\
+		--disable-convert-8-rgb-111	\
+		--enable-convert-16-rgb-565	\
+		--disable-convert-16-rgb-555	\
+		--disable-convert-16-rgb-444	\
+		--disable-convert-16-rgb-ipq	\
+		--enable-convert-16-rgb-rot-0	\
+		--disable-convert-16-rgb-rot-90	\
+		--enable-convert-16-rgb-rot-270	\
+		--disable-convert-24-rgb-888	\
+		--disable-convert-24-bgr-888	\
+		--disable-convert-32-rgb-8888	\
+		--disable-convert-32-rgbx-8888	\
+		--disable-convert-32-bgr-8888	\
+		--disable-convert-32-bgrx-8888	\
+		--disable-convert-32-rgb-rot-0	\
+		--disable-convert-32-rgb-rot-90	\
+		--disable-convert-32-rgb-rot-270"
+
+do_configure () {
+	install -m 0644 ${WORKDIR}/pkg.m4 acinclude.m4
+	autotools_do_configure
+}
+
+headers = "Evas_Engine_Buffer.h \
+           Evas_Engine_FB.h \
+           Evas.h"
+
+# Don't install these headers or subsequent libraries will include support for it:
+# Evas_Engine_DirectFB.h \
+# Evas_Engine_GL_X11.h \
+# Evas_Engine_Software_Win32_GDI.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}/
+}
+
+PACKAGES += "evas-examples"
+
+FILES_${PN} = "${libdir}/libevas*.so*"
+FILES_${PN}-dev += "${bindir}/evas-config ${libdir}/pkgconfig"
+FILES_${PN}-examples = "${bindir}/evas_fb_test ${datadir}"
diff --git a/packages/linux/linux-x86_2.6.11.6.bb b/packages/linux/linux-x86_2.6.11.6.bb
index 85512d0b3e..87036a2be8 100644
--- a/packages/linux/linux-x86_2.6.11.6.bb
+++ b/packages/linux/linux-x86_2.6.11.6.bb
@@ -12,3 +12,8 @@ inherit kernel
 
 COMPATIBLE_HOST = "i.86.*-linux"
 KERNEL_IMAGETYPE = "bzImage"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+}
+
diff --git a/packages/python/python-pygtk/acinclude.m4 b/packages/python/python-pygtk/acinclude.m4
deleted file mode 100644
index eec3758afc..0000000000
--- a/packages/python/python-pygtk/acinclude.m4
+++ /dev/null
@@ -1,84 +0,0 @@
-## this one is commonly used with AM_PATH_PYTHONDIR ...
-dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
-dnl Check if a module containing a given symbol is visible to python.
-AC_DEFUN(AM_CHECK_PYMOD,
-[AC_REQUIRE([AM_PATH_PYTHON])
-py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-ifelse([$2],[], [prog="
-import sys
-try:
-        import $1
-except ImportError:
-        sys.exit(1)
-except:
-        sys.exit(0)
-sys.exit(0)"], [prog="
-import $1
-$1.$2"])
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-  then
-    eval "py_cv_mod_$py_mod_var=yes"
-  else
-    eval "py_cv_mod_$py_mod_var=no"
-  fi
-])
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-if test "x$py_val" != xno; then
-  AC_MSG_RESULT(yes)
-  ifelse([$3], [],, [$3
-])dnl
-else
-  AC_MSG_RESULT(no)
-  ifelse([$4], [],, [$4
-])dnl
-fi
-])
-
-dnl a macro to check for ability to create python extensions
-dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl function also defines PYTHON_INCLUDES
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
-[AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING(for headers required to compile python extensions)
-dnl deduce PYTHON_INCLUDES
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-if test "$py_prefix" != "$py_exec_prefix"; then
-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-fi
-AC_SUBST(PYTHON_INCLUDES)
-dnl check if the headers exist:
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-AC_TRY_CPP([#include <Python.h>],dnl
-[AC_MSG_RESULT(found)
-$1],dnl
-[AC_MSG_RESULT(not found)
-$2])
-CPPFLAGS="$save_CPPFLAGS"
-])
-
-dnl
-dnl JH_ADD_CFLAG(FLAG)
-dnl checks whether the C compiler supports the given flag, and if so, adds
-dnl it to $CFLAGS.  If the flag is already present in the list, then the
-dnl check is not performed.
-AC_DEFUN([JH_ADD_CFLAG],
-[
-case " $CFLAGS " in
-*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
-  ;;
-*)
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $1"
-  AC_MSG_CHECKING([whether [$]CC understands $1])
-  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
-  AC_MSG_RESULT($jh_has_option)
-  if test $jh_has_option = no; then
-    CFLAGS="$save_CFLAGS"
-  fi
-  ;;
-esac])
diff --git a/packages/python/python-pygtk_2.4.1.bb b/packages/python/python-pygtk2/acinclude.m4
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pygtk_2.4.1.bb
+++ b/packages/python/python-pygtk2/acinclude.m4
diff --git a/packages/python/python-pygtk_2.6.2.bb b/packages/python/python-pygtk2_2.4.1.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pygtk_2.6.2.bb
+++ b/packages/python/python-pygtk2_2.4.1.bb
diff --git a/packages/python/python-pygtk2_2.6.2.bb b/packages/python/python-pygtk2_2.6.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pygtk2_2.6.2.bb
diff --git a/packages/python/python-pysqlite2_2.0.0.bb b/packages/python/python-pysqlite2_2.0.0.bb
index e69de29bb2..124a2ed5bc 100644
--- a/packages/python/python-pysqlite2_2.0.0.bb
+++ b/packages/python/python-pysqlite2_2.0.0.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "A Python extension for the SQLite Embedded Relational Database"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "PSF"
+RDEPENDS = "python-core python-re python-lang"
+DEPENDS = "sqlite3"
+SRCNAME = "pysqlite"
+PR = "ml0"
+
+SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.0/${PV}/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils