r2712 - in trunk: BOOK BOOK/introduction/welcome BOOK/multimedia/libdriv BOOK/multimedia/videoutils patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sat Sep 4 16:52:05 PDT 2004


Author: randy
Date: 2004-09-04 17:52:03 -0600 (Sat, 04 Sep 2004)
New Revision: 2712

Added:
   trunk/patches/MPlayer-1.0pre5-kernel_2.6-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/xine-lib.xml
   trunk/BOOK/multimedia/videoutils/mplayer.xml
   trunk/BOOK/multimedia/videoutils/xine-ui.xml
Log:
Updated to MPlayer-1.0pre5

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-09-04 19:45:14 UTC (rev 2711)
+++ trunk/BOOK/general.ent	2004-09-04 23:52:03 UTC (rev 2712)
@@ -415,7 +415,7 @@
 <!-- Chapter 39 --> 
 <!ENTITY ffmpeg-version               "0.4.8">
 <!ENTITY avifile-version              "0.7.38">  
-<!ENTITY mplayer-version              "1.0pre4"> 
+<!ENTITY mplayer-version              "1.0pre5"> 
 <!ENTITY xine-ui-version              "0.99.2">  
 <!ENTITY transcode-version            "0.6.12"> 
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-09-04 19:45:14 UTC (rev 2711)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-09-04 23:52:03 UTC (rev 2712)
@@ -23,7 +23,8 @@
 <itemizedlist>
 
 <listitem><para>September 4th, 2004 [randy]: Updated to 
-Whois-4.6.21 as suggested by Jeremy Utley.</para></listitem>
+Whois-4.6.21 as suggested by Jeremy Utley; Updated to 
+MPlayer-1.0pre5.</para></listitem>
 
 <listitem><para>September 4th, 2004 [dj]: Added instructions to create
 /etc/sysconfig/nfs-server to NFS Server instructions.</para></listitem>

Modified: trunk/BOOK/multimedia/libdriv/xine-lib.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/xine-lib.xml	2004-09-04 19:45:14 UTC (rev 2711)
+++ trunk/BOOK/multimedia/libdriv/xine-lib.xml	2004-09-04 23:52:03 UTC (rev 2712)
@@ -54,7 +54,7 @@
 <xref linkend="speex"/>, 
 <ulink url="http://www.theora.org/">Theora</ulink>, 
 <ulink url="http://www.libstk.org/">LibSTK</ulink> and 
-<ulink url="http://packages.debian.org/testing/source/libcaca">CACA</ulink>
+<ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>
 </para></sect4>
 </sect3>
 

Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/mplayer.xml	2004-09-04 19:45:14 UTC (rev 2711)
+++ trunk/BOOK/multimedia/videoutils/mplayer.xml	2004-09-04 23:52:03 UTC (rev 2712)
@@ -2,12 +2,15 @@
    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
- 
+
   <!ENTITY mplayer-download-http "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.bz2">
   <!ENTITY mplayer-download-ftp  "ftp://ftp1.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.bz2">
-  <!ENTITY mplayer-size          "4.7 MB">
-  <!ENTITY mplayer-buildsize     "51 MB">
+  <!ENTITY mplayer-size          "5.1 MB">
+  <!ENTITY mplayer-buildsize     "74 MB (additional 19 MB for CODECs)">
   <!ENTITY mplayer-time          "1.80 SBU">
+  <!ENTITY mplayer-default-codec "essential-20040809.tar.bz2">
+  <!ENTITY mplayer-default-skin  "Blue-1.4.tar.bz2">
+  <!ENTITY mplayer-default-font  "font-arial-iso-8859-1">
 ]>
 
 <sect1 id="mplayer" xreflabel="MPlayer-&mplayer-version;">
@@ -21,11 +24,19 @@
 <sect2>
 <title>Introduction to <application>MPlayer</application></title>
 
