Ignore:
Timestamp:
05/07/2016 04:37:10 AM (8 years ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
systemd-13485
Children:
d7bee48
Parents:
54aaa89
Message:

Sync to trunk r17270. Last round for the night.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17330 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/graphlib/gegl.xml

    r54aaa89 r37191af  
    55  %general-entities;
    66
    7   <!ENTITY gegl-download-http "http://download.gimp.org/pub/gegl/0.2/gegl-&gegl-version;.tar.bz2">
     7  <!ENTITY gegl-download-http "http://download.gimp.org/pub/gegl/0.3/gegl-&gegl-version;.tar.bz2">
    88  <!ENTITY gegl-download-ftp " ">
    99<!--  <!ENTITY gegl-download-ftp "ftp://ftp.gimp.org/pub/gegl/0.2/gegl-&gegl-version;.tar.bz2">-->
    10   <!ENTITY gegl-md5sum        "32b00002f1f1e316115c4ed922e1dec8">
    11   <!ENTITY gegl-size          "7.2 MB">
    12   <!ENTITY gegl-buildsize     "50 MB">
    13   <!ENTITY gegl-time          "0.9 SBU">
     10  <!ENTITY gegl-md5sum        "e6b4eb720ef541aab8c9b12b1a517a78">
     11  <!ENTITY gegl-size          "5.5 MB">
     12  <!ENTITY gegl-buildsize     "138 MB (additional 25 MB for tests)">
     13  <!ENTITY gegl-time          "2.4 SBU (additional 1.9 SBU for tests)">
    1414]>
    1515
     
    7272    </itemizedlist>
    7373
    74     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    75     <itemizedlist spacing="compact">
    76       <listitem>
    77         <para>
    78           Required patch:
    79           <ulink url="&patch-root;/gegl-&gegl-version;-ffmpeg2-1.patch"/>
    80         </para>
    81       </listitem>
    82     </itemizedlist>
    83 
    8474    <bridgehead renderas="sect3">gegl Dependencies</bridgehead>
    85 
    8675
    8776    <bridgehead renderas="sect4">Required</bridgehead>
    8877    <para role="required">
    8978      <xref linkend="babl"/> and
    90       <xref linkend="glib2"/>
     79      <xref linkend="json-glib"/>
    9180    </para>
    9281
    9382    <bridgehead renderas="sect4">Optional</bridgehead>
    9483    <para role="optional">
     84      <xref linkend="asciidoc"/>,
    9585      <xref linkend="cairo"/>,
    9686      <xref linkend="enscript"/>,
     
    110100      <xref linkend="vala"/>,
    111101      <xref linkend="w3m"/>,
    112       <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink>,
    113102      <ulink url="http://lensfun.berlios.de/">lensfun</ulink>,
    114103      <ulink url="http://libopenraw.freedesktop.org/wiki/">libopenraw</ulink>,
    115104      <ulink url="http://libspiro.sourceforge.net/">libspiro</ulink>,
    116       <ulink url="http://www.cise.ufl.edu/research/sparse/umfpack/">libumfpack</ulink>, and
     105      <ulink url="http://www.cise.ufl.edu/research/sparse/umfpack/">libumfpack</ulink>,
     106      <ulink url="http://www.khronos.org/opencl/">OpenCL</ulink> (for tests), and
    117107      <ulink url="http://www.openexr.org">OpenEXR</ulink>
    118108    </para>
     
    130120    </para>
    131121
    132 <screen><userinput>patch -Np1 -i ../gegl-&gegl-version;-ffmpeg2-1.patch &amp;&amp;
     122<screen><userinput>sed -i '/check:/s/images//' tests/ff-load-save/Makefile.in &amp;&amp;
    133123
    134124./configure --prefix=/usr &amp;&amp;
     
    146136install -v -m644 docs/*.{css,html} /usr/share/gtk-doc/html/gegl &amp;&amp;
    147137install -d -v -m755 /usr/share/gtk-doc/html/gegl/images &amp;&amp;
    148 install -v -m644 docs/images/* /usr/share/gtk-doc/html/gegl/images</userinput></screen>
     138install -v -m644 docs/images/*.{png,ico,svg} /usr/share/gtk-doc/html/gegl/images</userinput></screen>
    149139  </sect2>
    150140
    151141  <sect2 role="commands">
    152142    <title>Command Explanations</title>
     143
     144    <para>
     145      <command>sed ...</command>
     146      Skip tests that fail due to missing image files.
     147    </para>
    153148
    154149    <para>
Note: See TracChangeset for help on using the changeset viewer.