Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

author: Sergey Lapin <slapin@ossfans.org> 2010-03-22 18:13:56 +0300
committer: Sergey Lapin <slapin@ossfans.org> 2010-03-22 18:13:56 +0300
commit: 3937c88166a493900a694ea8fe53b860f4099d83 (patch)
tree: 57597245b6efd4cf27c1f4c9ff21c0515e530c15 /recipes/python
parent: df2ace6d59e22b42e50bcf4e8a9c92b580602c2e (diff)
parent: 3510d2ed15a4b477aa7af802a839e11a87b981ed (diff)
12 files changed, 62 insertions, 98 deletions
diff --git a/recipes/python/python-epsilon_svn.bb b/recipes/python/python-epsilon_svn.bb
deleted file mode 100644
index 9f535e5fd7..0000000000
--- a/recipes/python/python-epsilon_svn.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require python-efl.inc
-DEPENDS += "epsilon python-ecore"
-RDEPENDS += "python-ecore"
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD/BINDINGS/python;module=${PN};proto=http"
diff --git a/recipes/python/python-etk_svn.bb b/recipes/python/python-etk_svn.bb
deleted file mode 100644
index ba082d873b..0000000000
--- a/recipes/python/python-etk_svn.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require python-efl.inc
-DEPENDS += "etk python-evas python-ecore"
-RDEPENDS += "python-evas python-ecore python-edje python-numeric python-math etk-themes" 
-PV = "0.1.1+svnr${SRCPV}"
-PR = "ml1"
-
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD/BINDINGS/python;module=${PN};proto=http"
-
-do_stage() {         
-	distutils_stage_all 
-}  
diff --git a/recipes/python/python-gst/python-path.patch b/recipes/python/python-gst/python-path.patch
index 6cbad8cc5f..5256ddd0ec 100644
--- a/recipes/python/python-gst/python-path.patch
+++ b/recipes/python/python-gst/python-path.patch
@@ -2,7 +2,7 @@ Index: gst-python-0.10.10/acinclude.m4
 ===================================================================
 --- gst-python-0.10.10.orig/acinclude.m4
 +++ gst-python-0.10.10/acinclude.m4
-@@ -43,16 +43,20 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+@@ -43,16 +43,21 @@ 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
@@ -15,6 +15,7 @@ Index: gst-python-0.10.10/acinclude.m4
 +       [  --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}"
++ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
  else
 -  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
 -  if test "$py_prefix" != "$py_exec_prefix"; then
@@ -23,7 +24,7 @@ Index: gst-python-0.10.10/acinclude.m4
 + 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
++ if test "$py_prefix" != "$py_exec_prefix"; then
 +   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
 + fi
  fi
diff --git a/recipes/python/python-gst_0.10.17.bb b/recipes/python/python-gst_0.10.17.bb
index 6b3a147f14..b0b552b7e1 100644
--- a/recipes/python/python-gst_0.10.17.bb
+++ b/recipes/python/python-gst_0.10.17.bb
@@ -3,6 +3,8 @@ SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "gstreamer gst-plugins-base python-pygobject"
 
+PR = "r1"
+
 SRC_URI = "\
   http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
   file://python-path.patch;patch=1 \
diff --git a/recipes/python/python-paste_1.7.2.bb b/recipes/python/python-paste_1.7.2.bb
new file mode 100644
index 0000000000..28c59fb39d
--- /dev/null
+++ b/recipes/python/python-paste_1.7.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE = "http://pythonpaste.org/"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "MIT"
+SRCNAME = "Paste"
+PR = "r0"
+
+SRC_URI = "http://pypi.python.org/packages/source/P/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;name=paste"
+SRC_URI[paste.md5sum] = "a6a58d08dc4bff91d5d1c519d2277f8a"
+SRC_URI[paste.sha256sum] = "67dde086f0aa84c3ec2452cd65d05d19a050ec2ba56483b1614bdbfd82b3b2b8"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
diff --git a/recipes/python/python-phoneutils_git.bb b/recipes/python/python-phoneutils_git.bb
index c616a2beed..2c6fca1ed1 100644
--- a/recipes/python/python-phoneutils_git.bb
+++ b/recipes/python/python-phoneutils_git.bb
@@ -3,6 +3,7 @@ SECTION = "devel/python"
 DEPENDS = "libphone-utils python-cython-native python-pyrex-native"
 RDEPENDS = "libphone-utils"
 
+SRCREV = "8a7c719e0c3f1f8c10f77f17422da02d7177f0dd"
 PV = "0.0.2+gitr${SRCREV}"
 PR = "r2"
 