-<para>The <application>MPlayer</application> package contains an audio/video player that is able to
-play almost every audio and video <acronym>CODEC</acronym> and can be
-controlled via the command
-line or a <acronym>GUI</acronym>.</para>
+<para>The <application>MPlayer</application> package contains an audio/video 
+player controlled via the command line or a graphical interface which is 
+able to play almost every popular audio and video file format 
+and <acronym>CODEC</acronym> (COder/DECoder, also COmpressor/DECompressor). 
+With supported video hardware and additional drivers, 
+<application>MPlayer</application> can play video files without an 
+<application>X</application> window system installed.</para>
 
+<para>For a full list of file formats, <acronym>CODEC</acronym>s and 
+output devices supported by <application>MPlayer</application>, visit the 
+<ulink url="http://www.mplayerhq.hu/DOCS/HTML/en/features.html">
+<application>MPlayer</application> web site</ulink>.</para>
+
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Download (HTTP): <ulink url="&mplayer-download-http;"/></para></listitem>
@@ -36,20 +47,41 @@
 </sect3>
 
 <sect3><title>Additional downloads</title>
+<para><emphasis>Patches</emphasis></para>
 <itemizedlist spacing='compact'>
-<listitem><para>Proprietary <acronym>CODEC</acronym>s: <ulink
-url="http://www1.mplayerhq.hu/MPlayer/releases/codecs/extralite.tar.bz2"/></para></listitem>
-<listitem><para>Default <acronym>GUI</acronym> skin: <ulink
-url="http://www1.mplayerhq.hu/MPlayer/Skin/default-1.8.tar.bz2"/></para></listitem>
-<listitem><para>Prerendered fonts: <ulink
-url="http://www1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2"/></para>
+<listitem><para>Required Patch (for fbdev driver support): <ulink 
+url="&patch-root;/MPlayer-&mplayer-version;-kernel_2.6-1.patch"/></para>
+</listitem></itemizedlist>
+
+<para><emphasis><acronym>CODEC</acronym>s</emphasis></para>
+<itemizedlist spacing='compact'>
+<listitem><para>Proprietary <acronym>CODEC</acronym>s: <ulink 
+url="http://www.mplayerhq.hu/MPlayer/releases/codecs/&mplayer-default-codec;"/></para>
 </listitem>
-</itemizedlist>
+<listitem><para>Additional <acronym>CODEC</acronym>s: <ulink 
+url="http://www.mplayerhq.hu/MPlayer/releases/codecs/"/></para>
+</listitem></itemizedlist>
 
-<note><para>The additional downloads are not required to build and use MPlayer. You can
-find many more <acronym>CODEC</acronym>s, skins and fonts at <ulink
-url="http://www.mplayerhq.hu/">MPlayer's homepage</ulink>.</para></note>
+<para><emphasis>Skins</emphasis></para>
+<itemizedlist spacing='compact'>
+<listitem><para>Default <acronym>GUI</acronym> skin: <ulink 
+url="http://www1.mplayerhq.hu/MPlayer/Skin/&mplayer-default-skin;"/></para>
+</listitem>
+<listitem><para>Additional skins: <ulink 
+url="http://www1.mplayerhq.hu/MPlayer/Skin/"/></para>
+</listitem></itemizedlist>
 
+<para><emphasis>Fonts</emphasis></para>
+<itemizedlist spacing='compact'>
+<listitem><para>Prerendered fonts: <ulink 
+url="http://www1.mplayerhq.hu/MPlayer/releases/fonts/&mplayer-default-font;.tar.bz2"/></para>
+</listitem>
+<listitem><para>Additional fonts: <ulink 
+url="http://www1.mplayerhq.hu/MPlayer/releases/fonts/"/></para>
+</listitem></itemizedlist>
+
+<note><para>The <acronym>CODEC</acronym>s, skins and fonts are not required to 
+build and use <application>MPlayer</application>.</para></note>
 </sect3>
 
 <sect3><title><application>MPlayer</application> dependencies</title>
@@ -90,8 +122,14 @@
 <ulink url="http://fribidi.sourceforge.net/">FriBidi</ulink>,
 <ulink url="http://www.unrarlib.org/">unrarlib</ulink>,
 <ulink url="http://www.lirc.org/">LIRC</ulink>,
