20 files changed, 19 insertions, 47 deletions
diff --git a/recipes/gnonlin-1.0-static.recipe b/recipes/gnonlin-1.0-static.recipe
index dadcbb93..6f8b7838 100644
--- a/recipes/gnonlin-1.0-static.recipe
+++ b/recipes/gnonlin-1.0-static.recipe
@@ -3,7 +3,7 @@ from cerbero.utils import shell
 
 class Recipe(custom.GStreamerStatic):
     name = 'gnonlin-1.0-static'
-    version = '1.1.90'
+    version = '1.2'
     gstreamer_version = '1.0'
     licenses = [License.LGPLv2Plus]
     commit = 'origin/master'
diff --git a/recipes/gnonlin-1.0.recipe b/recipes/gnonlin-1.0.recipe
index 1239ee6f..87bd9f9f 100644
--- a/recipes/gnonlin-1.0.recipe
+++ b/recipes/gnonlin-1.0.recipe
@@ -3,7 +3,7 @@ from cerbero.utils import shell
 
 class Recipe(recipe.Recipe):
     name = 'gnonlin-1.0'
-    version = '1.1.90'
+    version = '1.2'
     licenses = [License.LGPLv2Plus]
     commit = 'origin/master'
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
diff --git a/recipes/gnonlin-static.recipe b/recipes/gnonlin-static.recipe
deleted file mode 100644
index 95c8ab45..00000000
--- a/recipes/gnonlin-static.recipe
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-from cerbero.utils import shell
-
-class Recipe(custom.GStreamerStatic):
-    name = 'gnonlin-static'
-    version = '0.10.17'
-    gstreamer_version = '0.10'
-    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)' "
-    make_check = None
-    remotes = {'upstream': 'git://anongit.freedesktop.org/gstreamer/gnonlin'}
-    deps = ['gstreamer', 'gst-plugins-base' ]
-
-    files_plugins_gnl_devel = ['libgnl']
diff --git a/recipes/gnonlin.recipe b/recipes/gnonlin.recipe
deleted file mode 100644
index 7ef94115..00000000
--- a/recipes/gnonlin.recipe
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-from cerbero.utils import shell
-
-class Recipe(recipe.Recipe):
-    name = 'gnonlin'
-    version = '0.10.17'
-    licenses = [License.LGPLv2Plus]
-    config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
-    configure_options = "--disable-examples --with-package-origin='http://www.gstreamer.com' --with-package-name='GStreamer GNonLin (GStreamer SDK)' "
-    remotes = {'upstream': 'git://anongit.freedesktop.org/gstreamer/gnonlin'}
-    deps = ['gstreamer', 'gst-plugins-base' ]
-
-    files_plugins_gnl = ['lib/gstreamer-0.10/libgnl%(mext)s']
diff --git a/recipes/gst-editing-services-1.0.recipe b/recipes/gst-editing-services-1.0.recipe
index 635efd26..8df7f0ef 100644
--- a/recipes/gst-editing-services-1.0.recipe
+++ b/recipes/gst-editing-services-1.0.recipe
@@ -3,7 +3,7 @@ from cerbero.utils import shell
 
 class Recipe(recipe.Recipe):
     name = 'gst-editing-services-1.0'
-    version = '1.1.90'
+    version = '1.2'
     licenses = [License.LGPLv2Plus]
     commit = 'origin/master'
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
diff --git a/recipes/gst-libav-1.0-static.recipe b/recipes/gst-libav-1.0-static.recipe
index 6083ce4f..f7362798 100644
--- a/recipes/gst-libav-1.0-static.recipe
+++ b/recipes/gst-libav-1.0-static.recipe
@@ -7,7 +7,7 @@ from cerbero.tools.libtool import LibtoolLibrary
 
 class Recipe(custom.GStreamerStatic):
     name = 'gst-libav-1.0-static'
-    version = '1.0'
+    version = '1.2'
     gstreamer_version = '1.0'
     # TODO - check license - plugin is certainly LGPLv2+, but need to check
     #        the linked libs
