r3144 - in trunk: BOOK BOOK/introduction/welcome BOOK/multimedia/videoutils patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sat Dec 25 15:26:04 PST 2004


Author: randy
Date: 2004-12-25 16:26:02 -0700 (Sat, 25 Dec 2004)
New Revision: 3144

Removed:
   trunk/patches/transcode-0.6.12-fix_dv-1.patch
   trunk/patches/transcode-0.6.12-fix_largefile_split-1.patch
   trunk/patches/transcode-0.6.12-gcc34-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/videoutils/avifile.xml
   trunk/BOOK/multimedia/videoutils/transcode.xml
Log:
Updated to Transcode-0.6.14; added a command to the Avifile instructions to fix a broken pkgconfig file

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-12-25 01:25:17 UTC (rev 3143)
+++ trunk/BOOK/general.ent	2004-12-25 23:26:02 UTC (rev 3144)
@@ -1,4 +1,4 @@
-<!ENTITY day          "24">
+<!ENTITY day          "25">
 <!ENTITY month        "12">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -437,7 +437,7 @@
 <!ENTITY avifile-version              "0.7.41">  
 <!ENTITY mplayer-version              "1.0pre6"> 
 <!ENTITY xine-ui-version              "0.99.2">  
-<!ENTITY transcode-version            "0.6.12"> 
+<!ENTITY transcode-version            "0.6.14"> 
 
 <!-- Chapter 40 -->
 <!ENTITY cdrtools-version             "2.01">  

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-12-25 01:25:17 UTC (rev 3143)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-12-25 23:26:02 UTC (rev 3144)
@@ -22,6 +22,10 @@
 
 <itemizedlist>
 
+<listitem><para>December 25th, 2004 [randy]: Updated to 
+Transcode-0.6.14; added a command to the Avifile instructions to fix a 
+broken pkgconfig file.</para></listitem>
+
 <listitem><para>December 24th, 2004 [randy]: Updated to 
 MPlayer-1.0pre6</para></listitem>
 

Modified: trunk/BOOK/multimedia/videoutils/avifile.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/avifile.xml	2004-12-25 01:25:17 UTC (rev 3143)
+++ trunk/BOOK/multimedia/videoutils/avifile.xml	2004-12-25 23:26:02 UTC (rev 3144)
@@ -86,21 +86,19 @@
 ./configure --prefix=/usr \
     --with-win32-path=/usr/lib/avifile-0.7/win32 &&
 make &&
+sed -i -e "s,include/avifile,&-0.7," avifile.pc &&
 make install</command></userinput></screen>
 
 </sect2>
 
-<!-- <sect2>
+<sect2>
 <title>Command explanations</title>
 
-<para><command>./autogen.sh && ./configure &&
-make maintainer-clean && ./autogen.sh</command>: The 
-author of this package used the old autoconf which leads to
-problems like configure not being able to detect some libraries and compilation
-errors. This is fixed by rebuilding the configuration scripts.
-</para>
+<para><command>sed -i -e "s,include/avifile,&-0.7," avifile.pc</command>: 
+The <application>pkgconfig</application> file is installed with an incorrect 
+include directory definition. This command fixes the file.</para>
 
-</sect2> -->
+</sect2>
 
 <sect2>
 <title>Contents</title>

Modified: trunk/BOOK/multimedia/videoutils/transcode.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/transcode.xml	2004-12-25 01:25:17 UTC (rev 3143)
+++ trunk/BOOK/multimedia/videoutils/transcode.xml	2004-12-25 23:26:02 UTC (rev 3144)
@@ -3,27 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY transcode-download-http "http://zebra.fh-weingarten.de/~transcode/pre/transcode-&transcode-version;.tar.bz2">
-  <!ENTITY transcode-download-ftp  " ">
-  <!ENTITY transcode-size          "2.8 MB">
-  <!ENTITY transcode-buildsize     "88 MB">
-  <!ENTITY transcode-time          "1.89 SBU">
+  <!ENTITY transcode-download-http "http://www.ligo.caltech.edu/~pehrens/transcode-&transcode-version;.tar.gz">
+  <!ENTITY transcode-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/transcode-&transcode-version;.tar.gz">
+  <!ENTITY transcode-md5sum        "9bfef83b7e0fe2c27d25d871fef75a92">
+  <!ENTITY transcode-size          "2.6 MB">
+  <!ENTITY transcode-buildsize     "60 MB">
+  <!ENTITY transcode-time          "1.69 SBU">
 ]>
 