diff --git a/recipes/python/python-pygame-1.8.1/Setup b/recipes/python/python-pygame-1.8.1/Setup
deleted file mode 100644
index dd6d540da5..0000000000
--- a/recipes/python/python-pygame-1.8.1/Setup
+++ /dev/null
@@ -1,63 +0,0 @@
-#This Setup file is used by the setup.py script to configure the
-#python extensions. You will likely use the "config.py" which will
-#build a correct Setup file for you based on your system settings.
-#If not, the format is simple enough to edit by hand. First change
-#the needed commandline flags for each dependency, then comment out
-#any unavailable optional modules in the first optional section.
-
-
-SDL = -D_REENTRANT -Xlinker -lSDL -lpthread 
-FONT = -lSDL_ttf
-IMAGE = -lSDL_image
-MIXER = -lSDL_mixer
-SMPEG = -lsmpeg 
-PNG = -lpng
-JPEG = -ljpeg
-SCRAP = -lX11
-
-#DEBUG = -C-W -C-Wall
-DEBUG = 
-
-#the following modules are optional. you will want to compile
-#everything you can, but you can ignore ones you don't have
-#dependencies for, just comment them out
-
-imageext src/imageext.c $(SDL) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
-font src/font.c $(SDL) $(FONT) $(DEBUG)
-mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
-mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
-_numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
-_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-
-#experimental new movie movie. requires libavcodec and libavformat.
-#add any necessary compile flags to this line and uncomment.
-#movieext src/movie.c  src/ffmovie.c $(SDL) -lavcodec -lavformat
-
-
-#these modules are required for pygame to run. they only require
-#SDL as a dependency. these should not be altered
-
-base src/base.c $(SDL) $(DEBUG)
-cdrom src/cdrom.c $(SDL) $(DEBUG)
-color src/color.c $(SDL) $(DEBUG)
-constants src/constants.c $(SDL) $(DEBUG)
-display src/display.c $(SDL) $(DEBUG)
-event src/event.c $(SDL) $(DEBUG)
-fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
-key src/key.c $(SDL) $(DEBUG)
-mouse src/mouse.c $(SDL) $(DEBUG)
-rect src/rect.c $(SDL) $(DEBUG)
-rwobject src/rwobject.c $(SDL) $(DEBUG)
-surface src/surface.c src/alphablit.c src/surface_fill.c $(SDL) $(DEBUG)
-surflock src/surflock.c $(SDL) $(DEBUG)
-time src/time.c $(SDL) $(DEBUG)
-joystick src/joystick.c $(SDL) $(DEBUG)
-draw src/draw.c $(SDL) $(DEBUG)
-image src/image.c $(SDL) $(DEBUG)
-overlay src/overlay.c $(SDL) $(DEBUG)
-transform src/transform.c src/rotozoom.c src/scale2x.c $(SDL) $(DEBUG)
-mask src/mask.c src/bitmask.c $(SDL) $(DEBUG)
-bufferproxy src/bufferproxy.c $(SDL) $(DEBUG)
-pixelarray src/pixelarray.c $(SDL) $(DEBUG)
-
diff --git a/recipes/python/python-pygame_1.8.1.bb b/recipes/python/python-pygame_1.9.1.bb
index 95191ce350..bbeedda3a9 100644
--- a/recipes/python/python-pygame_1.8.1.bb
+++ b/recipes/python/python-pygame_1.9.1.bb
@@ -4,27 +4,23 @@ HOMEPAGE = "http://www.pygame.org"
 LICENSE = "LGPL"
 DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf python-numeric"
 DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'smpeg', d)}"
+RDEPENDS = "python-numeric"
 SRCNAME = "pygame"
 PR = "ml4"
 
-SRC_URI = "\
-  ftp://ftp.pygame.org/pub/pygame/${SRCNAME}-${PV}release.tar.gz \
-  file://Setup \
-"
+SRC_URI = "http://www.pygame.org/ftp/${SRCNAME}-${PV}release.tar.gz;name=archive"
+SRC_URI[archive.md5sum] = "1c4cdc708d17c8250a2d78ef997222fc"
+SRC_URI[archive.sha256sum] = "a26095472ae4be9631e0d5bfb9a52ac57a3a091e45757913128e4a473807d433"
 S = "${WORKDIR}/${SRCNAME}-${PV}release"
 
 inherit distutils
 
 do_configure_prepend() {
-	cat ${WORKDIR}/Setup >Setup
+	# Drop options to replace them later and drom pypm as we don't have portmidi/porttime
+	sed '/^SDL =/d; /^SMPEG =/d; /^movie src/d; /^pypm src/d' Setup.in > Setup
 	SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >>Setup
 	if [ '${ENTERPRISE_DISTRO}' != '1' ]; then
+		SMPEG="`smpeg-config --cflags` `smpeg-config --libs`"; echo "SMPEG=$SMPEG" >>Setup
 		echo "movie src/movie.c \$(SDL) \$(SMPEG) \$(DEBUG)" >>Setup
 	fi
 }