-<ulink url="http://www.dolda2000.cjb.net/~fredrik/lirccd/">lirccd</ulink> and
-<ulink url="http://www.live.com/mplayer/">LIVE.COM Streaming Media</ulink>
+<ulink url="http://www.dolda2000.cjb.net/~fredrik/lirccd/">lirccd</ulink>, 
+<ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>, 
+<ulink url="http://www.matroska.org/downloads/linux.html">libmatroska</ulink>, 
+<ulink url="http://www.live.com/mplayer/">LIVE.COM Streaming Media</ulink>, 
+<ulink url="http://bio2jack.sourceforge.net/">bio2jack</ulink>, 
+<ulink url="http://dxr2.sourceforge.net/">Dxr2</ulink>, 
+<ulink url="http://dxr3.sourceforge.net/">libdxr3</ulink>, 
+<ulink url="http://trific.ath.cx/software/enca/">Enca</ulink>
 </para></sect4>
 </sect3>
 
@@ -100,42 +138,119 @@
 <sect2>
 <title>Installation of <application>MPlayer</application></title>
 
-<para>If you downloaded any proprietary <acronym>CODEC</acronym>s,
-extract them at some system-wide location (like <filename
-class="directory">/usr/lib/mplayer/codecs</filename>) and add
-<parameter>--with-codecsdir=<replaceable>[location]</replaceable></parameter>
-option to the configure script.</para>
+<sect3>
+<title><acronym>CODEC</acronym> installation (optional)</title>
 
+<para>If you downloaded any proprietary <acronym>CODEC</acronym>s 
+(which can provide support for additional audio and video formats such as 
+Real, Indeo and QuickTime), extract them to 
+<filename class="directory">/usr/lib/mplayer/codecs</filename> 
+using the following commands (substitute and/or add different 
+<acronym>CODEC</acronym> filenames, if necessary):</para>
+
+<screen><userinput><command>install -d -m755 /usr/lib/mplayer/codecs &&
+tar xjfv ../&mplayer-default-codec; \
+    -C /usr/lib/mplayer/codecs --strip-path=1 &&
+chown -R root:root /usr/lib/mplayer/codecs</command></userinput></screen>
+
+<para>If you installed any <acronym>CODEC</acronym>s, ensure you add
+<parameter>--with-codecsdir=/usr/lib/mplayer/codecs</parameter>
+to the <command>configure</command> script.</para>
+</sect3>
+
+<sect3>
+<title><acronym>GUI</acronym> installation (optional)</title>
+
+<para>To enable building the <acronym>GUI</acronym> version of
+<application>MPlayer</application> (requires <xref linkend="GTK"/>), add 
+<parameter>--enable-gui</parameter> to the <command>configure</command> 
+script. You'll also need to extract at least one skin. Extract the desired 
+skin to the default location:</para>
+
+<screen><userinput><command>install -d -m755 /usr/share/mplayer/Skin/default &&
+tar xjvf ../&mplayer-default-skin; \
+    -C /usr/share/mplayer/Skin/default --strip-path=1 &&
+chown -R root:root /usr/share/mplayer/Skin/default</command></userinput></screen>
+</sect3>
+
+<sect3>
+<title>Installing <acronym>OSD</acronym> and subtitles support 
+(optional)</title>
+
+<para>To enable <acronym>OSD</acronym> (On Screen Display) and subtitles 
+support, add <parameter>--enable-menu</parameter> to the 
+<command>configure</command> script. You'll also need to set up at least one 
+font (see font installation instructions a little later).</para>
+</sect3>
+
+<sect3>
+<title>Main <application>MPlayer</application> installation</title>
+
 <note><para>The package maintainers recommend building without any
 optimizations.</para></note>
 
-<para>Install <application>MPlayer</application> by running the following commands:</para>
+<para>Install <application>MPlayer</application> by running the following 
+commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr --confdir=/etc/mplayer \
+<screen><userinput><command>patch -Np1 -i ../MPlayer-&mplayer-version;-kernel_2.6-1.patch &&
+./configure --prefix=/usr --confdir=/etc/mplayer \
     --enable-largefiles --enable-shared-pp &&
 make &&
 make install &&
