Changeset 748752de for general/genlib

Timestamp:

09/02/2023 12:29:28 PM (9 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

cc46f550

Parents:

c226321

Message:

Update to brotli-1.1.0

File:

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

general/genlib/brotli.xml

@@ -7 +7 @@
   <!ENTITY brotli-download-http "https://github.com/google/brotli/archive/v&brotli-version;/brotli-&brotli-version;.tar.gz">
   <!ENTITY brotli-download-ftp  " ">
-  <!ENTITY brotli-md5sum        "c2274f0c7af8470ad514637c35bcee7d">
-  <!ENTITY brotli-size          "476 KB">
-  <!ENTITY brotli-buildsize     "24 MB (with python3 bindings)">
+  <!ENTITY brotli-md5sum        "3a6a3dba82a3604792d3cb0bd41bca60">
+  <!ENTITY brotli-size          "500 KB">
+  <!ENTITY brotli-buildsize     "33 MB (with python3 bindings)">
   <!-- The python tests for this package are broken.  The tarball is missing a lot of test files -->
-  <!ENTITY brotli-time          "0.4 SBU (with python3 bindings)">
+  <!ENTITY brotli-time          "0.3 SBU (with python3 bindings; parallelism=4)">
 ]>
 
@@ -73 +73 @@
     <bridgehead renderas="sect3">Brotli Dependencies</bridgehead>
 
-    <!-- Not "Required" because we can use
-         "./bootstrap && ./configure ... && make && make install".
-         Doing so can break an optional circular dependency:
-         curl is recommended for cmake, and brotli is optional for curl. -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
       <xref linkend="cmake"/>
     </para>
 
   </sect2>
-
 
   <sect2 role="installation">
@@ -89 +84 @@
 
     <para>
-      At first, fix an issue in pkg-config files:
-    </para>
-
-<screen><userinput>sed -i 's@-R..libdir.@@' scripts/*.pc.in</userinput></screen>
-
-    <para>
       Install <application>brotli</application> by running the following
       commands:
     </para>
 
-<screen><userinput>mkdir out &amp;&amp;
-cd    out &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
@@ -107 +96 @@
 make</userinput></screen>
 
-
     <para>
       To test the results, issue: <command>make test</command>.
@@ -124 +112 @@
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-cd ..</userinput></screen>
-
-    <para>
-      If desired, build and install the <application>Python3</application>
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      If desired, build the <application>Python3</application>
+      bindings:
+    </para>
+
+<screen><userinput>cd .. &amp;&amp;
+pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+    <para>
+      Install the <application>Python3</application>
       bindings as the &root; user:
     </para>
 
-<screen role="root"><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD &amp;&amp;
-pip3 install --no-index --find-links dist --no-cache-dir --no-user Brotli</userinput></screen>
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user Brotli</userinput></screen>
 
   </sect2>
@@ -150 +144 @@
         </seg>
         <seg>
-          libbrotlicommon{-static.a,.so},
-          libbrotlidec{,-static.a,.so}, and
-          libbrotlienc{,-static.a,.so}
+          libbrotlicommon.so,
+          libbrotlidec.so, and
+          libbrotlienc.so
         </seg>
         <seg>