From c7cb25b4c200ac195ce07eebf3255ce479590af6 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 30 Jul 2017 20:46:41 +0000 Subject: [PATCH] Update to faad-2.8.1. Update to faac-1.29.3. Update to xfce4-terminal-0.8.6. Fix spacing in apache and icewm. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18965 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 2 +- introduction/welcome/changelog.xml | 12 +++++++++++ multimedia/libdriv/faac.xml | 32 +++++------------------------- multimedia/libdriv/faad2.xml | 10 +++++----- packages.ent | 6 +++--- server/major/apache.xml | 3 +-- x/wm/icewm.xml | 3 +-- xfce/apps/xfce4-terminal.xml | 4 ++-- 8 files changed, 30 insertions(+), 42 deletions(-) diff --git a/general.ent b/general.ent index 11b45f39d7..41d0a2eec3 100644 --- a/general.ent +++ b/general.ent @@ -6,7 +6,7 @@ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 58829d6e35..470248b032 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -45,6 +45,18 @@ July 30th, 2017 + + [bdubbs] - Update to faad-2.8.1. Fixes + #9492. + + + [bdubbs] - Update to faac-1.29.3. Fixes + #9416. + + + [bdubbs] - Update to xfce4-terminal-0.8.6. Fixes + #9485. + [dj] - Update to Node.js-8.2.1. Fixes #9502. diff --git a/multimedia/libdriv/faac.xml b/multimedia/libdriv/faac.xml index 978a50a9d8..4ba6488d29 100644 --- a/multimedia/libdriv/faac.xml +++ b/multimedia/libdriv/faac.xml @@ -4,12 +4,12 @@ %general-entities; - + - - - - + + + + ]> @@ -60,15 +60,6 @@ - FAAC Dependencies - - Optional - libmp4v2 from - mpeg4ip (untested, - as of 2007-09-28, development of the project is stopped; - an internal version of the library is used if the external one - is not found). - User Notes: @@ -84,7 +75,6 @@ ./bootstrap && -CFLAGS=-std=c99 CXXFLAGS=-std=c++98 \ ./configure --prefix=/usr --disable-static && make @@ -115,18 +105,6 @@ aplay Front_Left.wav Command Explanations - - - - - CFLAGS=... CXXFLAGS=...: These environment - variables fix a problem with compiling under GCC-6.x. - sed -i ...: This command removes documentation for the parameter from the faac --long-help command output. This parameter diff --git a/multimedia/libdriv/faad2.xml b/multimedia/libdriv/faad2.xml index 83f939a867..b4376fcc20 100644 --- a/multimedia/libdriv/faad2.xml +++ b/multimedia/libdriv/faad2.xml @@ -4,12 +4,12 @@ %general-entities; - + - - - - + + + + ]> diff --git a/packages.ent b/packages.ent index af78c0776d..b8f348f93b 100644 --- a/packages.ent +++ b/packages.ent @@ -640,7 +640,7 @@ - + @@ -751,8 +751,8 @@ - - + + diff --git a/server/major/apache.xml b/server/major/apache.xml index be7ba634d6..479e59bb48 100644 --- a/server/major/apache.xml +++ b/server/major/apache.xml @@ -135,8 +135,7 @@ useradd -c "Apache Server" -d /srv/www -g apache \ following commands: - -patch -Np1 -i ../httpd-&apache-version;-blfs_layout-1.patch && +patch -Np1 -i ../httpd-&apache-version;-blfs_layout-1.patch && sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in && diff --git a/x/wm/icewm.xml b/x/wm/icewm.xml index 263cc55720..25f4c41f95 100644 --- a/x/wm/icewm.xml +++ b/x/wm/icewm.xml @@ -82,8 +82,7 @@ Install IceWM by running the following commands: - -./configure --prefix=/usr \ +./configure --prefix=/usr \ --sysconfdir=/etc \ --docdir=/usr/share/icewm-&icewm-version; && make diff --git a/xfce/apps/xfce4-terminal.xml b/xfce/apps/xfce4-terminal.xml index 7289b4c3ad..26944ae3a4 100644 --- a/xfce/apps/xfce4-terminal.xml +++ b/xfce/apps/xfce4-terminal.xml @@ -7,8 +7,8 @@ - - + + ]>