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

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sun Sep 5 09:21:22 PDT 2004


Author: randy
Date: 2004-09-05 10:21:20 -0600 (Sun, 05 Sep 2004)
New Revision: 2715

Added:
   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/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/videoutils/transcode.xml
Log:
Added build/functionality fix patches and optional dependencies to transcode instructions

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-09-05 06:11:51 UTC (rev 2714)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-09-05 16:21:20 UTC (rev 2715)
@@ -22,6 +22,10 @@
 
 <itemizedlist>
 
+<listitem><para>September 5th, 2004 [randy]: Added optional dependencies 
+and build/functionality fix patches to transcode instructions.</para>
+</listitem>
+
 <listitem><para>September 5th, 2004 [randy]: Added gcc34 patch to 
 libFAME instructions to fix broken library if compiled with 
 GCC-3.4.x.</para></listitem>

Modified: trunk/BOOK/multimedia/videoutils/transcode.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/transcode.xml	2004-09-05 06:11:51 UTC (rev 2714)
+++ trunk/BOOK/multimedia/videoutils/transcode.xml	2004-09-05 16:21:20 UTC (rev 2715)
@@ -2,12 +2,12 @@
    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
   <!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          "2.41 SBU">
+  <!ENTITY transcode-time          "1.89 SBU">
 ]>
 
 <sect1 id="transcode" xreflabel="transcode-&transcode-version;">
@@ -21,8 +21,9 @@
 <sect2>
 <title>Introduction to <application>transcode</application></title>
 
-<para><application>transcode</application> is a fast, versatile and command-line 
-based audio/video everything to everything converter.</para>
+<para><application>transcode</application> is a fast, versatile and 
+command-line based audio/video everything to everything 
+converter.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -37,39 +38,52 @@
 &transcode-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patch: <ulink 
+url="&patch-root;/transcode-&transcode-version;-fix_largefile_split-1.patch"/></para>
+</listitem>
+<listitem><para>Required Patch (if 
+<application>libdv</application> is installed): <ulink 
+url="&patch-root;/transcode-&transcode-version;-fix_dv-1.patch"/></para>
+</listitem>
+<listitem><para>Required Patch (if compiled with
+<application><acronym>GCC</acronym></application>-3.4.x): <ulink 
+url="&patch-root;/transcode-&transcode-version;-gcc34-1.patch"/></para>
+</listitem>
+</itemizedlist>
+</sect3>
+
 <sect3><title><application>transcode</application> dependencies</title>
 <sect4><title>Optional</title>
-<para>
-<xref linkend="NASM"/>,
-<xref linkend="lame"/>,
-X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
-<xref linkend="mplayer"/>,
+<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
+<xref linkend="NASM"/>, 
+<xref linkend="freetype2"/>, 
+<xref linkend="curl"/>, 
+<xref linkend="libxml2"/>, 
+<xref linkend="GLib"/>, 
+<xref linkend="GTK"/>, 
 <xref linkend="imagemagick"/>, 
-<xref linkend="libdv"/>,
-<xref linkend="libdvdread"/>
-<ulink url="http://mjpeg.sourceforge.net/">mjpeg tools</ulink>,
+<xref linkend="libjpeg"/>, 
+<xref linkend="lame"/>, 
+<xref linkend="mplayer"/>, 
+<xref linkend="libdv"/>, 
+<xref linkend="libdvdread"/>, 
 <xref linkend="SDL"/>, 
-<xref linkend="qt"/>, 
-<xref linkend="avifile"/>,
+<xref linkend="avifile"/>, 
 <xref linkend="libfame"/>, 
-<xref linkend="libmpeg3"/>,
+<xref linkend="libmpeg3"/>, 
 <xref linkend="xvid"/>, 
 <xref linkend="LZO"/>, 
-<xref linkend="libxml2"/>,
-<xref linkend="liba52"/>,
+<xref linkend="liba52"/>, 
 <xref linkend="ffmpeg"/>, 
 <xref linkend="libmad"/>, 
