From 6ab1fb01b443ce8fcd0e81b15ba61c9d69f73d5ff37c5703351e32dd422c6f6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Mon, 4 Sep 2017 14:25:11 +0000
Subject: [PATCH] Accepting request 520822 from home:dimstar:Factory

Switch to meson, fixes build fail in :G

OBS-URL: https://build.opensuse.org/request/show/520822
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/orc?expand=0&rev=64
---
 orc-0.4.27.tar.gz |  3 +++
 orc-0.4.27.tar.xz |  3 ---
 orc.changes       | 11 +++++++++++
 orc.spec          | 21 +++++++++------------
 4 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 orc-0.4.27.tar.gz
 delete mode 100644 orc-0.4.27.tar.xz

diff --git a/orc-0.4.27.tar.gz b/orc-0.4.27.tar.gz
new file mode 100644
index 0000000..c3d25be
--- /dev/null
+++ b/orc-0.4.27.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49f331f1edbd43a0d8fae2634ded9c4a0fc8558a3388f6cbb203858e69165652
+size 281936
diff --git a/orc-0.4.27.tar.xz b/orc-0.4.27.tar.xz
deleted file mode 100644
index df4159c..0000000
--- a/orc-0.4.27.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51e53e58fc8158e5986a1f1a49a6d970c5b16493841cf7b9de2c2bde7ce36b93
-size 465116
diff --git a/orc.changes b/orc.changes
index 06b697e..3c28794 100644
--- a/orc.changes
+++ b/orc.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep  4 14:19:34 UTC 2017 - dimstar@opensuse.org
+
+- Switch to the meson build system, which knows how to cope with
+  GTK 1.26+:
+  + Use the tarball published on github (the automake bootstrapped
+    one does not contain the meson build system).
+  + Add meson BuildRequires and switch configure/make/make_install
+    macros to the relevant meson/meson_build/meson_install
+    variants.
+
 -------------------------------------------------------------------
 Mon Jul 17 16:15:12 UTC 2017 - zaitor@opensuse.org
 
diff --git a/orc.spec b/orc.spec
index 5f8891f..9143bc4 100644
--- a/orc.spec
+++ b/orc.spec
@@ -24,13 +24,12 @@ Summary:        The Oil Runtime Compiler
 License:        BSD-3-Clause
 Group:          Productivity/Multimedia/Other
 Url:            http://cgit.freedesktop.org/gstreamer/orc
-Source:         http://gstreamer.freedesktop.org/src/orc/%{name}-%{version}.tar.xz
+Source:         https://github.com/GStreamer/orc/archive/%{name}-%{version}.tar.gz
 Source99:       baselibs.conf
 BuildRequires:  gtk-doc >= 1.12
-BuildRequires:  pkg-config
+BuildRequires:  meson
 BuildRequires:  pkgconfig(glib-2.0)
 Provides:       %{name}-devel = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Orc is a library and set of tools for compiling and executing very simple
@@ -62,16 +61,14 @@ architectures, including saturated addition and subtraction, and many
 arithmetic operations.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version}
 
 %build
-%configure \
-    --disable-static \
-    --enable-gtk-doc
-make %{?_smp_mflags}
+%meson
+%meson_build
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%meson_install
 
 # These are some examples that seem not to make sense to be distributed
 rm -rf %{buildroot}%{_libdir}/orc
@@ -82,7 +79,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %check
 # Disable testsuite for almost all arches, it's only stable on x86_64
 %ifnarch aarch64 %{arm} %{ix86} ppc64le
-make check %{?_smp_mflags}
+%meson_test
 %endif
 
 %post -n liborc-0_4-0 -p /sbin/ldconfig
@@ -100,8 +97,8 @@ make check %{?_smp_mflags}
 
 %files doc
 %defattr(-,root,root)
-%dir /usr/share/gtk-doc
-%dir /usr/share/gtk-doc/html
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/html/orc/
 
 %files -n liborc-0_4-0