Changeset 4005416 for general/genlib/libwacom.xml

Timestamp:

01/02/2021 04:13:08 PM (3 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

qt5new

Children:

a84fc21

Parents:

03c3caa4 (diff), 24d47269 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge trunk up to r24051

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

File:

• general/genlib/libwacom.xml (modified) (6 diffs)

general/genlib/libwacom.xml

@@ -7 +7 @@
   <!ENTITY libwacom-download-http "https://github.com/linuxwacom/libwacom/releases/download/libwacom-&libwacom-version;/libwacom-&libwacom-version;.tar.bz2">
   <!ENTITY libwacom-download-ftp  " ">
-  <!ENTITY libwacom-md5sum        "1b0ee3f541433fc6df562cce314986da">
+  <!ENTITY libwacom-md5sum        "364bd470a35334b1a7fce70a359796d5">
   <!ENTITY libwacom-size          "504 KB">
-  <!ENTITY libwacom-buildsize     "9.6 MB (with tests)">
+  <!ENTITY libwacom-buildsize     "7.1 MB (with tests)">
   <!ENTITY libwacom-time          "less than 0.1 SBU (with tests)">
 ]>
@@ -87 +87 @@
       <xref linkend="doxygen"/>,
       <xref linkend="git"/>,
-      <xref linkend="librsvg"/>, and
-      <xref linkend="valgrind"/> (optional for some tests)
+      <xref linkend="librsvg"/>,
+      <xref linkend="valgrind"/> (optional for some tests), and
+      <ulink url="https://docs.pytest.org/en/stable/">pytest</ulink>
     </para>
 
@@ -99 +100 @@
     <title>Installation of libwacom</title>
 
+<!--  Fixed in libwacom-1.7
     <para>
       First, adapt the udev rules to upstream udev/kernel changes:
@@ -104 +106 @@
 
 <screen><userinput remap="pre">sed -i 's/ACTION!="add|change"/ACTION=="remove"/' tools/65-libwacom.rules.in</userinput></screen>
+-->
 
     <para>
@@ -113 +116 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr -Dudev-dir=/lib/udev .. &amp;&amp;
+meson --prefix=/usr -Dudev-dir=/lib/udev -Dtests=disabled .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
       To test the results, issue: <command>ninja test</command>.
+      To run additional tests, install 
+      <ulink url="https://docs.pytest.org/en/stable/">pytest</ulink> and remove
+      the "-Dtests=disabled" option from the meson line above.
     </para>
 
@@ -134 +140 @@
       <parameter>-Dudev-dir=/lib/udev</parameter>: This parameter sets the
       proper installation directory for udev rules.
+    </para>
+
+    <para>
+      <parameter>-Dtests=disabled</parameter>: This parameter disables some of
+      the more advanced tests because they require
+      <ulink url="https://docs.pytest.org/en/stable/">pytest</ulink> to work
+      properly.
     </para>