Merge branch 'android'

Conflicts:
	cerbero/build/filesprovider.py
	cerbero/config.py
	packages/base-system/base-system.package
	packages/gobject-python.package
	packages/gstreamer-capture.package
	packages/gstreamer-clutter.package
	packages/gstreamer-codecs-gpl.package
	packages/gstreamer-codecs-restricted.package
	packages/gstreamer-codecs.package
	packages/gstreamer-core.package
	packages/gstreamer-dvd.package
	packages/gstreamer-editing.package
	packages/gstreamer-effects.package
	packages/gstreamer-ffmpeg.package
	packages/gstreamer-networking-restricted.package
	packages/gstreamer-networking.package
	packages/gstreamer-playback.package
	packages/gstreamer-python.package
	packages/gstreamer-sdk/gstreamer-sdk.package
	packages/gstreamer-system.package
	packages/gstreamer-tests.package
	packages/gstreamer-tutorials.package
	packages/gstreamer-visualizers.package
	packages/gstreamer-xcode-integration.package
	packages/gtk-python.package
	packages/gtk.package
	packages/snappy.package
	packages/vsintegration.package
	recipes/glib.recipe
	recipes/libvpx.recipe

27 files changed, 117 insertions, 65 deletions

diff --git a/packages/base-system/base-system.package b/packages/base-system/base-system.package
index d7ef763..18ed902 100644
--- a/packages/base-system/base-system.package
+++ b/packages/base-system/base-system.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'base-system'
     shortdesc = 'Base system dependencies'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
@@ -18,11 +18,14 @@ class Package(package.Package):
              'gdk-pixbuf:bins:libs:modules:lang', 'libffi:libs', 'freetype:libs',
              'glib:libs:lang:bins:schemas', 'orc:libs', 'pango:libs:modules',
              'libpng:libs', 'tiff:libs', 'jpeg:libs',
-             'libxml2:libs', 'libxslt:libs', 'pixman:libs',
+             'libxml2:libs', 'pixman:libs',
              'zlib:libs', 'bzip2:libs', 'libcroco:libs', 'librsvg:libs:loader']
 
     platform_files = {
         Platform.WINDOWS: ['gettext:libs:lang', 'libiconv:libs:lang',
-                           'winpthreads', 'mingw'],
-        Platform.DARWIN: ['gettext:libs:lang', 'libiconv:libs:lang']
+            'winpthreads', 'mingw', 'libxslt:libs'],
+        Platform.DARWIN: ['gettext:libs:lang', 'libiconv:libs:lang',
+            'libxslt:libs'],
+        Platform.LINUX: ['libxslt:libs'],
+        Platform.ANDROID: ['gettext:libs:lang', 'libiconv:libs:lang', 'stlport']
         }
diff --git a/packages/gobject-python.package b/packages/gobject-python.package
index b9d9824..039d790 100644
--- a/packages/gobject-python.package
+++ b/packages/gobject-python.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gobject-python'
     shortdesc = 'GLib/GObject python bindings'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     uuid = '58fe67c2-4565-431f-8287-e8fba892f853'
     vendor = 'GStreamer Project'
diff --git a/packages/gstreamer-capture.package b/packages/gstreamer-capture.package
index 850f904..5383c65 100644
--- a/packages/gstreamer-capture.package
+++ b/packages/gstreamer-capture.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-capture'
     shortdesc = 'GStreamer plugins for capture'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-clutter.package b/packages/gstreamer-clutter.package
index c4575f0..5f792ec 100644
--- a/packages/gstreamer-clutter.package
+++ b/packages/gstreamer-clutter.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-clutter'
     shortdesc = 'GStreamer Clutter support'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-codecs-gpl.package b/packages/gstreamer-codecs-gpl.package
index 5447a30..9660fa3 100644
--- a/packages/gstreamer-codecs-gpl.package
+++ b/packages/gstreamer-codecs-gpl.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-codecs-gpl'
     shortdesc = 'GStreamer codecs under the GPL license and/or with patents issues'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-codecs-restricted.package b/packages/gstreamer-codecs-restricted.package
