gstreamer-1.0: Update recipes for 1.0

20 files changed, 602 insertions, 105 deletions

diff --git a/recipes/custom.py b/recipes/custom.py
index bbb5486..514c876 100644
--- a/recipes/custom.py
+++ b/recipes/custom.py
@@ -41,17 +41,18 @@ class GStreamerStatic(recipe.Recipe):
         self.platform_plugins_categories = [x for x in dir(self) if
                 x.startswith('platform_files_plugins')]
         self._files_list = []
+        plugin_path = 'lib/gstreamer-%s/static' % self.gstreamer_version
         for name in self.plugins_categories:
-            files =getattr(self, name)
-            f = ['lib/gstreamer-0.10/static/%s.a' % x for x in files]
-            f.extend(['lib/gstreamer-0.10/static/%s.la' % x for x in files])
+            files = getattr(self, name)
+            f = ['%s/%s.a' % (plugin_path, x) for x in files]
+            f.extend(['%s/%s.la' % (plugin_path, x) for x in files])
             setattr(self, name, f)
             self._files_list.extend(f)
         for name in self.platform_plugins_categories:
             platform_files = getattr(self, name)
             files = platform_files.get(self.config.target_platform, [])
-            f = ['lib/gstreamer-0.10/static/%s.a' % x for x in files]
-            f.extend(['lib/gstreamer-0.10/static/%s.la' % x for x in files])
+            f = ['%s/%s.a' % (plugin_path, x) for x in files]
+            f.extend(['%s/%s.la' % (plugin_path, x) for x in files])
             platform_files[self.config.target_platform] = f
             self._files_list.extend(f)
 
diff --git a/recipes/gnonlin-static.recipe b/recipes/gnonlin-static.recipe
index 7592fa1..c28b51b 100644
--- a/recipes/gnonlin-static.recipe
+++ b/recipes/gnonlin-static.recipe
@@ -4,6 +4,7 @@ from cerbero.utils import shell
 class Recipe(custom.GStreamerStatic):
     name = 'gnonlin-static'
     version = '0.10.17'
+    gstreamer_version = '1.0'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     extra_configure_options = "--disable-examples --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer GNonLin (GStreamer SDK)' "
diff --git a/recipes/gst-ffmpeg-static.recipe b/recipes/gst-ffmpeg-static.recipe
index 41906bd..fa32047 100644
--- a/recipes/gst-ffmpeg-static.recipe
+++ b/recipes/gst-ffmpeg-static.recipe
@@ -8,6 +8,7 @@ from cerbero.tools.libtool import LibtoolLibrary
 class Recipe(custom.GStreamerStatic):
     name = 'gst-ffmpeg-static'
     version = '0.10.13'
+    gstreamer_version = '0.10'
     # TODO - check license, plugin is certainly LGPLv2+, but need to check
     #        the linked libs
     licenses = [License.LGPLv2Plus]
diff --git a/recipes/gst-libav-1.0-static.recipe b/recipes/gst-libav-1.0-static.recipe
new file mode 100644
index 0000000..f5dd22e
--- /dev/null
+++ b/recipes/gst-libav-1.0-static.recipe
@@ -0,0 +1,82 @@
+# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+
+import shutil
+
+from cerbero.utils import shell
+from cerbero.tools.libtool import LibtoolLibrary
+
+class Recipe(custom.GStreamerStatic):
+    name = 'gst-libav-1.0-static'
+    version = '1.0'
+    gstreamer_version = '1.0'
+    # TODO - check license - plugin is certainly LGPLv2+, but need to check
+    #        the linked libs
+    licenses = [License.LGPLv2Plus]
+    extra_configure_options = "--enable-static --enable-lgpl --disable-example"
+    commit = 'upstream/1.0'
+    deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'bzip2', 'zlib' ]
+
+    files_plugins_codecs_restricted_devel = ['libgstlibav']
+
+    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'
+            elif self.config.target_arch == Architecture.X86:
+                asflags = ' -arch i386 -m32'
+            elif self.config.target_arch == Architecture.PPC:
+                asflags = ' -arch ppc'
+            self.configure_options += ' ASFLAGS="%s"' % asflags
+
+        super(Recipe, self).prepare()
+        for f in ['libavcodec', 'libavformat', 'libavutil']:
+            for ext in ['.a', '.la']:
+                path = os.path.join('lib', f + ext)
+                self.files_plugins_codecs_restricted_devel.append(path)
+
+    def configure(self):
+        super(recipe.Recipe, self).configure()
+
+        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',
+                                'HAVE_EBX_AVAILABLE 1': 'HAVE_EBX_AVAILABLE 0',}
+                shell.replace(os.path.join(libav_path, 'config.mak'), replacements)
+                shell.replace(os.path.join(libav_path, 'config.h'), replacements)
+
+        # log2 and log2f are not provided by bionic, but they are not checked
+        # properly
+        if self.config.target_platform == Platform.ANDROID:
+                libav_path = os.path.join(self.build_dir, 'gst-libs', 'ext', 'libav')
+                replacements = {'HAVE_LOG2 1': 'HAVE_LOG2 0',
+                                'HAVE_LOG2F 1': 'HAVE_LOG2F 0',}
+                shell.replace(os.path.join(libav_path, 'config.h'), replacements)
+
+    def post_install(self):
+        for n in ['avutil', 'avcodec', 'avformat']:
+            name = 'lib%s' % n
+            lib = '%s.a' % name
+            path = os.path.join(self.build_dir, 'gst-libs', 'ext', 'libav',
+                    name, lib)
+            shutil.copy(path, self.config.libdir)
+            deps = ['z', 'bz2']
+            if n == 'avcodec':
+                deps += ['avutil']
+            if n == 'avformat':
+                deps += ['avutil', 'avcodec']
+            libtool_la = LibtoolLibrary(n, None, None, None, self.config.libdir,
+                self.config.target_platform, deps)
+            libtool_la.change_value ('dlname', '')
+            libtool_la.change_value ('library_names', '')
+            libtool_la.save()
+        super(Recipe, self).post_install()
+        gstlibavlib = os.path.join(self.config.prefix, 'lib', 'gstreamer-1.0',
+                'static', 'libgstlibav.la')
+        shell.replace (gstlibavlib,
+                {'-lavformat': os.path.join(self.config.libdir, 'libavformat.la'),
+                '-lavcodec': os.path.join(self.config.libdir, 'libavcodec.la'),
+                '-lavutil': os.path.join(self.config.libdir, 'libavutil.la')})
+
diff --git a/recipes/gst-libav-1.0.recipe b/recipes/gst-libav-1.0.recipe
index dd82fbd..6324c0f 100644
--- a/recipes/gst-libav-1.0.recipe
+++ b/recipes/gst-libav-1.0.recipe
@@ -3,7 +3,7 @@ from cerbero.utils import shell
 
 class Recipe(recipe.Recipe):
     name = 'gst-libav-1.0'