-<sect1 id="transcode" xreflabel="transcode-&transcode-version;">
+<sect1 id="transcode" xreflabel="Transcode-&transcode-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="transcode.html"?>
-<title>transcode-&transcode-version;</title>
+<title><application>Transcode</application>-&transcode-version;</title>
 
 <sect2>
-<title>Introduction to <application>transcode</application></title>
+<title>Introduction to <application>Transcode</application></title>
 
-<para><application>transcode</application> is a fast, versatile and 
+<para><application>Transcode</application> is a fast, versatile and 
 command-line based audio/video everything to everything 
-converter.</para>
+converter. For a rundown of the features and capabilities, along with 
+usage examples, visit the Transcode Wiki at 
+<ulink url="http://www.transcoding.org/"/>.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -31,13 +34,15 @@
 url="&transcode-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): <ulink
 url="&transcode-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &transcode-md5sum;</para></listitem>
 <listitem><para>Download size: &transcode-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &transcode-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
 &transcode-time;</para></listitem></itemizedlist>
 </sect3>
 
+<!-- 
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Required Patch: <ulink 
@@ -53,51 +58,57 @@
 </listitem>
 </itemizedlist>
 </sect3>
+ -->
 
-<sect3><title><application>transcode</application> dependencies</title>
+<sect3><title><application>Transcode</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="ffmpeg"/></para>
+</sect4>
+
+<sect4><title>Recommended</title>
+<para><xref linkend="NASM"/> and <xref linkend="lame"/></para>
+</sect4>
+
 <sect4><title>Optional</title>
-<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
-<xref linkend="NASM"/>, 
-<xref linkend="freetype2"/>, 
-<xref linkend="curl"/>, 
+<para><xref linkend="freetype2"/>, 
+<xref linkend="GTK"/>, 
+<xref linkend="sdl"/>, 
 <xref linkend="libxml2"/>, 
-<xref linkend="GLib"/>, 
-<xref linkend="GTK"/>, 
 <xref linkend="imagemagick"/>, 
-<xref linkend="libjpeg"/>, 
-<xref linkend="lame"/>, 
-<xref linkend="mplayer"/>, 
+<xref linkend="libjpeg"/> or 
+<ulink url="http://sourceforge.net/projects/mjpeg">MMX Jpeg</ulink>, 
 <xref linkend="libdv"/>, 
 <xref linkend="libdvdread"/>, 
-<xref linkend="sdl"/>, 
 <xref linkend="avifile"/>, 
 <xref linkend="libfame"/>, 
 <xref linkend="libmpeg3"/>, 
 <xref linkend="xvid"/>, 
 <xref linkend="LZO"/>, 
 <xref linkend="liba52"/>, 
-<xref linkend="ffmpeg"/>, 
-<xref linkend="libmad"/>, 
 <xref linkend="libogg"/>, 
 <xref linkend="libvorbis"/>, 
-<xref linkend="openquicktime"/>, 
 <ulink url="http://mjpeg.sourceforge.net/">MJPEG Tools</ulink>, 
