Changeset e7d893b for gnome/platform/mutter.xml

Timestamp:

05/19/2019 04:54:33 AM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

215c728b

Parents:

853ae3e5

Message:

Merge to HEAD 21602.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/BOOK-elogind@21603 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• gnome/platform/mutter.xml (modified) (11 diffs)

gnome/platform/mutter.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-minor-30;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-minor-30;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-md5sum        "d74b9bf421b2b82ebfe11cccc055a760">
-  <!ENTITY mutter-size          "3.6 MB">
-  <!ENTITY mutter-buildsize     "236 MB">
-  <!ENTITY mutter-time          "2.9 SBU">
+  <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-minor-32;/mutter-&mutter-version;.tar.xz">
+  <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-minor-32;/mutter-&mutter-version;.tar.xz">
+  <!ENTITY mutter-md5sum        "6748ec4afdef5e06a9d5639cba3a5cdb">
+  <!ENTITY mutter-size          "2.7 MB">
+  <!ENTITY mutter-buildsize     "163 MB">
+  <!ENTITY mutter-time          "2.2 SBU">
 ]>
 
@@ -73 +73 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact" revision="sysv">
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink url="&patch-root;/mutter-&mutter-version;-elogind-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Mutter Dependencies</bridgehead>
 
@@ -89 +79 @@
       <xref linkend="clutter"/>,
       <xref linkend="gnome-desktop"/>,
+      <xref linkend="libcanberra"/>,
       <xref linkend="libwacom"/>,
       <xref linkend="libxkbcommon"/>,
+      <xref linkend="pipewire"/>,
       <xref linkend="upower"/>, and
       <xref linkend="zenity"/>
@@ -97 +89 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="libcanberra"/>, and
+      <xref linkend="gobject-introspection"/> and
       <xref linkend="startup-notification"/>
     </para>
@@ -113 +104 @@
     </para>
 
-    <!-- NOTE: For some reason, it builds internal git versions of
-    cogl and clutter during the building process, even with them preinstalled.
-    This adds 1.5 SBU, and I have no clue why it needs to do this. -->
+    <!-- NOTE: Mutter compiles git versions of COGL and Clutter for it's own
+    internal use. This is because the wayland support upstream isn't advanced
+    enough for the graphics stack used in Mutter. -->
 
     <para condition="html" role="usernotes">User Notes:
@@ -126 +117 @@
     <title>Installation of Mutter</title>
 
-    <para revision="sysv">
-      Apply a patch to use <xref linkend="elogind"/> session tracking:
-    </para>
-
-<screen revision="sysv"><userinput>patch -Np1 -i ../mutter-&mutter-version;-elogind-1.patch &amp;&amp;
-autoreconf -fi</userinput></screen>
-
     <para>
       Install <application>Mutter</application> by running the following
@@ -138 +122 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --enable-compile-warnings=minimum &amp;&amp;
-make</userinput></screen>
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+
+meson --prefix=/usr .. &amp;&amp;
+ninja</userinput></screen>
 
     <para>
-      This package does not come with a test suite.
+      To test the results, issue: <command>ninja test</command>. The tests
+      require an active X session to run correctly. A few tests may fail
+      depending on the gobject-introspection version installed as well.
     </para>
 
@@ -151 +138 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
@@ -176 +155 @@
         </seg>
         <seg>
-          libmutter-3.so
+          libmutter-4.so
         </seg>
         <seg>
-          /usr/{lib,include}/mutter
+          /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-4
         </seg>
       </seglistitem>
@@ -203 +182 @@
 
       <varlistentry id="libmutter">
-        <term><filename class="libraryfile">libmutter-3.so</filename></term>
+        <term><filename class="libraryfile">libmutter-4.so</filename></term>
         <listitem>
           <para>
@@ -209 +188 @@
           </para>
           <indexterm zone="mutter libmutter">
-            <primary sortas="c-libmutter">libmutter-3.so</primary>
+            <primary sortas="c-libmutter">libmutter-4.so</primary>
           </indexterm>
         </listitem>