-    version = '0.11.x'
+    version = '1.0'
     # TODO - check license - plugin is certainly LGPLv2+, but need to check
     #        the linked libs
     licenses = [License.LGPLv2Plus]
@@ -13,7 +13,7 @@ class Recipe(recipe.Recipe):
     commit = 'upstream/1.0'
     deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'bzip2', 'zlib' ]
 
-    files_codecs_restricted = ['lib/gstreamer-1.0/libgstlibav%(mext)s']
+    files_plugins_codecs_restricted = ['lib/gstreamer-1.0/libgstlibav%(mext)s']
 
     def prepare(self):
         if self.config.target_platform != Platform.LINUX:
diff --git a/recipes/gst-plugins-bad-1.0-static.recipe b/recipes/gst-plugins-bad-1.0-static.recipe
new file mode 100644
index 0000000..c0e885a
--- /dev/null
+++ b/recipes/gst-plugins-bad-1.0-static.recipe
@@ -0,0 +1,164 @@
+# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+
+
+class Recipe(custom.GStreamerStatic):
+    name = 'gst-plugins-bad-1.0-static'
+    version = '1.0'
+    gstreamer_version = '1.0'
+    licenses = [License.LGPLv2Plus]
+    extra_configure_options = "--enable-static --disable-gsm --disable-examples --disable-camerabin --disable-festival --disable-freeze --disable-h264parse --disable-inter --disable-legacyresample --disable-mpegvideoparse --disable-videomaxrate --disable-bz2 --disable-decklink --disable-linsys --disable-fbdev --disable-apexsink --disable-celt --disable-curl --disable-dc1394 --disable-directfb --disable-dirac --disable-divx --disable-faac --disable-flite --disable-gme --disable-ladspa --disable-lv2 --disable-mimic --disable-modplug --disable-mpeg2enc --disable-mplex --disable-musepack --disable-musicbrainz --disable-mythtv --disable-nas --disable-neon --disable-ofa --disable-openal --disable-opencv --disable-pvr --disable-sdl --disable-sndfile --disable-soundtouch --disable-spandsp --disable-swfdec --disable-teletextdec --disable-timidity --disable-vdpau --disable-voaacenc --disable-voamrwbenc --disable-wildmidi --disable-xvid --disable-zbar --disable-sdi --disable-cog"
+    commit = 'upstream/1.0'
+    deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'bzip2', 'libass',
+            'faad2', 'libkate', 'zlib', 'opus',
+            'schroedinger', 'libdca', 'jasper', 'libmms', 'libdvdnav', 'soundtouch' ]
+
+    files_plugins_effects_devel = [
+             'libgstautoconvert',
+             'libgstbayer',
+             'libgstcoloreffects',
+             'libgstfieldanalysis',
+             'libgstfrei0r',
+             'libgstgaudieffects',
+             'libgstgeometrictransform',
+             'libgstinterlace',
+             'libgstliveadder',
+             'libgstrawparse',
+             'libgstremovesilence',
+             'libgstscaletempoplugin',
+             'libgstsegmentclip',
+             'libgstsmooth',
+             'libgstspeed',
+    ]
+
+    files_plugins_codecs_devel = [
+             'libgstadpcmdec',
+             'libgstadpcmenc',
+             'libgstdtmf',
+             'libgstdvbsuboverlay',
+             'libgstdvdspu',
+             'libgstfragmented',
+             'libgstid3tag',
+             'libgstopus',
+             'libgstpcapparse',
+             'libgstpnm',
+             'libgstschro',
+             'libgstsiren',
+             'libgstsubenc',
+             'libgstvideoparsersbad',
+             'libgsty4mdec',
+    ]
+
+    platform_files_plugins_codecs_devel = {
+        Platform.ANDROID: [
+             'libgstandroidmedia',
+            ]
+    }
+
+    files_plugins_codecs_gpl_devel = [
+             'libgstassrender',
+    ]
+
+    files_plugins_codecs_restricted_devel = [
+             'libgstasfmux',
+             'libgstdtsdec',
+             'libgstfaad',
+             'libgstmpegpsdemux',
+             'libgstmpegpsmux',
+             'libgstmpegtsdemux',
+             'libgstmpegtsmux',
+    ]
+
+    files_plugins_dvd_devel = [
+             'libgstresindvd',
+    ]
+
+    files_plugins_net_devel = [
+             'libgstdataurisrc',
+             'libgstsdpelem',
+    ]
+
+    files_plugins_net_restricted_devel = [
+             'libgstmms',
+    ]
+
+    files_plugins_capture_devel = [
+             'libgstcamerabin2',
+            ]
+
+
+    platform_files_plugins_capture_devel = {
+        Platform.LINUX: [
+             'libgstdvb',
+            ],
+        Platform.WINDOWS: [
+             'libgstwinscreencap',
+            ]
+    }
+
+    files_plugins_vis_devel = [
+             'libgstaudiovisualizers',
+            ]
+
+    platform_files_plugins_sys_devel = {
+        Platform.LINUX: [
+            ],
+        Platform.WINDOWS: [
+             'libgstd3dvideosink',
+             'libgstdirectdrawsink',
+             'libgstwinks',
+             'libgstwasapi',
+            ],
+        Platform.DARWIN: [
+             'libgstapplemedia',
+             'libgstapplemedia_nonpublic',
+            ],
+        Platform.IOS: [
+             'libgsteglglessink',
+             'libgstapplemedia',
+             'libgstapplemedia_nonpublic',
+            ],
+        Platform.ANDROID: [
+             'libgsteglglessink',
+             'libgstopensles',
+            ]
+    }
+
+    def prepare(self):
+        self.append_env['CFLAGS'] = " -Wno-error "
+        self.append_env['CXXFLAGS'] = " -Wno-error "
+        self.append_env['CPPFLAGS'] = " -Wno-error "
+        if self.config.target_platform != Platform.LINUX:
+            self.configure_options += '--disable-gtk-doc '
+        if self.config.target_platform == Platform.WINDOWS:
+            self.configure_options += \
+                ' --disable-cog --disable-sdl '\
+                '--disable-cdaudio'
+        if self.config.target_platform == Platform.ANDROID:
+            for d in ['libdvdnav']:
+                self.deps.remove(d)
+        if self.config.variants.nodebug:
+            self.configure_options += ' --disable-gst-debug'
+
+        super(Recipe, self).prepare()
+
+        self.files_plugins_codecs_devel += [
+            'lib/libgstcodecparsers-1.0.la',
+            'lib/libgstcodecparsers-1.0.a',
+            'lib/libgstbasecamerabinsrc-1.0.la',
+            'lib/libgstbasecamerabinsrc-1.0.a',
+            'lib/libgstphotography-1.0.la',
+            'lib/libgstphotography-1.0.a']
+
+#    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-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe
index 25f7856..8651a96 100644
--- a/recipes/gst-plugins-bad-1.0.recipe
+++ b/recipes/gst-plugins-bad-1.0.recipe
@@ -3,10 +3,10 @@
 
 class Recipe(recipe.Recipe):
     name = 'gst-plugins-bad-1.0'
