Changeset 80cfbfb


Ignore:
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, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/python-mods, qt5new, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, 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

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • general/genutils/genutils.xml

    rf5d3213 r80cfbfb  
    3737  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ibus.xml"/>
    3838
     39  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick6.xml"/>
    3940  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick.xml"/>
    4041  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iso-codes.xml"/>

  • general/genutils/imagemagick.xml

    rf5d3213 r80cfbfb  
    55  %general-entities;
    66
    7   <!ENTITY imagemagick-patch-version "0">
     7  <!ENTITY imagemagick-patch-version "10">
    88
    99  <!ENTITY imagemagick-download-http "https://www.imagemagick.org/download/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
    1010  <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
    11   <!ENTITY imagemagick-md5sum        "60eaff0eead601a5a6a957730e018459">
    12   <!ENTITY imagemagick-size          "8.4 MB">
    13   <!ENTITY imagemagick-buildsize     "216 MB, with typical dependencies (add 33 MB for the test suite and 184 MB for the validation suite)">
    14   <!ENTITY imagemagick-time          "2.4 SBU - typical build (add 3.7 SBU for the test suite and 3.5 SBU for the validation suite)">
     11  <!ENTITY imagemagick-md5sum        "7040da7ec6a30f105d2c5db674523645">
     12  <!ENTITY imagemagick-size          "8.0 MB">
     13  <!ENTITY imagemagick-buildsize     "200 MB, with typical dependencies">
     14  <!ENTITY imagemagick-time          "2.1 SBU - typical build (add 1.1 SBU for the the validation suite)">
    1515]>
    1616
    … …  
    252252
    253253    <para>
    254       <command>sed ...</command>: Removes a lot of invalid warnings.
    255     </para>
    256 
    257     <para>
    258254      <parameter>--enable-hdri</parameter>: Enables building of a
    259255      high dynamic range version of ImageMagick.
    … …  
    337333        </seg>
    338334        <seg>
    339           libMagickCore-6.Q16HDRI.so,
    340           libMagickWand-6.Q16HDRI.so and
    341           libMagick++-6.Q16HDRI.so
     335          libMagickCore-7.Q16HDRI.so,
     336          libMagickWand-7.Q16HDRI.so and
     337          libMagick++-7.Q16HDRI.so
    342338        </seg>
    343339        <seg>
    344           /etc/ImageMagick-6,
    345           /usr/include/ImageMagick-6,
     340          /etc/ImageMagick-7,
     341          /usr/include/ImageMagick-7,
    346342          /usr/lib/ImageMagick-&imagemagick-version;,
    347343          /usr/lib/perl5/site_perl/&lfs-perl-version;/$(uname -m)-linux/{,auto}/Image/Magick,
    348344          /usr/share/doc/ImageMagick-&imagemagick-version;, and
    349           /usr/share/ImageMagick-6
     345          /usr/share/ImageMagick-7
    350346        </seg>
    351347      </seglistitem>
    … …  
    479475    </varlistentry>
    480476
     477    <!-- the following does not validate
    481478    <varlistentry id="perlmagick">
    482479      <term><filename class='libraryfile'>Image::Magick</filename></term>
    … …  
    494491    </varlistentry>
    495492
     493    <varlistentry id="libMagickCore-7.Q16HDRI">
     494      <term><filename class="libraryfile">libMagickCore-7.Q16HDRI.so</filename></term>
     495      <listitem>
     496        <para>
     497          provides the C API for ImageMagick.
     498        </para>
     499        <indexterm zone="imagemagick libMagickCore-7.Q16HDRI">
     500          <primary sortas="c-libMagickCore-7.Q16HDRI">libMagickCore-7.Q16HDRI.so</primary>
     501        </indexterm>
     502      </listitem>
     503    </varlistentry>
     504
     505    <varlistentry id="libMagickWand-7.Q16HDRI">
     506      <term><filename class="libraryfile">libMagickWand-7.Q16HDRI.so</filename></term>
     507      <listitem>
     508        <para>
     509          is the recommended C API for ImageMagick. Unlike the MagickCore API it
     510          uses  only a few opaque types.
     511        </para>
     512        <indexterm zone="imagemagick libMagickWand-7.Q16HDRI">
     513          <primary sortas="c-libMagickWand-7.Q16HDRI">libMagickWand-7.Q16HDRI.so</primary>
     514        </indexterm>
     515      </listitem>
     516    </varlistentry>
     517
     518    <varlistentry id="libMagick++-7.Q16HDRI">
     519      <term><filename class="libraryfile">libMagick++-7.Q16HDRI.so</filename></term>
     520      <listitem>
     521        <para>
     522          provides the C++ API for ImageMagick.
     523        </para>
     524        <indexterm zone="imagemagick libMagick++-7.Q16HDRI">
     525          <primary sortas="c-libMagick++-7.Q16HDRI">libMagick++-7.Q16HDRI.so</primary>
     526        </indexterm>
     527      </listitem>
     528    </varlistentry> -->
     529
    496530    </variablelist>
    497531

  • introduction/welcome/changelog.xml

    rf5d3213 r80cfbfb  
    4747      <itemizedlist>
    4848        <listitem>
     49          <para>[ken] - Modify ImageMagick-6 so that only the libs
     50          can be installed, without overwriting pkgconfig files and
     51          manpages, and add ImageMagick-7 for general use. Move to
     52          6.9.6-8 and 7.0.3-10. Use -6 for inkscape and emacs and
     53          make it recommended for inkscape, also change sed in
     54          xine-lib. Fixes
     55          <ulink url="&blfs-ticket-root;8528">#8528</ulink>.</para>
     56        </listitem>
     57        <listitem>
    4958          <para>[renodr] - Update to balsa-2.5.3. Fixes
    5059          <ulink url="&blfs-ticket-root;8634">#8634</ulink>.</para>

  • multimedia/libdriv/xine-lib.xml

    rf5d3213 r80cfbfb  
    130130       src/dxr3/ffmpeg_encoder.c &amp;&amp;
    131131
    132 sed -e 's|wand/magick_wand.h|ImageMagick-6/wand/MagickWand.h|' \
     132sed -e 's|wand/magick_wand.h|MagickWand/MagickWand.h|' \
    133133    -i src/video_dec/image.c &amp;&amp;
    134134

  • packages.ent

    rf5d3213 r80cfbfb  
    215215<!ENTITY highlight-version            "3.34">
    216216<!ENTITY ibus-version                 "1.5.14">
    217 <!ENTITY imagemagick-version          "6.9.6">
     217<!ENTITY imagemagick6-version          "6.9.6">
     218<!ENTITY imagemagick-version          "7.0.3">
    218219<!ENTITY intltool-version             "0.50.2">
    219220<!ENTITY lsof-version                 "4.89">

  • postlfs/editors/emacs.xml

    rf5d3213 r80cfbfb  
    7272      <xref linkend="gpm"/>,
    7373      <xref linkend="gtk2"/> or <xref linkend="gtk3"/>,
    74       <xref linkend="imagemagick"/>,
     74      <xref linkend="imagemagick6"/> (see command explanations),
    7575      <xref linkend="libjpeg"/>,
    7676      <xref linkend="libpng"/>,
    … …  
    153153    of <filename class='directory'>/usr/var/games/emacs</filename>.</para>
    154154
     155    <para><option>IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6
     156    IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI
     157    -lMagickWand-6.Q16HDRI" </option>:
     158    use these when you invoke configure if you have installe <xref
     159    linkend="imagemagick6"/> and wish to link to them (the normal unversioned
     160    pkgconfig files collide with <xref linkend="imagemagick"/> which this
     161    package cannot use).</para>
     162
    155163  </sect2>
    156164

  • xsoft/other/inkscape.xml

    rf5d3213 r80cfbfb  
    100100    <bridgehead renderas="sect4">Recommended</bridgehead>
    101101    <para role="recommended">
     102      <xref linkend="imagemagick6"/>,
    102103      <xref linkend="lcms2"/> or
    103104      <xref linkend="lcms"/>
    … …  
    109110      <xref linkend="dbus"/>,
    110111      <xref linkend="doxygen"/>,
    111       <xref linkend="imagemagick"/>,
    112112      <xref linkend="poppler"/>,
    113113
    … …  
    161161    -i src/ui/clipboard.cpp  &amp;&amp;
    162162
    163 CXXFLAGS="-g -O2 -std=c++11" ./configure --prefix=/usr &amp;&amp;
     163CXXFLAGS="-g -O2 -std=c++11" \
     164IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 \
     165IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI -lMagickWand-6.Q16HDRI" \
     166./configure --prefix=/usr &amp;&amp;
     167
    164168make</userinput></screen>
    165169
    … …  
    187191
    188192    <para>
    189       <command>CXXFLAGS="-g -O2 -std=c++11" ./configure...</command>: Inkscape
     193      <command>IMAGE_MAGICK_CFLAGS= ... IMAGE_MAGICK_LIBS= ...</command>:
     194      The configure script looks for ImageMagick-6 using the normal
     195      unversioned pkgconfig file names which are also used by the newer
     196      ImageMAgick-7 - in BLFS we patched it to rename those files, so
     197      these variables will allow <command>configure</command> to find
     198      the things it needs.
     199    </para>
     200
     201    <para>
     202      <command>CXXFLAGS="-g -O2 -std=c++11" </command>: Inkscape
    190203      has not yet been ported to the 2011 ISO C++ standard, one of its
    191204      dependencies is compiled with this standard.
Note: See TracChangeset for help on using the changeset viewer.