-<xref linkend="curl"/>,
-<xref linkend="libogg"/>,
-<xref linkend="libvorbis"/>,
-<ulink url="http://www.theora.org/">Theora</ulink>,
-<xref linkend="libjpeg"/>,
-<xref linkend="GLib"/>,
-<xref linkend="GTK"/>,
-<xref linkend="freetype2"/>,
-<xref linkend="libmpeg3"/> and
-<xref linkend="openquicktime"/>
-</para></sect4>
+<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>
 </sect3>
 
 </sect2>
@@ -80,7 +94,10 @@
 <para>Install <application>transcode</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr --without-x &&
+<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 &&
 make &&
 make install</command></userinput></screen>
 
@@ -89,10 +106,9 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><parameter>--without-x</parameter>: Omit this switch if you have
-an <application>X</application>
-Window System installed and you want to compile X11 dependent filter
-plugins.</para>
+<para><parameter>--without-x</parameter>: Omit this switch if you have an 
+<application>X</application> Window System installed and you want to compile 
+X11 dependent filter plugins.</para>
 
 </sect2>
 
@@ -143,7 +159,8 @@
 
 <sect3><title>tcdemux</title>
 <para><command>tcdemux</command> demultiplexes (separates) audio/video input 
-that contains multiple streams, e.g., <acronym>VOB</acronym> files.</para></sect3>
+that contains multiple streams, e.g., <acronym>VOB</acronym> files.</para>
+</sect3>
 
 <sect3><title>tcextract</title>
 <para><command>tcextract</command> grabs single streams from a file containing 
@@ -164,7 +181,8 @@
 <acronym>MP3</acronym> streams at milliseconds positions.</para></sect3>
 
 <sect3><title>tcprobe</title>
-<para><command>tcprobe</command> prints information about the input file format.</para></sect3>
+<para><command>tcprobe</command> prints information about the input file 
+format.</para></sect3>
 
 <sect3><title>tcrequant</title>
 <para><command>tcrequant</command> is a tool which can requantize an
@@ -197,9 +215,10 @@
 index of an <acronym>AVI</acronym> file.</para></sect3>
 
 <sect3><title>avimerge</title>
-<para><command>avimerge</command> merges <acronym>AVI</acronym> files of the same format. Do not 
-try to merge <acronym>AVI</acronym> files of different formats, it will most likely result in 
-errors (and format means same bitrates, too!).</para></sect3>
+<para><command>avimerge</command> merges <acronym>AVI</acronym> files of the 
+same format. Do not try to merge <acronym>AVI</acronym> files of different 
+formats, it will most likely result in errors (and format means same bitrates, 
+too!).</para></sect3>
 
 <sect3><title>avisplit</title>
 <para><command>avisplit</command> splits <acronym>AVI</acronym> files

Added: trunk/patches/transcode-0.6.12-fix_dv-1.patch
===================================================================
--- trunk/patches/transcode-0.6.12-fix_dv-1.patch	2004-09-05 06:11:51 UTC (rev 2714)
+++ trunk/patches/transcode-0.6.12-fix_dv-1.patch	2004-09-05 16:21:20 UTC (rev 2715)
@@ -0,0 +1,30 @@
+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;


Property changes on: trunk/patches/transcode-0.6.12-fix_dv-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date

Added: trunk/patches/transcode-0.6.12-fix_largefile_split-1.patch
===================================================================
--- trunk/patches/transcode-0.6.12-fix_largefile_split-1.patch	2004-09-05 06:11:51 UTC (rev 2714)
+++ trunk/patches/transcode-0.6.12-fix_largefile_split-1.patch	2004-09-05 16:21:20 UTC (rev 2715)
@@ -0,0 +1,40 @@
+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 = 


Property changes on: trunk/patches/transcode-0.6.12-fix_largefile_split-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date

Added: trunk/patches/transcode-0.6.12-gcc34-1.patch
===================================================================
--- trunk/patches/transcode-0.6.12-gcc34-1.patch	2004-09-05 06:11:51 UTC (rev 2714)
+++ trunk/patches/transcode-0.6.12-gcc34-1.patch	2004-09-05 16:21:20 UTC (rev 2715)
@@ -0,0 +1,91 @@
+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 ::)


Property changes on: trunk/patches/transcode-0.6.12-gcc34-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list