From 8c85454db3a38253085f1dadd1c6a56e79cb6aac Mon Sep 17 00:00:00 2001
From: matsuand <matsuand@d6661c75-0afd-443a-aae1-cb31083e41e8>
Date: Fri, 20 Dec 2013 22:30:32 +0000
Subject: [PATCH] =?utf8?q?[BLFS-SVN]=20Version=202013-12-20,=20r12421=20?=
 =?utf8?q?=E5=AF=BE=E5=BF=9C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://svn.osdn.net/svnroot/lfsbookja/trunk@858 d6661c75-0afd-443a-aae1-cb31083e41e8
---
 blfsbook/configure                               |  2 +-
 blfsbook/src/general.ch                          |  4 ++--
 blfsbook/src/general/graphlib/jasper.ch          | 28 +++++++++++++++++-------
 blfsbook/src/multimedia/libdriv/Makefile.am      |  2 ++
 blfsbook/src/multimedia/libdriv/Makefile.in      |  2 ++
 blfsbook/src/multimedia/libdriv/grilo-plugins.ch |  0
 blfsbook/version.ac                              |  2 +-
 7 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 blfsbook/src/multimedia/libdriv/grilo-plugins.ch

diff --git a/blfsbook/configure b/blfsbook/configure
index eb27e3bc..9ee7706b 100755
--- a/blfsbook/configure
+++ b/blfsbook/configure
@@ -4013,7 +4013,7 @@ $as_echo "found" >&6; }
   fi
 
 
-TARGETVER=20131218
+TARGETVER=20131220
 
 ORGDAY=`grep 'ENTITY day' ${bookdir}/general.ent | gawk '{print $3;}' | sed 's/^[^\"]*\"\([0-9]*\)\".*$/\1/'`
 ORGMONTH=`grep 'ENTITY month' ${bookdir}/general.ent | gawk '{print $3;}' | sed 's/^[^\"]*\"\([0-9]*\)\".*$/\1/'`
diff --git a/blfsbook/src/general.ch b/blfsbook/src/general.ch
index c10210fe..0570668c 100644
--- a/blfsbook/src/general.ch
+++ b/blfsbook/src/general.ch
@@ -15,11 +15,11 @@
 
 @x
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "December 18th, &year;">
+<!ENTITY releasedate  "December 20th, &year;">
 @y
 <!ENTITY version      "&year;-&month;-&day;">
 <!ENTITY releasedate  "&year;/&month;/&day;">
-<!ENTITY jversion     "20131219">
+<!ENTITY jversion     "20131221">
 <!ENTITY jratio       "55.9 &percnt;">
 @z
 
diff --git a/blfsbook/src/general/graphlib/jasper.ch b/blfsbook/src/general/graphlib/jasper.ch
index bcbcccdf..fbe26fc2 100644
--- a/blfsbook/src/general/graphlib/jasper.ch
+++ b/blfsbook/src/general/graphlib/jasper.ch
@@ -109,14 +109,26 @@
 
 @x
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="optional"><xref linkend="libjpeg"/>,
-    <xref linkend="x-window-system"/>, and
-    <xref linkend="freeglut"/></para>
+    <para role="recommended">
+      <xref linkend="libjpeg"/>
+    </para>
 @y
     <bridgehead renderas="sect4">&Recommended;</bridgehead>
-    <para role="optional"><xref linkend="libjpeg"/>,
-    <xref linkend="x-window-system"/>,
-    <xref linkend="freeglut"/></para>
+    <para role="recommended">
+      <xref linkend="libjpeg"/>
+    </para>
+@z
+
+@x
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="freeglut"/> (required for <command>jiv</command>)
+    </para>
+@y
+    <bridgehead renderas="sect4">&Optional;</bridgehead>
+    <para role="optional">
+      <xref linkend="freeglut"/> (<command>jiv</command> に必要)
+    </para>
 @z
 
 @x
@@ -175,10 +187,10 @@
 @z
 
 @x
-    <para><option>--enable-shared</option>: This command
+    <para><parameter>--enable-shared</parameter>: This command
     causes the shared library to be built.</para>
 @y
