[gnome-continuous] Update the Meson build-api patch for GStreamer
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] Update the Meson build-api patch for GStreamer
- Date: Thu, 4 May 2017 20:25:24 +0000 (UTC)
commit fed783738a4cdfd467bfea36bce23e6ab49d115b
Author: Emmanuele Bassi <ebassi gnome org>
Date: Thu May 4 21:24:41 2017 +0100
Update the Meson build-api patch for GStreamer
Use the right Meson option for disabling GTK-Doc.
manifest.json | 2 ++
patches/gstreamer-meson-buildapi.patch | 13 ++++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index b8340ee..3c1009e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -695,10 +695,12 @@
"config-opts": ["--disable-gtk-doc"]},
{"src": "fd-gstreamer:gstreamer",
+ "config-opts": ["--disable-gtk-doc"],
"patches": ["gstreamer-meson-buildapi.patch"]},
{"src": "fd-gstreamer:gst-plugins-base",
"config-opts": ["--with-gtk=3.0",
+ "--disable-gtk-doc",
"--disable-tests",
"--disable-gnome_vfs",
"--disable-fatal-warnings"]},
diff --git a/patches/gstreamer-meson-buildapi.patch b/patches/gstreamer-meson-buildapi.patch
index d1a053e..d59a1e6 100644
--- a/patches/gstreamer-meson-buildapi.patch
+++ b/patches/gstreamer-meson-buildapi.patch
@@ -1,10 +1,13 @@
-From f722b0df5aaa4b32fb1c34f8838294e174d2843f Mon Sep 17 00:00:00 2001
+From a1d23a4c69068acd3040369f77fcf8a2181817ef Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi gnome org>
Date: Mon, 20 Feb 2017 11:33:49 +0000
Subject: [PATCH] Add build-api wrapper for Meson/Ninja
Use Meson and Ninja, instead of autotools.
+v4:
+ - Update Meson flag to disable GTK-Doc build
+
v3:
- Enable CCache
- Pass CC and CXX flags to meson and ninja
@@ -17,7 +20,7 @@ v2:
diff --git a/configure b/configure
new file mode 100755
-index 000000000..33bca5167
+index 000000000..d48724f49
--- /dev/null
+++ b/configure
@@ -0,0 +1,130 @@
@@ -89,8 +92,8 @@ index 000000000..33bca5167
+ --libdir) read_arg libdir "$@" || shift;;
+ --mandir) read_arg mandir "$@" || shift;;
+ --includedir) read_arg includedir "$@" || shift;;
-+ --enable-gtk-doc) enable_docs='-Denable-gtk-doc=true';;
-+ --disable-gtk-doc) enable_docs='-Denable-gtk-doc=false';;
++ --enable-gtk-doc) enable_docs='-Ddisable_gtkdoc=false';;
++ --disable-gtk-doc) enable_docs='-Ddisable_gtkdoc=true';;
+ *) echo "Ignoring unknown option '$1'";;
+ esac
+ shift
@@ -152,5 +155,5 @@ index 000000000..33bca5167
+
+# vim: ai ts=8 noet sts=2 ft=sh
--
-2.11.1
+2.12.2
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]