summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2016-04-15 14:03:25 +0100
committerTim-Philipp Müller <tim@centricular.com>2016-04-15 14:03:25 +0100
commit2dc37615086dca628c4eeab9be569915958c320a (patch)
treea0db6a1412a907d28241f6a44ad11631877c2ff7
parentf57415b8400e9a86e091cbfdcb31ba2ff10daa8d (diff)
Revert "Revert "recipes: update gstreamer recipes to 1.6.4""
This reverts commit 8f0739c42382a8117d7c6facad150f01e0ede322. This was a revert that was used for convenience after tagging 1.6.4, to point recipes back to origin/1.6. Only that it points some back to 1.6.3 now. Undo this again for now, and once we know 1.6.4 builds fine without any other changes needed in cerbero we'll point recipes back to origin/1.6 again.
-rw-r--r--recipes/gst-editing-services-1.0-static.recipe2
-rw-r--r--recipes/gst-editing-services-1.0.recipe2
-rw-r--r--recipes/gst-libav-1.0-static.recipe2
-rw-r--r--recipes/gst-libav-1.0.recipe2
-rw-r--r--recipes/gst-plugins-bad-1.0-static.recipe2
-rw-r--r--recipes/gst-plugins-bad-1.0.recipe2
-rw-r--r--recipes/gst-plugins-base-1.0-static.recipe2
-rw-r--r--recipes/gst-plugins-base-1.0.recipe2
-rw-r--r--recipes/gst-plugins-good-1.0-static.recipe2
-rw-r--r--recipes/gst-plugins-good-1.0.recipe2
-rw-r--r--recipes/gst-plugins-ugly-1.0-static.recipe2
-rw-r--r--recipes/gst-plugins-ugly-1.0.recipe2
-rw-r--r--recipes/gst-python-1.0.recipe2
-rw-r--r--recipes/gst-rtsp-server-1.0.recipe2
-rw-r--r--recipes/gstreamer-1.0-static.recipe2
-rw-r--r--recipes/gstreamer-1.0.recipe2
16 files changed, 16 insertions, 16 deletions
diff --git a/recipes/gst-editing-services-1.0-static.recipe b/recipes/gst-editing-services-1.0-static.recipe
index 02e8e861..4e11f035 100644
--- a/recipes/gst-editing-services-1.0-static.recipe
+++ b/recipes/gst-editing-services-1.0-static.recipe
@@ -9,7 +9,7 @@ class Recipe(custom.GStreamerStatic):
licenses = [License.LGPLv2Plus]
extra_configure_options = "--enable-static"
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-editing-services'}
- commit = 'origin/1.6'
+ commit = '1.6.4'
config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'gst-plugins-good-1.0', 'gst-validate']
diff --git a/recipes/gst-editing-services-1.0.recipe b/recipes/gst-editing-services-1.0.recipe
index 4ccc3939..bdc49624 100644
--- a/recipes/gst-editing-services-1.0.recipe
+++ b/recipes/gst-editing-services-1.0.recipe
@@ -6,7 +6,7 @@ class Recipe(recipe.Recipe):
version = '1.6'
licenses = [License.LGPLv2Plus]
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-editing-services'}
- commit = 'origin/1.6'
+ commit = '1.6.4'
config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
configure_options = "--program-prefix= --disable-examples --enable-static "
deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'gst-plugins-good-1.0', 'gst-validate']
diff --git a/recipes/gst-libav-1.0-static.recipe b/recipes/gst-libav-1.0-static.recipe
index 44b155be..ac78e783 100644
--- a/recipes/gst-libav-1.0-static.recipe
+++ b/recipes/gst-libav-1.0-static.recipe
@@ -14,7 +14,7 @@ class Recipe(custom.GStreamerStatic):
licenses = [License.LGPLv2Plus]
extra_configure_options = "--enable-static --enable-lgpl --disable-example"
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-libav'}
- commit = 'origin/1.6'
+ commit = '1.6.4'
deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'bzip2', 'zlib' ]
files_plugins_codecs_restricted_devel = ['libgstlibav']
diff --git a/recipes/gst-libav-1.0.recipe b/recipes/gst-libav-1.0.recipe
index 058a8533..8ec10007 100644
--- a/recipes/gst-libav-1.0.recipe
+++ b/recipes/gst-libav-1.0.recipe
@@ -10,7 +10,7 @@ class Recipe(recipe.Recipe):
config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
configure_options = "--enable-lgpl --disable-examples "
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-libav'}
- commit = 'origin/1.6'
+ commit = '1.6.4'
deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'bzip2', 'zlib' ]
files_plugins_codecs_restricted = ['lib/gstreamer-1.0/libgstlibav%(mext)s']
diff --git a/recipes/gst-plugins-bad-1.0-static.recipe b/recipes/gst-plugins-bad-1.0-static.recipe
index 5e80c1ca..473a0ea0 100644
--- a/recipes/gst-plugins-bad-1.0-static.recipe
+++ b/recipes/gst-plugins-bad-1.0-static.recipe
@@ -19,7 +19,7 @@ class Recipe(custom.GStreamerStatic):
--disable-vdpau --disable-voamrwbenc --disable-wildmidi \
--disable-xvid --disable-zbar --disable-sdi --disable-qt'
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-bad'}
- commit = '1.6.3'
+ commit = '1.6.4'
deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'bzip2', 'libass',
'faad2', 'libkate', 'zlib', 'openh264', 'opus', 'nettle', 'librtmp',
'libsrtp', 'schroedinger', 'libdca', 'libmms', 'libdvdnav',
diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe
index 8eb9b145..9f1c6c6f 100644
--- a/recipes/gst-plugins-bad-1.0.recipe
+++ b/recipes/gst-plugins-bad-1.0.recipe
@@ -26,7 +26,7 @@ class Recipe(recipe.Recipe):
--enable-libmms --enable-resindvd --enable-soundtouch \
--enable-voaacenc --enable-rsvg --enable-openjpeg'
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-bad'}
- commit = '1.6.3'
+ commit = '1.6.4'
deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'bzip2', 'libass',
'faad2', 'libkate', 'zlib', 'openh264', 'opus', 'nettle', 'librtmp',
'libsrtp', 'schroedinger', 'libdca', 'libmms', 'libdvdnav',
diff --git a/recipes/gst-plugins-base-1.0-static.recipe b/recipes/gst-plugins-base-1.0-static.recipe
index 155fe5c8..b0729340 100644
--- a/recipes/gst-plugins-base-1.0-static.recipe
+++ b/recipes/gst-plugins-base-1.0-static.recipe
@@ -8,7 +8,7 @@ class Recipe(custom.GStreamerStatic):
licenses = [License.LGPLv2Plus]
extra_configure_options = "--enable-static"
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-base'}
- commit = '1.6.3'
+ commit = '1.6.4'
deps = ['glib', 'gstreamer-1.0', 'libxml2', 'libogg', 'pango', 'libtheora',
'libvisual', 'libvorbis', 'zlib', 'orc']
platform_deps = {Platform.ANDROID: [ 'tremor' ], Platform.IOS: [ 'tremor' ] }
diff --git a/recipes/gst-plugins-base-1.0.recipe b/recipes/gst-plugins-base-1.0.recipe
index c7efc27f..01915128 100644
--- a/recipes/gst-plugins-base-1.0.recipe
+++ b/recipes/gst-plugins-base-1.0.recipe
@@ -8,7 +8,7 @@ class Recipe(recipe.Recipe):
config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
configure_options = "--enable-static --program-prefix= --disable-examples "
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-base'}
- commit = '1.6.3'
+ commit = '1.6.4'
deps = ['glib', 'gstreamer-1.0', 'libxml2', 'libogg', 'pango', 'libtheora',
'libvisual', 'libvorbis', 'zlib', 'orc']
platform_deps = {Platform.ANDROID: [ 'tremor' ], Platform.IOS: [ 'tremor' ] }
diff --git a/recipes/gst-plugins-good-1.0-static.recipe b/recipes/gst-plugins-good-1.0-static.recipe
index ed3683e2..98770963 100644
--- a/recipes/gst-plugins-good-1.0-static.recipe
+++ b/recipes/gst-plugins-good-1.0-static.recipe
@@ -8,7 +8,7 @@ class Recipe(custom.GStreamerStatic):
licenses = [License.LGPLv2Plus]
extra_configure_options = '--enable-static --disable-oss4 --disable-oss --disable-dv1394 --disable-aalib --disable-libcaca --disable-jack --disable-shout2'
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-good'}
- commit = '1.6.3'
+ commit = '1.6.4'
deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'libjpeg-turbo', 'libpng',
'speex', 'gdk-pixbuf', 'libsoup',
'orc', 'wavpack', 'flac', 'taglib', 'bzip2', 'zlib',
diff --git a/recipes/gst-plugins-good-1.0.recipe b/recipes/gst-plugins-good-1.0.recipe
index 94ced7e4..52b60791 100644
--- a/recipes/gst-plugins-good-1.0.recipe
+++ b/recipes/gst-plugins-good-1.0.recipe
@@ -8,7 +8,7 @@ class Recipe(recipe.Recipe):
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 '
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-good'}
- commit = '1.6.3'
+ commit = '1.6.4'
deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'libjpeg-turbo', 'libpng',
'speex', 'gdk-pixbuf', 'libsoup',
'orc', 'wavpack', 'flac', 'taglib', 'bzip2', 'zlib',
diff --git a/recipes/gst-plugins-ugly-1.0-static.recipe b/recipes/gst-plugins-ugly-1.0-static.recipe
index e6f8b1c2..e287bbac 100644
--- a/recipes/gst-plugins-ugly-1.0-static.recipe
+++ b/recipes/gst-plugins-ugly-1.0-static.recipe
@@ -8,7 +8,7 @@ class Recipe(custom.GStreamerStatic):
licenses = [License.LGPLv2Plus]
extra_configure_options = "--enable-static --disable-iec958 --disable-mpegstream --disable-cdio --disable-sidplay --disable-twolame"
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly'}
- commit = '1.6.3'
+ commit = '1.6.4'
deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'a52dec', 'opencore-amr',
'libdvdread', 'libmpeg2', 'libmad', 'x264', 'lame']
diff --git a/recipes/gst-plugins-ugly-1.0.recipe b/recipes/gst-plugins-ugly-1.0.recipe
index ca4a0bbb..b4e82969 100644
--- a/recipes/gst-plugins-ugly-1.0.recipe
+++ b/recipes/gst-plugins-ugly-1.0.recipe
@@ -8,7 +8,7 @@ class Recipe(recipe.Recipe):
config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
configure_options = "--disable-examples --disable-iec958 --disable-mpegstream --disable-cdio --disable-sidplay --disable-twolame "
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly'}
- commit = '1.6.3'
+ commit = '1.6.4'
deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'a52dec', 'opencore-amr',
'libdvdread', 'libmpeg2', 'libmad', 'x264', 'lame']
diff --git a/recipes/gst-python-1.0.recipe b/recipes/gst-python-1.0.recipe
index 3fb22f66..5ad13145 100644
--- a/recipes/gst-python-1.0.recipe
+++ b/recipes/gst-python-1.0.recipe
@@ -10,7 +10,7 @@ class Recipe(recipe.Recipe):
autoreconf = True
autoreconf_sh = 'sh autogen.sh'
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-python'}
- commit = 'origin/1.6'
+ commit = '1.6.4'
deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'glib', 'pygobject']
# FIXME: disable checks until it's properly fixed
make_check = None
diff --git a/recipes/gst-rtsp-server-1.0.recipe b/recipes/gst-rtsp-server-1.0.recipe
index d660aea2..bc798d8b 100644
--- a/recipes/gst-rtsp-server-1.0.recipe
+++ b/recipes/gst-rtsp-server-1.0.recipe
@@ -7,7 +7,7 @@ class Recipe(recipe.Recipe):
config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
configure_options = "--disable-examples --enable-static "
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gst-rtsp-server'}
- commit = 'origin/1.6'
+ commit = '1.6.4'
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 fe7d7e05..ff16f04e 100644
--- a/recipes/gstreamer-1.0-static.recipe
+++ b/recipes/gstreamer-1.0-static.recipe
@@ -8,7 +8,7 @@ class Recipe(custom.GStreamerStatic):
licenses = [License.LGPLv2_1Plus]
extra_configure_options = '--enable-static'
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gstreamer'}
- commit = 'origin/1.6'
+ commit = '1.6.4'
deps = ['glib', 'gtk-doc-lite']
# Static build will always fail on make check
make_check = None
diff --git a/recipes/gstreamer-1.0.recipe b/recipes/gstreamer-1.0.recipe
index 64da2b72..5f112081 100644
--- a/recipes/gstreamer-1.0.recipe
+++ b/recipes/gstreamer-1.0.recipe
@@ -24,7 +24,7 @@ class Recipe(recipe.Recipe):
config_sh = 'sh ./autogen.sh --noconfigure && ./configure'
configure_options = "--enable-static --program-prefix= --disable-examples "
remotes = {'origin': 'git://anongit.freedesktop.org/gstreamer/gstreamer'}
- commit = '1.6.3'
+ commit = '1.6.4'
deps = ['glib', 'gtk-doc-lite']
files_bins = ['gst-inspect-1.0',