r4987 - in trunk: BOOK/introduction/welcome BOOK/multimedia/libdriv patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sat Aug 27 17:54:45 PDT 2005


Author: randy
Date: 2005-08-27 18:54:44 -0600 (Sat, 27 Aug 2005)
New Revision: 4987

Added:
   trunk/patches/id3lib-3.8.3-test_suite-1.patch
Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/id3lib.xml
Log:
Added a patch that fixes the test suite in the id3lib instructions

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-08-27 05:02:28 UTC (rev 4986)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-08-28 00:54:44 UTC (rev 4987)
@@ -45,6 +45,10 @@
       <para>August 27th, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Added a patch to fix the test suite in the id3lib
+          instructions.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated the GCC patch and provided documentation
           installation to the libmpeg3 instructions.</para>
         </listitem>

Modified: trunk/BOOK/multimedia/libdriv/id3lib.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/id3lib.xml	2005-08-27 05:02:28 UTC (rev 4986)
+++ trunk/BOOK/multimedia/libdriv/id3lib.xml	2005-08-28 00:54:44 UTC (rev 4987)
@@ -8,7 +8,7 @@
   <!ENTITY id3lib-download-ftp  " ">
   <!ENTITY id3lib-md5sum        "19f27ddd2dda4b2d26a559a4f0f402a7">
   <!ENTITY id3lib-size          "950 KB">
-  <!ENTITY id3lib-buildsize     "25 MB">
+  <!ENTITY id3lib-buildsize     "21 MB">
   <!ENTITY id3lib-time          "0.6 SBU">
 ]>
 
@@ -54,6 +54,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/id3lib-&id3lib-version;-test_suite-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
   </sect2>
 
   <sect2 role="installation">
@@ -62,9 +70,12 @@
     <para>Install <application>id3lib</application> by running the
     following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>patch -Np1 -i ../id3lib-&id3lib-version;-test_suite-1.patch &&
+./configure --prefix=/usr &&
 make</userinput></screen>
 
+    <para>To test the results, issue: <command>make check</command>.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &&

Added: trunk/patches/id3lib-3.8.3-test_suite-1.patch
===================================================================
--- trunk/patches/id3lib-3.8.3-test_suite-1.patch	2005-08-27 05:02:28 UTC (rev 4986)
+++ trunk/patches/id3lib-3.8.3-test_suite-1.patch	2005-08-28 00:54:44 UTC (rev 4987)
@@ -0,0 +1,93 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-08-27
+Initial Package Version: 3.8.3
+Upstream Status:         Not submitted
+Origin:                  Randy McMurchy and Gentoo CVS
+                         (http://www.gentoo.org/cgi-bin/viewcvs.cgi/media-libs/\
+                         id3lib/files/id3lib-3.8.3-test_io.patch?view=markup)
+Description:             Fixes a problem with one of the test suite source files
+                         and adds a few things to actually do some tests
+
+$LastChangedBy$
+$Date$
+
+
+diff -Naur id3lib-3.8.3-orig/examples/Makefile.in id3lib-3.8.3/examples/Makefile.in
+--- id3lib-3.8.3-orig/examples/Makefile.in	2003-03-02 00:23:00.000000000 +0000
++++ id3lib-3.8.3/examples/Makefile.in	2005-08-28 00:15:42.000000000 +0000
+@@ -895,6 +895,8 @@
+ 	done
+ check-am: all-am
+ 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
++	chmod 755 run_tests
++	./run_tests
+ check: check-am
+ all-am: Makefile $(PROGRAMS)
+ 
+
+diff -Naur id3lib-3.8.3-orig/examples/run_tests id3lib-3.8.3/examples/run_tests
+--- id3lib-3.8.3-orig/examples/run_tests	1970-01-01 00:00:00.000000000 +0000
++++ id3lib-3.8.3/examples/run_tests	2005-08-28 00:15:42.000000000 +0000
+@@ -0,0 +1,50 @@
++#!/bin/sh
++
++echo
++echo "Running tests..."
++echo
++
++./testremove
++
++if [ $? ]; then
++    echo
++    echo "----------------------------"
++    echo "Tag remove test:      PASSED"
++    echo "----------------------------"
++else
++    echo
++    echo "----------------------------"
++    echo "Tag remove test:      FAILED"
++    echo "----------------------------"
++fi
++
++./testcompression
++cmp 230-compressed.tag test-230-compressed.tag >/dev/null 2>&1
++
++if [ $? ]; then
++    echo
++    echo "----------------------------"
++    echo "Tag compression test: PASSED"
++    echo "----------------------------"
++else
++    echo
++    echo "----------------------------"
++    echo "Tag compression test: FAILED"
++    echo "----------------------------"
++fi
++
++./testpic
++cmp 230-picture.tag test-230-picture.tag >/dev/null 2>&1
++
++if [ $? ]; then
++    echo
++    echo "----------------------------"
++    echo "Picture test:         PASSED"
++    echo "----------------------------"
++else
++    echo
++    echo "----------------------------"
++    echo "Picture test:         FAILED"
++    echo "----------------------------"
++fi
++
+
+diff -Naur id3lib-3.8.3-orig/examples/test_io.cpp id3lib-3.8.3/examples/test_io.cpp
+--- id3lib-3.8.3-orig/examples/test_io.cpp	2003-03-02 00:23:00.000000000 +0000
++++ id3lib-3.8.3/examples/test_io.cpp	2005-08-28 00:15:42.000000000 +0000
+@@ -16,6 +16,7 @@
+ using std::cerr;
+ 
+ using namespace dami;
++using namespace std;
+ 
+ int
+ main(size_t argc, const char** argv)


Property changes on: trunk/patches/id3lib-3.8.3-test_suite-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list