Ignore:
Timestamp:
05/07/2016 08:10:29 PM (8 years ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
systemd-13485
Children:
2e633b6
Parents:
37191af
Message:

Sync to trunk r17332

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

Location:
multimedia/videoutils
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • multimedia/videoutils/ffmpeg.xml

    r37191af rd7bee48  
    77  <!ENTITY ffmpeg-download-http "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.xz">
    88  <!ENTITY ffmpeg-download-ftp  " ">
    9   <!ENTITY ffmpeg-md5sum        "0cff5dae51375f0a31a651f986ed1534">
    10   <!ENTITY ffmpeg-size          "6.9 MB">
    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)">
     9  <!ENTITY ffmpeg-md5sum        "beb5c69c671aba1386e7156fc2af1ab6">
     10  <!ENTITY ffmpeg-size          "7.1 MB">
     11  <!ENTITY ffmpeg-buildsize     "172 MB (add 1.6 GB for the FATE suite/tests
     12    and 1.0 GB for the documentation)">
     13  <!ENTITY ffmpeg-time          "5.3 SBU (add 0.6 SBU for docs and 4.5 SBU
     14    to run the FATE suite after sample files are downloaded)">
    1615]>
    1716
    … …  
    196195      Postscript versions of the documentation, issue the following commands:
    197196    </para>
    198 
     197<!--
    199198<screen><userinput>sed -i '$s/$/\n\n@bye/' doc/{git-howto,nut,fate}.texi             &amp;&amp;
    200199sed -i '/machine:i386/ s/\\/@backslashchar{}/g' doc/platform.texi &amp;&amp;
    201 
    202 pushd doc &amp;&amp;
     200-->
     201<screen><userinput>pushd doc &amp;&amp;
    203202for DOCNAME in `basename -s .html *.html`
    204203do

  • multimedia/videoutils/transcode.xml

    r37191af rd7bee48  
    7979        <para>
    8080          Required patch:
    81           <ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg2-1.patch"/>
     81          <ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg3-1.patch"/>
    8282        </para>
    8383      </listitem>
    … …  
    165165       $(find . -name Makefile.in -exec grep -l 'docsdir =' {} \;) &amp;&amp;
    166166
    167 sed -i "s:av_close_input_file:avformat_close_input:g" \
    168        import/probe_ffmpeg.c                                       &amp;&amp;
    169 
    170 patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch                   &amp;&amp;
     167patch -Np1 -i ../transcode-&transcode-version;-ffmpeg3-1.patch                   &amp;&amp;
    171168./configure --prefix=/usr \
    172169            --enable-alsa \

  • multimedia/videoutils/vlc.xml

    r37191af rd7bee48  
    66
    77  <!ENTITY vlc-download-http "http://download.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
    8       <!ENTITY vlc-download-ftp " ">
    9 <!--  <!ENTITY vlc-download-ftp "ftp://ftp.videolan.org/pub/videolan/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">-->
    10   <!ENTITY vlc-md5sum        "f98d60f0f59ef72b6e3407f2ff09bda6">
    11   <!ENTITY vlc-size          "22 MB">
    12   <!ENTITY vlc-buildsize     "679 MB (with tests)">
    13   <!ENTITY vlc-time          "4.4 SBU (with tests)">
     8  <!ENTITY vlc-download-ftp " ">
     9  <!ENTITY vlc-md5sum        "ecbc65be549e5cc83e4cbe0129e66dcd">
     10  <!ENTITY vlc-size          "21 MB">
     11  <!ENTITY vlc-buildsize     "603 MB (with tests)">
     12  <!ENTITY vlc-time          "4.6 SBU (with tests)">
    1413]>
    1514
    … …  
    7271        <para>
    7372          Estimated build time: &vlc-time;
     73        </para>
     74      </listitem>
     75    </itemizedlist>
     76
     77    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     78    <itemizedlist spacing="compact">
     79      <listitem>
     80        <para>
     81          Required patch:
     82          <ulink url="&patch-root;/vlc-&vlc-version;-ffmpeg3-1.patch"/>
    7483        </para>
    7584      </listitem>
    … …  
    212221
    213222    <para>
    214       If both Qt4 and Qt5 are installed, Qt5 has to be hidden from
    215       <envar>PKG_CONFIG_PATH</envar>, due to a bug. Temporarily do it, issuing:
     223      If both Qt4 and Qt5 are installed, Qt5 needs to be hidden from
     224      <envar>PKG_CONFIG_PATH</envar>, due to a bug. Temporarily do it by issuing:
    216225    </para>
    217226
    … …  
    221230
    222231    <para>
    223       If you wish to avoid thousands of annoying warnings, issue:
    224     </para>
    225 
    226 <screen><userinput>sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac</userinput></screen>
     232      If you wish to avoid many invalid warnings, issue:
     233    </para>
     234<screen><userinput>sed -i '/seems to be moved/s/^/#/' autotools/ltmain.sh</userinput></screen>
    227235
    228236    <para>
    … …  
    230238    </para>
    231239
    232 <screen><userinput>sed -e 's:libsmbclient.h:samba-4.0/&amp;:' \
    233     -i modules/access/smb.c &amp;&amp;
    234 
    235 sed -e '/LUA_C/ i #define LUA_COMPAT_APIINTCASTS' \
    236     -i modules/lua/vlc.h    &amp;&amp;
    237 
    238 sed -e '/core.h/ {
    239         a #include &lt;opencv2/imgproc/imgproc_c.h&gt;
    240         a #include &lt;opencv2/imgproc/imgproc.hpp&gt;
    241     }' \
    242     -i modules/video_filter/opencv_example.cpp &amp;&amp;
    243 
    244 ./bootstrap &amp;&amp;
    245 
     240<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-ffmpeg3-1.patch &amp;&amp;
     241
     242CXX="g++ -std=c++11"             \
     243CFLAGS="-DLUA_COMPAT_5_1"        \
    246244OPENCV_LIBS="-L/usr/share/OpenCV" \
    247245./configure --prefix=/usr &amp;&amp;
    248246
    249 sed -e '/seems to be moved/s/^/#/' \
    250     -i autotools/ltmain.sh libtool &amp;&amp;</userinput></screen>
    251 
    252     <para>
    253       In order to build with Lua 5.1 compatiblity, issue:
    254     </para>
    255 
    256 <screen><userinput>CFLAGS='-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_1' make </userinput></screen>
     247make</userinput></screen>
    257248
    258249    <para>
    … …  
    292283
    293284    <para>
    294       <command>sed -i ...</command>: This sed fixes compilation with
    295       <application>Samba</application> 4.
    296     </para>
    297 
    298     <para>
    299       <command>sed -e ... -i modules/lua/vlc.h</command> This sed fixes
    300       compilation with <application>lua</application> 5.3.
    301     </para>
    302 
    303     <para>
    304       <command>sed -e ... -i modules/video_filter/opencv_example.cpp</command>
    305       This sed partially fixes compilation with
    306       <application>OpenCV</application> 3.
     285      <envar>CXX="g++ -std=c++11"</envar>: This environment variable
     286      is needed for compatibility with <xref linkend="gcc"/>.
     287    </para>
     288
     289    <para>
     290      <envar>CFLAGS="-DLUA_COMPAT_5_1"</envar>: This environment variable
     291      is needed for compatibility with <xref linkend="lua"/>.
    307292    </para>
    308293
    … …  
    314299
    315300    <para>
    316       <command>./bootstrap</command>: This command calls autoreconf to generate
    317       m4 macros and prepare Makefiles.
    318     </para>
    319 
    320     <para>
    321       <command>sed -e ... -i.orig autotools/ltmain.sh libtool</command>: This
    322       optional sed removes a lot of invalid build warnings.
    323       If desired, remove it.
    324     </para>
    325 
    326     <para>
    327301      <option>--enable-opencv=no</option>: This switch disables
    328302      <application>OpenCV</application> suport.
    … …  
    363337      have <application>libgcrypt</application> installed.
    364338    </para>
    365 
    366 <!--
    367     <para>
    368       <option>- -enable-shine</option>: Use this option if you wish to build the
    369       <application>Shine</application> plugin.
    370     </para>
    371 
    372     <para>
    373       <option>- -enable-tremor</option>: Use this option if you have
    374       <application>Tremor</application> installed and wish to build the
    375       <application>Tremor</application> plugin.
    376     </para>
    377 
    378     <para>
    379       <option>- -enable-aa</option>: Use this option if you have
    380       <application>AAlib</application> installed and wish to build the
    381       <application>AAlib</application> plugin.
    382     </para>
    383 -->
    384339
    385340    <note>
    … …  
    406361        </seg>
    407362        <seg>
    408           libvlccore.so, libvlc.so and several plugins in
     363          libvlccore.so, libvlc.so and many plugins in
    409364          /usr/lib/vlc/plugins
    410365        </seg>
Note: See TracChangeset for help on using the changeset viewer.