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

Added ENTITY gcc8_checked to aid transition to gcc-6.1.0.

Browse Source 
Update to ffmpeg-3.0.2. Required updates to
ptlib, libquicktime, opal, xine-lib, and transcode.



git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17324 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Bruce Dubbs 2016-05-06 16:47:07 +00:00
parent b9178ccfa3
commit ba1ccf6223
9 changed files with 78 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
general.ent
View File

@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
<!ENTITY day "05"> <!-- Always 2 digits -->
<!ENTITY day "06"> <!-- Always 2 digits -->
<!ENTITY month "05"> <!-- Always 2 digits -->
<!ENTITY year "2016">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
<!ENTITY releasedate "May 5th, &year;">
<!ENTITY releasedate "May 6th &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development] -->
@ -130,7 +130,8 @@ export -f as_root</userinput></screen>
<!-- Problem with some packages introduced by a given dependency version -->
<!ENTITY gcc-490 "gcc-4.9.0">
<!ENTITY gcc6_checked "<para>This package is known to build
properly using the gcc-6 compiler.</para>">
<!ENTITY % package-entities SYSTEM "packages.ent">
%package-entities;

4
general/genlib/ptlib.xml
View File

@ -77,7 +77,7 @@
<listitem>
<para>
Required patch:
<ulink url="&patch-root;/ptlib-&ptlib-version;-bison_fixes-1.patch"/>
<ulink url="&patch-root;/ptlib-&ptlib-version;-bison_fixes-2.patch"/>
</para>
</listitem>
</itemizedlist>
@ -116,7 +116,7 @@
commands:
</para>
<screen><userinput>patch -Np1 -i ../ptlib-&ptlib-version;-bison_fixes-1.patch &amp;&amp;
<screen><userinput>patch -Np1 -i ../ptlib-&ptlib-version;-bison_fixes-2.patch &amp;&amp;
./configure --prefix=/usr &amp;&amp;
make</userinput></screen>

15
introduction/welcome/changelog.xml
View File

@ -43,6 +43,21 @@
</listitem>
-->
<listitem>
<para>May 6th, 2016</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Added ENTITY gcc8_checked to aid
transition to gcc-6.1.0.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to ffmpeg-3.0.2. Required updates to
ptlib, libquicktime, opal, xine-lib, and transcode. Fixes
<ulink url="&blfs-ticket-root;7470">#7470</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>May 5th, 2016</para>
<itemizedlist>

4
multimedia/libdriv/libquicktime.xml
View File

@ -80,7 +80,7 @@
<listitem>
<para>
Required patch:
<ulink url="&patch-root;/libquicktime-&libquicktime-version;-ffmpeg2-1.patch"/>
<ulink url="&patch-root;/libquicktime-&libquicktime-version;-ffmpeg3-1.patch"/>
</para>
</listitem>
</itemizedlist>
@ -118,7 +118,7 @@
following commands:
</para>
<screen><userinput>patch -Np1 -i ../libquicktime-&libquicktime-version;-ffmpeg2-1.patch &amp;&amp;
<screen><userinput>patch -Np1 -i ../libquicktime-&libquicktime-version;-ffmpeg3-1.patch &amp;&amp;
./configure --prefix=/usr \
--enable-gpl \

28
multimedia/libdriv/opal.xml
View File

@ -115,8 +115,18 @@
<screen><userinput>patch -Np1 -i ../opal-&opal-version;-ffmpeg2-1.patch &amp;&amp;
sed -e 's/CODEC_ID/AV_&amp;/' \
-e 's/PIX_FMT_/AV_&amp;/' \
-i plugins/video/H.263-1998/h263-1998.cxx \
plugins/video/common/dyna.cxx \
plugins/video/H.264/h264-x264.cxx \
plugins/video/MPEG4-ffmpeg/mpeg4.cxx &amp;&amp;
ed -e '/&lt;&lt; mime.PrintContents/ s/mime/(const std::string\&amp;)&amp;/' \
-i src/im/msrp.cxx &amp;&amp;
./configure --prefix=/usr &amp;&amp;
make</userinput></screen>
CXXFLAGS=-Wno-deprecated-declarations make</userinput></screen>
<para>
This package does not come with a test suite.
@ -131,6 +141,22 @@ chmod -v 644 /usr/lib/libopal_s.a</userinput></screen>
</sect2>
<sect2 role="commands">
<title>Command Explanations</title>
<para>
<command>sed ...</command>: The first sed fixes several files
to work properly with <xref linkend='ffmpeg'/>. The second fixes
a build issue with <xref linkend='gcc'/>.
</para>
<para>
<envar>CXXFLAGS=-Wno-deprecated-declarations</envar>: This parameter
reduces a lot of warnings generated by <xref linkend='gcc'/>.
</para>
</sect2>
<sect2 role="content">
<title>Contents</title>

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

