From 7bb72e0c62410682fcb0ad936c47bf30382d1391 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 23 Aug 2013 20:56:44 +0000 Subject: [PATCH] Move Video HW acceleration into Xorg drivers section LFS 7.4 tags git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11680 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- archive/{qt.xml => qt4.xml} | 0 general/genlib/libarchive.xml | 2 +- general/genlib/lzo.xml | 2 +- general/graphlib/lcms.xml | 2 +- general/graphlib/libmng.xml | 2 +- general/graphlib/openjpeg.xml | 2 +- general/prog/cmake.xml | 2 +- multimedia/audioutils/cdparanoia.xml | 2 +- multimedia/audioutils/mpg123.xml | 2 +- multimedia/hwaccel/hwaccel.xml | 27 -------- multimedia/libdriv/faac.xml | 2 +- multimedia/libdriv/faad2.xml | 2 +- multimedia/libdriv/gst10-plugins-base.xml | 2 +- multimedia/libdriv/libmpeg2.xml | 2 +- multimedia/libdriv/libtheora.xml | 8 ++- multimedia/libdriv/taglib.xml | 2 +- multimedia/libdriv/xvid.xml | 2 +- multimedia/multimedia.xml | 1 - .../hwaccel => x/installing}/libva.xml | 62 ++++++++++--------- .../hwaccel => x/installing}/libvdpau.xml | 59 ++++++++++++------ x/installing/x7driver.xml | 24 +++++++ 21 files changed, 116 insertions(+), 93 deletions(-) rename archive/{qt.xml => qt4.xml} (100%) delete mode 100644 multimedia/hwaccel/hwaccel.xml rename {multimedia/hwaccel => x/installing}/libva.xml (77%) rename {multimedia/hwaccel => x/installing}/libvdpau.xml (67%) diff --git a/archive/qt.xml b/archive/qt4.xml similarity index 100% rename from archive/qt.xml rename to archive/qt4.xml diff --git a/general/genlib/libarchive.xml b/general/genlib/libarchive.xml index 999cbc4147..348e2da380 100644 --- a/general/genlib/libarchive.xml +++ b/general/genlib/libarchive.xml @@ -34,7 +34,7 @@ interface for reading/writing various compression formats. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/general/genlib/lzo.xml b/general/genlib/lzo.xml index 7669e2defa..e012a1a435 100644 --- a/general/genlib/lzo.xml +++ b/general/genlib/lzo.xml @@ -35,7 +35,7 @@ real-time. This means it favors speed over compression ratio. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/general/graphlib/lcms.xml b/general/graphlib/lcms.xml index 2fcbfc6555..e52a5e5247 100644 --- a/general/graphlib/lcms.xml +++ b/general/graphlib/lcms.xml @@ -32,7 +32,7 @@ The Little CMS library is used by other programs to provide color management facilities. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/general/graphlib/libmng.xml b/general/graphlib/libmng.xml index 3a9baba6ca..b9c587da27 100644 --- a/general/graphlib/libmng.xml +++ b/general/graphlib/libmng.xml @@ -33,7 +33,7 @@ programs wanting to read and write Multiple-image Network Graphics (MNG) files which are the animation equivalents to PNG files. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/general/graphlib/openjpeg.xml b/general/graphlib/openjpeg.xml index 43d7f42c8e..d308e73099 100644 --- a/general/graphlib/openjpeg.xml +++ b/general/graphlib/openjpeg.xml @@ -33,7 +33,7 @@ of the JPEG-2000 standard. OpenJPEG fully respects the JPEG-2000 specifications and can compress/decompress lossless 16-bit images. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/general/prog/cmake.xml b/general/prog/cmake.xml index cacb93bf49..f3ad1dea14 100644 --- a/general/prog/cmake.xml +++ b/general/prog/cmake.xml @@ -38,7 +38,7 @@ since version 4. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/multimedia/audioutils/cdparanoia.xml b/multimedia/audioutils/cdparanoia.xml index 6b099cb257..51cdb20cb0 100644 --- a/multimedia/audioutils/cdparanoia.xml +++ b/multimedia/audioutils/cdparanoia.xml @@ -36,7 +36,7 @@ Practically all drives supported by Linux can be used. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/multimedia/audioutils/mpg123.xml b/multimedia/audioutils/mpg123.xml index e54fc5f2b9..e924c53d95 100644 --- a/multimedia/audioutils/mpg123.xml +++ b/multimedia/audioutils/mpg123.xml @@ -34,7 +34,7 @@ player. It claims to be the fastest MP3 decoder for Unix. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/multimedia/hwaccel/hwaccel.xml b/multimedia/hwaccel/hwaccel.xml deleted file mode 100644 index 8c2f652e82..0000000000 --- a/multimedia/hwaccel/hwaccel.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - %general-entities; -]> - - - - - - - Hardware Accelerated Video Decoding Libraries and Drivers - - - This chapter contains libraries and hardware specific drivers which - provide interfaces to hardware video decoders. They enable hardware - accelerated video decoding in apps that support it. - - - - - - diff --git a/multimedia/libdriv/faac.xml b/multimedia/libdriv/faac.xml index dbe4abf382..06a4515a7a 100644 --- a/multimedia/libdriv/faac.xml +++ b/multimedia/libdriv/faac.xml @@ -35,7 +35,7 @@ producing files that can be played back on iPod. Moreover, iPod does not understand other sound compression schemes in video files. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/multimedia/libdriv/faad2.xml b/multimedia/libdriv/faad2.xml index 83fecc0069..27c7de7026 100644 --- a/multimedia/libdriv/faad2.xml +++ b/multimedia/libdriv/faad2.xml @@ -33,7 +33,7 @@ compression scheme specified in MPEG-2 Part 7 and MPEG-4 Part 3 standards and known as Advanced Audio Coding (AAC). - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/multimedia/libdriv/gst10-plugins-base.xml b/multimedia/libdriv/gst10-plugins-base.xml index 5a8b15c622..54298ff355 100644 --- a/multimedia/libdriv/gst10-plugins-base.xml +++ b/multimedia/libdriv/gst10-plugins-base.xml @@ -39,7 +39,7 @@ applications to function properly. - &lfs73_checked; + &lfs74_checked; &gst-compat; diff --git a/multimedia/libdriv/libmpeg2.xml b/multimedia/libdriv/libmpeg2.xml index e78a3e8364..202e8c93d9 100644 --- a/multimedia/libdriv/libmpeg2.xml +++ b/multimedia/libdriv/libmpeg2.xml @@ -36,7 +36,7 @@ This is useful for programs and applications needing to decode MPEG-2 and MPEG-1 video streams. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/multimedia/libdriv/libtheora.xml b/multimedia/libdriv/libtheora.xml index 3f34bba96c..d8adffb7c4 100644 --- a/multimedia/libdriv/libtheora.xml +++ b/multimedia/libdriv/libtheora.xml @@ -94,12 +94,14 @@ make make install - If you built the examples and wish to install them (so that you can hack on - theora): + If you wish to install the examples (so that you can hack on + theora), install them as the root user: cd examples/.libs && for E in *; do -install -v -m755 $E /usr/bin/theora_${E}; done + install -v -m755 $E /usr/bin/theora_${E} +done diff --git a/multimedia/libdriv/taglib.xml b/multimedia/libdriv/taglib.xml index fc3fc981b9..7bd7b475d2 100644 --- a/multimedia/libdriv/taglib.xml +++ b/multimedia/libdriv/taglib.xml @@ -36,7 +36,7 @@ VLC. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/multimedia/libdriv/xvid.xml b/multimedia/libdriv/xvid.xml index c151458b48..1fa4a33ce3 100644 --- a/multimedia/libdriv/xvid.xml +++ b/multimedia/libdriv/xvid.xml @@ -32,7 +32,7 @@ XviD is an MPEG-4 compliant video CODEC. - &lfs73_checked; + &lfs74_checked; Package Information diff --git a/multimedia/multimedia.xml b/multimedia/multimedia.xml index 96e4653baa..05e5aad450 100644 --- a/multimedia/multimedia.xml +++ b/multimedia/multimedia.xml @@ -16,7 +16,6 @@ $Date$ Multimedia - diff --git a/multimedia/hwaccel/libva.xml b/x/installing/libva.xml similarity index 77% rename from multimedia/hwaccel/libva.xml rename to x/installing/libva.xml index 19934ffb0e..1c8a9ca552 100644 --- a/multimedia/hwaccel/libva.xml +++ b/x/installing/libva.xml @@ -21,13 +21,12 @@ ]> - - + - + $LastChangedBy$ $Date$ - + libva-&libva-version; @@ -35,19 +34,25 @@ libva - + Introduction to libva - - The libva package contains a library which - provides access to hardware accelerated video processing, using hardware - to accelerate video processing in order to offload the central processing - unit (CPU) to decode and encode compressed digital video. + + The libva package contains a library which + provides access to hardware accelerated video processing, using hardware + to accelerate video processing in order to offload the central + processing unit (CPU) to decode and encode compressed digital video. VA + API video decode/encode interface is platform and window system + independent targeted at Direct Rendering Infrastructure (DRI) in the X + Window System however it can potentially also be used with direct + framebuffer and graphics sub-systems for video output. Accelerated + processing includes support for video decoding, video encoding, + subpicture blending, and rendering. - &lfs73_checked; + &lfs74_checked; - Package Information + Package Information @@ -81,7 +86,7 @@ - Additional Downloads + Additional Downloads @@ -115,14 +120,14 @@ - libva Dependencies + libva Dependencies - Required + Required - Optional + Optional and Wayland @@ -131,9 +136,9 @@ User Notes: - + - + Installation of libva @@ -141,7 +146,7 @@ commands: -./configure --prefix=/usr && +./configure $XORG_CONFIG && make @@ -154,17 +159,18 @@ make make install - + - + Installation of libva-intel-driver - Install libva-intel-driver by running the - following commands: + The libva-intel-driver is designed + specifically for video cards based on an Intel GPU. + Install the driver by running the following commands: -./configure --prefix=/usr && +./configure $XORG_CONFIG && make @@ -177,9 +183,9 @@ make make install - + - + Contents @@ -226,6 +232,6 @@ make - + - + diff --git a/multimedia/hwaccel/libvdpau.xml b/x/installing/libvdpau.xml similarity index 67% rename from multimedia/hwaccel/libvdpau.xml rename to x/installing/libvdpau.xml index cdc88307f1..0231b9a2d1 100644 --- a/multimedia/hwaccel/libvdpau.xml +++ b/x/installing/libvdpau.xml @@ -12,13 +12,12 @@ ]> - - + - + $LastChangedBy$ $Date$ - + libvdpau-&libvdpau-version; @@ -26,18 +25,38 @@ libvdpau - + Introduction to libvdpau The libvdpau package contains a library which - allows video programs to offload portions of the video decoding process - and video post-processing to the GPU video-hardware. + implements the VDPAU library. + + + + VDPAU (Video Decode and Presentation API for Unix) is an open source + library (libvdpau) and API originally designed by Nvidia for its GeForce + 8 series and later GPU hardware,[1][2] targeted at the X Window System + This VDPAU API allows video programs to offload portions of the video + decoding process and video post-processing to the GPU video-hardware. + + + + Currently, the portions capable of being offloaded by VDPAU onto the GPU + are motion compensation (mo comp), inverse discrete cosine transform + (iDCT), VLD (variable-length decoding) and deblocking for MPEG-1, MPEG-2, + MPEG-4 ASP (MPEG-4 Part 2), H.264/MPEG-4 AVC and VC-1, WMV3/WMV9 encoded + videos. Which specific codecs of these that can be offloaded to the + GPU depends on the version of the GPU hardware; specifically, + to also decode MPEG-4 ASP (MPEG-4 Part 2), Xvid/OpenDivX (DivX 4), and + DivX 5 formats, a GeForce 200M (2xxM) Series (the eleventh generation of + Nvidia's GeForce graphics processing units) or newer GPU hardware is + required. - &lfs73_checked; + &lfs74_checked; - Package Information + Package Information @@ -71,21 +90,21 @@ - libvdpau Dependencies + libvdpau Dependencies - Required + Required - Optional + Optional , and - Runtime Dependency + Runtime Dependency @@ -93,9 +112,9 @@ User Notes: - + - + Installation of libvdpau @@ -103,7 +122,7 @@ commands: -./configure --prefix=/usr --sysconfdir=/etc && +./configure $XORG_CONFIG && make @@ -116,9 +135,9 @@ make make install - + - + Contents @@ -160,6 +179,6 @@ make - + - + diff --git a/x/installing/x7driver.xml b/x/installing/x7driver.xml index b92e802254..d0fef24741 100644 --- a/x/installing/x7driver.xml +++ b/x/installing/x7driver.xml @@ -160,6 +160,24 @@ + + Hardware Video Acceleration + + + + + + + + + + + + + + + + + + + +