r4648 - in trunk: BOOK BOOK/introduction/welcome BOOK/multimedia/cdwriteutils patches

djensen at linuxfromscratch.org djensen at linuxfromscratch.org
Thu Jun 23 06:04:59 PDT 2005


Author: djensen
Date: 2005-06-23 07:04:58 -0600 (Thu, 23 Jun 2005)
New Revision: 4648

Removed:
   trunk/patches/cdrdao-1.1.9-gcc34-1.patch
   trunk/patches/libglademm-2.2.0-gcc34-1.patch
   trunk/patches/libgnomecanvasmm-2.0.2-gcc34-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml
Log:
updated to Cdrdao-1.2.0

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-06-22 00:52:36 UTC (rev 4647)
+++ trunk/BOOK/general.ent	2005-06-23 13:04:58 UTC (rev 4648)
@@ -1,4 +1,4 @@
-<!ENTITY day          "21">
+<!ENTITY day          "23">
 <!ENTITY month        "06">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -473,7 +473,7 @@
 
 <!-- Chapter 40 -->
 <!ENTITY cdrtools-version             "2.01">
-<!ENTITY cdrdao-version               "1.1.9">
+<!ENTITY cdrdao-version               "1.2.0">
 <!ENTITY udftools-version             "1.0.0b3">
 
 <!-- Part XII -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-06-22 00:52:36 UTC (rev 4647)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-06-23 13:04:58 UTC (rev 4648)
@@ -25,6 +25,10 @@
   <itemizedlist>
 
     <listitem>
+      <para>Jun 23th, 2005 [djensen]: Updated to Cdrdao-1.2.0.</para>
+    </listitem>
+
+    <listitem>
       <para>Jun 21th, 2005 [djensen]: Updated to OpenSSL-0.9.7g.</para>
     </listitem>
 

Modified: trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml	2005-06-22 00:52:36 UTC (rev 4647)
+++ trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml	2005-06-23 13:04:58 UTC (rev 4648)
@@ -6,10 +6,10 @@
 
   <!ENTITY cdrdao-download-http "http://prdownloads.sourceforge.net/cdrdao/cdrdao-&cdrdao-version;.tar.gz">
   <!ENTITY cdrdao-download-ftp  " ">
-  <!ENTITY cdrdao-md5sum        "dd7df809fca7db8e212a6522688c166b">
-  <!ENTITY cdrdao-size          "1.6 MB">
-  <!ENTITY cdrdao-buildsize     "54 MB">
-  <!ENTITY cdrdao-time          "1.47 SBU (includes building <command>gcdmaster</command>)">
+  <!ENTITY cdrdao-md5sum        "dc2bdef7a7c8973e678ba4a4a2d9cc7e">
+  <!ENTITY cdrdao-size          "2.0 MB">
+  <!ENTITY cdrdao-buildsize     "64 MB">
+  <!ENTITY cdrdao-time          "1.5 SBU (includes building <command>gcdmaster</command>)">
 ]>
 
 <sect1 id="cdrdao" xreflabel="Cdrdao-&cdrdao-version;">
@@ -55,44 +55,42 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch (if building <command>gcdmaster</command>):
-        <ulink url="&patch-root;/cdrdao-&cdrdao-version;-gcc34-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch (if building <command>gcdmaster</command>):
-        <ulink url="&patch-root;/libglademm-2.2.0-gcc34-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch (if building <command>gcdmaster</command>):
-        <ulink url="&patch-root;/libgnomecanvasmm-2.0.2-gcc34-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Cdrdao Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="lame"/> (required to build
-    <command>toc2mp3</command>) and
-    <ulink url="http://www.polhode.com/pccts.html">PCCTS</ulink></para>
+      <para><xref linkend="libao"/>,
+        <xref linkend="libvorbis"/>,
+        <xref linkend="libmad"/> and
+        <xref linkend="lame"/> (required to build
+      <command>toc2mp3</command>)</para>
 
     <bridgehead renderas="sect4">Optional (Required to Build the 'gcdmaster'
     Program)</bridgehead>
 
     <para><emphasis>Note: all the following packages must be built in
     the order listed.</emphasis></para>
+    
+    <note>
+    <para>Recent changes in pkgconfig may cause linking errors in gtkmm
+    applications.  After installing gtkmm-2.6.3 issue this command, as the
+    root user:</para>
+    <screen role="root"><literal>sed -i.bak \
+    's:-lgtkmm-2.4:& -lgdkmm-2.4 -lpangomm-1.4 -latkmm-1.6:' \
+    /usr/lib/pkgconfig/gtkmm-2.4.pc</literal></screen>
+    <para>A backup (.bak) is created, you can revert if desired.</para>
+    </note>
 
