summaryrefslogtreecommitdiff
path: root/meta-extras/packages/flumotion
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-09-30 22:15:13 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-30 22:16:10 +0100
commitc0c657bd92911788b96d9670620eabf024453752 (patch)
tree774a5e2d966d6ee87da17cd063580d5970564d00 /meta-extras/packages/flumotion
parente71a306f9cac8e30e689d607e2092e11a756ef5d (diff)
downloadopenembedded-core-c0c657bd92911788b96d9670620eabf024453752.tar.gz
openembedded-core-c0c657bd92911788b96d9670620eabf024453752.tar.bz2
openembedded-core-c0c657bd92911788b96d9670620eabf024453752.zip
Split meta-extras and meta-moblin out of the main repository
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-extras/packages/flumotion')
-rw-r--r--meta-extras/packages/flumotion/flumotion/no-check-for-python-stuff.patch68
-rw-r--r--meta-extras/packages/flumotion/flumotion/python-path.patch25
-rw-r--r--meta-extras/packages/flumotion/flumotion_0.4.1.bb41
3 files changed, 0 insertions, 134 deletions
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
deleted file mode 100644
index 08503c82e0..0000000000
--- a/meta-extras/packages/flumotion/flumotion/no-check-for-python-stuff.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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
deleted file mode 100644
index 377994e729..0000000000
--- a/meta-extras/packages/flumotion/flumotion/python-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 976c8c4142..0000000000
--- a/meta-extras/packages/flumotion/flumotion_0.4.1.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Fluendo Streaming Server"
-LICENSE = "GPL"
-DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk"
-RDEPENDS = "python-resource python-pprint python-threading \
- python-imaging python-xml python-curses \
- python-compression python-fcntl python-pygobject \
- python-pickle python-netclient python-datetime \
- python-crypt python-twisted-core python-twisted-web \
- python-lang python-zopeinterface python-textutils \
- python-gst python-misc"
-RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo"
-PR = "r10"
-
-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}-dbg += "${libdir}/flumotion/python/flumotion/extern/*/.debug/*"
-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/*.py* \
- ${libdir}/flumotion/python/flumotion/extern/fdpass/*.py* \
- ${libdir}/flumotion/python/flumotion/extern/fdpass/fdpass.so \
- ${libdir}/flumotion/python/flumotion/extern/pytrayicon/*.py* \
- ${libdir}/flumotion/python/flumotion/extern/pytrayicon/pytrayicon.so \
- ${libdir}/flumotion/python/flumotion/manager \
- ${libdir}/flumotion/python/flumotion/ui \
- ${libdir}/flumotion/python/flumotion/wizard \
- ${datadir}/pixmaps ${datadir}/flumotion ${datadir}/applications"