Loading...

blfs-book@linuxfromscratch.org

[Prev] Thread [Next]  |  [Prev] Date [Next]

[blfs-book] r9499 - in trunk/BOOK: . gnome/add introduction/welcome ken Wed Feb 22 17:01:16 2012

Author: ken
Date: 2012-02-22 18:01:55 -0700 (Wed, 22 Feb 2012)
New Revision: 9499

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/gnome/add/cheese.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
cheese-3.2.2

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2012-02-22 23:54:22 UTC (rev 9498)
+++ trunk/BOOK/general.ent      2012-02-23 01:01:55 UTC (rev 9499)
@@ -772,7 +772,7 @@
 <!ENTITY accerciser-version           "3.2.1">
 <!ENTITY aisleriot-version            "3.2.2">
 <!ENTITY anjuta-version               "3.2.1">
-<!ENTITY cheese-version               "2.30.1">
+<!ENTITY cheese-version               "3.2.2">
 <!ENTITY devhelp-version              "3.2.0">
 <!ENTITY file-roller-version          "3.2.2">
 <!ENTITY gedit-version                "2.30.3">

Modified: trunk/BOOK/gnome/add/cheese.xml
===================================================================
--- trunk/BOOK/gnome/add/cheese.xml     2012-02-22 23:54:22 UTC (rev 9498)
+++ trunk/BOOK/gnome/add/cheese.xml     2012-02-23 01:01:55 UTC (rev 9499)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY cheese-download-http 
"&gnome-download-http;/cheese/&gnome-version;/cheese-&cheese-version;.tar.bz2">
-  <!ENTITY cheese-download-ftp  
"&gnome-download-ftp;/cheese/&gnome-version;/cheese-&cheese-version;.tar.bz2">
-  <!ENTITY cheese-md5sum        "1599fded8a1797ea51fb010af4e6c45b">
-  <!ENTITY cheese-size          "5.0 MB">
-  <!ENTITY cheese-buildsize     "28 MB">
-  <!ENTITY cheese-time          "0.4 SBU">
+  <!ENTITY cheese-download-http 
"&gnome-download-http;/cheese/&gnome-version;/cheese-&cheese-version;.tar.xz">
+  <!ENTITY cheese-download-ftp  
"&gnome-download-ftp;/cheese/&gnome-version;/cheese-&cheese-version;.tar.xz">
+  <!ENTITY cheese-md5sum        "a674bbe235cc960e578bb71b6aa55783">
+  <!ENTITY cheese-size          "3.4 MB">
+  <!ENTITY cheese-buildsize     "27 MB">
+  <!ENTITY cheese-time          "0.9 SBU">
 ]>
 
 <sect1 id="cheese" xreflabel="cheese-&cheese-version;">
@@ -32,7 +32,7 @@
     <para>The <application>cheese</application> package takes photos and videos
     with your webcam, with fun graphical effects.</para>
 
-    &lfs65_checked;
+    &lfs70_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -59,10 +59,14 @@
     <bridgehead renderas="sect3">cheese Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-desktop"/>,
-    <xref linkend="gst-plugins-base"/> (with <xref linkend="libtheora"/>),
+    <para role="required"><xref linkend="clutter-gst"/> ( with
+    <xref linkend="gst-plugins-base"/> using <xref linkend="libtheora"/>),
+    <xref linkend="clutter-gtk"/>,
+    <xref linkend="gnome-desktop"/>,
+    <xref linkend="gnome-video-effects"/>,
     <xref linkend="libcanberra"/>,
-    <xref linkend="librsvg"/>, and
+    <xref linkend="librsvg"/>,
+    <xref linkend="mx"/>, and
     <xref linkend="udev"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -79,11 +83,7 @@
     <para>Install <application>cheese</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix 
ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib \
-            --disable-scrollkeeper &amp;&amp;
+<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -100,19 +100,21 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
+    <!-- a nice description, but no libexec is created
+    <para><parameter>\-\-libexecdir=$GNOME_PREFIX/lib/cheese</parameter>: This
+    parameter is used so that the <application>cheese</application> internal
+    support programs are installed in the preferred location of <filename
+    class='directory'>$GNOME_PREFIX/lib/cheese</filename> instead of <filename
+    class='directory'>$GNOME_PREFIX/libexec/cheese</filename>.</para>-->
 
-    <para><parameter>--libexecdir=$(pkg-config
-    --variable=prefix ORBit-2.0)/lib/cheese</parameter>: This parameter is
-    used so that the <application>cheese</application> internal support 
programs
-    are installed in the preferred location of
-    <filename class='directory'>$GNOME_PREFIX/lib/cheese</filename> instead of
-    <filename class='directory'>$GNOME_PREFIX/libexec/cheese</filename>.</para>
+    <!-- despite suggestionsi otherwise, this is still offered by configure and
+    rarian, whick provides the scrollkeeper commands, is only used if present 
-->
+    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
+    have installed <application>rarian</application> but wish to disable the
+    updates to the scrollkeeper database.</para>
 
-    <para><parameter>--disable-scrollkeeper</parameter>: Do not make updates to
-    the <application>scrollkeeper</application> database. Remove it if you have
-    <application>rarian</application> installed.</para>
+    <para><option>--enable-static=no</option>: This switch prevents the static
+    libraries being installed.</para>
 
   </sect2>
 
@@ -126,7 +128,7 @@
 
       <seglistitem>
         <seg>cheese</seg>
-        <seg>libcheese-gtk.{so,a}</seg>
+        <seg>libcheese.{so,a}, libcheese-gtk.{so,a}</seg>
         <seg><envar>$GNOME_PREFIX</envar>/{include/cheese,lib/cheese,
         share/{cheese/{effects,icons/hicolor/*,pixmaps},gnome/help/cheese/*,
         gtk-doc/html/cheese,omf/cheese}}</seg>
@@ -148,11 +150,22 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="libcheese">
+        <term><filename class='libraryfile'>libcheese.{so,a}</filename></term>
+        <listitem>
+          <para>contains the <application>cheese</application> API
+          functions.</para>
+          <indexterm zone="cheese libcheese">
+            <primary sortas="c-libcheese">libcheese.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libcheese-gtk">
         <term><filename 
class='libraryfile'>libcheese-gtk.{so,a}</filename></term>
         <listitem>
           <para>contains the <application>cheese</application> API
-          functions.</para>
+          functions for Gtk+-2.</para>
           <indexterm zone="cheese libcheese-gtk">
             <primary sortas="c-libcheese-gtk">libcheese-gtk.{so,a}</primary>
           </indexterm>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2012-02-22 23:54:22 UTC 
(rev 9498)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2012-02-23 01:01:55 UTC 
(rev 9499)
@@ -65,6 +65,9 @@
         <listitem>
           <para>[ken] - add gnome-video-effects-0.3.0 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge cheese-3.2.2 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page