-
-do_stage() {
-	distutils_stage_all
-}
-
-RDEPENDS = "python-numeric"
diff --git a/recipes/python/python-pygobject-native_2.20.0.bb b/recipes/python/python-pygobject-native_2.20.0.bb
index 918ffa2643..409481c2bf 100644
--- a/recipes/python/python-pygobject-native_2.20.0.bb
+++ b/recipes/python/python-pygobject-native_2.20.0.bb
@@ -1,11 +1,11 @@
 require python-pygobject_${PV}.bb
 
+inherit native
+
 DEPENDS = "python-native glib-2.0-native"
 
 PARALLEL_MAKE = ""
 
-inherit native
-
 SRC_URI = "\
   ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
 #  file://python-path.patch;patch=1 \
@@ -13,7 +13,11 @@ SRC_URI = "\
 
 export GOBJECT_INTROSPECTION_CFLAGS="-pthread -I${STAGING_INCDIR}/gobject-introspection-1.0 -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_LIBDIR}/glib-2.0/include"
 
-do_stage_append() {
-	install -d ${STAGING_BINDIR}
-	install -m 0755 gobject/generate-constants ${STAGING_BINDIR}/gobject-generate-constants
+do_configure_prepend() {
+	unset PYTHONPATH
+}
+
+do_install_append() {
+	install -d ${D}${bindir}
+	install -m 0755 gobject/generate-constants ${D}${bindir}/gobject-generate-constants
 }
diff --git a/recipes/python/python-pygobject_2.20.0.bb b/recipes/python/python-pygobject_2.20.0.bb
index 10c94dcbc1..fb97e53600 100644
--- a/recipes/python/python-pygobject_2.20.0.bb
+++ b/recipes/python/python-pygobject_2.20.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Python GObject bindings"
 SECTION = "devel/python"
 LICENSE = "LGPL"
-DEPENDS = "python-pygobject-native-${PV}"
+DEPENDS = "libffi python-pygobject-native-${PV}"
 PE = "1"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
diff --git a/recipes/python/python-pysqlite2-native_2.4.0.bb b/recipes/python/python-pysqlite2-native_2.4.0.bb
new file mode 100644
index 0000000000..0a7d667dca
--- /dev/null
+++ b/recipes/python/python-pysqlite2-native_2.4.0.bb
@@ -0,0 +1,10 @@
+require python-pysqlite2_${PV}.bb
+inherit native
+DEPENDS = "python-native sqlite3-native"
+RDEPENDS = ""
+
+do_stage() {
+    BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+    STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
+        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
+}
diff --git a/recipes/python/python-wsgiref_0.1.2.bb b/recipes/python/python-wsgiref_0.1.2.bb
new file mode 100644
index 0000000000..757a81c4f5
--- /dev/null
+++ b/recipes/python/python-wsgiref_0.1.2.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "WSGI (PEP 333) Reference Library"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "PSF ZPL"
+SRCNAME = "wsgiref"
+PR = "ml0"
+
+SRC_URI = "http://pypi.python.org/packages/source/w/${SRCNAME}/${SRCNAME}-${PV}.zip;name=wsgiref"
+SRC_URI[wsgiref.md5sum] = "29b146e6ebd0f9fb119fe321f7bcf6cb"
+SRC_URI[wsgiref.sha256sum] = "c7e610c800957046c04c8014aab8cce8f0b9f0495c8cd349e57c1f7cabf40e79"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
author	Sergey Lapin <slapin@ossfans.org>	2010-03-22 18:13:56 +0300
committer	Sergey Lapin <slapin@ossfans.org>	2010-03-22 18:13:56 +0300
commit	3937c88166a493900a694ea8fe53b860f4099d83 (patch)
tree	57597245b6efd4cf27c1f4c9ff21c0515e530c15 /recipes/python
parent	df2ace6d59e22b42e50bcf4e8a9c92b580602c2e (diff)
parent	3510d2ed15a4b477aa7af802a839e11a87b981ed (diff)