recipes: Workaround cerbero looking into first base class

To obtain the btype, cerbero seems to introspect the first base class,
with the introduction of multiple inheritance, this cause some
information not to be found. To workaround, we simply flatten the
hierarchy, so the recipe looks like having a single base class.

11 files changed, 16 insertions, 12 deletions

diff --git a/recipes/custom.py b/recipes/custom.py
index baa8d131..54026de2 100644
--- a/recipes/custom.py
+++ b/recipes/custom.py
@@ -10,13 +10,17 @@ from cerbero.config import Platform
 from cerbero.enums import License
 from cerbero.utils import shell, to_unixpath
 
-class GStreamer:
+class GStreamerBase:
 
     licenses = [License.LGPLv2Plus]
     version = '1.9'
     commit = 'origin/master'
 
-class GStreamerStatic(GStreamer, recipe.Recipe):
+class GStreamer(GStreamerBase, recipe.Recipe):
+
+    pass
+
+class GStreamerStatic(GStreamerBase, recipe.Recipe):
 
     gstreamer_version = '1.0'
     configure_options = "--enable-introspection=no --disable-examples --enable-static-plugins --disable-shared --enable-static "
diff --git a/recipes/gst-editing-services-1.0.recipe b/recipes/gst-editing-services-1.0.recipe
index 9d5377e8..68cf8a80 100644
--- a/recipes/gst-editing-services-1.0.recipe
+++ b/recipes/gst-editing-services-1.0.recipe
@@ -1,7 +1,7 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 from cerbero.utils import shell
 
-class Recipe(recipe.Recipe, custom.GStreamer):
+class Recipe(custom.GStreamer):
     name = 'gst-editing-services-1.0'
     licenses = [License.LGPLv2Plus]
     remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-editing-services'}
diff --git a/recipes/gst-libav-1.0.recipe b/recipes/gst-libav-1.0.recipe
index b59e1011..ca9ab2b2 100644
--- a/recipes/gst-libav-1.0.recipe
+++ b/recipes/gst-libav-1.0.recipe
@@ -1,7 +1,7 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 from cerbero.utils import shell
 
-class Recipe(recipe.Recipe, custom.GStreamer):
+class Recipe(custom.GStreamer):
     name = 'gst-libav-1.0'
     # TODO - check license - plugin is certainly LGPLv2+, but need to check
     #        the linked libs
diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe
index 472fea1c..e86ec94c 100644
--- a/recipes/gst-plugins-bad-1.0.recipe
+++ b/recipes/gst-plugins-bad-1.0.recipe
@@ -1,7 +1,7 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
 
-class Recipe(recipe.Recipe, custom.GStreamer):
+class Recipe(custom.GStreamer):
     name = 'gst-plugins-bad-1.0'
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     configure_options = '--enable-static --disable-introspection --disable-gsm \
diff --git a/recipes/gst-plugins-base-1.0.recipe b/recipes/gst-plugins-base-1.0.recipe
index e74b8c56..e3e64495 100644
--- a/recipes/gst-plugins-base-1.0.recipe
+++ b/recipes/gst-plugins-base-1.0.recipe
@@ -1,7 +1,7 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
 
-class Recipe(recipe.Recipe, custom.GStreamer):
+class Recipe(custom.GStreamer):
     name = 'gst-plugins-base-1.0'
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     configure_options = "--enable-static --program-prefix= --disable-examples "
diff --git a/recipes/gst-plugins-good-1.0.recipe b/recipes/gst-plugins-good-1.0.recipe
index f9ac7022..e5bb65d3 100644
--- a/recipes/gst-plugins-good-1.0.recipe
+++ b/recipes/gst-plugins-good-1.0.recipe
@@ -1,7 +1,7 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
 
-class Recipe(recipe.Recipe, custom.GStreamer):
+class Recipe(custom.GStreamer):
     name = 'gst-plugins-good-1.0'
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     configure_options = '--disable-examples --disable-oss4 --disable-oss --disable-dv1394 --disable-aalib --disable-libcaca --disable-jack --disable-shout2 '
diff --git a/recipes/gst-plugins-ugly-1.0.recipe b/recipes/gst-plugins-ugly-1.0.recipe
index f7a38101..544cf60e 100644
--- a/recipes/gst-plugins-ugly-1.0.recipe
+++ b/recipes/gst-plugins-ugly-1.0.recipe
@@ -1,7 +1,7 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
 
-class Recipe(recipe.Recipe, custom.GStreamer):
+class Recipe(custom.GStreamer):
     name = 'gst-plugins-ugly-1.0'
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     configure_options = "--disable-examples --disable-iec958 --disable-mpegstream --disable-cdio --disable-sidplay --disable-twolame "
diff --git a/recipes/gst-python-1.0.recipe b/recipes/gst-python-1.0.recipe
index 05438ef4..2014bcb6 100644
--- a/recipes/gst-python-1.0.recipe
+++ b/recipes/gst-python-1.0.recipe
@@ -1,7 +1,7 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
 
-class Recipe(recipe.Recipe, custom.GStreamer):
+class Recipe(custom.GStreamer):
     name = 'gst-python-1.0'
     # TODO: check license - some source files are LGPLv2+, others LGPLv2.1+ and
     #       COPYING is LGPLv2.1
diff --git a/recipes/gst-rtsp-server-1.0.recipe b/recipes/gst-rtsp-server-1.0.recipe
index 17199748..12a30f7e 100644
--- a/recipes/gst-rtsp-server-1.0.recipe
+++ b/recipes/gst-rtsp-server-1.0.recipe
@@ -1,6 +1,6 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
-class Recipe(recipe.Recipe, custom.GStreamer):
+class Recipe(custom.GStreamer):
     name = 'gst-rtsp-server-1.0'
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     configure_options = "--disable-examples --enable-static "
diff --git a/recipes/gst-validate.recipe b/recipes/gst-validate.recipe
index b11c4656..f54f07f4 100644
--- a/recipes/gst-validate.recipe
+++ b/recipes/gst-validate.recipe
@@ -1,7 +1,7 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 from cerbero.utils import shell
 
-class Recipe(recipe.Recipe, custom.GStreamer):
+class Recipe(custom.GStreamer):
     name = 'gst-validate'
     remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-devtools'}
     srcdir = 'validate'
diff --git a/recipes/gstreamer-1.0.recipe b/recipes/gstreamer-1.0.recipe
index 6f8dd1b1..373418a0 100644
--- a/recipes/gstreamer-1.0.recipe
+++ b/recipes/gstreamer-1.0.recipe
@@ -1,7 +1,7 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 import shutil
 
-class Recipe(recipe.Recipe, custom.GStreamer):
+class Recipe(custom.GStreamer):
     name = 'gstreamer-1.0'
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     configure_options = "--enable-static --program-prefix= --disable-examples "