Index: general.ent
===================================================================
--- general.ent	(revision 0db2a7fe7f88cb901006898c4d850b032af4eb13)
+++ general.ent	(revision d42f02c64cc85d2c2cc89d27f41058e320a44f97)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "21">                   <!-- Always 2 digits -->
+<!ENTITY day          "22">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 21st &year;">
+<!ENTITY releasedate  "January 22nd &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision 0db2a7fe7f88cb901006898c4d850b032af4eb13)
+++ general/graphlib/libpng.xml	(revision d42f02c64cc85d2c2cc89d27f41058e320a44f97)
@@ -7,5 +7,5 @@
   <!ENTITY libpng-download-http "&sourceforge-repo;/libpng/libpng-&libpng-version;.tar.xz">
   <!ENTITY libpng-download-ftp  " ">
-  <!ENTITY libpng-md5sum        "3968acb7c66ef81a9dab867f35d0eb4b">
+  <!ENTITY libpng-md5sum        "3bacb4728f6694a64ad9052769d6a4ce">
   <!ENTITY libpng-size          "924 KB">
   <!ENTITY libpng-buildsize     "16 MB (with tests)">
@@ -14,6 +14,8 @@
   <!ENTITY apng-version "&libpng-version;">
 
+  <!--<!ENTITY apng-patch
+           "&sourceforge-repo;/libpng-apng/libpng-&apng-version;-apng.patch.gz">-->
   <!ENTITY apng-patch
-           "&sourceforge-repo;/libpng-apng/libpng-&apng-version;-apng.patch.gz">
+           "&sourceforge-repo;/project/apng/libpng/libpng16/libpng-&apng-version;-apng.patch.gz">
 ]>
 
@@ -104,5 +106,6 @@
     </para>
 
-<screen><userinput>gzip -cd ../libpng-&apng-version;-apng.patch.gz | patch -p1</userinput></screen>
+<!--<screen><userinput>gzip -cd ../libpng-&apng-version;-apng.patch.gz | patch -p1</userinput></screen>-->
+<screen><userinput>gzip -cd ../libpng-&apng-version;-apng.patch.gz | patch -p0</userinput></screen>
 
     <para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 0db2a7fe7f88cb901006898c4d850b032af4eb13)
+++ introduction/welcome/changelog.xml	(revision d42f02c64cc85d2c2cc89d27f41058e320a44f97)
@@ -44,4 +44,26 @@
 
 -->
+
+    <listitem>
+      <para>January 22nd, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to cups-filters-1.8.1. Fixes
+          <ulink url="&blfs-ticket-root;7388">#7388</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to libpng-1.6.21. Replaced apng patch. Fixes
+          <ulink url="&blfs-ticket-root;7369">#7369</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - VLC-2.2.1: several fixes and disable building
+          with opencv-3.1.0.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to pulseaudio-8.0. Fixes
+          <ulink url="&blfs-ticket-root;7302">#7302</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision 0db2a7fe7f88cb901006898c4d850b032af4eb13)
+++ multimedia/libdriv/pulseaudio.xml	(revision d42f02c64cc85d2c2cc89d27f41058e320a44f97)
@@ -8,8 +8,8 @@
            "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-&pulseaudio-version;.tar.xz">
   <!ENTITY pulseaudio-download-ftp  " ">
-  <!ENTITY pulseaudio-md5sum        "9d0a9817b632cac8e3f3834d7eb1c99d">
-  <!ENTITY pulseaudio-size          "1.4 MB">
-  <!ENTITY pulseaudio-buildsize     "91 MB (additional 20 MB for tests)">
-  <!ENTITY pulseaudio-time          "1.7 SBU (additional 0.8 SBU for tests)">
+  <!ENTITY pulseaudio-md5sum        "8678442ba0bb4b4c33ac6f62542962df">
+  <!ENTITY pulseaudio-size          "1.5 MB">
+  <!ENTITY pulseaudio-buildsize     "110 MB (with tests)">
+  <!ENTITY pulseaudio-time          "2.2 SBU (with tests)">
 ]>
 
@@ -110,9 +110,9 @@
       <ulink url="http://0pointer.de/lennart/projects/libasyncns/">libasyncns</ulink>,
       <ulink url="http://www.lirc.org/">LIRC</ulink>,
-      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
+      <ulink url="http://gstreamer.freedesktop.org/src/orc/">ORC</ulink>,
       <ulink url="http://tdb.samba.org/">TDB</ulink>,
       <ulink url="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/">
       WebRTC AudioProcessing</ulink> and
-      <ulink url="http://www.xen.org/">XEN</ulink>
+      <ulink url="http://www.xenproject.org/">XEN</ulink>
     </para>
 
@@ -257,16 +257,13 @@
         </seg>
         <seg>
-          libpulse.so,
-          libpulsecommon-&pulseaudio-major-version;.so,
-          libpulsedsp.so,
           libpulse-mainloop-glib.so,
-          libpulse-simple.so, and
-          libpulsecore-&pulseaudio-major-version;.so
+          libpulse-simple.so and
+          libpulse.so
         </seg>
         <seg>
           /etc/pulse,
           /usr/include/pulse,
+          /usr/lib/cmake/PulseAudio,
           /usr/lib/{pulseaudio,pulse-&pulseaudio-major-version;},
-          /usr/lib/cmake/PulseAudio,
           /usr/libexec/pulse, and
           /usr/share/pulseaudio
Index: multimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision 0db2a7fe7f88cb901006898c4d850b032af4eb13)
+++ multimedia/videoutils/vlc.xml	(revision d42f02c64cc85d2c2cc89d27f41058e320a44f97)
@@ -101,4 +101,5 @@
       <xref linkend="libdvdread"/>,
       <xref linkend="libdvdnav"/>,