-    version = '0.11.x'
+    version = '1.0'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
-    configure_options = "--disable-introspection --disable-gsm --disable-examples --disable-camerabin --disable-festival --disable-freeze --disable-h264parse --disable-inter --disable-legacyresample --disable-mpegvideoparse --disable-videomaxrate --disable-bz2 --disable-decklink --disable-linsys --disable-fbdev --disable-apexsink --disable-celt --disable-curl --disable-dc1394 --disable-directfb --disable-dirac --disable-divx --disable-faac --disable-flite --disable-gme --disable-ladspa --disable-lv2 --disable-mimic --disable-modplug --disable-mpeg2enc --disable-mplex --disable-musepack --disable-musicbrainz --disable-mythtv --disable-nas --disable-neon --disable-ofa --disable-openal --disable-opencv --disable-pvr --disable-sdl --disable-sndfile --disable-soundtouch --disable-spandsp --disable-swfdec --disable-teletextdec --disable-timidity --disable-vdpau --disable-voaacenc --disable-voamrwbenc --disable-wildmidi --disable-xvid --disable-zbar --disable-sdi --disable-cog --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer Bad Plugins (GStreamer SDK)' "
+    configure_options = "--enable-static --disable-introspection --disable-gsm --disable-examples --disable-camerabin --disable-festival --disable-freeze --disable-h264parse --disable-inter --disable-legacyresample --disable-mpegvideoparse --disable-videomaxrate --disable-bz2 --disable-decklink --disable-linsys --disable-fbdev --disable-apexsink --disable-celt --disable-curl --disable-dc1394 --disable-directfb --disable-dirac --disable-divx --disable-faac --disable-flite --disable-gme --disable-ladspa --disable-lv2 --disable-mimic --disable-modplug --disable-mpeg2enc --disable-mplex --disable-musepack --disable-musicbrainz --disable-mythtv --disable-nas --disable-neon --disable-ofa --disable-openal --disable-opencv --disable-pvr --disable-sdl --disable-sndfile --disable-soundtouch --disable-spandsp --disable-swfdec --disable-teletextdec --disable-timidity --disable-vdpau --disable-voaacenc --disable-voamrwbenc --disable-wildmidi --disable-xvid --disable-zbar --disable-sdi --disable-cog --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer Bad Plugins (GStreamer SDK)' "
     remotes = {'upstream': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-bad'}
     commit = 'upstream/1.0'
     deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'bzip2', 'libass',
@@ -15,18 +15,15 @@ class Recipe(recipe.Recipe):
 
     files_lang = ['gst-plugins-bad-1.0']
 
-    files_effects = [
+    files_plugins_effects = [
              'lib/gstreamer-1.0/libgstautoconvert%(mext)s',
              'lib/gstreamer-1.0/libgstbayer%(mext)s',
              'lib/gstreamer-1.0/libgstcoloreffects%(mext)s',
-             'lib/gstreamer-1.0/libgstfaceoverlay%(mext)s',
              'lib/gstreamer-1.0/libgstfieldanalysis%(mext)s',
-             'lib/gstreamer-1.0/libgstfreeverb%(mext)s',
              'lib/gstreamer-1.0/libgstfrei0r%(mext)s',
              'lib/gstreamer-1.0/libgstgaudieffects%(mext)s',
              'lib/gstreamer-1.0/libgstgeometrictransform%(mext)s',
              'lib/gstreamer-1.0/libgstinterlace%(mext)s',
-             'lib/gstreamer-1.0/libgstjp2kdecimator%(mext)s',
              'lib/gstreamer-1.0/libgstliveadder%(mext)s',
              'lib/gstreamer-1.0/libgstrawparse%(mext)s',
              'lib/gstreamer-1.0/libgstremovesilence%(mext)s',
@@ -34,86 +31,68 @@ class Recipe(recipe.Recipe):
              'lib/gstreamer-1.0/libgstsegmentclip%(mext)s',
              'lib/gstreamer-1.0/libgstsmooth%(mext)s',
              'lib/gstreamer-1.0/libgstspeed%(mext)s',
-             'lib/gstreamer-1.0/libgststereo%(mext)s',
-             'lib/gstreamer-1.0/libgstvideofiltersbad%(mext)s',
-             'lib/gstreamer-1.0/libgstvideomeasure%(mext)s',
-             'lib/gstreamer-1.0/libgstvideosignal%(mext)s',
     ]
 
-    files_codecs = [
+    files_plugins_codecs = [
              'lib/gstreamer-1.0/libgstadpcmdec%(mext)s',
              'lib/gstreamer-1.0/libgstadpcmenc%(mext)s',
-             'lib/gstreamer-1.0/libgstaiff%(mext)s',
-             'lib/gstreamer-1.0/libgstcdxaparse%(mext)s',
-             'lib/gstreamer-1.0/libgstdccp%(mext)s',
              'lib/gstreamer-1.0/libgstdtmf%(mext)s',
              'lib/gstreamer-1.0/libgstdvbsuboverlay%(mext)s',
              'lib/gstreamer-1.0/libgstdvdspu%(mext)s',
              'lib/gstreamer-1.0/libgstfragmented%(mext)s',
-             'lib/gstreamer-1.0/libgsthdvparse%(mext)s',
              'lib/gstreamer-1.0/libgstid3tag%(mext)s',
-             'lib/gstreamer-1.0/libgstivfparse%(mext)s',
-             'lib/gstreamer-1.0/libgstjp2k%(mext)s',
-             'lib/gstreamer-1.0/libgstkate%(mext)s',
-             'lib/gstreamer-1.0/libgstmve%(mext)s',
-             'lib/gstreamer-1.0/libgstmxf%(mext)s',
-             'lib/gstreamer-1.0/libgstnsf%(mext)s',
-             'lib/gstreamer-1.0/libgstnuvdemux%(mext)s',
              'lib/gstreamer-1.0/libgstopus%(mext)s',
              'lib/gstreamer-1.0/libgstpcapparse%(mext)s',
              'lib/gstreamer-1.0/libgstpnm%(mext)s',
              'lib/gstreamer-1.0/libgstschro%(mext)s',
              'lib/gstreamer-1.0/libgstsiren%(mext)s',
              'lib/gstreamer-1.0/libgstsubenc%(mext)s',
-             'lib/gstreamer-1.0/libgsttta%(mext)s',
              'lib/gstreamer-1.0/libgstvideoparsersbad%(mext)s',
-             'lib/gstreamer-1.0/libgstvmnc%(mext)s',
              'lib/gstreamer-1.0/libgsty4mdec%(mext)s',
              '%(sdir)s/libgstcodecparsers-1.0%(sext)s',
     ]
 
-    platform_files_codecs = {
+    platform_files_plugins_codecs = {
         Platform.ANDROID: [
              'lib/gstreamer-1.0/libgstandroidmedia%(mext)s',
             ]
     }
 
-    files_codecs_gpl = [
+    files_plugins_codecs_gpl = [
              'lib/gstreamer-1.0/libgstassrender%(mext)s',
     ]
 
-    files_codecs_restricted = [
+    files_plugins_codecs_restricted = [
              'lib/gstreamer-1.0/libgstasfmux%(mext)s',
              'lib/gstreamer-1.0/libgstdtsdec%(mext)s',
              'lib/gstreamer-1.0/libgstfaad%(mext)s',
+             'lib/gstreamer-1.0/libgstmpegpsdemux%(mext)s',
              'lib/gstreamer-1.0/libgstmpegpsmux%(mext)s',
              'lib/gstreamer-1.0/libgstmpegtsdemux%(mext)s',
              'lib/gstreamer-1.0/libgstmpegtsmux%(mext)s',
     ]
 
-    files_dvd = [
+    files_plugins_dvd = [
              'lib/gstreamer-1.0/libgstresindvd%(mext)s',
     ]
 
-    files_net = [
+    files_plugins_net = [
              'lib/gstreamer-1.0/libgstdataurisrc%(mext)s',
-             'lib/gstreamer-1.0/libgstrtpmux%(mext)s',
-             'lib/gstreamer-1.0/libgstrtpvp8%(mext)s',
              'lib/gstreamer-1.0/libgstsdpelem%(mext)s',
     ]
 
-    files_net_restricted = [
+    files_plugins_net_restricted = [
              'lib/gstreamer-1.0/libgstmms%(mext)s',
     ]
 
-    files_capture = [
+    files_plugins_capture = [
              'lib/gstreamer-1.0/libgstcamerabin2%(mext)s',
              '%(sdir)s/libgstbasecamerabinsrc-1.0%(sext)s',
              '%(sdir)s/libgstphotography-1.0%(sext)s',
             ]
 
 
-    platform_files_capture = {
+    platform_files_plugins_capture = {
         Platform.LINUX: [
              'lib/gstreamer-1.0/libgstdvb%(mext)s',
             ],
@@ -122,33 +101,25 @@ class Recipe(recipe.Recipe):
             ]
     }
 
-    files_vis = [
+    files_plugins_vis = [
              'lib/gstreamer-1.0/libgstaudiovisualizers%(mext)s',
             ]
 
-    platform_files_capture = {
+    platform_files_plugins_sys = {
         Platform.LINUX: [
-             'lib/gstreamer-1.0/libgstdvb%(mext)s',
-            ],
-    }
-
-    platform_files_sys = {
-        Platform.LINUX: [
-             'lib/gstreamer-1.0/libgstvcdsrc%(mext)s',
             ],
         Platform.WINDOWS: [
              'lib/gstreamer-1.0/libgstd3dvideosink%(mext)s',
              'lib/gstreamer-1.0/libgstdirectdrawsink%(mext)s',
-             'lib/gstreamer-1.0/libgstdshowdecwrapper%(mext)s',
-             'lib/gstreamer-1.0/libgstdshowsrcwrapper%(mext)s',
-             'lib/gstreamer-1.0/libgstdshowvideosink%(mext)s',
              'lib/gstreamer-1.0/libgstwinks%(mext)s',
+             'lib/gstreamer-1.0/libgstwasapi%(mext)s',
             ],
         Platform.DARWIN: [
              'lib/gstreamer-1.0/libgstapplemedia%(mext)s',
              'lib/gstreamer-1.0/libgstapplemedia_nonpublic%(mext)s',
             ],
         Platform.IOS: [
+             'lib/gstreamer-1.0/libgsteglglessink%(mext)s',
              'lib/gstreamer-1.0/libgstapplemedia%(mext)s',
              'lib/gstreamer-1.0/libgstapplemedia_nonpublic%(mext)s',
             ],
@@ -169,12 +140,8 @@ class Recipe(recipe.Recipe):
                 ' --disable-cog --disable-sdl '\
                 '--disable-cdaudio'
         if self.config.target_platform == Platform.ANDROID:
-            self.configure_options += ' --disable-dccp'
-            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'
 
diff --git a/recipes/gst-plugins-bad-static.recipe b/recipes/gst-plugins-bad-static.recipe
index e3899a1..d7a6ab1 100644
--- a/recipes/gst-plugins-bad-static.recipe
+++ b/recipes/gst-plugins-bad-static.recipe
@@ -3,6 +3,7 @@
 class Recipe(custom.GStreamerStatic):
     name = 'gst-plugins-bad-static'
     version = '0.10.23'
+    gstreamer_version = '0.10'
     licenses = [License.LGPLv2Plus]
     extra_configure_options = " --disable-gsm --disable-camerabin --disable-festival --disable-freeze --disable-h264parse --disable-inter --disable-legacyresample --disable-mpegvideoparse --disable-videomaxrate --disable-bz2 --disable-decklink --disable-linsys --disable-fbdev --disable-apexsink --disable-celt --disable-curl --disable-dc1394 --disable-directfb --disable-dirac --disable-divx --disable-faac --disable-flite --disable-gme --disable-ladspa --disable-lv2 --disable-mimic --disable-modplug --disable-mpeg2enc --disable-mplex --disable-musepack --disable-musicbrainz --disable-mythtv --disable-nas --disable-neon --disable-ofa --disable-openal --disable-opencv --disable-pvr --disable-sdl --disable-sndfile --disable-spandsp --disable-swfdec --disable-teletextdec --disable-timidity --disable-vdpau --disable-voaacenc --disable-voamrwbenc --disable-wildmidi --disable-xvid --disable-zbar --disable-sdi --disable-cog "
 
diff --git a/recipes/gst-plugins-base-1.0-static.recipe b/recipes/gst-plugins-base-1.0-static.recipe
new file mode 100644
index 0000000..1646819
--- /dev/null
+++ b/recipes/gst-plugins-base-1.0-static.recipe
@@ -0,0 +1,86 @@
+# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+
+
+class Recipe(custom.GStreamerStatic):
+    name = 'gst-plugins-base-1.0-static'
+    version = '1.0'
+    gstreamer_version = '1.0'
+    licenses = [License.LGPLv2Plus]
+    extra_configure_options = "--enable-static"
+    commit = 'upstream/1.0'
+    deps = ['glib', 'gstreamer-1.0', 'libxml2', 'libogg', 'pango', 'libtheora',
+            'libvisual', 'libvorbis', 'zlib', 'orc']
+    platform_deps = { Platform.LINUX: [ 'cdparanoia' ], Platform.ANDROID: [ 'tremor' ], Platform.IOS: [ 'tremor' ] }
+    use_system_libs = True
+
+    files_plugins_core_devel = [
+             'libgstadder',
+             'libgstapp',
+             'libgstaudioconvert',
+             'libgstaudiorate',
+             'libgstaudioresample',
+             'libgstaudiotestsrc',
+             'libgstgio',
+             'libgstpango',
+             'libgsttypefindfunctions',
+             'libgstvideoconvert',
+             'libgstvideorate',
+             'libgstvideoscale',
+             'libgstvideotestsrc',
+             'libgstvolume',
+    ]
+
+    files_plugins_playback_devel = [
+             'libgstplayback',
+            ]
+
+    # Not used currently
+    files_plugins_encoding_devel = [
+             'libgstencodebin',
+            ]
+
+    files_plugins_codecs_devel = [
+             'libgstsubparse',
+             'libgstogg',
+             'libgsttheora',
+             'libgstvorbis',
+            ]
+
+    files_plugins_vis_devel = [
+             'libgstlibvisual',
+            ]
+
+    files_plugins_net_devel = [
+            'libgsttcp',
+    ]
+
+    platform_files_plugins_codecs_devel = {
+        Platform.ANDROID: [
+             'libgstivorbisdec',
+            ],
+        Platform.IOS: [
+             'libgstivorbisdec',
+            ]
+    }
+
+    platform_files_plugins_sys_devel = {
+        Platform.LINUX: [
+             'libgstalsa',
+             'libgstximagesink',
+             'libgstxvimagesink',
+             'libgstcdparanoia',
+            ]
+    }
+
+    def prepare(self):
+        self.append_env['CFLAGS'] = " -Wno-error "
+        self.append_env['CXXFLAGS'] = " -Wno-error "
+        self.append_env['CPPFLAGS'] = " -Wno-error "
+        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 --disable-x'
+        if self.config.variants.nodebug:
+            self.configure_options += ' --disable-gst-debug'
+
+        custom.GStreamerStatic.prepare(self)
diff --git a/recipes/gst-plugins-base-1.0.recipe b/recipes/gst-plugins-base-1.0.recipe
index b01ab6f..4d51419 100644
--- a/recipes/gst-plugins-base-1.0.recipe
+++ b/recipes/gst-plugins-base-1.0.recipe
@@ -3,34 +3,32 @@
 
 class Recipe(recipe.Recipe):
     name = 'gst-plugins-base-1.0'
-    version = '0.11.x'
+    version = '1.0'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
-    configure_options = "--disable-introspection --disable-examples --disable-gst_v4l --disable-gnome_vfs --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer Base Plugins (GStreamer SDK)' "
+    configure_options = "--enable-static --disable-introspection --disable-examples --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer Base Plugins (GStreamer SDK)' "
     remotes = {'upstream': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-base'}
     commit = 'upstream/1.0'
-    deps = ['glib', 'gstreamer-1.0', 'libogg', 'pango', 'libtheora', 'libvisual',
-            'libvorbis', 'zlib', 'orc']
+    deps = ['glib', 'gstreamer-1.0', 'libxml2', 'libogg', 'pango', 'libtheora',
+            'libvisual', 'libvorbis', 'zlib', 'orc']
     platform_deps = { Platform.LINUX: [ 'cdparanoia' ], Platform.ANDROID: [ 'tremor' ], Platform.IOS: [ 'tremor' ] }
     use_system_libs = True
 
-    files_bins = ['gst-discoverer-1.0', 'gst-visualize-1.0']
+    files_bins = ['gst-discoverer-1.0']
 
-    files_libs = ['libgstapp-1.0', 'libgstaudio-1.0', 'libgstcdda-1.0', 'libgstfloatcast-1.0',
-                 'libgstfft-1.0', 'libgstinterfaces-1.0', 'libgstnetbuffer-1.0',
-                 'libgstpbutils-1.0', 'libgstriff-1.0', 'libgstrtp-1.0',
+    files_libs = [#'libgstallocators-1.0'
+                 'libgstapp-1.0', 'libgstaudio-1.0',
+                 'libgstfft-1.0', 'libgstpbutils-1.0', 'libgstriff-1.0', 'libgstrtp-1.0',
                  'libgstrtsp-1.0', 'libgstsdp-1.0', 'libgsttag-1.0',
                  'libgstvideo-1.0',]
 
-    files_core = [
+    files_plugins_core = [
              'lib/gstreamer-1.0/libgstadder%(mext)s',
              'lib/gstreamer-1.0/libgstapp%(mext)s',
              'lib/gstreamer-1.0/libgstaudioconvert%(mext)s',
              'lib/gstreamer-1.0/libgstaudiorate%(mext)s',
              'lib/gstreamer-1.0/libgstaudioresample%(mext)s',
              'lib/gstreamer-1.0/libgstaudiotestsrc%(mext)s',
-             'lib/gstreamer-1.0/libgstffmpegcolorspace%(mext)s',
-             'lib/gstreamer-1.0/libgstgdp%(mext)s',
              'lib/gstreamer-1.0/libgstgio%(mext)s',
              'lib/gstreamer-1.0/libgstpango%(mext)s',
              'lib/gstreamer-1.0/libgsttypefindfunctions%(mext)s',
@@ -41,27 +39,28 @@ class Recipe(recipe.Recipe):
              'lib/gstreamer-1.0/libgstvolume%(mext)s',
     ]
 
-    files_playback = [
+    files_plugins_playback = [
              'lib/gstreamer-1.0/libgstplayback%(mext)s',
             ]
 
     # Not used currently
-    files_encoding = [
+    files_plugins_encoding = [
              'lib/gstreamer-1.0/libgstencodebin%(mext)s',
             ]
 
-    files_codecs = [
+    files_plugins_codecs = [
              'lib/gstreamer-1.0/libgstsubparse%(mext)s',
              'lib/gstreamer-1.0/libgstogg%(mext)s',
              'lib/gstreamer-1.0/libgsttheora%(mext)s',
              'lib/gstreamer-1.0/libgstvorbis%(mext)s',
             ]
 
-    files_vis = [
+    files_plugins_vis = [
              'lib/gstreamer-1.0/libgstlibvisual%(mext)s',
             ]
 
-    files_devel = [
+    files_plugins_devel = [
+            #'include/gstreamer-1.0/gst/allocators',
             'include/gstreamer-1.0/gst/app',
             'include/gstreamer-1.0/gst/audio',
             'include/gstreamer-1.0/gst/fft',
@@ -85,7 +84,11 @@ class Recipe(recipe.Recipe):
             'lib/pkgconfig/gstreamer-plugins-base-1.0.pc',
     ]
 
-    platform_files_codecs = {
+    files_plugins_net = [
+            'lib/gstreamer-1.0/libgsttcp%(mext)s',
+    ]
+
+    platform_files_plugins_codecs = {
         Platform.ANDROID: [
              'lib/gstreamer-1.0/libgstivorbisdec%(mext)s',
             ],
@@ -94,7 +97,7 @@ class Recipe(recipe.Recipe):
             ]
     }
 
-    platform_files_sys = {
+    platform_files_plugins_sys = {
         Platform.LINUX: [
              'lib/gstreamer-1.0/libgstalsa%(mext)s',
              'lib/gstreamer-1.0/libgstximagesink%(mext)s',
@@ -103,15 +106,6 @@ class Recipe(recipe.Recipe):
             ]
     }
 
-    platform_files_net = {
-        Platform.LINUX: [
-             'lib/gstreamer-1.0/libgsttcp%(mext)s',
-            ],
-        Platform.DARWIN: [
-             'lib/gstreamer-1.0/libgsttcp%(mext)s',
-            ]
-    }
-
     files_lang = ['gst-plugins-base-1.0']
 
 
diff --git a/recipes/gst-plugins-base-static.recipe b/recipes/gst-plugins-base-static.recipe
index 97b33d1..bea08d7 100644
--- a/recipes/gst-plugins-base-static.recipe
+++ b/recipes/gst-plugins-base-static.recipe
@@ -3,6 +3,7 @@
 class Recipe(custom.GStreamerStatic):
     name = 'gst-plugins-base-static'
     version = '0.10.36'
+    gstreamer_version = '0.10'
     licenses = [License.LGPLv2Plus]
     extra_configure_options = "--disable-gst_v4l --disable-gnome_vfs"
     deps = ['glib', 'gstreamer', 'libogg', 'pango', 'libtheora', 'libvisual',
diff --git a/recipes/gst-plugins-good-1.0-static.recipe b/recipes/gst-plugins-good-1.0-static.recipe
new file mode 100644
index 0000000..2508860
--- /dev/null
+++ b/recipes/gst-plugins-good-1.0-static.recipe
@@ -0,0 +1,124 @@
+# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+
+
+class Recipe(custom.GStreamerStatic):
+    name = 'gst-plugins-good-1.0-static'
+    version = '1.0'
+    gstreamer_version = '1.0'
+    licenses = [License.LGPLv2Plus]
+    extra_configure_options = '--enable-static --disable-oss4 --disable-oss --disable-dv1394 --disable-aalib --disable-libcaca --disable-jack --disable-shout2'
+    commit = 'upstream/1.0'
+    deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'jpeg', 'libpng',
+            'speex', 'gdk-pixbuf', 'libsoup',
+            'orc', 'wavpack', 'flac', 'taglib', 'bzip2', 'zlib',
+            'libvpx', 'libdv', 'cairo']
+
+
+    files_plugins_core_devel = [
+             'libgstautodetect',
+             'libgstvideofilter',
+    ]
+
+    files_plugins_effects_devel = [
+             'libgstalpha',
+             'libgstalphacolor',
+             'libgstaudiofx',
+             'libgstcairo',
+             'libgstcutter',
+             'libgstdebug',
+             'libgstdeinterlace',
+             'libgsteffectv',
+             'libgstequalizer',
+             'libgstgdkpixbuf',
+             'libgstimagefreeze',
+             'libgstinterleave',
+             'libgstlevel',
+             'libgstmultifile',
+             'libgstreplaygain',
+             'libgstshapewipe',
+             'libgstsmpte',
+             'libgstspectrum',
+             'libgstvideobox',
+             'libgstvideocrop',
+             'libgstvideomixer',
+    ]
+
+    files_plugins_codecs_devel = [
+             'libgstalaw',
+             'libgstapetag',
+             'libgstaudioparsers',
+             'libgstauparse',
+             'libgstavi',
+             'libgstdv',
+             'libgstflac',
+             'libgstflv',
+             'libgstflxdec',
+             'libgsticydemux',
+             'libgstid3demux',
+             'libgstisomp4',
+             'libgstjpeg',
+             'libgstmatroska',
+             'libgstmulaw',
+             'libgstmultipart',
+             'libgstpng',
+             'libgstspeex',
+             'libgsttaglib',
+             'libgstvpx',
+             'libgstwavenc',
+             'libgstwavpack',
+             'libgstwavparse',
+             'libgsty4menc',
+    ]
+
+    files_plugins_net_devel = [
+             'libgstrtsp',
+             'libgstrtp',
+             'libgstrtpmanager',
+             'libgstsouphttpsrc',
+             'libgstudp',
+    ]
+
+    files_plugins_vis_devel = [
+             'libgstgoom',
+             'libgstgoom2k1',
+            ]
+
+    platform_files_plugins_capture_devel = {
+        Platform.LINUX: [
+             'libgstvideo4linux2',
+             'libgstximagesrc',
+            ]
+    }
+
+    platform_files_plugins_sys_devel = {
+        Platform.WINDOWS: [
+             'libgstdirectsoundsink',
+            ],
+        Platform.LINUX: [
+             'libgstpulse',
+            ],
+        Platform.DARWIN: [
+             'libgstosxaudio',
+             'libgstosxvideosink',
+            ],
+        Platform.IOS: [
+             'libgstosxaudio'
+        ]
+    }
+
+    def prepare(self):
+        self.append_env['CFLAGS'] = " -Wno-error "
+        self.append_env['CXXFLAGS'] = " -Wno-error "
+        self.append_env['CPPFLAGS'] = " -Wno-error "
+        if self.config.target_platform != Platform.LINUX:
+            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 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'
+
+        custom.GStreamerStatic.prepare(self)
diff --git a/recipes/gst-plugins-good-1.0.recipe b/recipes/gst-plugins-good-1.0.recipe
index 222d9da..56a332e 100644
--- a/recipes/gst-plugins-good-1.0.recipe
+++ b/recipes/gst-plugins-good-1.0.recipe
@@ -3,10 +3,10 @@
 
 class Recipe(recipe.Recipe):
     name = 'gst-plugins-good-1.0'
-    version = '0.11.x'
+    version = '1.0'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
-    configure_options = '--disable-introspection --disable-examples --disable-oss4 --disable-oss --disable-dv1394 --disable-aalib --disable-libcaca --disable-esd --disable-gconf --disable-hal --disable-jack --disable-cairo --disable-shout2 --with-package-origin="http://www.gstreamer.com" --with-package-name=\'GStreamer Good Plugins (GStreamer SDK)\' '
+    configure_options = '--disable-introspection --disable-examples --disable-oss4 --disable-oss --disable-dv1394 --disable-aalib --disable-libcaca --disable-jack --disable-shout2 --with-package-origin="http://www.gstreamer.com" --with-package-name=\'GStreamer Good Plugins (GStreamer SDK)\' '
     remotes = {'upstream': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-good'}
     commit = 'upstream/1.0'
     deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'jpeg', 'libpng',
@@ -17,15 +17,16 @@ class Recipe(recipe.Recipe):
 
     files_lang = ['gst-plugins-good-1.0']
 
-    files_core = [
+    files_plugins_core = [
              'lib/gstreamer-1.0/libgstautodetect%(mext)s',
              'lib/gstreamer-1.0/libgstvideofilter%(mext)s',
     ]
 
-    files_effects = [
+    files_plugins_effects = [
              'lib/gstreamer-1.0/libgstalpha%(mext)s',
              'lib/gstreamer-1.0/libgstalphacolor%(mext)s',
              'lib/gstreamer-1.0/libgstaudiofx%(mext)s',
+             'lib/gstreamer-1.0/libgstcairo%(mext)s',
              'lib/gstreamer-1.0/libgstcutter%(mext)s',
              'lib/gstreamer-1.0/libgstdebug%(mext)s',
              'lib/gstreamer-1.0/libgstdeinterlace%(mext)s',
@@ -45,9 +46,8 @@ class Recipe(recipe.Recipe):
              'lib/gstreamer-1.0/libgstvideomixer%(mext)s',
     ]
 
-    files_codecs = [
+    files_plugins_codecs = [
              'lib/gstreamer-1.0/libgstalaw%(mext)s',
-             'lib/gstreamer-1.0/libgstannodex%(mext)s',
              'lib/gstreamer-1.0/libgstapetag%(mext)s',
              'lib/gstreamer-1.0/libgstaudioparsers%(mext)s',
              'lib/gstreamer-1.0/libgstauparse%(mext)s',
@@ -73,7 +73,7 @@ class Recipe(recipe.Recipe):
              'lib/gstreamer-1.0/libgsty4menc%(mext)s',
     ]
 
-    files_net = [
+    files_plugins_net = [
              'lib/gstreamer-1.0/libgstrtsp%(mext)s',
              'lib/gstreamer-1.0/libgstrtp%(mext)s',
              'lib/gstreamer-1.0/libgstrtpmanager%(mext)s',
@@ -81,19 +81,19 @@ class Recipe(recipe.Recipe):
              'lib/gstreamer-1.0/libgstudp%(mext)s',
     ]
 
-    files_vis = [
+    files_plugins_vis = [
              'lib/gstreamer-1.0/libgstgoom%(mext)s',
              'lib/gstreamer-1.0/libgstgoom2k1%(mext)s',
             ]
 
-    platform_files_capture = {
+    platform_files_plugins_capture = {
         Platform.LINUX: [
              'lib/gstreamer-1.0/libgstvideo4linux2%(mext)s',
              'lib/gstreamer-1.0/libgstximagesrc%(mext)s',
             ]
     }
 
-    platform_files_sys = {
+    platform_files_plugins_sys = {
         Platform.WINDOWS: [
              'lib/gstreamer-1.0/libgstdirectsoundsink%(mext)s',
             ],
@@ -103,7 +103,10 @@ class Recipe(recipe.Recipe):
         Platform.DARWIN: [
              'lib/gstreamer-1.0/libgstosxaudio%(mext)s',
              'lib/gstreamer-1.0/libgstosxvideosink%(mext)s',
-            ]
+            ],
+        Platform.IOS: [
+             'lib/gstreamer-1.0/libgstosxaudio%(mext)s'
+        ]
     }
 
     def prepare(self):
diff --git a/recipes/gst-plugins-good-static.recipe b/recipes/gst-plugins-good-static.recipe
index 6bd2a8e..f9962f2 100644
--- a/recipes/gst-plugins-good-static.recipe
+++ b/recipes/gst-plugins-good-static.recipe
@@ -4,6 +4,7 @@
 class Recipe(custom.GStreamerStatic):
     name = 'gst-plugins-good-static'
     version = '0.10.31'
+    gstreamer_version = '0.10'
     licenses = [License.LGPLv2Plus]
     extra_configure_options = ' --disable-oss4 --disable-oss --disable-dv1394 --disable-aalib --disable-libcaca --disable-esd --disable-gconf --disable-hal --disable-jack --disable-shout2'
     deps = ['gstreamer', 'gst-plugins-base', 'jpeg', 'libpng',
diff --git a/recipes/gst-plugins-ugly-1.0-static.recipe b/recipes/gst-plugins-ugly-1.0-static.recipe
new file mode 100644
index 0000000..dde0fbe
--- /dev/null
+++ b/recipes/gst-plugins-ugly-1.0-static.recipe
@@ -0,0 +1,39 @@
+# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+
+
+class Recipe(custom.GStreamerStatic):
+    name = 'gst-plugins-ugly-1.0-static'
+    version = '1.0'
+    gstreamer_version = '1.0'
+    licenses = [License.LGPLv2Plus]
+    extra_configure_options = "--enable-static --disable-iec958 --disable-mpegstream --disable-cdio --disable-lame --disable-sidplay --disable-twolame --disable-x264"
+    commit = 'upstream/1.0'
+    deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'a52dec', 'opencore-amr',
+            'libdvdread', 'libmpeg2', 'libmad']
+
+    files_plugins_codecs_restricted_devel = [
+             'libgsta52dec',
+             'libgstamrnb',
+             'libgstamrwbdec',
+             'libgstasf',
+             'libgstmad',
+             'libgstmpeg2dec',
+             'libgstxingmux',
+             'libgstrmdemux',
+    ]
+
+    files_plugins_dvd_devel = [
+             'libgstdvdlpcmdec',
+             'libgstdvdread',
+    ]
+
+    def prepare(self):
+        self.append_env['CFLAGS'] = " -Wno-error "
+        self.append_env['CXXFLAGS'] = " -Wno-error "
+        self.append_env['CPPFLAGS'] = " -Wno-error "
+        if self.config.target_platform != Platform.LINUX:
+            self.configure_options += ' --disable-gtk-doc'
+        if self.config.variants.nodebug:
+            self.configure_options += ' --disable-gst-debug'
+
+        custom.GStreamerStatic.prepare(self)
diff --git a/recipes/gst-plugins-ugly-1.0.recipe b/recipes/gst-plugins-ugly-1.0.recipe
index 847cd4a..0d1b34e 100644
--- a/recipes/gst-plugins-ugly-1.0.recipe
+++ b/recipes/gst-plugins-ugly-1.0.recipe
@@ -3,7 +3,7 @@
 
 class Recipe(recipe.Recipe):
     name = 'gst-plugins-ugly-1.0'
-    version = '0.11.x'
+    version = '1.0'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     configure_options = "--disable-introspection --disable-examples --disable-iec958 --disable-mpegstream --disable-cdio --disable-lame --disable-sidplay --disable-twolame --disable-x264 --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer Ugly Plugins (GStreamer SDK)' "
@@ -12,7 +12,7 @@ class Recipe(recipe.Recipe):
     deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'a52dec', 'opencore-amr',
             'libdvdread', 'libmpeg2', 'libmad']
 
-    files_codecs_restricted = [
+    files_plugins_codecs_restricted = [
              'lib/gstreamer-1.0/libgsta52dec%(mext)s',
              'lib/gstreamer-1.0/libgstamrnb%(mext)s',
              'lib/gstreamer-1.0/libgstamrwbdec%(mext)s',
@@ -23,7 +23,7 @@ class Recipe(recipe.Recipe):
              'lib/gstreamer-1.0/libgstrmdemux%(mext)s',
     ]
 
-    files_dvd = [
+    files_plugins_dvd = [
              'lib/gstreamer-1.0/libgstdvdlpcmdec%(mext)s',
              'lib/gstreamer-1.0/libgstdvdread%(mext)s',
     ]
diff --git a/recipes/gst-plugins-ugly-static.recipe b/recipes/gst-plugins-ugly-static.recipe
index 3f1c2ff..c148734 100644
--- a/recipes/gst-plugins-ugly-static.recipe
+++ b/recipes/gst-plugins-ugly-static.recipe
@@ -4,6 +4,7 @@
 class Recipe(custom.GStreamerStatic):
     name = 'gst-plugins-ugly-static'
     version = '0.10.19'
+    gstreamer_version = '0.10'
     licenses = [License.LGPLv2Plus]
     extra_configure_options = " --disable-iec958 --disable-mpegstream --disable-cdio --disable-lame --disable-sidplay --disable-twolame --disable-x264"
     deps = ['gstreamer', 'gst-plugins-base', 'a52dec', 'opencore-amr',
diff --git a/recipes/gstreamer-1.0-static.recipe b/recipes/gstreamer-1.0-static.recipe
new file mode 100644
index 0000000..0c3a300
--- /dev/null
+++ b/recipes/gstreamer-1.0-static.recipe
@@ -0,0 +1,32 @@
+# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+
+
+class Recipe(custom.GStreamerStatic):
+    name = 'gstreamer-1.0-static'
+    version = '1.0'
+    gstreamer_version = '1.0'
+    licenses = [License.LGPLv2_1Plus]
+    extra_configure_options = '--enable-static'
+    commit = 'upstream/1.0'
+    deps = ['glib', 'gtk-doc-lite']
+    # Static build will always fail on make check
+    make_check = None
+
+    files_plugins_core_devel = ['libgstcoreelements']
+
+    def prepare(self):
+        self.append_env['CFLAGS'] = " -Wno-error "
+        self.append_env['CXXFLAGS'] = " -Wno-error "
+        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'
+
+        custom.GStreamerStatic.prepare(self)
diff --git a/recipes/gstreamer-1.0.recipe b/recipes/gstreamer-1.0.recipe
index cf49149..d8eb114 100644
--- a/recipes/gstreamer-1.0.recipe
+++ b/recipes/gstreamer-1.0.recipe
@@ -3,23 +3,22 @@
 
 class Recipe(recipe.Recipe):
     name = 'gstreamer-1.0'
-    version = '0.11.x'
+    version = '1.0'
     licenses = [License.LGPLv2_1Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
-    configure_options = "--program-prefix= --disable-instrospection --disable-examples --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer (GStreamer SDK) '"
+    configure_options = "--enable-static --program-prefix= --disable-instrospection --disable-examples --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer (GStreamer SDK) '"
     remotes = {'upstream': 'git://anongit.freedesktop.org/gstreamer/gstreamer'}
     commit = 'upstream/1.0'
-    deps = ['glib', 'libxml2', 'gtk-doc-lite']
+    deps = ['glib', 'gtk-doc-lite']
 
     files_bins = ['gst-inspect-1.0',
                   'gst-typefind-1.0',
                   'gst-launch-1.0']
 
     files_libs = ['libgstbase-1.0', 'libgstcheck-1.0', 'libgstcontroller-1.0',
-                  'libgstdataprotocol-1.0', 'libgstnet-1.0',
-                  'libgstreamer-1.0']
+                  'libgstnet-1.0', 'libgstreamer-1.0']
 
-    files_plugins = ['lib/gstreamer-1.0/libgstcoreelements%(mext)s']
+    files_plugins_core = ['lib/gstreamer-1.0/libgstcoreelements%(mext)s']
 
     files_misc = ['libexec/gstreamer-1.0/gst-plugin-scanner%(bext)s']
 
@@ -28,7 +27,6 @@ class Recipe(recipe.Recipe):
             'include/gstreamer-1.0/gst/base',
             'include/gstreamer-1.0/gst/check',
             'include/gstreamer-1.0/gst/controller',
-            'include/gstreamer-1.0/gst/dataprotocol',
             'include/gstreamer-1.0/gst/net',
             'lib/pkgconfig/gstreamer-1.0.pc',
             'lib/pkgconfig/gstreamer-base-1.0.pc',
diff --git a/recipes/gstreamer-static.recipe b/recipes/gstreamer-static.recipe
index 5191b03..1919db4 100644
--- a/recipes/gstreamer-static.recipe
+++ b/recipes/gstreamer-static.recipe
@@ -3,6 +3,7 @@
 class Recipe(custom.GStreamerStatic):
     name = 'gstreamer-static'
     version = '0.10.36'
+    gstreamer_version = '0.10'
     licenses = [License.LGPLv2_1Plus]
     deps = ['glib', 'libxml2', 'gtk-doc-lite']
     # Static build will always fail on make check