-make -C libavcodec/libpostproc install</command></userinput></screen>
+make -C libavcodec/libpostproc install &&
+install -d -m755 /usr/share/doc/mplayer &&
+cp -R DOCS/* /usr/share/doc/mplayer &&
+chown -R root:root /usr/share/doc/mplayer</command></userinput></screen>
 
 <para>You will need <filename>codecs.conf</filename> only if you want to
 change its properties, as the main binary contains an internal copy of
-it:</para>
+it. Ensure any changes you make to <filename>codecs.conf</filename> achieve 
+the desired results, as incorrect entries in this file have been known to
+cause errors. If necessary, create the file using the following command.</para>
 
 <screen><userinput><command>cp etc/codecs.conf /etc/mplayer</command></userinput></screen>
+</sect3>
 
-<para>The <acronym>GUI</acronym> version of
-<application>MPlayer</application> requires a skin. Extract the default
-one to the recommended location:</para>
+<sect3>
+<title><acronym>OSD</acronym> and subtitles font installation 
+(required if <parameter>--enable-menu</parameter> was passed to 
+<command>configure</command>)</title>
 
-<screen><userinput><command>install -d /usr/share/mplayer/Skin &&
-tar xjvf ../default-1.8.tar.bz2 -C /usr/share/mplayer/Skin</command></userinput></screen>
+<para>The recommended method to set up a font for 
+<application>MPlayer</application> is to link a <acronym>TTF</acronym> file to 
+your <filename class="directory">~/.mplayer</filename> directory. A link 
+should be created in each user's home directory who may use 
+<application>MPlayer</application>. For example: 
+</para>
 
+<screen><userinput><command>mkdir ~/.mplayer &&
+ln -sf /usr/X11R6/lib/X11/fonts/TTF/luxisri.ttf \
+    ~/.mplayer/subfont.ttf</command></userinput></screen>
+
+<para>There are several other ways to set up a font package. To use a 
+prerendered <application>MPlayer</application> font package, extract and link 
+one of the font tarballs using the following commands:</para>
+
+<screen><userinput><command>tar xjvf ../&mplayer-default-font;.tar.bz2 \
+    -C /usr/share/mplayer/font &&
+chown -R root:root /usr/share/mplayer/font &&
+cd /usr/share/mplayer/font &&
+ln -sf &mplayer-default-font;/font-arial-<replaceable>[font size]</replaceable>-iso-8859-1/* .</command></userinput></screen>
+
+<para>Available font sizes are 14, 18, 24 or 28.</para>
+
+<para>Additional information as well as additional methods to set up an 
+<application>MPlayer</application> font package can be found at <ulink 
+url="http://www.mplayerhq.hu/DOCS/HTML/en/subosd.html#mpsub-install"/>.</para>
+</sect3>
+
 <sect3>
-<title>Installation for <acronym>DVD</acronym> playback</title>
+<title>Installation for <acronym>DVD</acronym> playback (optional)</title>
 
 <para>If you want <acronym>DVD</acronym> playback with
-<application>MPlayer</application>, you need to make a link
-from your <acronym>DVD</acronym> drive to <filename>/dev/dvd</filename>:</para>
+<application>MPlayer</application>, you need to ensure a link exists 
+from your <acronym>DVD</acronym> drive to <filename>/dev/dvd</filename>. If
+necessary, create the link using the following command:</para>
 
 <screen><userinput><command>ln -s /dev/<replaceable>[dvd drive]</replaceable> /dev/dvd</command></userinput></screen>
 
@@ -150,11 +265,12 @@
 <screen><userinput>hdc: Pioneer DVD-ROM ATAPIModel DVD-114 0110,
 ATAPI CD/DVD-ROM drive</userinput></screen>
 
-<para>If you have SCSI-Emulation activated for the drives, you'll need
-to get the right SCSI-device. Every CD/DVD-ROM drive is mapped in the
-same order as in <acronym>IDE</acronym> devices to the devices named
-<filename>/dev/scd0</filename>,
-<filename>/dev/scd1</filename> and so on.</para>
+<para>If you have <acronym>SCSI</acronym>-Emulation activated for the drives, 
+you'll need to get the right <acronym>SCSI</acronym>-device. Every 
+<acronym>CD</acronym>/<acronym>DVD</acronym>-<acronym>ROM</acronym> drive is 
+mapped in the same order as in <acronym>IDE</acronym> devices to the devices 
+named <filename>/dev/scd0</filename>, <filename>/dev/scd1</filename> and so on.
+</para>
 
 </sect3>
 
@@ -162,75 +278,29 @@
 
 <sect2>
 <title>Command explanations</title>
+<para><parameter>--enable-shared-pp</parameter>: This enables building the 
+shared <filename class="libraryfile">libpostproc</filename> library (for 
+post processing) which features filters such as sharpen.</para>
 
-<para><option>--enable-shared-pp</option>: This enables the
-building of a shared <filename
-class="libraryfile">libpostproc</filename> (library for post processing, featuring
-filters like sharpen).</para>
-
-<para><option>--enable-gui</option>: This switch tells
-<application>MPlayer</application> to compile the <acronym>GUI</acronym>
-code (requires <xref linkend="GTK"/>).</para>
-
-<para><option>--enable-menu</option>:  This
-switch enables the new menu support.  It's like an
-<acronym>OSD</acronym>, but you can
-also run a shell with it.</para>
-
 </sect2>
 
 <sect2>
 <title>Configuring MPlayer</title>
 
 <sect3><title>Config files</title>
-<para><filename>/etc/mplayer/*</filename>, <filename>~/.mplayer/*</filename></para>
+<para><filename>/etc/mplayer/*</filename>, 
+<filename>~/.mplayer/*</filename></para>
 </sect3>
 
-<sect3><title>Configuration Information</title>
-
-
-<para>If you wish to utilize a <application>FreeType</application> font,
-you need to link a <acronym>TTF</acronym>
-file to your <filename class="directory">~/.mplayer</filename> directory.  For example:
-<screen><userinput><command>ln -sf /usr/X11R6/lib/X11/fonts/TTF/luxisri.ttf ~/.mplayer/subfont.ttf
-</command></userinput></screen>
-otherwise
-<screen><userinput><command>tar xjvf ../font-arial-iso-8859-1.tar.bz2 -C /usr/share/mplayer/font &&
-cd /usr/share/mplayer/font &&
-ln -sf font-arial-iso-8859-1/font-arial-<replaceable>[font size]</replaceable>-iso-8859-1/* .</command></userinput></screen>
-You can chose your font size of 14, 18, 24 or 28.
-</para>
-
-<para>Set the proper ownership for <acronym>CODEC</acronym>s, skins and fonts:</para>
-
-<screen><userinput><command>chown -R root:root <replaceable>[CODECs location]</replaceable> &&
-chown -R root:root /usr/share/mplayer</command></userinput></screen>
-
-<para>Optionally, set up the <acronym>GUI</acronym> with the following commands:</para>
-
-<screen><userinput><command>cat > /etc/mplayer/mplayer.conf << "EOF"</command>
-gui = yes
-skin = default
-<command>EOF</command></userinput></screen>
-
-<para>The first line, <userinput>gui = yes</userinput>, will make
-MPlayer start in <acronym>GUI</acronym> mode automatically. If you want to decide whether to start
-in <acronym>GUI</acronym> mode or not, leave that line out and start
-<command>mplayer</command> with
-<option>-gui</option> or as <command>gmplayer</command> (e.g.,
-when starting from a Window Manager menu or command prompt). Note that
-the main configuration file is called <filename>config</filename> if it
-is placed in the <filename class="directory">~/.mplayer</filename> directory.</para>
-
-</sect3>
-
 </sect2>
 
 <sect2>
 <title>Contents</title>
 
-<para>The <application>MPlayer</application> package contains <command>mplayer</command>,
-<command>gmplayer</command> and <command>mencoder</command>.</para>
+<para>The <application>MPlayer</application> package contains 
+<command>mplayer</command>,
+<command>gmplayer</command> and 
+<command>mencoder</command>.</para>
 
 </sect2>
 
@@ -238,10 +308,10 @@
 
 <sect3><title>mplayer</title>
 <para><command>mplayer</command> manages the input formats, the
-<acronym>CODEC</acronym>s and the output
-formats to play video files, <acronym>DVD</acronym>s,
-(S)<acronym>VCD</acronym>s or network streams containing
-audio and/or video information on your system.</para>
+<acronym>CODEC</acronym>s and the output formats to play video files, 
+<acronym>DVD</acronym>s, (S)<acronym>VCD</acronym>s or network streams 
+containing audio and/or video information on your system.</para>
+
 <para>Examples:</para>
 
 <screen><command>mplayer -fs blfs.avi
@@ -249,18 +319,21 @@
 mplayer -fs vcd://1    # works both for VCDs and SVCDs
 mplayer http://www.students.uni-marburg.de/~Klossa/hapkidofight_lo.mpg</command></screen>
 
-<para>For further information, look at the very good
-documentation included with the package in the source tree subdirectory <filename
-class="directory">DOCS/</filename>.
-</para></sect3>
+<para>For further information, look at the very good documentation included 
+with the package in the source tree subdirectory 
+<filename class="directory">DOCS</filename> (also installed at
+<filename class='directory'>/usr/share/doc/mplayer</filename>).</para>
+</sect3>
 
 <sect3><title>gmplayer</title>
-<para><command>gmplayer</command> is <application>MPlayer</application> with a graphical user interface.</para></sect3>
+<para><command>gmplayer</command> is <application>MPlayer</application> with a 
+graphical user interface.</para></sect3>
 
 <sect3><title>mencoder</title>
 <para><command>mencoder</command> is used to encode any
 <application>MPlayer</application> playable movie to DivX4,
-<application>XviD</application> or any <acronym>CODEC</acronym> in libavcodec with
+<application>XviD</application> or any <acronym>CODEC</acronym> in 
+<filename class='libraryfile'>libavcodec</filename> with
 <acronym>PCM</acronym>/MP3/VBRMP3 audio.</para>
 
 <para>Example:</para>

Modified: trunk/BOOK/multimedia/videoutils/xine-ui.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/xine-ui.xml	2004-09-04 19:45:14 UTC (rev 2711)
+++ trunk/BOOK/multimedia/videoutils/xine-ui.xml	2004-09-04 23:52:03 UTC (rev 2712)
@@ -56,8 +56,7 @@
 <xref linkend="curl"/>, 
 <xref linkend="aalib"/>, 
 <ulink url="http://www.lirc.org">LIRC</ulink> and 
-<ulink url="http://packages.debian.org/testing/source/libcaca">CACA</ulink>
-</para>
+<ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink></para>
 </sect4>
 </sect3>
 

Added: trunk/patches/MPlayer-1.0pre5-kernel_2.6-1.patch
===================================================================
--- trunk/patches/MPlayer-1.0pre5-kernel_2.6-1.patch	2004-09-04 19:45:14 UTC (rev 2711)
+++ trunk/patches/MPlayer-1.0pre5-kernel_2.6-1.patch	2004-09-04 23:52:03 UTC (rev 2712)
@@ -0,0 +1,23 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-04-29
+Initial Package Version: 1.0pre4
+Origin: Jim Gifford
+Upstream Status: Sent
+Description: Fixes Compile Issues with the 2.6 Kernel
+ 
+$LastChangedBy$
+$Date$
+
+diff -Naur MPlayer-1.0pre4.orig/osdep/kerneltwosix.h MPlayer-1.0pre4/osdep/kerneltwosix.h
+--- MPlayer-1.0pre4.orig/osdep/kerneltwosix.h	2004-01-10 09:48:15.000000000 +0000
++++ MPlayer-1.0pre4/osdep/kerneltwosix.h	2004-04-30 02:10:54.429252761 +0000
+@@ -1,9 +1,3 @@
+ #include <linux/version.h>
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
+-#define __KERNEL__
+-#include <linux/thread_info.h>
+-#include <linux/list.h>
+-#undef __KERNEL__
+-#endif
+ 
+ 


Property changes on: trunk/patches/MPlayer-1.0pre5-kernel_2.6-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list