gstreamer-1.0: Update 1.0 recipes with changes from the 0.10 versions

5 files changed, 34 insertions, 20 deletions

diff --git a/recipes/gst-libav-1.0.recipe b/recipes/gst-libav-1.0.recipe
index 33f7b7a..dd82fbd 100644
--- a/recipes/gst-libav-1.0.recipe
+++ b/recipes/gst-libav-1.0.recipe
@@ -18,7 +18,6 @@ class Recipe(recipe.Recipe):
     def prepare(self):
         if self.config.target_platform != Platform.LINUX:
             self.configure_options += ' --disable-gtk-doc'
-
         if self.config.target_platform == Platform.DARWIN:
             if self.config.target_arch == Architecture.X86_64:
                 asflags = ' -arch x86_64 -m64'
@@ -31,7 +30,7 @@ class Recipe(recipe.Recipe):
     def configure(self):
         super(recipe.Recipe, self).configure()
 
-        if self.config.target_platform == Platform.DARWIN:
+        if self.config.target_platform in [Platform.DARWIN, Platform.IOS]:
             if self.config.target_arch == Architecture.X86:
                 libav_path = os.path.join(self.build_dir, 'gst-libs', 'ext', 'libav')
                 replacements = {'HAVE_EBX_AVAILABLE=yes': 'HAVE_EBX_AVAILABLE=no',
diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe
index 3ad65ea..6de4816 100644
--- a/recipes/gst-plugins-bad-1.0.recipe
+++ b/recipes/gst-plugins-bad-1.0.recipe
@@ -11,7 +11,7 @@ class Recipe(recipe.Recipe):
     commit = 'upstream/1.0'
     deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'bzip2', 'libass',
             'faad2', 'libkate', 'zlib', 'opus',
-            'schroedinger', 'libdca', 'jasper', 'libmms', 'libdvdnav' ]
+            'schroedinger', 'libdca', 'jasper', 'libmms', 'libdvdnav', 'soundtouch' ]
 
     files_lang = ['gst-plugins-bad-1.0']
 
@@ -168,19 +168,21 @@ class Recipe(recipe.Recipe):
             self.files_codecs.remove('lib/gstreamer-1.0/libgstdccp%(mext)s')
             for d in ['libdvdnav']:
                 self.deps.remove(d)
+        if self.config.target_platform == Platform.IOS:
+            self.configure_options += ' --disable-apple_media'
         if self.config.variants.nodebug:
             self.configure_options += ' --disable-gst-debug'
 
-    def post_install(self):
-        if self.config.platform == Platform.WINDOWS and\
-                self.config.target_platform == Platform.WINDOWS:
-            from cerbero.utils.msbuild import MSBuild
-            from cerbero.utils import messages as m
-            solution = os.path.join(self.build_dir, 'win32', 'vs10', 'gst-plugins-bad.sln')
-            root = self.config.prefix.rsplit('/', 1)[0]
-            msbuild  = MSBuild(solution, self.config.target_arch,
-                               GSTREAMER_SDK_ROOT=root)
-            try:
-                msbuild.build()
-            except Exception, e:
-                m.error("The Direct Show plugins will not be built.")
+#    def post_install(self):
+#        if self.config.platform == Platform.WINDOWS and\
+#                self.config.target_platform == Platform.WINDOWS:
+#            from cerbero.utils.msbuild import MSBuild
+#            from cerbero.utils import messages as m
+#            solution = os.path.join(self.build_dir, 'win32', 'vs10', 'gst-plugins-bad.sln')
+#            root = self.config.prefix.rsplit('/', 1)[0]
+#            msbuild  = MSBuild(solution, self.config.target_arch,
+#                               GSTREAMER_SDK_ROOT=root)
+#            try:
+#                msbuild.build()
+#            except Exception, e:
+#                m.error("The Direct Show plugins will not be built.")
diff --git a/recipes/gst-plugins-base-1.0.recipe b/recipes/gst-plugins-base-1.0.recipe
index 182dc75..1b185e2 100644
--- a/recipes/gst-plugins-base-1.0.recipe
+++ b/recipes/gst-plugins-base-1.0.recipe
@@ -119,4 +119,6 @@ class Recipe(recipe.Recipe):
         if self.config.target_platform != Platform.LINUX:
             self.configure_options += '--disable-gtk-doc '
         if self.config.target_platform in [Platform.ANDROID, Platform.IOS]:
-            self.configure_options += ' --disable-alsa'
+            self.configure_options += ' --disable-alsa --disable-x'
+        if self.config.variants.nodebug:
+            self.configure_options += ' --disable-gst-debug'
diff --git a/recipes/gst-plugins-good-1.0.recipe b/recipes/gst-plugins-good-1.0.recipe
index 8b9b2ad..222d9da 100644
--- a/recipes/gst-plugins-good-1.0.recipe
+++ b/recipes/gst-plugins-good-1.0.recipe
@@ -12,7 +12,7 @@ class Recipe(recipe.Recipe):
     deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'jpeg', 'libpng',
             'speex', 'gdk-pixbuf', 'libsoup',
             'orc', 'wavpack', 'flac', 'taglib', 'bzip2', 'zlib',
-            'libvpx', 'libdv']
+            'libvpx', 'libdv', 'cairo']
 
 
     files_lang = ['gst-plugins-good-1.0']
@@ -114,7 +114,9 @@ class Recipe(recipe.Recipe):
             self.configure_options += '--disable-gtk-doc '
         if self.config.target_platform == Platform.WINDOWS:
             self.configure_options += '--disable-aalib --disable-esd '
-        if self.config.target_platform == Platform.ANDROID:
-            self.configure_options += '--disable-pulse'
+        if self.config.target_platform in [Platform.ANDROID, Platform.IOS]:
+            self.configure_options += '--disable-pulse --disable-x'
         if self.config.target_platform == Platform.LINUX:
             self.use_system_libs = True
+        if self.config.variants.nodebug:
+            self.configure_options += ' --disable-gst-debug'
diff --git a/recipes/gstreamer-1.0.recipe b/recipes/gstreamer-1.0.recipe
index 94f0b60..cf49149 100644
--- a/recipes/gstreamer-1.0.recipe
+++ b/recipes/gstreamer-1.0.recipe
@@ -45,3 +45,12 @@ class Recipe(recipe.Recipe):
         self.append_env['CPPFLAGS'] = " -Wno-error "
         if self.config.target_platform != Platform.LINUX:
             self.configure_options += ' --disable-gtk-doc --disable-docbook'
+
+        if self.config.target_platform == Platform.IOS:
+            # iOS only supports static builds so plugins must be linked
+            # and registered statically.
+            self.configure_options += ' --disable-registry '
+
+        if self.config.variants.nodebug:
+            self.configure_options += ' --disable-gst-debug'
+