-    <para><option>--enable-shared</option>: This command
+    <para><parameter>--enable-shared</parameter>: This command
     causes the shared library to be built.</para>
 @z
 
diff --git a/blfsbook/src/multimedia/libdriv/Makefile.am b/blfsbook/src/multimedia/libdriv/Makefile.am
index 8efd2bcd..e6137fdb 100644
--- a/blfsbook/src/multimedia/libdriv/Makefile.am
+++ b/blfsbook/src/multimedia/libdriv/Makefile.am
@@ -21,6 +21,7 @@ CHANGE_FILES = \
 	fdk-aac.ch            \
 	flac.ch               \
 	grilo.ch              \
+	grilo-plugins.ch      \
 	gst-ffmpeg.ch         \
 	gst-plugins-bad.ch    \
 	gst-plugins-base.ch   \
@@ -92,6 +93,7 @@ farstream.xml:               $(BOOKdir)/$@ $(srcdir)/farstream.ch
 fdk-aac.xml:                 $(BOOKdir)/$@ $(srcdir)/fdk-aac.ch
 flac.xml:                    $(BOOKdir)/$@ $(srcdir)/flac.ch
 grilo.xml:                   $(BOOKdir)/$@ $(srcdir)/grilo.ch
+grilo-plugins.xml:           $(BOOKdir)/$@ $(srcdir)/grilo-plugins.ch
 gst-ffmpeg.xml:              $(BOOKdir)/$@ $(srcdir)/gst-ffmpeg.ch
 gst-plugins-bad.xml:         $(BOOKdir)/$@ $(srcdir)/gst-plugins-bad.ch $(srcdir)/gst-plugins-bad.sed
 	sed -f $(srcdir)/gst-plugins-bad.sed $(BOOKdir)/gst-plugins-bad.xml > $(BOOKdir)/gst-plugins-bad_lfsbookja.xml
diff --git a/blfsbook/src/multimedia/libdriv/Makefile.in b/blfsbook/src/multimedia/libdriv/Makefile.in
index b7bfc6d3..141ea161 100644
--- a/blfsbook/src/multimedia/libdriv/Makefile.in
+++ b/blfsbook/src/multimedia/libdriv/Makefile.in
@@ -198,6 +198,7 @@ CHANGE_FILES = \
 	fdk-aac.ch            \
 	flac.ch               \
 	grilo.ch              \
+	grilo-plugins.ch      \
 	gst-ffmpeg.ch         \
 	gst-plugins-bad.ch    \
 	gst-plugins-base.ch   \
@@ -451,6 +452,7 @@ farstream.xml:               $(BOOKdir)/$@ $(srcdir)/farstream.ch
 fdk-aac.xml:                 $(BOOKdir)/$@ $(srcdir)/fdk-aac.ch
 flac.xml:                    $(BOOKdir)/$@ $(srcdir)/flac.ch
 grilo.xml:                   $(BOOKdir)/$@ $(srcdir)/grilo.ch
+grilo-plugins.xml:           $(BOOKdir)/$@ $(srcdir)/grilo-plugins.ch
 gst-ffmpeg.xml:              $(BOOKdir)/$@ $(srcdir)/gst-ffmpeg.ch
 gst-plugins-bad.xml:         $(BOOKdir)/$@ $(srcdir)/gst-plugins-bad.ch $(srcdir)/gst-plugins-bad.sed
 	sed -f $(srcdir)/gst-plugins-bad.sed $(BOOKdir)/gst-plugins-bad.xml > $(BOOKdir)/gst-plugins-bad_lfsbookja.xml
diff --git a/blfsbook/src/multimedia/libdriv/grilo-plugins.ch b/blfsbook/src/multimedia/libdriv/grilo-plugins.ch
new file mode 100644
index 00000000..e69de29b
diff --git a/blfsbook/version.ac b/blfsbook/version.ac
index 6bbdc646..d7a846f0 100644
--- a/blfsbook/version.ac
+++ b/blfsbook/version.ac
@@ -6,4 +6,4 @@ dnl  $Rev$
 dnl  $Date::                           $
 dnl
 dnl m4-include this file to define the current BLFS version
-m4_define([blfs_version], [20131218])
+m4_define([blfs_version], [20131220])
-- 
2.11.0