index 1e21bf6..304726a 100644
--- a/packages/gstreamer-codecs-restricted.package
+++ b/packages/gstreamer-codecs-restricted.package
@@ -6,8 +6,8 @@ class Package(package.Package):
 
     name = 'gstreamer-codecs-restricted'
     shortdesc = 'GStreamer restricted codecs with potential patent issues in some countries'
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     url = "http://www.gstreamer.com"
     license = License.LGPL
     vendor = 'GStreamer Project'
diff --git a/packages/gstreamer-codecs.package b/packages/gstreamer-codecs.package
index 5a2f61e..40e695f 100644
--- a/packages/gstreamer-codecs.package
+++ b/packages/gstreamer-codecs.package
@@ -6,8 +6,8 @@ class Package(package.Package):
 
     name = 'gstreamer-codecs'
     shortdesc = 'GStreamer codecs'
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     url = "http://www.gstreamer.com"
     license = License.LGPL
     vendor = 'GStreamer Project'
@@ -21,12 +21,17 @@ class Package(package.Package):
             'libtheora:libs', 'libvorbis:libs', 'wavpack:libs', 'libvpx:libs',
             'taglib:libs', 'opus:libs',
             'gst-plugins-base:codecs', 'gst-plugins-good:codecs',
-            'gst-plugins-bad:codecs', 'gst-plugins-ugly:codecs']
+            'gst-plugins-bad:codecs', 'gst-plugins-ugly:codecs',
+            ]
     files_devel = ['gst-plugins-base-static:codecs_devel',
             'gst-plugins-good-static:codecs_devel',
             'gst-plugins-bad-static:codecs_devel',
             'gst-plugins-ugly-static:codecs_devel']
     platform_files = {
             Platform.LINUX: ['libdv:libs'],
-            Platform.DARWIN: ['libdv:libs']
+            Platform.DARWIN: ['libdv:libs'],
+            Platform.ANDROID: ['gst-amc:sys']
+    }
+    platform_files_devel = {
+            Platform.ANDROID: ['gst-amc-static:sys_devel']
     }
diff --git a/packages/gstreamer-core.package b/packages/gstreamer-core.package
index 61e72c5..4b49664 100644
--- a/packages/gstreamer-core.package
+++ b/packages/gstreamer-core.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-core'
     shortdesc = 'GStreamer core'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
@@ -23,4 +23,7 @@ class Package(package.Package):
             'gst-plugins-ugly:core:lang']
     files_devel = ['gstreamer-static', 'gst-plugins-base-static:core_devel',
             'gst-plugins-good-static:core_devel', 'gst-plugins-bad-static:core_devel']
-    platform_files = {Platform.DARWIN: ['gstreamer-osx-framework']}
+    platform_files = {
+            Platform.DARWIN: ['gstreamer-osx-framework'],
+            Platform.ANDROID: ['gst-android'],
+            }
diff --git a/packages/gstreamer-dvd.package b/packages/gstreamer-dvd.package
index d87e811..8e3fea3 100644
--- a/packages/gstreamer-dvd.package
+++ b/packages/gstreamer-dvd.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-dvd'
     shortdesc = 'GStreamer DVD support'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-editing.package b/packages/gstreamer-editing.package
index 016ba58..3254b06 100644
--- a/packages/gstreamer-editing.package
+++ b/packages/gstreamer-editing.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-editing'
     shortdesc = 'GStreamer plugins and libraries for editing'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-effects.package b/packages/gstreamer-effects.package
index 0749a3e..3114baf 100644
--- a/packages/gstreamer-effects.package
+++ b/packages/gstreamer-effects.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-effects'
     shortdesc = 'GStreamer effects and instrumentation plugins'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-encoding.package b/packages/gstreamer-encoding.package
index 3020224..efac9ee 100644
--- a/packages/gstreamer-encoding.package
+++ b/packages/gstreamer-encoding.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-encoding'
     shortdesc = 'GStreamer plugins for playback'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-ffmpeg.package b/packages/gstreamer-ffmpeg.package
index c9ed9e4..09b1d86 100644
--- a/packages/gstreamer-ffmpeg.package
+++ b/packages/gstreamer-ffmpeg.package
@@ -7,13 +7,13 @@ class Package(package.Package):
     name = 'gstreamer-libav'
     shortdesc = 'GStreamer libav wrapper'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
     uuid = 'afce67f2-4165-411f-8287-e8f2a892f853'
     deps = ['gstreamer-core']
 