+      <xref linkend="opencv"/>,
       <xref linkend="samba"/>,
       <xref linkend="v4l-utils"/>,
@@ -107,6 +108,5 @@
       <ulink url="http://sourceforge.net/projects/libcddb/">libcddb</ulink>,
       <ulink url="http://code.google.com/p/libproxy/">libproxy</ulink>,
-      <ulink url="http://www.live555.com/">Live555</ulink>,
-      <ulink url="http://sourceforge.net/projects/opencvlibrary/">OpenCV</ulink>, and
+      <ulink url="http://www.live555.com/">Live555</ulink>, and
       <ulink url="http://www.gnu.org/software/vcdimager/">VCDImager</ulink>
       (requires <xref linkend="libcdio"/>)
@@ -217,13 +217,13 @@
     -i modules/access/smb.c &amp;&amp;
 
+sed -e '/LUA_C/ i #define LUA_COMPAT_APIINTCASTS' \
+    -i modules/lua/vlc.h    &amp;&amp;
+
 ./bootstrap &amp;&amp;
 
-./configure --prefix=/usr &amp;&amp;
-
-sed -e 's/luaL_optint/(int)&amp;eger/' \
-    -i modules/lua/libs/{net,osd,volume}.c &amp;&amp;
-sed -e 's/luaL_checkint(/(int)luaL_checkinteger(/' \
-    -i modules/lua/{demux,libs/{configuration,net,osd,playlist}}.c \
-       modules/lua/{demux,libs/{stream,variables,volume}}.c &amp;&amp;
+./configure --prefix=/usr --enable-opencv=no &amp;&amp;
+
+sed -e '/seems to be moved/s/^/#/' \
+    -i.orig autotools/ltmain.sh libtool &amp;&amp;
 
 make</userinput></screen>
@@ -262,4 +262,9 @@
 
     <para>
+      <command>sed -e ... -i modules/lua/vlc.h</command> This sed fixes
+      compilation with <application>lua</application> 5.3.
+    </para>
+
+    <para>
       <command>./bootstrap</command>: This command calls autoreconf to generate
       m4 macros and prepare Makefiles.
@@ -267,11 +272,13 @@
 
     <para>
-      <command>sed -i ... {net,osd,volume}.c</command> This sed fixes
-      compilation with <application>lua</application> 5.3.
-    </para>
-
-    <para>
-      <command>sed -i ... variables,volume}}.c</command>: This sed fixes
-      compilation with <application>lua</application> 5.3.
+      <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>
+      <parameter>--enable-opencv=no</parameter>: This switch disables
+      <application>opencv</application> suport, because build is broken with
+      opencv-3.1.
     </para>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision 0db2a7fe7f88cb901006898c4d850b032af4eb13)
+++ packages.ent	(revision d42f02c64cc85d2c2cc89d27f41058e320a44f97)
@@ -177,5 +177,5 @@
 <!ENTITY libjpeg-turbo-version        "1.4.2">
 <!ENTITY libmng-version               "2.0.3">
-<!ENTITY libpng-version               "1.6.20">
+<!ENTITY libpng-version               "1.6.21">
 <!ENTITY librsvg-version              "2.40.13">   <!-- Normally even minors
                                                        Required version in order to use
@@ -734,5 +734,5 @@
 <!ENTITY opal-version                 "3.10.10">
 <!ENTITY opus-version                 "1.1.2">
-<!ENTITY pulseaudio-major-version     "7.1">
+<!ENTITY pulseaudio-major-version     "8.0">
 <!ENTITY pulseaudio-version           "&pulseaudio-major-version;">
 <!ENTITY sdl-version                  "1.2.15">
@@ -783,5 +783,5 @@
 <!-- Chapter 50 -->
 <!ENTITY cups-version                 "2.1.2">
-<!ENTITY cups-filters-version         "1.7.0">
+<!ENTITY cups-filters-version         "1.8.1">
 <!ENTITY gs-version                   "9.18">
 <!ENTITY gutenprint-version           "5.2.11">
Index: pst/printing/cups-filters.xml
===================================================================
--- pst/printing/cups-filters.xml	(revision 0db2a7fe7f88cb901006898c4d850b032af4eb13)
+++ pst/printing/cups-filters.xml	(revision d42f02c64cc85d2c2cc89d27f41058e320a44f97)
@@ -8,5 +8,5 @@
   "https://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz">
   <!ENTITY cups-filters-download-ftp  " ">
-  <!ENTITY cups-filters-md5sum        "aa63e117f963c83ad7d916287217cbc1">
+  <!ENTITY cups-filters-md5sum        "4c4a10b7cbc20f6f6ee5d05d7561399d">
   <!ENTITY cups-filters-size          "1.4 MB">
   <!ENTITY cups-filters-buildsize     "50 MB (with tests)">
@@ -107,6 +107,7 @@
       <xref linkend="avahi"/>,
       <xref linkend="openldap"/>,
-      <xref linkend="php"/> (use of this might be broken), and
-      <ulink url="http://liblouis.org/">Liblouis (Braille)</ulink>
+      <xref linkend="php"/> (use of this might be broken),
+      <ulink url="http://liblouis.org/">Liblouis (Braille)</ulink>, and
+      <ulink url="http://liblouis.org/">Liblouisutdml (Braille)</ulink>
     </para>
 
@@ -214,5 +215,5 @@
         <seg>
           /usr/include/{cupsfilters,fontembed},
-          /usr/share/cups/charsets,
+          /usr/share/cups/{braille,charsets},
           /usr/share/doc/cups-filters-&cups-filters-version; and
           /usr/share/ppd/cupsfilters
