linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 23:07:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18159 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Ken Moffat 2017-01-09 04:46:11 +00:00
parent f5d32132ff
commit 80cfbfb434
7 changed files with 87 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
general/genutils/genutils.xml
View File

@ -36,6 +36,7 @@ $Date$
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="highlight.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ibus.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick6.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iso-codes.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsof.xml"/>

64
general/genutils/imagemagick.xml
View File

@ -4,14 +4,14 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%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)">
]>
<!-- Editors: It is highly unlikely that the buildsize (disk space used) will
@ -250,10 +250,6 @@ make</userinput></screen>
<sect2 role="commands">
<title>Command Explanations</title>
<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.
@ -336,17 +332,17 @@ make</userinput></screen>
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;/$(uname -m)-linux/{,auto}/Image/Magick,
/usr/share/doc/ImageMagick-&imagemagick-version;, and
/usr/share/ImageMagick-6
/usr/share/ImageMagick-7
</seg>
</seglistitem>
</segmentedlist>
@ -478,6 +474,7 @@ make</userinput></screen>
</listitem>
</varlistentry>
<!-- the following does not validate
<varlistentry id="perlmagick">
<term><filename class='libraryfile'>Image::Magick</filename></term>
<listitem>
@ -493,6 +490,43 @@ make</userinput></screen>
</listitem>
</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>
</sect2>

9
introduction/welcome/changelog.xml
View File

@ -45,6 +45,15 @@
<listitem>
<para>January 8th, 2017</para>
<itemizedlist>
<listitem>
<para>[ken] - Modify ImageMagick-6 so that only the libs
can be installed, without overwriting pkgconfig files and
manpages, and add ImageMagick-7 for general use. Move to
6.9.6-8 and 7.0.3-10. Use -6 for inkscape and emacs and
make it recommended for inkscape, also change sed in
xine-lib. Fixes
<ulink url="&blfs-ticket-root;8528">#8528</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to balsa-2.5.3. Fixes
<ulink url="&blfs-ticket-root;8634">#8634</ulink>.</para>

2
multimedia/libdriv/xine-lib.xml
View File

@ -129,7 +129,7 @@
-i src/combined/ffmpeg/ff_{audio,video}_decoder.c \
src/dxr3/ffmpeg_encoder.c &amp;&amp;
sed -e 's|wand/magick_wand.h|ImageMagick-6/wand/MagickWand.h|' \
sed -e 's|wand/magick_wand.h|MagickWand/MagickWand.h|' \
-i src/video_dec/image.c &amp;&amp;
sed -e '/xineplug_vo_out_xcbxv_la_LIBADD/s/$(XCB_LIBS)/$(XCBSHM_LIBS) $(XCB_LIBS)/' \

3
packages.ent
View File

@ -214,7 +214,8 @@
<!ENTITY icon-naming-utils-version "0.8.90">
<!ENTITY highlight-version "3.34">
<!ENTITY ibus-version "1.5.14">
<!ENTITY imagemagick-version "6.9.6">
<!ENTITY imagemagick6-version "6.9.6">
<!ENTITY imagemagick-version "7.0.3">
<!ENTITY intltool-version "0.50.2">
<!ENTITY lsof-version "4.89">
<!ENTITY pinentry-version "1.0.0">

10
postlfs/editors/emacs.xml
View File

@ -71,7 +71,7 @@
<xref linkend="gsettings-desktop-schemas"/>,
<xref linkend="gpm"/>,
<xref linkend="gtk2"/> or <xref linkend="gtk3"/>,
<xref linkend="imagemagick"/>,
<xref linkend="imagemagick6"/> (see command explanations),
<xref linkend="libjpeg"/>,
<xref linkend="libpng"/>,
<xref linkend="librsvg"/>,
@ -152,6 +152,14 @@ update-desktop-database</userinput></screen>
in <filename class='directory'>/var/games/emacs</filename> instead
of <filename class='directory'>/usr/var/games/emacs</filename>.</para>
<para><option>IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6
IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI
-lMagickWand-6.Q16HDRI" </option>:
use these when you invoke configure if you have installe <xref
linkend="imagemagick6"/> and wish to link to them (the normal unversioned
pkgconfig files collide with <xref linkend="imagemagick"/> which this
package cannot use).</para>
</sect2>
<sect2 role="content">

19
xsoft/other/inkscape.xml
View File

@ -99,6 +99,7 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
<xref linkend="imagemagick6"/>,
<xref linkend="lcms2"/> or
<xref linkend="lcms"/>
</para>
@ -108,7 +109,6 @@
<xref linkend="aspell"/>,
<xref linkend="dbus"/>,
<xref linkend="doxygen"/>,
<xref linkend="imagemagick"/>,
<xref linkend="poppler"/>,
<!-- these document foundation links work from firefox's address bar, or
@ -160,7 +160,11 @@
sed -e 's/ScopedPtr&lt;char&gt;/make_unique_ptr_gfree/' \
-i src/ui/clipboard.cpp &amp;&amp;
CXXFLAGS="-g -O2 -std=c++11" ./configure --prefix=/usr &amp;&amp;
CXXFLAGS="-g -O2 -std=c++11" \
IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 \
IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI -lMagickWand-6.Q16HDRI" \
./configure --prefix=/usr &amp;&amp;
make</userinput></screen>
<para>
@ -186,7 +190,16 @@ make</userinput></screen>
</para>
<para>
<command>CXXFLAGS="-g -O2 -std=c++11" ./configure...</command>: Inkscape
<command>IMAGE_MAGICK_CFLAGS= ... IMAGE_MAGICK_LIBS= ...</command>:
The configure script looks for ImageMagick-6 using the normal
unversioned pkgconfig file names which are also used by the newer
ImageMAgick-7 - in BLFS we patched it to rename those files, so
these variables will allow <command>configure</command> to find
the things it needs.
</para>
<para>
<command>CXXFLAGS="-g -O2 -std=c++11" </command>: Inkscape
has not yet been ported to the 2011 ISO C++ standard, one of its
dependencies is compiled with this standard.
<command>-std=c++11</command> has