@ -124,7 +124,12 @@
commands:
</para>
<screen><userinput>./configure --prefix=/usr \
<screen><userinput>sed -e 's/avcodec_alloc_frame/av_frame_alloc/' \
-e 's/avcodec_free_frame/av_frame_free/' \
-i src/combined/ffmpeg/ff_{audio,video}_decoder.c \
src/dxr3/ffmpeg_encoder.c
./configure --prefix=/usr \
--disable-vcd \
--with-external-dvdnav \
--docdir=/usr/share/doc/xine-lib-&xine-lib-version; &amp;&amp;
@ -162,6 +167,15 @@ install -v -m644 doc/api/* \
<sect2 role="commands">
<title>Command Explanations</title>
<para>
<command>sed ...</command>: This command enables the package to be
built with <xref linkend='ffmpeg'/>.
</para>
<para>
<parameter>--with-external-dvdnav</parameter>: This switch is required,
because internal libraries cannot decrypt DVD.
</para>
<para>
<parameter>--disable-vcd</parameter>: This switch is required to compile
<application>Xine Lib</application> without <ulink

20
multimedia/videoutils/ffmpeg.xml
View File

@ -6,13 +6,12 @@
<!ENTITY ffmpeg-download-http "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.xz">
<!ENTITY ffmpeg-download-ftp " ">
<!ENTITY ffmpeg-md5sum "0cff5dae51375f0a31a651f986ed1534">
<!ENTITY ffmpeg-size "6.9 MB">
<!ENTITY ffmpeg-buildsize "156 MB (additional 2450 MB for the FATE suite
and 2251 MB for the documentation, making a total of 4.8 GB for the complete
build of this page)">
<!ENTITY ffmpeg-time "1.3 SBU, with -j4 (additional 3.1 SBU, with
THREADS=4, to run the FATE suite, after sample files are downloaded)">
<!ENTITY ffmpeg-md5sum "beb5c69c671aba1386e7156fc2af1ab6">
<!ENTITY ffmpeg-size "7.1 MB">
<!ENTITY ffmpeg-buildsize "172 MB (add 1.6 GB for the FATE suite/tests
and 1.0 GB for the documentation)">
<!ENTITY ffmpeg-time "5.3 SBU (add 0.6 SBU for docs and 4.5 SBU
to run the FATE suite after sample files are downloaded)">
]>
<sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
@ -196,10 +195,9 @@ gcc tools/qt-faststart.c -o tools/qt-faststart</userinput></screen>
Postscript versions of the documentation, issue the following commands:
</para>
<screen><userinput>sed -i '$s/$/\n\n@bye/' doc/{git-howto,nut,fate}.texi &amp;&amp;
sed -i '/machine:i386/ s/\\/@backslashchar{}/g' doc/platform.texi &amp;&amp;
pushd doc &amp;&amp;
<!-- sed -i '$s/$/\n\n@bye/' doc/{git-howto,nut,fate}.texi &amp;&amp;
sed -i '/machine:i386/ s/\\/@backslashchar{}/g' doc/platform.texi &amp;&amp; -->
<screen><userinput>pushd doc &amp;&amp;
for DOCNAME in `basename -s .html *.html`
do
texi2pdf -b $DOCNAME.texi &amp;&amp;

8
multimedia/videoutils/transcode.xml
View File

@ -38,6 +38,7 @@
</para>
&lfs79_checked;
&gcc6_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@ -78,7 +79,7 @@
<listitem>
<para>
Required patch:
<ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg2-1.patch"/>
<ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg3-1.patch"/>
</para>
</listitem>
</itemizedlist>
@ -164,10 +165,7 @@
<screen><userinput>sed -i 's|doc/transcode|&amp;-$(PACKAGE_VERSION)|' \
$(find . -name Makefile.in -exec grep -l 'docsdir =' {} \;) &amp;&amp;
sed -i "s:av_close_input_file:avformat_close_input:g" \
import/probe_ffmpeg.c &amp;&amp;
patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch &amp;&amp;
patch -Np1 -i ../transcode-&transcode-version;-ffmpeg3-1.patch &amp;&amp;
./configure --prefix=/usr \
--enable-alsa \
--enable-libmpeg2 &amp;&amp;

2
packages.ent
View File

@ -756,7 +756,7 @@
<!ENTITY pnmixer-version "0.5.1">
<!-- Chapter 48 -->
<!ENTITY ffmpeg-version "2.8.6">
<!ENTITY ffmpeg-version "3.0.2">
<!ENTITY mplayer-version "SVN-r37794">
<!ENTITY xine-ui-version "0.99.9">
<!ENTITY transcode-version "1.1.7">