From a1dcfe003939d5a92abd4f794839e9014967d153 Mon Sep 17 00:00:00 2001 From: Ragnar Thomsen Date: Wed, 29 Feb 2012 20:56:46 +0000 Subject: [PATCH] Phonon and backends. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9557 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 4 +- introduction/welcome/changelog.xml | 12 ++++ kde4/core/core.xml | 2 +- kde4/core/phonon-backend-gstreamer.xml | 38 ++++++------ ...ackend-xine.xml => phonon-backend-vlc.xml} | 62 +++++++++---------- kde4/core/phonon.xml | 39 +++++++----- 6 files changed, 86 insertions(+), 71 deletions(-) rename kde4/core/{phonon-backend-xine.xml => phonon-backend-vlc.xml} (55%) diff --git a/general.ent b/general.ent index 57a9fccd35..c34a828c23 100644 --- a/general.ent +++ b/general.ent @@ -657,9 +657,9 @@ $Date$ - + - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 43f34d93e6..7f3e4a621d 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -44,6 +44,18 @@ February 29th, 2012 + + [rthomsen] - added phonon-backend-vlc 0.5.0. + + + [rthomsen] - update to phonon-backend-gstreamer 4.6.0. + + + [rthomsen] - removed phonon-backend-xine (deprecated). + + + [rthomsen] - update to phonon 4.6.0. + [ken] - added rygel-0.12.5 from Wayne. diff --git a/kde4/core/core.xml b/kde4/core/core.xml index 6ea92ad81b..c2664d4f2d 100644 --- a/kde4/core/core.xml +++ b/kde4/core/core.xml @@ -17,8 +17,8 @@ $Date$ - + diff --git a/kde4/core/phonon-backend-gstreamer.xml b/kde4/core/phonon-backend-gstreamer.xml index d13a707acc..64508ba332 100644 --- a/kde4/core/phonon-backend-gstreamer.xml +++ b/kde4/core/phonon-backend-gstreamer.xml @@ -5,10 +5,10 @@ %general-entities; - - - - + + + + ]> @@ -32,7 +32,7 @@ This package provides a Phonon backend which utilizes the GStreamer media framework. - &lfs67_checked; + &lfs70_checked; Package Information @@ -56,17 +56,7 @@ - - - Phonon Dependencies + Phonon GStreamer Backend Dependencies Required @@ -74,10 +64,18 @@ , - + + Recommended + + (needed for output to ALSA), + (needed for output to PulseAudio), + (needed for AAC/M4A support), + (needed for MP3 support) + + User Notes: - + @@ -91,8 +89,8 @@ cd build Prepare the package for compilation: -cmake -DCMAKE_INSTALL_PREFIX=$QT4DIR \ - .. && +cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \ + .. && make Now, as the root user: diff --git a/kde4/core/phonon-backend-xine.xml b/kde4/core/phonon-backend-vlc.xml similarity index 55% rename from kde4/core/phonon-backend-xine.xml rename to kde4/core/phonon-backend-vlc.xml index a79a6d4394..b903ed54ab 100644 --- a/kde4/core/phonon-backend-xine.xml +++ b/kde4/core/phonon-backend-vlc.xml @@ -4,55 +4,55 @@ %general-entities; - - - - - - + + + + + + ]> - - + + $LastChangedBy$ $Date$ - Phonon Backend Xine &phonon-backend-xine-version; + Phonon Backend VLC &phonon-backend-vlc-version; - - phonon-backend-xine + + phonon-backend-vlc - Introduction to the Phonon Xine backend + Introduction to the Phonon VLC backend This package provides a Phonon backend which - utilizes the Xine media framework. + utilizes the VLC media framework. - &lfs67_checked; + &lfs70_checked; Package Information - Download (HTTP): + Download (HTTP): - Download (FTP): + Download (FTP): - Download MD5 sum: &phonon-backend-xine-md5sum; + Download MD5 sum: &phonon-backend-vlc-md5sum; - Download size: &phonon-backend-xine-size; + Download size: &phonon-backend-vlc-size; - Estimated disk space required: &phonon-backend-xine-buildsize; + Estimated disk space required: &phonon-backend-vlc-buildsize; - Estimated build time: &phonon-backend-xine-time; + Estimated build time: &phonon-backend-vlc-time; @@ -61,29 +61,29 @@ Required patch: + url="&patch-root;/phonon-backend-vlc-&phonon-backend-vlc-version;-fixes-1.patch"/> --> - Phonon Dependencies + Phonon VLC Backend Dependencies Required , , - + User Notes: - - + + - Installation of Phonon Backend Xine + Installation of Phonon Backend VLC - Install Phonon Backend Xine by running the following + Install Phonon Backend VLC by running the following commands: mkdir build && @@ -91,8 +91,8 @@ cd build Prepare the package for compilation: -cmake -DCMAKE_INSTALL_PREFIX=$QT4DIR \ - .. && +cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \ + .. && make Now, as the root user: @@ -118,7 +118,7 @@ make none - phonon_xine.so + phonon_vlc.so none @@ -131,7 +131,7 @@ make phonon - is a testing utility for phonon-backend-xine-generated build trees. + is a testing utility for phonon-backend-vlc-generated build trees. phonon diff --git a/kde4/core/phonon.xml b/kde4/core/phonon.xml index 135fb222f9..eebf44243f 100644 --- a/kde4/core/phonon.xml +++ b/kde4/core/phonon.xml @@ -5,11 +5,11 @@ %general-entities; - - - - - + + + + + ]> @@ -31,9 +31,9 @@ Phonon is the multimedia API for KDE4. It replaces the old aRts, that is not more - supported by KDE. It supports backends like xine, GStreamer etc. + supported by KDE. It supports backends like GStreamer and VLC. - &lfs67_checked; + &lfs70_checked; Package Information @@ -75,17 +75,12 @@ - Recommended - - , - - - Optional - - - + , + QZeitgeist + + User Notes: @@ -107,6 +102,7 @@ cd build Prepare the package for compilation: cmake -DCMAKE_INSTALL_PREFIX=$QT4DIR \ + -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \ .. && make @@ -114,6 +110,15 @@ make make install + + + + Command Explanations + + : This option ensures that the plugins and mkspecs files get installed in the correct location. + + + - +