Changeset 2f034e7


Ignore:
Timestamp:
02/02/2016 12:22:00 AM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
741f7111
Parents:
d6e4445
Message:

Merge r16894, r16896, r16897 from trunk.

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

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    rd6e4445 r2f034e7  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "01">                   <!-- Always 2 digits -->
     3<!ENTITY day          "02">                   <!-- Always 2 digits -->
    44<!ENTITY month        "02">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2016">
    … …  
    77<!ENTITY copyholder   "The BLFS systemd Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "February 1st, &year;">
     9<!ENTITY releasedate  "February 2nd, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "systemd">                  <!-- svn|[release #] -->

  • general/graphlib/pixman.xml

    rd6e4445 r2f034e7  
    77  <!ENTITY pixman-download-http "http://cairographics.org/releases/pixman-&pixman-version;.tar.gz">
    88  <!ENTITY pixman-download-ftp  " ">
    9   <!ENTITY pixman-md5sum        "e588622e375e7d578e9df320f1ace2de">
    10   <!ENTITY pixman-size          "806 KB">
    11   <!ENTITY pixman-buildsize     "37 MB (additional 3 MB for tests)">
    12   <!ENTITY pixman-time          "0.4 SBU (additional 0.8 SBU for tests)">
     9  <!ENTITY pixman-md5sum        "e80ebae4da01e77f68744319f01d52a3">
     10  <!ENTITY pixman-size          "860 KB">
     11  <!ENTITY pixman-buildsize     "47 MB (with tests)">
     12  <!ENTITY pixman-time          "0.8 SBU (with tests)">
    1313]>
    1414

  • general/prog/php.xml

    rd6e4445 r2f034e7  
    116116      <xref linkend="libtiff"/>,
    117117      <xref linkend="x-window-system"/>,
    118       <ulink url="http://www.fastio.com/">ClibPDF</ulink>,
     118      <!--<ulink url="http://www.fastio.com/">ClibPDF</ulink>, - site asks for username/password-->
    119119      <ulink url="http://www.adobe.com/devnet/acrobat/fdftoolkit.html">FDF Toolkit</ulink>,
    120120      <ulink url="https://bitbucket.org/libgd/gd-libgd/downloads">GD</ulink>, and
    … …  
    146146      <ulink url="http://www.dbmaker.com/">DBMaker</ulink>,
    147147      <ulink url="http://www.empress.com/">Empress</ulink>,
    148       <ulink url="http://www.frontbase.com/">FrontBase</ulink>,
     148      <ulink url="http://www.frontbase.com/cgi-bin/WebObjects/FBWebSite">FrontBase</ulink>,
    149149      <ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink>,
    150150      <ulink url="http://www.monetra.com/">Monetra</ulink>, and
    … …  
    205205      </para>
    206206    </note>
     207
     208    <para>
     209      If you wish to build <application>PHP</application> with the
     210      <application>tidy-html5</application> library, due to API changes, in the
     211      <application>PHP</application> source, <filename>buffio.h</filename>
     212      header needs to be changed to <filename>tidybuffio.h</filename> in the
     213      file <filename>ext/tidy/tidy.c</filename>:
     214    </para>
     215
     216<screen><userinput>sed -i 's/buffio.h/tidy&amp;/' ext/tidy/*.c</userinput></screen>
    207217
    208218    <para>
    … …  
    380390
    381391      <para>
    382         <option>--with-mysqli=/usr/bin/mysql_config</option>: This option
    383         includes MySQLi support.
     392        <option>--with-mysqli=shared</option>: This option includes MySQLi
     393        support.
    384394      </para>
    385395
    … …  
    390400
    391401      <para>
    392         <option>--with-pdo-mysql=/usr</option>: This option includes PDO: MySQL
     402        <option>--with-pdo-mysql=shared</option>: This option includes PDO:
     403        MySQL support.
     404      </para>
     405
     406      <para>
     407        <option>--with-tidy=shared</option>: This option includes tidy library
    393408        support.
    394409      </para>

  • introduction/welcome/changelog.xml

    rd6e4445 r2f034e7  
    4444
    4545-->
     46
     47    <listitem>
     48      <para>February 2nd, 2016</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[dj] - Updated to ffmpeg-2.8.6. Merged from trunk r16894.</para>
     52        </listitem>
     53        <listitem>
     54          <para>[dj] - Updated to pixman-0.34.0. Merged from trunk
     55          r16894.</para>
     56        </listitem>
     57      </itemizedlist>
     58    </listitem>
     59
    4660    <listitem>
    4761      <para>February 1st, 2016</para>

  • multimedia/libdriv/x265.xml

    rd6e4445 r2f034e7  
    7676        <para>
    7777          Required patch:
    78           <ulink url="&patch-root;/x265_&x265-version;-enable_static-1.patch"/>
     78          <ulink url="&patch-root;/x265-&x265-version;-enable_static-1.patch"/>
    7979        </para>
    8080      </listitem>
    … …  
    112112    </para>
    113113
    114 <screen><userinput>patch -Np1 -i x265_&x265-version;-enable_static-1.patch &amp;&amp;
     114<screen><userinput>patch -Np1 -i ../x265-&x265-version;-enable_static-1.patch &amp;&amp;
    115115
    116116mkdir bld &amp;&amp;

  • multimedia/videoutils/ffmpeg.xml

    rd6e4445 r2f034e7  
    77  <!ENTITY ffmpeg-download-http "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.xz">
    88  <!ENTITY ffmpeg-download-ftp  " ">
    9   <!ENTITY ffmpeg-md5sum        "b34164bd181f4f81c21da3dd131d919d">
     9  <!ENTITY ffmpeg-md5sum        "0cff5dae51375f0a31a651f986ed1534">
    1010  <!ENTITY ffmpeg-size          "6.9 MB">
    11   <!ENTITY ffmpeg-buildsize     "156 MB (additional 2450 MB for the FATE suite)">
    12   <!ENTITY ffmpeg-time          "1.2 SBU, with -j4 (additional 3.1 SBU, with THREADS=4,
    13     to run the FATE suite, after sample files are downloaded)">
     11  <!ENTITY ffmpeg-buildsize     "156 MB (additional 2450 MB for the FATE suite
     12    and 2251 MB for the documentation, making a total of 4.8 GB for the complete
     13    build of this page)">
     14  <!ENTITY ffmpeg-time          "1.3 SBU, with -j4 (additional 3.1 SBU, with
     15    THREADS=4, to run the FATE suite, after sample files are downloaded)">
    1416]>
    1517
    … …  
    468470        </seg>
    469471        <seg>
    470           /usr/include/lib{avcodec,avdevice,avfilter,avformat},
    471           /usr/include/lib{avutil,postproc,swresample,swscale},
     472          /usr/include/libav{codec,device,filter,format,util},
     473          /usr/include/libpostproc,
     474          /usr/include/libsw{resample,scale},
    472475          /usr/share/doc/ffmpeg-&ffmpeg-version;, and
    473476          /usr/share/ffmpeg

  • packages.ent

    rd6e4445 r2f034e7  
    196196<!ENTITY openjpeg-version             "1.5.2">
    197197<!ENTITY openjpeg2-version            "2.1.0">
    198 <!ENTITY pixman-version               "0.32.8">   <!-- Even minors only -->
     198<!ENTITY pixman-version               "0.34.0">   <!-- Even minors only -->
    199199<!ENTITY poppler-version              "0.40.0">
    200200<!ENTITY qpdf-version                 "6.0.0">
    … …  
    758758
    759759<!-- Chapter 40 -->
    760 <!ENTITY ffmpeg-version               "2.8.5">
     760<!ENTITY ffmpeg-version               "2.8.6">
    761761<!ENTITY mplayer-version              "SVN-r37561">
    762762<!ENTITY xine-ui-version              "0.99.9">
Note: See TracChangeset for help on using the changeset viewer.