+
     <para><xref linkend="libgnomeui"/>,
-    <ulink url="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/">
-    libsigc++-1.2.5</ulink>,
-    <ulink url="http://www.gtkmm.org/">gtkmm-2.2.12</ulink>,
-    <ulink url="http://www.gtkmm.org/">libglademm-2.2.0</ulink>,
-    <ulink url="http://www.gtkmm.org/">libgnomecanvasmm-2.0.2</ulink>,
-    <ulink url="http://www.gtkmm.org/">gconfmm-2.0.2</ulink>,
-    <ulink url="http://www.gtkmm.org/">libgnomemm-2.0.1</ulink> and
-    <ulink url="http://www.gtkmm.org/">libgnomeuimm-2.0.0</ulink></para>
+    <ulink url="http://libsigc.sourceforge.net/">libsigc++-2.0.13</ulink>,
+    <ulink url="http://www.gtkmm.org/">glibmm-2.6.1</ulink>,
+    <ulink url="http://www.gtkmm.org/">gtkmm-2.6.3</ulink>,
+    <ulink url="http://www.gtkmm.org/">libglademm-2.6.0</ulink>,
+    <ulink url="http://www.gtkmm.org/">libgnomecanvasmm-2.10.0</ulink>,
+    <ulink url="http://www.gtkmm.org/">gconfmm-2.10.0</ulink>,
+    <ulink url="http://www.gtkmm.org/">libgnomemm-2.10.0</ulink>,
+    <ulink url="http://www.gtkmm.org/">gnome-vfsmm-2.10.0</ulink> and
+    <ulink url="http://www.gtkmm.org/">libgnomeuimm-2.10.0</ulink></para>
 
   </sect2>
 
@@ -102,8 +100,28 @@
     <para>Install <application>Cdrdao</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../cdrdao-&cdrdao-version;-gcc34-1.patch &&
-./configure --prefix=/usr &&
+    <para>For mp3 support in the 'gcdmaster' program, you will need
+    a temporary mad.pc. If desired, it can be deleted after the build.</para>
+    
+    <para>As the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cat > /usr/lib/pkgconfig/mad.pc << "EOF"
+<literal>prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: mad
+Description: MPEG audio decoder
+Requires:
+Version: 0.15.1
+Libs: -L${libdir} -lmad
+Cflags: -I${includedir}</literal>
+EOF</userinput></screen>
+
+    <para>And, as the normal user:</para>
+
+<screen><userinput>./configure --prefix=/usr &&
 make</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -121,7 +139,7 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>cdrdao, cue2toc, toc2cddb, toc2cue and optionally, gcdmaster, and
+        <seg>cdrdao, cue2toc, toc2cddb, toc2cue and optionally, gcdmaster and
         toc2mp3</seg>
         <seg>None</seg>
         <seg>/usr/share/cdrdao</seg>

Deleted: trunk/patches/cdrdao-1.1.9-gcc34-1.patch
===================================================================
--- trunk/patches/cdrdao-1.1.9-gcc34-1.patch	2005-06-22 00:52:36 UTC (rev 4647)
+++ trunk/patches/cdrdao-1.1.9-gcc34-1.patch	2005-06-23 13:04:58 UTC (rev 4648)
@@ -1,39 +0,0 @@
-Submitted By:            BLFS Book <blfs-book at linuxfromscratch.org>
-Date:                    2005-01-24
-Initial Package Version: 1.1.9
-Upstream Status:         Already in CVS
-Origin:                  Cdrdao CVS
-Description:             Fixes gcdmaster compilation issue with GCC-3.4.x
-
-$LastChangedBy$
-$Date$
-
-diff -Naur cdrdao-1.1.9-orig/xdao/Project.h cdrdao-1.1.9/xdao/Project.h
---- cdrdao-1.1.9-orig/xdao/Project.h	2004-02-12 01:13:32.000000000 +0000
-+++ cdrdao-1.1.9/xdao/Project.h	2005-01-25 01:22:03.961953520 +0000
-@@ -51,14 +51,12 @@
-   virtual void createToolbar() = 0;
-   virtual void createStatusbar();
-   void updateWindowTitle();
--  void saveProject();
-   void saveAsProject();
-   Gtk::FileSelection *saveFileSelector_;
-   void saveFileSelectorOKCB();
-   void saveFileSelectorCancelCB();
- 
-   virtual bool on_delete_event(GdkEventAny *event);
--  virtual void recordToc2CD() = 0;
-   virtual void projectInfo() = 0;
- 
- public:
-@@ -67,7 +65,9 @@
-   void readToc(char *name);
-   void statusMessage(const char *fmt, ...);
-   void tocBlockedMsg(const char *);
--  virtual bool closeProject() = 0;
-+  virtual bool closeProject() = 0; 
-+  virtual void saveProject();
-+  virtual void recordToc2CD() = 0;
-   int projectNumber();
-   TocEdit *tocEdit();
-   gint getViewNumber();

