diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 1 | ||||
| -rw-r--r-- | packages/python/python-formencode/setup.py.diff | 13 | ||||
| -rw-r--r-- | packages/python/python-formencode_svn.bb | 5 | ||||
| -rw-r--r-- | packages/python/python-gst_0.10.8.bb | 4 | ||||
| -rw-r--r-- | packages/python/python-pygtk-1.2/acinclude.m4 | 90 |
5 files changed, 96 insertions, 17 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 72b45cc9bc..864f6fe178 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -111,6 +111,7 @@ SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" +SRCREV_pn-python-formencode = "3148" SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" diff --git a/packages/python/python-formencode/setup.py.diff b/packages/python/python-formencode/setup.py.diff deleted file mode 100644 index dc9db4352e..0000000000 --- a/packages/python/python-formencode/setup.py.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- python-formencode-0.4.orig/setup.py -+++ python-formencode-0.4/setup.py -@@ -1,6 +1,7 @@ --from ez_setup import use_setuptools --use_setuptools() --from setuptools import setup -+#from ez_setup import use_setuptools -+#use_setuptools() -+#from setuptools import setup -+from distutils.core import setup - - version = '0.4' - diff --git a/packages/python/python-formencode_svn.bb b/packages/python/python-formencode_svn.bb index b1cf3ce7c7..80a1ba2e5b 100644 --- a/packages/python/python-formencode_svn.bb +++ b/packages/python/python-formencode_svn.bb @@ -4,12 +4,11 @@ PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "sqlite3" SRCNAME = "FormEncode" -PV = "0.4+svn${SRCDATE}" +PV = "0.4+svnr${SRCREV}" PR = "ml0" inherit distutils -SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http \ - file://setup.py.diff;patch=1" +SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http" S = "${WORKDIR}/trunk" diff --git a/packages/python/python-gst_0.10.8.bb b/packages/python/python-gst_0.10.8.bb index 7b3535ce25..224d24b59a 100644 --- a/packages/python/python-gst_0.10.8.bb +++ b/packages/python/python-gst_0.10.8.bb @@ -21,4 +21,6 @@ do_stage() { autotools_stage_all } -FILES_${PN}-dbg = "${libdir}/python2.5/site-packages/gst-0.10/gst/.debug/" +FILES_${PN} += "${datadir}/gst-python" +FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/" diff --git a/packages/python/python-pygtk-1.2/acinclude.m4 b/packages/python/python-pygtk-1.2/acinclude.m4 new file mode 100644 index 0000000000..53518fb2eb --- /dev/null +++ b/packages/python/python-pygtk-1.2/acinclude.m4 @@ -0,0 +1,90 @@ +## 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 +AC_ARG_WITH(python-includes, + [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) +if test x$py_exec_prefix != x; then +PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" +else +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 +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]) |