From e39e5d959894710e7690d9134b8e5bfee73fc013 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Sat, 20 Apr 2019 10:41:23 +0530
Subject: orc.recipe: Bump to 0.4.29, use the tarball

Also, rename build-tools/orc.recipe to build-tools/orc-tool.recipe to
match the recipe name. Same as glib-tools.
---
 recipes/build-tools/orc-tool.recipe | 26 ++++++++++++++++++++++++++
 recipes/build-tools/orc.recipe      | 18 ------------------
 recipes/orc.recipe                  |  9 ++++++++-
 3 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 recipes/build-tools/orc-tool.recipe
 delete mode 100644 recipes/build-tools/orc.recipe

diff --git a/recipes/build-tools/orc-tool.recipe b/recipes/build-tools/orc-tool.recipe
new file mode 100644
index 00000000..4e5ef6b3
--- /dev/null
+++ b/recipes/build-tools/orc-tool.recipe
@@ -0,0 +1,26 @@
+# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
+
+
+class Recipe(recipe.Recipe):
+    name = 'orc-tool'
+    version = '0.4.29'
+
+    stype = SourceType.TARBALL
+    # These properties are only used when stype is TARBALL
+    url = 'https://gstreamer.freedesktop.org/src/orc/orc-%(version)s.tar.xz'
+    tarball_checksum = '4f8901f9144b5ec17dffdb33548b5f4c7f8049b0d1023be3462cdd64ec5a3ab2'
+    tarball_dirname = 'orc-%(version)s'
+    # These properties are only used when stype is GIT
+    remotes = {'origin': 'https://gitlab.freedesktop.org/gstreamer/orc.git'}
+    commit = 'origin/master'
+
+    btype = BuildType.MESON
+    licenses = [{License.BSD_like: ['COPYING']}]
+    deps = ['meson']
+    meson_options = {'benchmarks': 'disabled', 'tests': 'disabled',
+                     'tools': 'enabled', 'orc-test': 'enabled'}
+
+    files_libs = ['liborc-0.4', 'liborc-test-0.4']
+    files_devel = ['include/orc-0.4', 'lib/pkgconfig/orc-0.4.pc',
+        'bin/orc-bugreport%(bext)s', 'share/aclocal/orc.m4',
+        'bin/orcc%(bext)s']
diff --git a/recipes/build-tools/orc.recipe b/recipes/build-tools/orc.recipe
deleted file mode 100644
index 3ba4e32c..00000000
--- a/recipes/build-tools/orc.recipe
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
-
-
-class Recipe(recipe.Recipe):
-    name = 'orc-tool'
-    version = '0.4.28'
-    remotes = {'origin': 'https://gitlab.freedesktop.org/gstreamer/orc.git'}
-    commit = 'origin/master'
-    btype = BuildType.MESON
-    licenses = [{License.BSD_like: ['COPYING']}]
-    deps = ['meson']
-    meson_options = {'benchmarks': 'disabled', 'tests': 'disabled',
-                     'tools': 'enabled', 'orc-test': 'enabled'}
-
-    files_libs = ['liborc-0.4', 'liborc-test-0.4']
-    files_devel = ['include/orc-0.4', 'lib/pkgconfig/orc-0.4.pc',
-        'bin/orc-bugreport%(bext)s', 'share/aclocal/orc.m4',
-        'bin/orcc%(bext)s']
diff --git a/recipes/orc.recipe b/recipes/orc.recipe
index 8a8d1821..d41f21dc 100644
--- a/recipes/orc.recipe
+++ b/recipes/orc.recipe
@@ -3,9 +3,16 @@ from cerbero.tools.libtool import LibtoolLibrary
 
 class Recipe(recipe.Recipe):
     name = 'orc'
-    version = '0.4.28'
+    version = '0.4.29'
+
+    stype = SourceType.TARBALL
+    # These properties are only used when stype is TARBALL
+    url = 'https://gstreamer.freedesktop.org/src/orc/orc-%(version)s.tar.xz'
+    tarball_checksum = '4f8901f9144b5ec17dffdb33548b5f4c7f8049b0d1023be3462cdd64ec5a3ab2'
+    # These properties are only used when stype is GIT
     remotes = {'origin': 'https://gitlab.freedesktop.org/gstreamer/orc.git'}
     commit = 'origin/master'
+
     btype = BuildType.MESON
     licenses = [{License.BSD_like: ['COPYING']}]
     meson_options = {'benchmarks': 'disabled', 'tests': 'disabled',
-- 
cgit v1.2.3