Deleted: trunk/patches/libglademm-2.2.0-gcc34-1.patch
===================================================================
--- trunk/patches/libglademm-2.2.0-gcc34-1.patch	2005-06-22 00:52:36 UTC (rev 4647)
+++ trunk/patches/libglademm-2.2.0-gcc34-1.patch	2005-06-23 13:04:58 UTC (rev 4648)
@@ -1,23 +0,0 @@
-Submitted By:            BLFS Book <blfs-book at linuxfromscratch.org>
-Date:                    2005-01-24
-Initial Package Version: 2.2.0
-Upstream Status:         Not Required - already in recent package versions
-Origin:                  http://bugzilla.gnome.org/attachment.cgi?id=31277&action=view
-Description:             Fixes GCC-3.4.x compiling issues
-
-$LastChangedBy$
-$Date$
-
-diff -Nur libglademm-2.2.0-orig/libglade/libglademm/xml.h libglademm-2.2.0/libglade/libglademm/xml.h
---- libglademm-2.2.0-orig/libglade/libglademm/xml.h	2004-03-29 19:23:17.000000000 +0200
-+++ libglademm-2.2.0/libglade/libglademm/xml.h	2004-09-04 13:38:29.000000000 +0200
-@@ -244,7 +244,7 @@
-      //If there is already a C++ instance, then return it again:
-      if(pObjectBase)
-      {
--       widget = dynamic_cast<T_Widget*>( Glib::wrap(pCWidget) );
-+       widget = dynamic_cast<T_Widget*>( Glib::wrap((GtkWidget*)(pCWidget)) );
- 
-        //The dynamic cast checks that it is of the correct type.
-        //Somebody might be trying to call get_widget_derived() after already calling get_widget(),
-

Deleted: trunk/patches/libgnomecanvasmm-2.0.2-gcc34-1.patch
===================================================================
--- trunk/patches/libgnomecanvasmm-2.0.2-gcc34-1.patch	2005-06-22 00:52:36 UTC (rev 4647)
+++ trunk/patches/libgnomecanvasmm-2.0.2-gcc34-1.patch	2005-06-23 13:04:58 UTC (rev 4648)
@@ -1,36 +0,0 @@
-Submitted By:            BLFS Book <blfs-book at linuxfromscratch.org>
-Date:                    2005-01-24
-Initial Package Version: 2.0.1
-Upstream Status:         Not Required - already in recent package versions
-Origin:                  http://bugzilla.gnome.org/attachment.cgi?id=31276&action=view
-Description:             Fixes compilation issues when using GCC-3.4.x
-
-$LastChangedBy$
-$Date$
-
---- libgnomecanvasmm-2.0.1-orig/examples/canvas_events/canvas_events.cc	2004-09-04 15:10:54.502629928 -0700
-+++ libgnomecanvasmm-2.0.1/examples/canvas_events/canvas_events.cc	2004-09-04 15:21:57.682811216 -0700
-@@ -73,15 +73,15 @@
-   
-   //Connect canvas signals:
- 
--  signal_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer_notify),CE));
--  signal_button_press_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_button_event_stub_notify),CBE));
--  signal_button_press_event().connect(SigC::bind(SigC::slot(*this, &CanvasExample::on_button_event_stub),CBEA));
-+  signal_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer_notify),(guint)CE));
-+  signal_button_press_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_button_event_stub_notify),(guint)CBE));
-+  signal_button_press_event().connect(SigC::bind(SigC::slot(*this, &CanvasExample::on_button_event_stub),(guint)CBEA));
- 	
--  item->signal_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer_notify),IE));
--  item->signal_event().connect(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer),IEA));
-+  item->signal_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer_notify),(guint)IE));
-+  item->signal_event().connect(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer),(guint)IEA));
- 
--  item2->signal_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer_notify),IE));
--  item2->signal_event().connect(bind(slot(*this, &CanvasExample::on_event_explorer),IEA));
-+  item2->signal_event().connect_notify(SigC::bind(SigC::slot(*this, &CanvasExample::on_event_explorer_notify),(guint)IE));
-+  item2->signal_event().connect(bind(slot(*this, &CanvasExample::on_event_explorer),(guint)IEA));
- }
- 
- CanvasExample::~CanvasExample()
-




More information about the blfs-book mailing list