Author: randy Date: 2005-05-01 08:28:53 -0600 (Sun, 01 May 2005) New Revision: 3918
Added: trunk/patches/MPlayer-1.0pre7-kernel_2.6-1.patch Removed: trunk/patches/MPlayer-1.0pre6a-kernel_2.6-1.patch Modified: trunk/BOOK/general.ent trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/multimedia/videoutils/mplayer.xml Log: Updated to MPlayer-1.0pre7 Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2005-05-01 13:30:51 UTC (rev 3917) +++ trunk/BOOK/general.ent 2005-05-01 14:28:53 UTC (rev 3918) @@ -1,8 +1,8 @@ -<!ENTITY day "29"> -<!ENTITY month "04"> +<!ENTITY day "01"> +<!ENTITY month "05"> <!ENTITY year "2005"> <!ENTITY version "svn-&year;&month;&day;"> -<!ENTITY releasedate "April &day;th, &year;"> +<!ENTITY releasedate "May &day;st, &year;"> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY blfs-version "cvs"> <!-- cvs|[release #] --> <!ENTITY lfs-version "development"> <!-- version|stable|testing|unstable|development] --> @@ -459,7 +459,7 @@ <!-- Chapter 39 --> <!ENTITY ffmpeg-version "0.4.9-pre1"> <!ENTITY avifile-version "0.7.41"> -<!ENTITY mplayer-version "1.0pre6a"> +<!ENTITY mplayer-version "1.0pre7"> <!ENTITY xine-ui-version "0.99.3"> <!ENTITY transcode-version "0.6.14"> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2005-05-01 13:30:51 UTC (rev 3917) +++ trunk/BOOK/introduction/welcome/changelog.xml 2005-05-01 14:28:53 UTC (rev 3918) @@ -21,6 +21,10 @@ <para>&version; – &releasedate;</para> <itemizedlist> + +<listitem><para>May 1st, 2005 [randy]: Updated to +MPlayer-1.0pre7</para></listitem> + <listitem><para>April 29th, 2005 [bdubbs]: Update to aRts 1.4, kde 3.4, and kdevelop 3.2.</para></listitem> Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml =================================================================== --- trunk/BOOK/multimedia/videoutils/mplayer.xml 2005-05-01 13:30:51 UTC (rev 3917) +++ trunk/BOOK/multimedia/videoutils/mplayer.xml 2005-05-01 14:28:53 UTC (rev 3918) @@ -5,14 +5,14 @@ <!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-md5sum "a812d945b884c2e2fa7f90c57cd76bff"> - <!ENTITY mplayer-size "6.3 MB"> - <!ENTITY mplayer-buildsize "93.5 MB (additional 22 MB for essential CODECs)"> - <!ENTITY mplayer-time "2.19 SBU"> + <!ENTITY mplayer-md5sum "5fadd6957d3aab989cd760ff38fb8fdf"> + <!ENTITY mplayer-size "6.8 MB"> + <!ENTITY mplayer-buildsize "97 MB (additional 22 MB for essential CODECs)"> + <!ENTITY mplayer-time "2.0 SBU"> - <!ENTITY mplayer-codec "essential-20050115.tar.bz2"> - <!ENTITY mplayer-codec-md5sum "b627e5710c6f2bf38fc2a6ef81c13be8"> - <!ENTITY mplayer-codec-size "9.4 MB"> + <!ENTITY mplayer-codec "essential-20050412.tar.bz2"> + <!ENTITY mplayer-codec-md5sum "5fe89bb095bdf9b4f9cda5479dbde906"> + <!ENTITY mplayer-codec-size "9.3 MB"> <!ENTITY mplayer-skin "Blue-1.4.tar.bz2"> <!ENTITY mplayer-skin-md5sum "3006f514cf0c9a8f832cfb1abee276bf"> @@ -118,6 +118,9 @@ <xref linkend="samba3"/>, <ulink url="http://www.live.com/mplayer/";>LIVE.COM Streaming Media</ulink>, <ulink url="http://www.matroska.org/downloads/linux.html";>libmatroska</ulink> +(requires +<ulink url="http://dl.matroska.org/downloads/libebml/";>libebml</ulink>), +<ulink url="http://www.linuxtv.org/";>DVB drivers</ulink> and <ulink url="http://www.metzlerbros.org/dvb/";>DVB</ulink></para> </sect4> @@ -128,7 +131,7 @@ <xref linkend="nas"/>, <xref linkend="sdl"/> (also used for video output), <xref linkend="xmms"/>, -<ulink url="http://0pointer.de/lennart/projects/polypaudio/";>polypaudio</ulink>, +<ulink url="http://0pointer.de/lennart/projects/polypaudio/";>Polypaudio</ulink>, <ulink url="http://bio2jack.sourceforge.net/";>bio2jack</ulink> (requires <ulink url="http://jackit.sourceforge.net/";>JACK</ulink>)</para> </sect4> @@ -149,7 +152,7 @@ <ulink url="http://www.ladspa.org/";>LADSPA</ulink>, <ulink url="http://dxr2.sourceforge.net/";>Dxr2</ulink>, <ulink url="http://dxr3.sourceforge.net/";>libdxr3</ulink>, -<ulink url="http://prdownloads.sourceforge.net/zapping/mp1e-1.9.3.tar.bz2";>MP1E</ulink>, +<ulink url="http://prdownloads.sourceforge.net/zapping/";>MP1E</ulink>, <ulink url="http://freedesktop.org/Software/FriBidi";>FriBidi</ulink> and <ulink url="http://trific.ath.cx/software/enca/";>Enca</ulink></para> </sect4> @@ -165,7 +168,7 @@ <ulink url="http://www.xiph.org/ogg/vorbis/index.html";>Tremor</ulink>, <ulink url="http://www.audiocoding.com/modules/mydownloads/";>FAAD2</ulink>, <ulink url="http://www.divx.com/divx/linux/";>DivX4Linux</ulink>, -<ulink url="http://users.tpg.com.au/adslblvi/#tooLAME";>tooLAME</ulink>, +<ulink url="http://sourceforge.net/projects/toolame";>TooLAME</ulink>, <ulink url="http://www.dolda2000.cjb.net/~fredrik/lirccd/";>lirccd</ulink> and <ulink url="http://www.lirc.org/";>LIRC</ulink></para> </sect4> @@ -186,10 +189,10 @@ using the following commands as the root user (substitute and/or add different <acronym>CODEC</acronym> filenames, if necessary):</para> -<screen><userinput role='root'><command>install -d -m755 /usr/lib/mplayer/codecs && -tar -jxf ../&mplayer-codec; \ +<screen><userinput role='root'><command>install -v -d -m755 /usr/lib/mplayer/codecs && +tar -jvxf ../&mplayer-codec; \ -C /usr/lib/mplayer/codecs --strip-components=1 && -chown -R root:root /usr/lib/mplayer/codecs</command></userinput></screen> +chown -v -R root:root /usr/lib/mplayer/codecs</command></userinput></screen> <para>If you installed any <acronym>CODEC</acronym>s, ensure you add <option>--with-codecsdir=/usr/lib/mplayer/codecs</option> @@ -206,7 +209,7 @@ skin and create the default location (as the root user):</para> <screen><userinput role='root'><command>install -v -d -m755 /usr/share/mplayer/Skin && -tar -jxf ../&mplayer-skin; \ +tar -jvxf ../&mplayer-skin; \ -C /usr/share/mplayer/Skin && chown -v -R root:root /usr/share/mplayer/Skin/Blue && chmod -v 0755 /usr/share/mplayer/Skin/Blue{,/icons} && @@ -229,6 +232,19 @@ <note><para>The package maintainers recommend building without any optimizations.</para></note> +<para><application>MPlayer</application> can build a shared post-processing +library from the internal <application>FFmpeg</application> package which other +packages can link to. This requires <application>MPlayer</application> to link +dynamically to this library instead of the default statically linked method. +If you desire to build the shared library, +add <option>--enable-shared-pp</option> to the <command>configure</command> +script.</para> + +<para>You may wish to examine the output from +<command>./configure --help</command> to find out what additional parameters +to <command>configure</command> are needed to include the dependencies you +have installed on your system.</para> + <para>Install <application>MPlayer</application> by running the following commands:</para> @@ -242,18 +258,16 @@ <para>Now, as the root user:</para> <screen><userinput role='root'><command>make install && -install -d -m755 /usr/share/doc/mplayer && -cp -R DOCS/* /usr/share/doc/mplayer</command></userinput></screen> +install -v -m755 -d /usr/share/doc/mplayer-&mplayer-version; && +cp -v -R DOCS/* /usr/share/doc/mplayer-&mplayer-version;</command></userinput></screen> -<para><application>MPlayer</application> can build a shared post-processing -library which other packages can link to. Doing this means that -<application>MPlayer</application> must also link dynamically to this library -instead of the default statically linked method. If you desire to build the -shared library, add <option>--enable-shared-pp</option> to the -<command>configure</command> script, then execute the following command after -the commands above:</para> +<para>Passing parameters to <command>configure</command> may result in the +creation of <filename class='libraryfile'>libdha.so.1.0</filename>. If so, +you may wish to create a symlink to this library in case other packages link +to <filename class='libraryfile'>libdha.so</filename>. Use the following +command as the root user to create the symlink:</para> -<screen><userinput role='root'><command>make -C libavcodec/libpostproc install</command></userinput></screen> +<screen><userinput role='root'><command>ln -v -s libdha.so.1.0 /usr/lib/libdha.so</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 @@ -282,19 +296,19 @@ 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 \ +<screen><userinput><command>install -v -m750 -d ~/.mplayer && +ln -v -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 role='root'><command>tar -jxf ../&mplayer-font;.tar.bz2 \ +<screen><userinput role='root'><command>tar -jvxf ../&mplayer-font;.tar.bz2 \ -C /usr/share/mplayer/font && -chown -R root:root /usr/share/mplayer/font && +chown -v -R root:root /usr/share/mplayer/font && cd /usr/share/mplayer/font && -ln -sf &mplayer-font;/font-arial-<replaceable>[font size]</replaceable>-iso-8859-1/* .</command></userinput></screen> +ln -v -sf &mplayer-font;/font-arial-<replaceable>[font size]</replaceable>-iso-8859-1/* .</command></userinput></screen> <para>Available font sizes are 14, 18, 24 or 28.</para> @@ -367,8 +381,8 @@ <seglistitem> <seg>gmplayer, mplayer and mencoder</seg> <seg>libdha.so and optionally, libpostproc.so</seg> -<seg>/etc/mplayer, /usr/lib/mplayer, /usr/share/mplayer and -/usr/share/doc/mplayer</seg> +<seg>~/.mplayer, /etc/mplayer, /usr/include/postproc, /usr/lib/mplayer, +/usr/share/mplayer and /usr/share/doc/mplayer-&mplayer-version;</seg> </seglistitem> </segmentedlist> @@ -455,7 +469,6 @@ <primary sortas="c-libpostproc">libpostproc.so</primary></indexterm> </listitem> </varlistentry> - </variablelist> </sect2> Deleted: trunk/patches/MPlayer-1.0pre6a-kernel_2.6-1.patch =================================================================== --- trunk/patches/MPlayer-1.0pre6a-kernel_2.6-1.patch 2005-05-01 13:30:51 UTC (rev 3917) +++ trunk/patches/MPlayer-1.0pre6a-kernel_2.6-1.patch 2005-05-01 14:28:53 UTC (rev 3918) @@ -1,23 +0,0 @@ -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 - - Copied: trunk/patches/MPlayer-1.0pre7-kernel_2.6-1.patch (from rev 3897, trunk/patches/MPlayer-1.0pre6a-kernel_2.6-1.patch) -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
