diff --git a/general.ent b/general.ent index e07300f7f1..8048f94758 100644 --- a/general.ent +++ b/general.ent @@ -990,7 +990,7 @@ program you invoke. Development restarted Feb 12, so commented until a new rele - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index d2a9ac2ba8..b9c32c4cb7 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -44,6 +44,9 @@ March 15th, 2012 + + [rthomsen] - Upgrade to MPlayer svn_20120315. + [abenton] - Openssl 1.0.1. diff --git a/multimedia/videoutils/ffmpeg.xml b/multimedia/videoutils/ffmpeg.xml index ceb5207eac..9df288a62f 100644 --- a/multimedia/videoutils/ffmpeg.xml +++ b/multimedia/videoutils/ffmpeg.xml @@ -382,7 +382,7 @@ cp -v doxy/* /usr/share/doc/ffmpeg-&ffmpeg-version;/api try this variant : mmm, bizarrely, it accepts this but drops everything from the first hyphen, so that in longindex.html it looks just right (one library, two packages) --> - + libpostproc.so is the FFmpeg post processing diff --git a/multimedia/videoutils/mplayer.xml b/multimedia/videoutils/mplayer.xml index 262fe3e1a1..9792e1051c 100644 --- a/multimedia/videoutils/mplayer.xml +++ b/multimedia/videoutils/mplayer.xml @@ -4,25 +4,20 @@ %general-entities; - - - - - - + + + + + + - - - - + + + - - - - - - - + + + ]> @@ -42,19 +37,20 @@ Introduction to MPlayer - The MPlayer package contains an + The MPlayer package contains a powerful audio/video player controlled via the command line or graphical interface - which is able to play almost every popular audio and video file format and - CODEC (COder/DECoder, also COmpressor/DECompressor). With supported video - hardware and additional drivers, MPlayer can + which is able to play almost every popular audio and video file format. With + supported video hardware and additional drivers, MPlayer can play video files without an X Window System installed. For MPlayer general information and available features, including a full list of file formats, CODECs and output devices supported by MPlayer, visit the - + MPlayer web site. + + &lfs70_checked; Package Information @@ -79,7 +75,7 @@ Additional Downloads - + CODECs + Although MPlayer has built-in support for playing most popular video + and audio formats, packages with proprietary binary CODECs that enable support + for playing some rare formats are available. Most people don't need the binary + CODECs. - Proprietary CODECs: Essential binary CODECs: @@ -108,6 +108,7 @@ Download size: &mplayer-codec-size; + - + Skins @@ -135,7 +137,7 @@ url="http://www1.mplayerhq.hu/MPlayer/skins/"/> - + + The CODECs and skins are not required to build and use MPlayer. MPlayer Dependencies + Recommended + + + + Optional Input Drivers and Libraries - , - DVB, - DVB drivers, + + , + , + libbluray, libcdio, - , - , LIVE555 Streaming Media, - , and - TiVo vstream client - + RTMPDump, + TiVo vstream client and + XMMS + + Optional Audio Output Drivers and Libraries @@ -180,108 +189,69 @@ , , , - (also used for video output), - JACK, - LADSPA, and - OpenAL - - + , + JACK, + OpenAL and + NAS Optional Video Output Drivers and Libraries - , - DirectFB, - Enca, - , - , - , - GGI, - , - - libcaca, - , + + , , - maemo, - VIDIX, and - + , + , + , + DirectFB, + libcaca, + SVGAlib and + OpenJPEG + Optional CODECs - AMR - narrowband (floating point) or - AMR - naarrowband (fixed point), - - AMR wideband, - - , - (must disable the internal version), - , - , - libdca, - , + , - libmpcdec, - libnut (SVN checkout), - , - LIRC, - lirccd, - (requires - Version 1), - SVGAlib, + , + , , + , + , + , + , + , + , + , + , tooLAME, TwoLAME, - Tremor (requires - and you must disable the internal version), - x264, and - - - Optional Hardware Specific Options - There is hardware specific packages (or vendor supplied software) you - can install to improve the performance of your video card when using - MPlayer. Some of the packages and/or vendor - supplied software and the MPlayer specific - driver created if it is found is shown here. - - - - mga: Matrox G200/G400/G450/G550 hardware YUV overlay via the - mga_vid device - - - xmga: Matrox G200/G400/G450/G550 overlay (mga_vid) in X11 - window - - - syncfb: Matrox G400 YUV support on framebuffer - - - 3dfx: Voodoo 3/Banshee hardware YUV support (/dev/3dfx) - - - tdfxfb: Voodoo 3/Banshee hardware YUV support on tdfx - framebuffer - - - mpegpes: support for Siemens DVB hardware MPEG-1/2 decoder boards - (or MPEG-PES file output) - - - dxr2: support for DXR2 hardware MPEG-1/2 decoder boards - Dxr2 - - - dxr3: support for DXR3/Hollywood+ hardware MPEG-1/2 decoder - boards libdxr3 - - - zr: support for Zoran360[56]7 based hardware MJPEG cards - - - + libgsm, + libdca, + libmpcdec, + OpenCore Adaptive Multi Rate, + CrystalHD, + x264, + Dirac, + Schroedinger, + libnut + + + + + + Optional Miscellaneous Dependencies + + , + , + , + , + (required for the GUI), + Enca, + LADSPA, + libbs2b, + LIRC and + LIRC Client Daemon + + User Notes: @@ -293,12 +263,10 @@ CODEC Installation (Optional) - If you downloaded any proprietary CODECs (which can provide support - for additional audio and video formats such as Real, Indeo and QuickTime), - extract them to /usr/lib/mplayer/codecs - using the following commands as the root user (substitute and/or add different - CODEC filenames, if necessary): + If you downloaded the binary CODECs, extract them to + /usr/lib/mplayer/codecs using the + following commands as the root + user (substitute and/or add different CODEC filenames, if necessary): install -v -d -m755 /usr/lib/mplayer/codecs && tar -xvf ../&mplayer-codec; \ @@ -306,40 +274,22 @@ tar -xvf ../&mplayer-codec; \ chown -v -R root:root /usr/lib/mplayer/codecs If you installed any CODECs, ensure you add - + to the configure script. - - GUI Installation (Optional) - - To enable building the GUI version of - MPlayer (requires ), add to the - configure script. You'll also need to extract at least - one skin. Extract the desired skin and create the default location (as - the root user): - -install -v -d -m755 /usr/share/mplayer/Skin && -tar -xvf ../&mplayer-skin; \ - -C /usr/share/mplayer/Skin && -chown -v -R root:root /usr/share/mplayer/Skin/Blue && -chmod -v 755 /usr/share/mplayer/Skin/Blue{,/icons} && -ln -sfv Blue /usr/share/mplayer/Skin/default - - - + Main MPlayer Installation @@ -351,63 +301,29 @@ ln -sfv Blue /usr/share/mplayer/Skin/default - MPlayer can build a shared - post-processing library from the internal - FFmpeg package which - other packages can link to. This requires - MPlayer - to link dynamically to this library instead of the default statically - linked method. If you desire to build the shared library, add - to the configure - script. Note that the FFmpeg package can also - build this library (which MPlayer can link to - instead of building it), ensure you don't overwrite an existing one. - You may wish to examine the output from ./configure --help to find out what additional parameters to configure are needed to include - the dependencies you have installed on your system. To link in existing - FFmpeg libraries (and - MPlayer won't have to build them), you must - pass a total of nine additional options to the - configure script. Four to disable building the static - FFmpeg libraries, four to enable using the - system-installed shared libraries and - so the build can - locate the FFmpeg interface headers. + the dependencies you have installed on your system. Install MPlayer by running the following commands: - -patch -Np0 -i ../asmrules_fix_20061231.diff && -patch -Np0 -i ../cddb_fix_20070605.diff && -patch -Np1 -i ../MPlayer-&mplayer-version;-ext_ffmpeg-1.patch && - -./configure --prefix=/usr \ +./configure --prefix=/usr \ --confdir=/etc/mplayer \ - --enable-largefiles \ - --enable-dynamic-plugins && + --enable-dynamic-plugins \ + --enable-menu \ + --enable-gui && make This package does not come with a test suite. Now, as the root user: -make install && - +make install && + You will need codecs.conf only if you want to change its properties, as the main binary contains an internal copy of it. Ensure any changes you make to codecs.conf @@ -423,25 +339,43 @@ cp -v -R DOCS/* /usr/share/doc/mplayer-&mplayer-version;install -m644 etc/*.conf /etc/mplayer + + - OSD and Subtitles Font Installation (Required if '--enable-menu' Was + <title>Skin Installation (Optional) + + To enable the GTK frontend of MPlayer, + you'll need to install at least one skin. Extract the desired skin and + create the default location (as the root + user): + +tar -xvf ../&mplayer-skin; \ + -C /usr/share/mplayer/skins && +chown -v -R root:root /usr/share/mplayer/skins/Blue && +chmod -v 755 /usr/share/mplayer/skins/Blue{,/icons} && +ln -sfv Blue /usr/share/mplayer/skins/default + + + + + - + + + + Command Explanations + + --enable-gui: This option is set to build GMPlayer, + a GTK frontend for MPlayer. + --enable-menu: This option is set to enable the + on-screen-display. + --codecsdir=/usr/lib/mplayer/codecs: Use this option + if you installed the binary codecs. + @@ -509,13 +455,13 @@ ln -v -sf &mplayer-font;/font-arial-<font size> this directory is empty unless you copied the default files as mentioned above). Configuration can be accomplished by choosing the configuration button located on the MPlayer GUI. Any - configuration changes made here will be copied to the user's + configuration changes made in the GUI will be saved in the user's ~/.mplayer directory. - + Contents @@ -525,10 +471,10 @@ ln -v -sf &mplayer-font;/font-arial-<font size> Installed Directories - gmplayer, mplayer, and mencoder - libdha.so and optionally, libpostproc.so - ~/.mplayer, /etc/mplayer, /usr/include/postproc, /usr/lib/mplayer, - /usr/share/mplayer, and /usr/share/doc/mplayer-&mplayer-version; + gmplayer, mplayer and mencoder + none + /etc/mplayer, /usr/lib/mplayer, /usr/share/mplayer and + /usr/share/doc/mplayer @@ -541,7 +487,7 @@ ln -v -sf &mplayer-font;/font-arial-<font size> gmplayer is a symlink to mplayer which - brings up the graphical user interface component of + brings up the GTK frontend of MPlayer. gmplayer @@ -552,12 +498,10 @@ ln -v -sf &mplayer-font;/font-arial-<font size> mplayer - manages the input formats, the CODECs and - the output formats to play video files, DVDs, - (S)VCDs or network streams containing audio and/or video - information on your system. + is the main MPlayer video player. - Examples: + mplayer @@ -579,7 +523,10 @@ mplayer http://fredrik.hubbe.net/plugger/test.mpg mencoder - is used to encode any MPlayer + is a powerful command line video decoding, encoding and + filtering tool. + mencoder - + +