Changeset e54771c for general/genutils/imagemagick.xml

Timestamp:

05/06/2016 09:08:59 PM (8 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 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, nosym, 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:

01e86d88

Parents:

ba1ccf6

Message:

Update to ImageMagick-7.0.1-1.
Fix/Mark several packages for gcc6.

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

File:

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

general/genutils/imagemagick.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "5">
+  <!ENTITY imagemagick-patch-version "1">
 
   <!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        "af1c85b8b8f817e919f9ca4408d86782">
-  <!ENTITY imagemagick-size          "8.4 MB">
-  <!ENTITY imagemagick-buildsize     "193 MB, with typical dependencies (222 MB with the test suite, reputedly 450 MB with all dependencies)">
-  <!ENTITY imagemagick-time          "2.0 SBU - typical build (additional 1.6 SBU to run the test suite and 1.4 SBU to run the validation suite)">
+  <!ENTITY imagemagick-md5sum        "24673d00fcc8aa00313eeca6aa20fd3c">
+  <!ENTITY imagemagick-size          "7.9 MB">
+  <!ENTITY imagemagick-buildsize     "200 MB, with typical dependencies (add 31 MB for the test suite)">
+  <!ENTITY imagemagick-time          "2.9 SBU - typical build (add 1.8 SBU for the test suite and 1.5 SBU for the validation suite)">
 ]>
 
@@ -22 +22 @@
 
      Marked as 'typical' because nobody builds ALL the optional extras [ken]
+   
+     [bdubbs] I do; at least the internal ones.  I still got only 200 MB.
+
      Saved the "full" 450MB as a comment - feel free to update this iff you
      do build all dependencies, it's probably a lot bigger now.
+
+     [bdubbs] Just removed it.  I don't think it adds anything.
 
      Also, please look over the output from the configure command for any
@@ -59 +64 @@
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -158 +164 @@
       <ulink url="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/">
       FlashPIX (libfpx)</ulink>,
+      <ulink url="https://github.com/FLIF-hub/FLIF/releases">FLIF</ulink>,
       <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
       <ulink url="&gnome-download-http;/libgxps/">libgxps</ulink>,
@@ -211 +218 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr     \
+<screen><userinput>sed -i '/seems to be moved/ s/^/true #/' config/ltmain.sh &amp;&amp;
+
+./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --enable-hdri     \
@@ -246 +255 @@
 
     <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.
@@ -321 +334 @@
       <seglistitem>
         <seg>
-          animate, compare, composite, conjure, convert, display,
-          identify, import, Magick-config, Magick++-config, MagickCore-config,
-          MagickWand-config, mogrify, montage, stream, and Wand-config
+          magick, Magick++-config, MagickCore-config, and MagickWand-config.
+          (animate, compare, composite, conjure, convert, display,
+          identify, import, magick-script, mogrify, montage, and stream
+          are all symbolic links to magick)
         </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;/{,auto}/Image/Magick,
+          /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>
@@ -427 +441 @@
 
     <varlistentry id="magick-config">
-      <term><command>Magick{,++,Core,Wand}-config</command></term>
+      <term><command>Magick{++,Core,Wand}-config</command></term>
       <listitem>
         <para>show information about the installed versions of the
@@ -464 +478 @@
         <indexterm zone="imagemagick stream">
           <primary sortas="b-stream">stream</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="wand-config">
-      <term><command>Wand-config</command></term>
-      <listitem>
-        <para>shows the options required to use the Wand library.</para>
-        <indexterm zone="imagemagick wand-config">
-          <primary sortas="b-Wand-config">Wand-config</primary>
         </indexterm>
       </listitem>