diff --git a/recipes/gst-libav-1.0.recipe b/recipes/gst-libav-1.0.recipe
index 8ce72a63..4868ab34 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 = '1.0'
+    version = '1.2'
     # TODO - check license - plugin is certainly LGPLv2+, but need to check
     #        the linked libs
     licenses = [License.LGPLv2Plus]
diff --git a/recipes/gst-plugins-bad-1.0-static.recipe b/recipes/gst-plugins-bad-1.0-static.recipe
index 3e7a30a2..0ca3924f 100644
--- a/recipes/gst-plugins-bad-1.0-static.recipe
+++ b/recipes/gst-plugins-bad-1.0-static.recipe
@@ -3,7 +3,7 @@
 
 class Recipe(custom.GStreamerStatic):
     name = 'gst-plugins-bad-1.0-static'
-    version = '1.0'
+    version = '1.2'
     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 --disable-yadif "
diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe
index 02557bfc..b63bafd7 100644
--- a/recipes/gst-plugins-bad-1.0.recipe
+++ b/recipes/gst-plugins-bad-1.0.recipe
@@ -3,7 +3,7 @@
 
 class Recipe(recipe.Recipe):
     name = 'gst-plugins-bad-1.0'
-    version = '1.0'
+    version = '1.2'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     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 --disable-yadif "
diff --git a/recipes/gst-plugins-base-1.0-static.recipe b/recipes/gst-plugins-base-1.0-static.recipe
index 1bb6963d..f9cc7a21 100644
--- a/recipes/gst-plugins-base-1.0-static.recipe
+++ b/recipes/gst-plugins-base-1.0-static.recipe
@@ -3,7 +3,7 @@
 
 class Recipe(custom.GStreamerStatic):
     name = 'gst-plugins-base-1.0-static'
-    version = '1.0'
+    version = '1.2'
     gstreamer_version = '1.0'
     licenses = [License.LGPLv2Plus]
     extra_configure_options = "--enable-static"
diff --git a/recipes/gst-plugins-base-1.0.recipe b/recipes/gst-plugins-base-1.0.recipe
index 6bbdfde0..7b23b4df 100644
--- a/recipes/gst-plugins-base-1.0.recipe
+++ b/recipes/gst-plugins-base-1.0.recipe
@@ -3,7 +3,7 @@
 
 class Recipe(recipe.Recipe):
     name = 'gst-plugins-base-1.0'
-    version = '1.0'
+    version = '1.2'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     configure_options = "--enable-static --program-prefix= --disable-introspection --disable-examples "
diff --git a/recipes/gst-plugins-gl-1.0-static.recipe b/recipes/gst-plugins-gl-1.0-static.recipe
index c5865bd6..3943a9c7 100644
--- a/recipes/gst-plugins-gl-1.0-static.recipe
+++ b/recipes/gst-plugins-gl-1.0-static.recipe
@@ -3,7 +3,7 @@ from cerbero.utils import shell
 
 class Recipe(custom.GStreamerStatic):
     name = 'gst-plugins-gl-1.0-static'
-    version = '1.0'
+    version = '1.2'
     gstreamer_version = '1.0'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
diff --git a/recipes/gst-plugins-gl-1.0.recipe b/recipes/gst-plugins-gl-1.0.recipe
index 6b294832..0d1ff969 100644
--- a/recipes/gst-plugins-gl-1.0.recipe
+++ b/recipes/gst-plugins-gl-1.0.recipe
@@ -3,7 +3,7 @@ from cerbero.utils import shell
 
 class Recipe(recipe.Recipe):
     name = 'gst-plugins-gl-1.0'
-    version = '1.0'
+    version = '1.2'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     configure_options = "--disable-examples "
diff --git a/recipes/gst-plugins-good-1.0-static.recipe b/recipes/gst-plugins-good-1.0-static.recipe
index 733bc801..18493054 100644
--- a/recipes/gst-plugins-good-1.0-static.recipe
+++ b/recipes/gst-plugins-good-1.0-static.recipe
@@ -3,7 +3,7 @@
 
 class Recipe(custom.GStreamerStatic):
     name = 'gst-plugins-good-1.0-static'