-<ulink url="http://libquicktime.sourceforge.net/">libquicktime</ulink> and 
-<ulink url="http://www.theora.org/">Theora</ulink></para></sect4>
+<ulink url="http://libquicktime.sourceforge.net/">libquicktime</ulink>, 
+<ulink url="http://www.theora.org/">Theora</ulink>, 
+<ulink url="http://lvempeg.sourceforge.net/">LVE</ulink>, 
+<ulink url="http://www.netlib.org/pvm3/">PVM3</ulink> and 
+<ulink url="http://loci.cs.utk.edu/">LoRS/IBP</ulink></para>
+
+<para>Though <application>Transcode</application> has no compile-time 
+requirement for <xref linkend="mplayer"/>'s shared post-processing library, 
+<application>Transcode</application> can use it at run-time.</para>
+</sect4>
 </sect3>
 
 </sect2>
 
 <sect2>
-<title>Installation of <application>transcode</application></title>
+<title>Installation of <application>Transcode</application></title>
 
-<para>Install <application>transcode</application> by running the following 
+<para>Install <application>Transcode</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../transcode-&transcode-version;-fix_largefile_split-1.patch &&
-patch -Np1 -i ../transcode-&transcode-version;-fix_dv-1.patch &&
-patch -Np1 -i ../transcode-&transcode-version;-gcc34-1.patch &&
-./configure --prefix=/usr --without-x &&
+<screen><userinput><command>./configure --prefix=/usr --without-x &&
 make &&
 make install</command></userinput></screen>
 
@@ -106,16 +117,25 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><parameter>--without-x</parameter>: Omit this switch if you have an 
+<para><option>--without-x</option>: Omit this parameter if you have an 
 <application>X</application> Window System installed and you want to compile 
 X11 dependent filter plugins.</para>
 
+<para><option>--enable-netstream</option>: This parameter enables network 
+streaming support.</para>
+
+<para>Building support for most of the dependency packages requires using 
+options passed to the <command>configure</command> script. View the 
+<filename>INSTALL</filename> file and the output from 
+<command>./configure --help</command> for complete information about 
+enabling dependency packages.</para>
+
 </sect2>
 
 <sect2>
 <title>Contents</title>
 
-<para>The <application>transcode</application> package contains 
+<para>The <application>Transcode</application> package contains 
 <command>transcode</command>,
 <command>tccat</command>, 
 <command>tcdecode</command>,
@@ -151,7 +171,7 @@
 
 <sect3><title>tccat</title>
 <para><command>tccat</command> concatenates input files using the input plugins
-of <application>transcode</application>.</para></sect3>
+of <application>Transcode</application>.</para></sect3>
 
 <sect3><title>tcdecode</title>
 <para><command>tcdecode</command> is used to decode input files to
@@ -173,7 +193,7 @@
 
 <sect3><title>tcmodinfo</title>
 <para><command>tcmodinfo</command> loads a supplied
-<application>transcode</application> filter module and prints its
+<application>Transcode</application> filter module and prints its
 parameters.</para></sect3>
 
 <sect3><title>tcmp3cut</title>

Deleted: trunk/patches/transcode-0.6.12-fix_dv-1.patch
===================================================================
--- trunk/patches/transcode-0.6.12-fix_dv-1.patch	2004-12-25 01:25:17 UTC (rev 3143)
+++ trunk/patches/transcode-0.6.12-fix_dv-1.patch	2004-12-25 23:26:02 UTC (rev 3144)
@@ -1,30 +0,0 @@
-Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date:                    2004-09-04
-Initial Package Version: 0.6.12
-Upstream Status:         Not submitted 
-Origin:                  http://zebra.fh-weingarten.de/~maxi/html/transcode-users/2004-08/msg00233.html
-Description:             Fixes build when linking libdv
-
-$LastChangedBy$
-$Date$
-
-diff -Naur transcode-0.6.12-orig/import/decode_dv.c transcode-0.6.12/import/decode_dv.c
---- transcode-0.6.12-orig/import/decode_dv.c	2003-12-20 11:49:13.000000000 +0000
-+++ transcode-0.6.12/import/decode_dv.c	2004-09-05 01:10:40.487460896 +0000
-@@ -37,8 +37,14 @@
- #include "transcode.h"
- #include "ioaux.h"
- 
--#define DV_PAL_SIZE    frame_size_625_50
--#define DV_NTSC_SIZE   frame_size_525_60
-+/* #define DV_PAL_SIZE    frame_size_625_50
-+#define DV_NTSC_SIZE   frame_size_525_60 */
-+
-+static const int frame_size_625_50 = 12 * 150 * 80;
-+static const int frame_size_525_60 = 10 * 150 * 80;
-+#define DV_PAL_SIZE 12 * 150 * 80
-+#define DV_NTSC_SIZE  10 * 150 * 8
-+
- #define DV_HEADER_SIZE header_size
- 
- static int verbose=TC_QUIET;

