Changeset 80cfbfb for general/genutils/imagemagick.xml

Timestamp:

01/09/2017 04:46:11 AM (7 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

b54f1de7

Parents:

f5d3213

Message:

Move back to ImageMagick-7, with added ImageMagick-6 libs also installable for emacs and inkscape.

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

File:

• general/genutils/imagemagick.xml (modified) (5 diffs)

general/genutils/imagemagick.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "0">
+  <!ENTITY imagemagick-patch-version "10">
 
   <!ENTITY imagemagick-download-http "https://www.imagemagick.org/download/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
   <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-md5sum        "60eaff0eead601a5a6a957730e018459">
-  <!ENTITY imagemagick-size          "8.4 MB">
-  <!ENTITY imagemagick-buildsize     "216 MB, with typical dependencies (add 33 MB for the test suite and 184 MB for the validation suite)">
-  <!ENTITY imagemagick-time          "2.4 SBU - typical build (add 3.7 SBU for the test suite and 3.5 SBU for the validation suite)">
+  <!ENTITY imagemagick-md5sum        "7040da7ec6a30f105d2c5db674523645">
+  <!ENTITY imagemagick-size          "8.0 MB">
+  <!ENTITY imagemagick-buildsize     "200 MB, with typical dependencies">
+  <!ENTITY imagemagick-time          "2.1 SBU - typical build (add 1.1 SBU for the the validation suite)">
 ]>
 
@@ -252 +252 @@
 
     <para>
-      <command>sed ...</command>: Removes a lot of invalid warnings.
-    </para>
-
-    <para>
       <parameter>--enable-hdri</parameter>: Enables building of a
       high dynamic range version of ImageMagick.
@@ -337 +333 @@
         </seg>
         <seg>
-          libMagickCore-6.Q16HDRI.so,
-          libMagickWand-6.Q16HDRI.so and
-          libMagick++-6.Q16HDRI.so
+          libMagickCore-7.Q16HDRI.so,
+          libMagickWand-7.Q16HDRI.so and
+          libMagick++-7.Q16HDRI.so
         </seg>
         <seg>
-          /etc/ImageMagick-6,
-          /usr/include/ImageMagick-6,
+          /etc/ImageMagick-7,
+          /usr/include/ImageMagick-7,
           /usr/lib/ImageMagick-&imagemagick-version;,
           /usr/lib/perl5/site_perl/&lfs-perl-version;/$(uname -m)-linux/{,auto}/Image/Magick,
           /usr/share/doc/ImageMagick-&imagemagick-version;, and
-          /usr/share/ImageMagick-6
+          /usr/share/ImageMagick-7
         </seg>
       </seglistitem>
@@ -479 +475 @@
     </varlistentry>
 
+    <!-- the following does not validate
     <varlistentry id="perlmagick">
       <term><filename class='libraryfile'>Image::Magick</filename></term>
@@ -494 +491 @@
     </varlistentry>
 
+    <varlistentry id="libMagickCore-7.Q16HDRI">
+      <term><filename class="libraryfile">libMagickCore-7.Q16HDRI.so</filename></term>
+      <listitem>
+        <para>
+          provides the C API for ImageMagick.
+        </para>
+        <indexterm zone="imagemagick libMagickCore-7.Q16HDRI">
+          <primary sortas="c-libMagickCore-7.Q16HDRI">libMagickCore-7.Q16HDRI.so</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="libMagickWand-7.Q16HDRI">
+      <term><filename class="libraryfile">libMagickWand-7.Q16HDRI.so</filename></term>
+      <listitem>
+        <para>
+          is the recommended C API for ImageMagick. Unlike the MagickCore API it
+          uses  only a few opaque types.
+        </para>
+        <indexterm zone="imagemagick libMagickWand-7.Q16HDRI">
+          <primary sortas="c-libMagickWand-7.Q16HDRI">libMagickWand-7.Q16HDRI.so</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="libMagick++-7.Q16HDRI">
+      <term><filename class="libraryfile">libMagick++-7.Q16HDRI.so</filename></term>
+      <listitem>
+        <para>
+          provides the C++ API for ImageMagick.
+        </para>
+        <indexterm zone="imagemagick libMagick++-7.Q16HDRI">
+          <primary sortas="c-libMagick++-7.Q16HDRI">libMagick++-7.Q16HDRI.so</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry> -->
+
     </variablelist>