-    version = '1.0'
+    version = '1.2'
     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'
diff --git a/recipes/gst-plugins-good-1.0.recipe b/recipes/gst-plugins-good-1.0.recipe
index 29fe267a..5fb42c3e 100644
--- a/recipes/gst-plugins-good-1.0.recipe
+++ b/recipes/gst-plugins-good-1.0.recipe
@@ -3,7 +3,7 @@
 
 class Recipe(recipe.Recipe):
     name = 'gst-plugins-good-1.0'
-    version = '1.0'
+    version = '1.2'
     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-jack --disable-shout2 '
diff --git a/recipes/gst-plugins-ugly-1.0-static.recipe b/recipes/gst-plugins-ugly-1.0-static.recipe
index ce3b5105..9e52d539 100644
--- a/recipes/gst-plugins-ugly-1.0-static.recipe
+++ b/recipes/gst-plugins-ugly-1.0-static.recipe
@@ -3,7 +3,7 @@
 
 class Recipe(custom.GStreamerStatic):
     name = 'gst-plugins-ugly-1.0-static'
-    version = '1.0'
+    version = '1.2'
     gstreamer_version = '1.0'
     licenses = [License.LGPLv2Plus]
     extra_configure_options = "--enable-static --disable-iec958 --disable-mpegstream --disable-cdio --disable-lame --disable-sidplay --disable-twolame"
diff --git a/recipes/gst-plugins-ugly-1.0.recipe b/recipes/gst-plugins-ugly-1.0.recipe
index 501e097f..9c0c2f4d 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 = '1.0'
+    version = '1.2'
     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 "
diff --git a/recipes/gst-rtsp-server-1.0.recipe b/recipes/gst-rtsp-server-1.0.recipe
index ecac763f..f59abe9e 100644
--- a/recipes/gst-rtsp-server-1.0.recipe
+++ b/recipes/gst-rtsp-server-1.0.recipe
@@ -3,12 +3,12 @@ from cerbero.utils import shell
 
 class Recipe(recipe.Recipe):
     name = 'gst-rtsp-server-1.0'
-    version = '1.0'
+    version = '1.2'
     licenses = [License.LGPLv2Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     configure_options = "--disable-examples --enable-static "
     remotes = {'upstream': 'git://anongit.freedesktop.org/gstreamer/gst-rtsp-server'}
-    commit = 'origin/1.2'
+    commit = 'origin/master'
     deps = ['gstreamer-1.0', 'gst-plugins-base-1.0' ]
 
     files_devel = ['include/gstreamer-1.0/gst/rtsp-server', 'lib/pkgconfig/gstreamer-rtsp-server-1.0.pc']
diff --git a/recipes/gstreamer-1.0-static.recipe b/recipes/gstreamer-1.0-static.recipe
index 79347d45..e98c9847 100644
--- a/recipes/gstreamer-1.0-static.recipe
+++ b/recipes/gstreamer-1.0-static.recipe
@@ -3,7 +3,7 @@
 
 class Recipe(custom.GStreamerStatic):
     name = 'gstreamer-1.0-static'
-    version = '1.0'
+    version = '1.2'
     gstreamer_version = '1.0'
     licenses = [License.LGPLv2_1Plus]
     extra_configure_options = '--enable-static'
diff --git a/recipes/gstreamer-1.0.recipe b/recipes/gstreamer-1.0.recipe
index 7ddcaea0..26abe1a5 100644
--- a/recipes/gstreamer-1.0.recipe
+++ b/recipes/gstreamer-1.0.recipe
@@ -3,7 +3,7 @@
 
 class Recipe(recipe.Recipe):
     name = 'gstreamer-1.0'
-    version = '1.0'
+    version = '1.2'
     licenses = [License.LGPLv2_1Plus]
     config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
     configure_options = "--enable-static --program-prefix= --disable-instrospection --disable-examples "