Author: bdubbs Date: Fri May 6 20:46:30 2016 New Revision: 17329 Log: Update to vlc-2.2.3. Update to iso-codes-3.68. Update to btrfs-progs-v4.5.2. Update List-MoreUtils perl module to version 0.415.
Modified: trunk/BOOK/general/genutils/iso-codes.xml trunk/BOOK/general/prog/perl-modules.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/multimedia/videoutils/vlc.xml trunk/BOOK/packages.ent trunk/BOOK/postlfs/filesystems/btrfs-progs.xml Modified: trunk/BOOK/general/genutils/iso-codes.xml ============================================================================== --- trunk/BOOK/general/genutils/iso-codes.xml Fri May 6 18:40:16 2016 (r17328) +++ trunk/BOOK/general/genutils/iso-codes.xml Fri May 6 20:46:30 2016 (r17329) @@ -6,10 +6,10 @@ <!ENTITY iso-codes-download-http "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz";> <!ENTITY iso-codes-download-ftp " "> - <!ENTITY iso-codes-md5sum "8dbf901d2c90afd508ffbd99aed2c456"> - <!ENTITY iso-codes-size "3.4 MB"> + <!ENTITY iso-codes-md5sum "a5ce7d78b80f6d29150883d892f2e185"> + <!ENTITY iso-codes-size "3.3 MB"> <!ENTITY iso-codes-buildsize "78 MB"> - <!ENTITY iso-codes-time "0.1 SBU (plus 0.1 SBU for tests)"> + <!ENTITY iso-codes-time "0.1 SBU (add 0.1 SBU for tests)"> ]> <sect1 id="iso-codes" xreflabel="ISO Codes-&iso-codes-version;"> @@ -36,6 +36,7 @@ </para> &lfs79_checked; + <!-- Does not use gcc/g++ --> <bridgehead renderas="sect3">Package Information</bridgehead> <itemizedlist spacing="compact"> Modified: trunk/BOOK/general/prog/perl-modules.xml ============================================================================== --- trunk/BOOK/general/prog/perl-modules.xml Fri May 6 18:40:16 2016 (r17328) +++ trunk/BOOK/general/prog/perl-modules.xml Fri May 6 20:46:30 2016 (r17329) @@ -64,7 +64,7 @@ <!ENTITY List-AllUtils-md5sum "3e2dfeeef80c4e1952443c6b7d48583c"> <!ENTITY List-MoreUtils-download-http "http://www.cpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-&List-MoreUtils-version;.tar.gz";> - <!ENTITY List-MoreUtils-md5sum "bc577c86455e2d1397187bce286a53b9"> + <!ENTITY List-MoreUtils-md5sum "a8e42767dd4f41f51b96749efe5ef31a"> <!ENTITY Log-Log4perl-download-http "http://www.cpan.org/authors/id/M/MS/MSCHILLI/Log-Log4perl-&Log-Log4perl-version;.tar.gz";> <!ENTITY Log-Log4perl-md5sum "53a0a2e68da51fa445c3557e4852d3a4"> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Fri May 6 18:40:16 2016 (r17328) +++ trunk/BOOK/introduction/welcome/changelog.xml Fri May 6 20:46:30 2016 (r17329) @@ -47,8 +47,24 @@ <para>May 6th, 2016</para> <itemizedlist> <listitem> - <para>[bdubbs] - Update to ImageMagick-7.0.1-1. - Fixes + <para>[bdubbs] - Update to vlc-2.2.3. Fixes + <ulink url="&blfs-ticket-root;7799">#7799</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to iso-codes-3.68. Fixes + <ulink url="&blfs-ticket-root;7796">#7796</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to btrfs-progs-v4.5.2. Fixes + <ulink url="&blfs-ticket-root;7795">#7795</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update List-MoreUtils perl module to version + 0.415. Fixes + <ulink url="&blfs-ticket-root;7789">#7789</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to ImageMagick-7.0.1-1. Fixes <ulink url="&blfs-ticket-root;7520">#7520</ulink>.</para> </listitem> <listitem> Modified: trunk/BOOK/multimedia/videoutils/vlc.xml ============================================================================== --- trunk/BOOK/multimedia/videoutils/vlc.xml Fri May 6 18:40:16 2016 (r17328) +++ trunk/BOOK/multimedia/videoutils/vlc.xml Fri May 6 20:46:30 2016 (r17329) @@ -5,12 +5,11 @@ %general-entities; <!ENTITY vlc-download-http "http://download.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz";> - <!ENTITY vlc-download-ftp " "> -<!-- <!ENTITY vlc-download-ftp "ftp://ftp.videolan.org/pub/videolan/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz";>--> - <!ENTITY vlc-md5sum "f98d60f0f59ef72b6e3407f2ff09bda6"> - <!ENTITY vlc-size "22 MB"> - <!ENTITY vlc-buildsize "679 MB (with tests)"> - <!ENTITY vlc-time "4.4 SBU (with tests)"> + <!ENTITY vlc-download-ftp " "> + <!ENTITY vlc-md5sum "ecbc65be549e5cc83e4cbe0129e66dcd"> + <!ENTITY vlc-size "21 MB"> + <!ENTITY vlc-buildsize "603 MB (add xx MB for tests)"> + <!ENTITY vlc-time "4.6 SBU (add x.y SBU for tests)"> ]> <sect1 id="vlc" xreflabel="VLC-&vlc-version;"> @@ -75,6 +74,17 @@ </listitem> </itemizedlist> + <bridgehead renderas="sect3">Additional Downloads</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para> + Required patch: + <ulink + url="&patch-root;/vlc-&vlc-version;-ffmpeg3-1.patch"/> + </para> + </listitem> + </itemizedlist> + <bridgehead renderas="sect3">VLC Dependencies</bridgehead> <bridgehead renderas="sect4">Recommended</bridgehead> @@ -211,8 +221,8 @@ <title>Installation of VLC</title> <para> - If both Qt4 and Qt5 are installed, Qt5 has to be hidden from - <envar>PKG_CONFIG_PATH</envar>, due to a bug. Temporarily do it, issuing: + If both Qt4 and Qt5 are installed, Qt5 needs to be hidden from + <envar>PKG_CONFIG_PATH</envar>, due to a bug. Temporarily do it by issuing: </para> <screen><userinput>SAVEPATH=$PKG_CONFIG_PATH && @@ -220,40 +230,23 @@ `echo $PKG_CONFIG_PATH | sed 's@:/opt/qt5/lib/pkgconfig@@'`"</userinput></screen> <para> - If you wish to avoid thousands of annoying warnings, issue: + If you wish to avoid many invalid warnings, issue: </para> -<screen><userinput>sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac</userinput></screen> +<screen><userinput>sed -i '/seems to be moved/s/^/#/' autotools/ltmain.sh</userinput></screen> <para> Install <application>VLC</application> by running the following commands: </para> -<screen><userinput>sed -e 's:libsmbclient.h:samba-4.0/&:' \ - -i modules/access/smb.c && - -sed -e '/LUA_C/ i #define LUA_COMPAT_APIINTCASTS' \ - -i modules/lua/vlc.h && - -sed -e '/core.h/ { - a #include <opencv2/imgproc/imgproc_c.h> - a #include <opencv2/imgproc/imgproc.hpp> - }' \ - -i modules/video_filter/opencv_example.cpp && - -./bootstrap && +<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-ffmpeg3-1.patch && +CXX="g++ -std=c++11" \ +CFLAGS="-DLUA_COMPAT_5_1" \ OPENCV_LIBS="-L/usr/share/OpenCV" \ ./configure --prefix=/usr && -sed -e '/seems to be moved/s/^/#/' \ - -i autotools/ltmain.sh libtool &&</userinput></screen> - - <para> - In order to build with Lua 5.1 compatiblity, issue: - </para> - -<screen><userinput>CFLAGS='-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_1' make </userinput></screen> +make</userinput></screen> <para> Again, if both Qt4 and 5 are installed, restore @@ -291,19 +284,13 @@ <title>Command Explanations</title> <para> - <command>sed -i ...</command>: This sed fixes compilation with - <application>Samba</application> 4. + <envar>CXX="g++ -std=c++11"</envar> This environment variable + is needed for compatibility with <xref linkend='gcc'/>. </para> <para> - <command>sed -e ... -i modules/lua/vlc.h</command> This sed fixes - compilation with <application>lua</application> 5.3. - </para> - - <para> - <command>sed -e ... -i modules/video_filter/opencv_example.cpp</command> - This sed partially fixes compilation with - <application>OpenCV</application> 3. + <envar>CFLAGS="-DLUA_COMPAT_5_1"</envar> This environment variable + is needed for compatibilty with <xref linkend='lua'/>. </para> <para> @@ -313,17 +300,6 @@ </para> <para> - <command>./bootstrap</command>: This command calls autoreconf to generate - m4 macros and prepare Makefiles. - </para> - - <para> - <command>sed -e ... -i.orig autotools/ltmain.sh libtool</command>: This - optional sed removes a lot of invalid build warnings. - If desired, remove it. - </para> - - <para> <option>--enable-opencv=no</option>: This switch disables <application>OpenCV</application> suport. </para> @@ -363,25 +339,6 @@ have <application>libgcrypt</application> installed. </para> -<!-- - <para> - <option>- -enable-shine</option>: Use this option if you wish to build the - <application>Shine</application> plugin. - </para> - - <para> - <option>- -enable-tremor</option>: Use this option if you have - <application>Tremor</application> installed and wish to build the - <application>Tremor</application> plugin. - </para> - - <para> - <option>- -enable-aa</option>: Use this option if you have - <application>AAlib</application> installed and wish to build the - <application>AAlib</application> plugin. - </para> ---> - <note> <para> There are many options to <application>VLC</application>'s @@ -405,7 +362,7 @@ cvlc, nvlc, qvlc, rvlc, svlc, vlc and vlc-wrapper </seg> <seg> - libvlccore.so, libvlc.so and several plugins in + libvlccore.so, libvlc.so, and many plugins in /usr/lib/vlc/plugins </seg> <seg> Modified: trunk/BOOK/packages.ent ============================================================================== --- trunk/BOOK/packages.ent Fri May 6 18:40:16 2016 (r17328) +++ trunk/BOOK/packages.ent Fri May 6 20:46:30 2016 (r17329) @@ -42,7 +42,7 @@ <!ENTITY tripwire-version "2.4.2.2"> <!-- Chapter 5 --> -<!ENTITY btrfs-progs-version "4.5.1"> +<!ENTITY btrfs-progs-version "4.5.2"> <!ENTITY fuse-version "2.9.6"> <!ENTITY jfsutils-version "1.1.15"> <!ENTITY lvm2-version "2.02.152"> @@ -101,7 +101,7 @@ <!ENTITY icu-version "&icu-major;.&icu-minor;"><!-- .&icu-patch;--> <!ENTITY icu-dl-version "&icu-major;_&icu-minor;"><!-- _&icu-patch;--> -<!ENTITY iso-codes-version "3.67"> +<!ENTITY iso-codes-version "3.68"> <!ENTITY JS-version "17.0.0"> <!ENTITY JS2-version "24.2.0"> <!ENTITY json-c-version "0.12"> @@ -321,7 +321,7 @@ <!ENTITY HTML-Parser-version "3.72"> <!ENTITY IPC-Run3-version "0.048"> <!ENTITY List-AllUtils-version "0.09"> -<!ENTITY List-MoreUtils-version "0.413"> +<!ENTITY List-MoreUtils-version "0.415"> <!ENTITY Log-Log4perl-version "1.47"> <!ENTITY LWP-version "6.15"> <!ENTITY LWP-Protocol-https-version "6.06"> @@ -760,7 +760,7 @@ <!ENTITY mplayer-version "SVN-r37794"> <!ENTITY xine-ui-version "0.99.9"> <!ENTITY transcode-version "1.1.7"> -<!ENTITY vlc-version "2.2.2"> +<!ENTITY vlc-version "2.2.3"> <!-- Chapter 49 --> <!ENTITY cdrdao-version "1.2.3"> Modified: trunk/BOOK/postlfs/filesystems/btrfs-progs.xml ============================================================================== --- trunk/BOOK/postlfs/filesystems/btrfs-progs.xml Fri May 6 18:40:16 2016 (r17328) +++ trunk/BOOK/postlfs/filesystems/btrfs-progs.xml Fri May 6 20:46:30 2016 (r17329) @@ -6,10 +6,10 @@ <!ENTITY btrfs-progs-download-http "https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz";> <!ENTITY btrfs-progs-download-ftp " "> - <!ENTITY btrfs-progs-md5sum "31be62e9a772f297669b2ee14dc85c27"> + <!ENTITY btrfs-progs-md5sum "10d57fdfc791825e906aa7bd783d2da3"> <!ENTITY btrfs-progs-size "1.1 MB"> - <!ENTITY btrfs-progs-buildsize "67 MB (add 96 MB for tests)"> - <!ENTITY btrfs-progs-time "0.4 SBU (add 1.2 SBU for checks)"> + <!ENTITY btrfs-progs-buildsize "46 MB (add 1.4 GB for tests)"> + <!ENTITY btrfs-progs-time "0.4 SBU (add 2.1 SBU for tests)"> ]> <sect1 id="btrfs-progs" xreflabel="btrfs-progs-&btrfs-progs-version;"> @@ -33,6 +33,7 @@ and debugging tools for the B-tree file system (btrfs).</para> &lfs79_checked; + &gcc6_checked; <bridgehead renderas="sect3">Package Information</bridgehead> <itemizedlist spacing="compact"> @@ -106,9 +107,9 @@ <para>Now, as the <systemitem class="username">root</systemitem> user:</para> -<screen role="root"><userinput>make install && +<screen role="root"><userinput>make install && -ln -s ../../lib/$(readlink /lib/libbtrfs.so) /usr/lib/libbtrfs.so && +ln -sf ../../lib/$(readlink /lib/libbtrfs.so) /usr/lib/libbtrfs.so && rm /lib/libbtrfs.{a,so}</userinput></screen> </sect2> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
