[jhbuild] core-deps-3.26: switch GStreamer back to Autotools again
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] core-deps-3.26: switch GStreamer back to Autotools again
- Date: Fri, 28 Apr 2017 04:41:06 +0000 (UTC)
commit e5a03eb7ef68e43e03cb8be443ba238dd4217a67
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Thu Apr 27 23:39:19 2017 -0500
core-deps-3.26: switch GStreamer back to Autotools again
Although meson builds properly from git now that we disable gtk-doc
generation, these modulesets should work for tarball builds as well
without manual editing, and GStreamer does not currently distribute
meson build files in release tarballs. So switch back to Autotools for
now. We can switch to meson again once there are actual releases that
include meson.build files.
modulesets/gnome-suites-core-deps-3.26.modules | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index 2f75da2..70789db 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -682,7 +682,7 @@
</suggests>
</autotools>
- <meson id="gstreamer">
+ <autotools id="gstreamer">
<branch repo="gstreamer.freedesktop.org"
module="gstreamer"
checkoutdir="gstreamer"/>
@@ -691,7 +691,7 @@
<dep package="libxml2"/>
<dep package="gobject-introspection"/>
</dependencies>
- </meson>
+ </autotools>
<meson id="graphene">
<branch repo="github.com" checkoutdir="graphene" module="ebassi/graphene.git"/>
@@ -701,7 +701,7 @@
</dependencies>
</meson>
- <meson id="gst-plugins-bad">
+ <autotools id="gst-plugins-bad">
<branch repo="gstreamer.freedesktop.org"
checkoutdir="gst-plugins-bad"
module="gst-plugins-bad"/>
@@ -712,9 +712,9 @@
<suggests>
<dep package="graphene"/>
</suggests>
- </meson>
+ </autotools>
- <meson id="gst-plugins-base">
+ <autotools id="gst-plugins-base">
<branch repo="gstreamer.freedesktop.org"
module="gst-plugins-base"
checkoutdir="gst-plugins-base"/>
@@ -728,9 +728,9 @@
<dep package="gudev"/>
</if>
</suggests>
- </meson>
+ </autotools>
- <meson id="gst-plugins-good">
+ <autotools id="gst-plugins-good">
<branch repo="gstreamer.freedesktop.org"
module="gst-plugins-good"
checkoutdir="gst-plugins-good"/>
@@ -752,7 +752,7 @@
<dep package="gudev"/>
</if>
</suggests>
- </meson>
+ </autotools>
<autotools id="gtk+" autogenargs="--enable-broadway-backend --enable-installed-tests">
<if condition-set="x11">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]