-    files = ['gst-ffmpeg:codecs']
-    files_devel = ['gst-ffmpeg-static:codecs_devel']
+    files = ['gst-ffmpeg:codecs_restricted']
+    files_devel = ['gst-ffmpeg-static:codecs_restricted_devel']
diff --git a/packages/gstreamer-networking-restricted.package b/packages/gstreamer-networking-restricted.package
index ff8f397..86bdede 100644
--- a/packages/gstreamer-networking-restricted.package
+++ b/packages/gstreamer-networking-restricted.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-networking-restricted'
     shortdesc = 'GStreamer plugins for network protocols with potential patent issues in some countries'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-networking.package b/packages/gstreamer-networking.package
index 6307b1f..23efa22 100644
--- a/packages/gstreamer-networking.package
+++ b/packages/gstreamer-networking.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-networking'
     shortdesc = 'GStreamer plugins for network protocols'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
@@ -16,12 +16,27 @@ class Package(package.Package):
     deps = ['gstreamer-core']
 
     files = ['libsoup:libs',
-            'gst-plugins-base:net', 'gst-plugins-good:net', 'gst-plugins-ugly:net', 'gst-plugins-bad:net']
+            'gst-plugins-base:net', 'gst-plugins-good:net',
+            'gst-plugins-ugly:net', 'gst-plugins-bad:net']
     files_devel = ['gst-plugins-base-static:net_devel',
             'gst-plugins-good-static:net_devel',
             'gst-plugins-ugly-static:net_devel',
             'gst-plugins-bad-static:net_devel',
-            ]#'gst-rtsp-server:devel']
+            ]
+
+    platform_files = {
+        Platform.WINDOWS: [],
+        Platform.DARWIN: ['gst-rtsp-server:libs:python'],
+        Platform.LINUX: ['gst-rtsp-server:libs:python'],
+        Platform.ANDROID: [],
+        }
+
+    platform_files_devel = {
+        Platform.WINDOWS: [],
+        Platform.DARWIN: ['gst-rtsp-server:devel'],
+        Platform.LINUX: ['gst-rtsp-server:devel'],
+        Platform.ANDROID: [],
+        }
 
     def prepare(self):
         if self.config.target_platform != Platform.LINUX or \
@@ -32,8 +47,9 @@ class Package(package.Package):
                  DistroVersion.UBUNTU_PRECISE,
                  DistroVersion.FEDORA_16,
                  DistroVersion.FEDORA_17]:
-            self.files += ['libgcrypt:libs', 'gmp:libs', 'gnutls:libs:libs_extra:lang',
-                           'libgpg-error:libs:lang', 'libtasn1:libs',
-                           'nettle:libs', 'glib-networking']
+            self.files += ['gmp:libs', 'gnutls:libs:libs_extra:lang',
+                           'libtasn1:libs', 'nettle:libs',
+                           'glib-networking', 'glib-networking-static'
+                           ]
         elif self.config.target_platform == Platform.LINUX:
             self.sys_deps = {self.config.target_distro_version: ['glib-networking']}
diff --git a/packages/gstreamer-playback.package b/packages/gstreamer-playback.package
index 8dadf68..9f25cd1 100644
--- a/packages/gstreamer-playback.package
+++ b/packages/gstreamer-playback.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-playback'
     shortdesc = 'GStreamer plugins for playback'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-python.package b/packages/gstreamer-python.package
index 1befde5..473cdf5 100644
--- a/packages/gstreamer-python.package
+++ b/packages/gstreamer-python.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-python'
     shortdesc = 'GStreamer python bindings'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-sdk/gstreamer-sdk.package b/packages/gstreamer-sdk/gstreamer-sdk.package
index c0ec6a3..2940b82 100644
--- a/packages/gstreamer-sdk/gstreamer-sdk.package
+++ b/packages/gstreamer-sdk/gstreamer-sdk.package
@@ -8,9 +8,9 @@ class SDKPackage(package.SDKPackage):
     longdesc = "GStreamer SDK"
     title = "GStreamer SDK"
     url = "http://www.gstreamer.com"
