From ed327197a7e68e72f8d9be9a3e970962c8eea35b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 11 Jun 2007 12:12:17 +0000 Subject: flumotion: added 0.4.1 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1912 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../flumotion/no-check-for-python-stuff.patch | 68 ++++++++++++++++++++++ .../packages/flumotion/flumotion/python-path.patch | 25 ++++++++ meta-extras/packages/flumotion/flumotion_0.4.1.bb | 30 ++++++++++ 3 files changed, 123 insertions(+) create mode 100644 meta-extras/packages/flumotion/flumotion/no-check-for-python-stuff.patch create mode 100644 meta-extras/packages/flumotion/flumotion/python-path.patch create mode 100644 meta-extras/packages/flumotion/flumotion_0.4.1.bb (limited to 'meta-extras') diff --git a/meta-extras/packages/flumotion/flumotion/no-check-for-python-stuff.patch b/meta-extras/packages/flumotion/flumotion/no-check-for-python-stuff.patch new file mode 100644 index 0000000000..08503c82e0 --- /dev/null +++ b/meta-extras/packages/flumotion/flumotion/no-check-for-python-stuff.patch @@ -0,0 +1,68 @@ +Index: flumotion-0.4.1/configure.ac +=================================================================== +--- flumotion-0.4.1.orig/configure.ac 2007-03-05 17:16:48.121264330 +0100 ++++ flumotion-0.4.1/configure.ac 2007-03-05 17:20:40.343837320 +0100 +@@ -73,13 +73,6 @@ + AC_MSG_ERROR([PyGTK 2.5.2 contains known bugs, please install other version]) + fi + +-if test "x$DISPLAY" != "x"; then +- AS_PYTHON_IMPORT([gtk.glade],, +- AC_MSG_ERROR([You need to have python libglade bindings installed])) +-else +- AC_MSG_NOTICE([Not trying to import gtk.glade because DISPLAY is unset]) +-fi +- + if test $GST_010_SUPPORTED = "no"; then + AC_MSG_ERROR([No appropriate version of PyGTK installed. Correct the above + errors and try again.]) +@@ -94,16 +87,6 @@ + [AC_MSG_RESULT([$PYGST_010_PKG_ERRORS]) + GST_010_SUPPORTED=no]) + +- if test $GST_010_SUPPORTED = "yes"; then +- saved_PYTHONPATH=$PYTHONPATH +- export PYTHONPATH=$PYGST_010_DIR:$PYTHONPATH +- AS_PYTHON_IMPORT([gst],, +- [AC_MSG_NOTICE([Unable to import gst-python 0.10 -- check your PYTHONPATH?]) +- GST_010_SUPPORTED=no], +- [import pygst; pygst.require('0.10')], +- [assert gst.pygst_version[[1]] == 10 or (gst.pygst_version[[1]] == 9 and gst.pygst_version[[2]] >= 7)]) +- +- fi + fi + + if test $GST_010_SUPPORTED = "no"; then +@@ -158,32 +141,7 @@ + AC_CHECK_PROG(PYCHECKER, pychecker, yes, no) + AM_CONDITIONAL(HAVE_PYCHECKER, test "x$PYCHECKER" = "xyes") + +-dnl check for Twisted +-AS_PYTHON_IMPORT(twisted, +- [ +- AC_MSG_CHECKING(for Twisted >= 2.0.1) +- prog=" +-import sys +-import twisted.copyright +-minver = '2.0.1' +-if twisted.copyright.version < minver: +- sys.exit(1) +-sys.exit(0) +-" +- if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC +- then +- AC_MSG_RESULT(found) +- else +- AC_MSG_RESULT(too old) +- AC_MSG_ERROR([You need at least version 2.0.1 of Twisted]) +- fi +- ] +- , +- AC_MSG_ERROR([You need at least version 2.0.1 of Twisted]) +-) + +-TWISTED_MODULE([twisted.names]) +-TWISTED_MODULE([twisted.web]) + + AC_CONFIG_FILES([env], [chmod +x env]) + AC_CONFIG_FILES([bin/flumotion], [chmod +x bin/flumotion]) diff --git a/meta-extras/packages/flumotion/flumotion/python-path.patch b/meta-extras/packages/flumotion/flumotion/python-path.patch new file mode 100644 index 0000000000..377994e729 --- /dev/null +++ b/meta-extras/packages/flumotion/flumotion/python-path.patch @@ -0,0 +1,25 @@ +Index: flumotion-0.3.1/common/as-python.m4 +=================================================================== +--- flumotion-0.3.1.orig/common/as-python.m4 2007-03-02 15:26:46.704717964 +0100 ++++ flumotion-0.3.1/common/as-python.m4 2007-03-02 15:27:28.601326374 +0100 +@@ -199,6 +199,12 @@ + 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}" +@@ -206,6 +212,7 @@ + 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: diff --git a/meta-extras/packages/flumotion/flumotion_0.4.1.bb b/meta-extras/packages/flumotion/flumotion_0.4.1.bb new file mode 100644 index 0000000000..42474e011b --- /dev/null +++ b/meta-extras/packages/flumotion/flumotion_0.4.1.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Fluendo Streaming Server" +LICENSE = "GPL" +DEPENDS = "gstreamer python-gst twisted python-pygtk2" +RDEPENDS = "python-twisted-core python-twisted-web python-core python-gst" +RDEPENDS_${PN}-gui = "${PN} python-pygtk2" +PR = "r3" + +SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \ + file://python-path.patch;patch=1 \ + file://no-check-for-python-stuff.patch;patch=1" + +inherit autotools distutils-base pkgconfig + +export EPYDOC = "no" + +EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" + +PACKAGES =+ "flumotion-gui" + +FILES_${PN} = "${bindir} ${sbindir} ${libdir}/flumotion" +FILES_${PN}-dev += "${libdir}/pkgconfig" +FILES_${PN}-gui = "${bindir}/flumotion-admin ${bindir}/flumotion-tester \ + ${libdir}/flumotion/python/flumotion/admin/gtk \ + ${libdir}/flumotion/python/flumotion/component/*/admin_gtk* \ + ${libdir}/flumotion/python/flumotion/component/*/*/admin_gtk* \ + ${libdir}/flumotion/python/flumotion/extern \ + ${libdir}/flumotion/python/flumotion/manager \ + ${libdir}/flumotion/python/flumotion/ui \ + ${libdir}/flumotion/python/flumotion/wizard \ + ${datadir}/pixmaps ${datadir}/flumotion ${datadir}/applications" -- cgit v1.2.3