Title: [209859] trunk/Tools
Revision
209859
Author
[email protected]
Date
2016-12-15 05:05:44 -0800 (Thu, 15 Dec 2016)

Log Message

[GTK] Ensure gst* docs are not built with update-webkitgtk-libs
https://bugs.webkit.org/show_bug.cgi?id=165855

Reviewed by Philippe Normand.

GStreamer's autogen.sh enables gtk-doc always so we end up building
docs even if we disable them. Use the configure script instead, since
we build from packages and these include it already.

* gtk/jhbuild.modules: Use shipped configure instead of autogen.sh for
upstream gstreamer packages.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (209858 => 209859)


--- trunk/Tools/ChangeLog	2016-12-15 10:28:55 UTC (rev 209858)
+++ trunk/Tools/ChangeLog	2016-12-15 13:05:44 UTC (rev 209859)
@@ -1,3 +1,17 @@
+2016-12-15  Claudio Saavedra  <[email protected]>
+
+        [GTK] Ensure gst* docs are not built with update-webkitgtk-libs
+        https://bugs.webkit.org/show_bug.cgi?id=165855
+
+        Reviewed by Philippe Normand.
+
+        GStreamer's autogen.sh enables gtk-doc always so we end up building
+        docs even if we disable them. Use the configure script instead, since
+        we build from packages and these include it already.
+
+        * gtk/jhbuild.modules: Use shipped configure instead of autogen.sh for
+        upstream gstreamer packages.
+
 2016-12-15  Alex Christensen  <[email protected]>
 
         REGRESSION (r208902) Null pointer dereference in wkIsPublicSuffix

Modified: trunk/Tools/gtk/jhbuild.modules (209858 => 209859)


--- trunk/Tools/gtk/jhbuild.modules	2016-12-15 10:28:55 UTC (rev 209858)
+++ trunk/Tools/gtk/jhbuild.modules	2016-12-15 13:05:44 UTC (rev 209859)
@@ -347,7 +347,7 @@
             md5sum="af1bf3dab9e69f3c36f389285e2a12a1"/>
   </autotools>
 
-  <autotools id="gstreamer" autogenargs="--disable-gtk-doc">
+  <autotools id="gstreamer" autogen-sh="configure" autogenargs="--disable-gtk-doc">
     <if condition-set="macos">
       <autogenargs value="--disable-introspection"/>
     </if>
@@ -361,7 +361,7 @@
   </autotools>
 
   <autotools id="gst-plugins-base"
-             autogen-sh="autogen.sh"
+             autogen-sh="configure"
              autogenargs="--disable-examples --disable-gtk-doc">
     <if condition-set="macos">
       <autogenargs value="--disable-introspection"/>
@@ -375,7 +375,7 @@
             md5sum="20cc8231609318310f2a55f64c86cbb4"/>
   </autotools>
 
-  <autotools id="gst-plugins-good" autogenargs="--disable-examples --disable-soup --disable-gtk-doc">
+  <autotools id="gst-plugins-good" autogen-sh="configure" autogenargs="--disable-examples --disable-soup --disable-gtk-doc">
     <if condition-set="macos">
       <autogenargs value="--disable-introspection"/>
     </if>
@@ -396,7 +396,7 @@
     </branch>
   </autotools>
 
-  <autotools id="gst-plugins-bad" autogenargs="--disable-examples --disable-gtk-doc">
+  <autotools id="gst-plugins-bad" autogen-sh="configure" autogenargs="--disable-examples --disable-gtk-doc">
     <if condition-set="macos">
       <autogenargs value="--disable-introspection"/>
     </if>
@@ -413,7 +413,7 @@
     </branch>
   </autotools>
 
-  <autotools id="gst-libav" autogenargs="--with-libav-extra-configure='--disable-yasm' --disable-gtk-doc">
+  <autotools id="gst-libav" autogen-sh="configure" autogenargs="--with-libav-extra-configure='--disable-yasm' --disable-gtk-doc">
     <dependencies>
       <dep package="gst-plugins-base"/>
     </dependencies>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to