-    version = '2012.9'
+    version = '2012.10'
     sdk_version = '0.10'
-    codename = 'Amazon'
+    codename = 'Brahmaputra'
     license = License.LGPL
     uuid = '3ffe67b2-4565-411f-8287-e8faa892f853'
     vendor = "GStreamer Project"
@@ -61,3 +61,11 @@ class SDKPackage(package.SDKPackage):
             },
         }
     osx_framework_library = ('GStreamer', 'lib/GStreamer')
+
+
+    def prepare(self):
+        if self.config.target_platform == Platform.ANDROID:
+            p = ['gstreamer-clutter', 'gstreamer-python', 'gtk+-2.0',
+                 'gtk+-2.0-python', 'snappy', 'gstreamer-dvd',
+                 'gstreamer-editing', 'gstreamer-tests']
+            self.packages = [ x for x in self.packages if x[0] not in p]
diff --git a/packages/gstreamer-system.package b/packages/gstreamer-system.package
index 605379b..348c316 100644
--- a/packages/gstreamer-system.package
+++ b/packages/gstreamer-system.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-system'
     shortdesc = 'GStreamer system plugins'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-tests.package b/packages/gstreamer-tests.package
index 2be71c2..3c1dee6 100644
--- a/packages/gstreamer-tests.package
+++ b/packages/gstreamer-tests.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-tests'
     shortdesc = 'Tests for GStreamer'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-tutorials.package b/packages/gstreamer-tutorials.package
index 29be6a4..b3f8e9c 100644
--- a/packages/gstreamer-tutorials.package
+++ b/packages/gstreamer-tutorials.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-tutorials'
     shortdesc = 'Tutorials for GStreamer'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-visualizers.package b/packages/gstreamer-visualizers.package
index 1557153..3ca2bcc 100644
--- a/packages/gstreamer-visualizers.package
+++ b/packages/gstreamer-visualizers.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gstreamer-visualizers'
     shortdesc = 'GStreamer visualization plugins'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gstreamer-xcode-integration.package b/packages/gstreamer-xcode-integration.package
new file mode 100644
index 0000000..3b2e9f9
--- /dev/null
+++ b/packages/gstreamer-xcode-integration.package
@@ -0,0 +1,17 @@
+# vi:si:et:sw=4:sts=4:ts=4:syntax=python
+# -*- Mode: Python -*-
+
+
+class Package(package.Package):
+
+    name = 'gstreamer-xcode-integration'
+    shortdesc = 'GStreamer XCode integration'
+    url = "http://www.gstreamer.com"
+    version = '2012.10'
+    codename = 'Brahmaputra'
+    license = License.LGPL
+    vendor = 'GStreamer Project'
+    org = 'com.gstreamer'
+    uuid = '533337c2-4565-413f-3287-e8f44442f853'
+
+    files_devel = ['gst-xcconfig']
diff --git a/packages/gtk-python.package b/packages/gtk-python.package
index 99723d0..5872b72 100644
--- a/packages/gtk-python.package
+++ b/packages/gtk-python.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gtk+-2.0-python'
     shortdesc = 'Gtk python bindings'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/gtk.package b/packages/gtk.package
index bfa6703..3b40ae7 100644
--- a/packages/gtk.package
+++ b/packages/gtk.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'gtk+-2.0'
     shortdesc = 'Gtk toolkit'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GTK+ Project'
     org = 'com.gstreamer'
diff --git a/packages/snappy.package b/packages/snappy.package
index b0b3cd0..59be852 100644
--- a/packages/snappy.package
+++ b/packages/snappy.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'snappy'
     shortdesc = 'Snappy media player'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'
diff --git a/packages/vsintegration.package b/packages/vsintegration.package
index dbcdada..ac52857 100644
--- a/packages/vsintegration.package
+++ b/packages/vsintegration.package
@@ -7,8 +7,8 @@ class Package(package.Package):
     name = 'vsintegration'
     shortdesc = 'Visual Studio Integration'
     url = "http://www.gstreamer.com"
-    version = '2012.9'
-    codename = 'Amazon'
+    version = '2012.10'
+    codename = 'Brahmaputra'
     license = License.LGPL
     vendor = 'GStreamer Project'
     org = 'com.gstreamer'