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

Archive ImageMagick-6.

Browse Source 
In emacs add optional switch to emable ImageMagick-7.
In transcode optional deps point to legacy imagemagick site.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23535 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Ken Moffat 2020-08-16 17:15:18 +00:00
parent f243c97623
commit 918c149cde
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
general/genutils/imagemagick6.xml → archive/imagemagick6.xml
View File

1
general/genutils/genutils.xml
View File

@ -36,7 +36,6 @@ $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"/>

5
introduction/welcome/changelog.xml
View File

@ -44,6 +44,11 @@
<listitem>
<para>August 16th, 2020</para>
<itemizedlist>
<listitem>
<para>[ken] - Archive ImageMagick-6, emacs-27.1 can link to
ImageMagick-7. Fixes
<ulink url="&blfs-ticket-root;13932">#13932</ulink>.</para>
</listitem>
<listitem>
<para>[ken] - Update to sqlite-3.33.0. Fixes
<ulink url="&blfs-ticket-root;13929">#13929</ulink>.</para>

2
multimedia/videoutils/transcode.xml
View File

@ -125,7 +125,7 @@
<para role="optional">
<xref linkend="faac"/>,
<xref linkend="freetype2"/>,
<xref linkend="imagemagick6"/>,
<ulink url="https://legacy.imagemagick.org/script/download.php">ImageMagick-6</ulink>,
<xref linkend="liba52"/>,
<xref linkend="libdv"/>,
<xref linkend="libjpeg"/>,

11
postlfs/editors/emacs.xml
View File

@ -90,7 +90,7 @@
<xref linkend="gsettings-desktop-schemas"/>,
<xref linkend="gpm"/>,
<xref role="nodep" linkend="gtk2"/> or <xref linkend="gtk3"/>,
<xref linkend="imagemagick6"/> (see command explanations),
<xref linkend="imagemagick"/>,
<xref linkend="jansson"/>, <!-- for JSON support -->
<xref linkend="libjpeg"/>,
<xref linkend="libpng"/>,
@ -158,13 +158,8 @@ rm -vf /usr/lib/systemd/user/emacs.service</userinput></screen>
</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 installed <xref
linkend="imagemagick6"/> and wish to link to them (the normal unversioned
pkgconfig files collide with <xref linkend="imagemagick"/> which this
package cannot use).
<option>--with-imagemagick</option>: Use this if you have installed
<xref linkend="imagemagick"/> and wish to link against it.
</para>
<para>