Deleted: trunk/patches/transcode-0.6.12-fix_largefile_split-1.patch
===================================================================
--- trunk/patches/transcode-0.6.12-fix_largefile_split-1.patch	2004-12-25 01:25:17 UTC (rev 3143)
+++ trunk/patches/transcode-0.6.12-fix_largefile_split-1.patch	2004-12-25 23:26:02 UTC (rev 3144)
@@ -1,40 +0,0 @@
-Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date:                    2004-09-05
-Initial Package Version: 0.6.12
-Upstream Status:         Not submitted 
-Origin:                  http://zebra.fh-weingarten.de/~maxi/html/transcode-users/2004-01/msg00504.html
-Description:             Fixes corrupted files created by splitting a large file into smaller files
-
-$LastChangedBy$
-$Date$
-
-diff -Naur transcode-0.6.12-orig/avilib/avilib.c transcode-0.6.12/avilib/avilib.c
---- transcode-0.6.12-orig/avilib/avilib.c	2004-01-02 15:12:38.000000000 +0000
-+++ transcode-0.6.12/avilib/avilib.c	2004-09-05 14:50:36.833479496 +0000
-@@ -165,10 +165,13 @@
- }
- 
- 
--// if bit 31 is not 0, its a keyframe
-+// if bit 31 is 0, its a keyframe
- static uint32_t str2ulong_key (unsigned char *str)
- {
--   return (str2ulong(str) & 0x80000000)?0:0x10;
-+  uint32_t c = str2ulong(str);
-+  c &= 0x80000000;
-+  if (c == 0) return 0x10;
-+  else return 0;
- }
- 
- /* Calculate audio sample size from number of bits and number of channels.
-@@ -360,7 +363,9 @@
-     if(len>AVI->max_len) AVI->max_len=len;
- 
-     // if bit 31 is set, it is NOT a keyframe
--    if (flags != 0x10) len |= (1 << 30) & 0x80000000;
-+    if (flags != 0x10) {
-+	len |= 0x80000000;
-+    }
- 
-     si->aIndex [ cur_chunk_idx ].dwSize = len;
-     si->aIndex [ cur_chunk_idx ].dwOffset = 

Deleted: trunk/patches/transcode-0.6.12-gcc34-1.patch
===================================================================
--- trunk/patches/transcode-0.6.12-gcc34-1.patch	2004-12-25 01:25:17 UTC (rev 3143)
+++ trunk/patches/transcode-0.6.12-gcc34-1.patch	2004-12-25 23:26:02 UTC (rev 3144)
@@ -1,91 +0,0 @@
-Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date:                    2004-09-04
-Initial Package Version: 0.6.12
-Upstream Status:         Not submitted 
-Origin:                  Randy McMurchy
-Description:             Fixes GCC-3.4 related build problems
-
-$LastChangedBy$
-$Date$
-
-diff -Naur transcode-0.6.12-orig/filter/subtitler/frame_list.c transcode-0.6.12/filter/subtitler/frame_list.c
---- transcode-0.6.12-orig/filter/subtitler/frame_list.c	2004-01-05 13:12:55.000000000 +0000
-+++ transcode-0.6.12/filter/subtitler/frame_list.c	2004-09-05 02:17:32.368562264 +0000
-@@ -33,7 +33,8 @@
- 
- char *strsave(char *s) /*save char array s somewhere*/
- {
--char *p, *malloc();
-+/* char *p, *malloc(); */
-+char *p;
- if(p = malloc( strlen(s) +  1) ) strcpy(p, s);
- return(p);
- }
-
-diff -Naur transcode-0.6.12-orig/ffmpeg/libavcodec/i386/simple_idct_mmx.c transcode-0.6.12/ffmpeg/libavcodec/i386/simple_idct_mmx.c
---- transcode-0.6.12-orig/ffmpeg/libavcodec/i386/simple_idct_mmx.c	2003-12-20 11:49:12.000000000 +0000
-+++ transcode-0.6.12/ffmpeg/libavcodec/i386/simple_idct_mmx.c	2004-09-05 02:04:32.318147952 +0000
-@@ -45,10 +45,10 @@
- #define ROW_SHIFT 11
- #define COL_SHIFT 20 // 6
- 
--static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
--static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
-+const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
-+const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
- 
--static const int16_t __attribute__((aligned(8))) coeffs[]= {
-+const int16_t __attribute__((aligned(8))) coeffs[]= {
- 	1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
- //	1<<(COL_SHIFT-1), 0, 1<<(COL_SHIFT-1), 0,
- //	0, 1<<(COL_SHIFT-1-16), 0, 1<<(COL_SHIFT-1-16),
-
-diff -Naur transcode-0.6.12-orig/ffmpeg/libavcodec/i386/motion_est_mmx.c transcode-0.6.12/ffmpeg/libavcodec/i386/motion_est_mmx.c
---- transcode-0.6.12-orig/ffmpeg/libavcodec/i386/motion_est_mmx.c	2003-12-30 10:02:10.000000000 +0000
-+++ transcode-0.6.12/ffmpeg/libavcodec/i386/motion_est_mmx.c	2004-09-05 02:06:37.490118920 +0000
-@@ -20,13 +20,13 @@
-  */
- #include "../dsputil.h"
- 
--static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={
-+const __attribute__ ((aligned(8))) uint64_t round_tab[3]={
- 0x0000000000000000ULL,
- 0x0001000100010001ULL,
- 0x0002000200020002ULL,
- };
- 
--static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
-+const __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
- 
- static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
- {
-
-diff -Naur transcode-0.6.12-orig/ffmpeg/libavcodec/i386/dsputil_mmx.c transcode-0.6.12/ffmpeg/libavcodec/i386/dsputil_mmx.c
---- transcode-0.6.12-orig/ffmpeg/libavcodec/i386/dsputil_mmx.c	2003-12-30 10:02:10.000000000 +0000
-+++ transcode-0.6.12/ffmpeg/libavcodec/i386/dsputil_mmx.c	2004-09-05 02:08:27.098455920 +0000
-@@ -27,16 +27,16 @@
- int mm_flags; /* multimedia extension flags */
- 
- /* pixel operations */
--static const uint64_t mm_bone __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
--static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
--static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
--
--static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
--static const uint64_t ff_pw_3  __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
--static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
--static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
-+const uint64_t mm_bone __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
-+const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
-+const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
-+
-+const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
-+const uint64_t ff_pw_3  __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
-+const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
-+const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
- 
--static const uint64_t ff_pb_FC __attribute__ ((aligned(8))) = 0xFCFCFCFCFCFCFCFCULL;
-+const uint64_t ff_pb_FC __attribute__ ((aligned(8))) = 0xFCFCFCFCFCFCFCFCULL;
- 
- #define JUMPALIGN() __asm __volatile (".balign 8"::)
- #define MOVQ_ZERO(regd)  __asm __volatile ("pxor %%" #regd ", %%" #regd ::)




More information about the blfs-book mailing list