From 51f88d05028ff746f05e09508faf54699937f7a9 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 27 Feb 2010 00:17:11 +0000 Subject: [PATCH] clarify the comments about phonon (e.g. it's not in kdesupport anymore) svn path=/trunk/KDE/kdesdk/scripts/kdesvn-buildrc-sample; revision=1096597 --- kdesvn-buildrc-sample | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kdesvn-buildrc-sample b/kdesvn-buildrc-sample index 3d78732..74ef317 100644 --- a/kdesvn-buildrc-sample +++ b/kdesvn-buildrc-sample @@ -128,15 +128,15 @@ module qt-copy # Do not specify -prefix, kdesvn-build will handle that. # # Phonon note: -# - If you compile phonon separately make sure to pass -no-phonon. +# - If you compile phonon separately, make sure to pass -no-phonon. # - Alternatively, if you use Qt's phonon, ensure kdesupport is -# built without Phonon. -# - As of KDE 4.4/Qt 4.6 the "right answer" is to use kdesupport's phonon. +# built without Phonon and don't use phonon-git below. +# - As of KDE 4.4/Qt 4.6 the "right answer" is the first option: separate phonon. configure-flags -qt-gif -fast -debug -no-separate-debug-info \ -system-zlib -system-libpng -system-libjpeg \ -dbus -webkit -plugin-sql-mysql \ -nomake examples -nomake demos \ - -no-phonon # See "module phonon" below + -no-phonon # See "module phonon-git" below # make-options -j2 @@ -166,13 +166,13 @@ end module # kdesupport is also the bearer of automoc and all that is good and right with # CMake, install it before all KDE modules but after Qt 4. module kdesupport -# To get the necessary kdesupport stuff for KDE-4.3, use: -# tag kdesupport-for-4.3/kdesupport +# To get the necessary kdesupport stuff for KDE-4.4, use: +# tag kdesupport-for-4.4/kdesupport +# and add -DBUILD_phonon=OFF to the cmake-options below (not needed in trunk). # Note: -DWITH_ASF=TRUE and -DWITH_MP4=TRUE is required to allow Amarok # (defined below, near the end of this file) to build. - cmake-options -DWITH_ASF=TRUE -DWITH_MP4=TRUE \ - -DBUILD_phonon=OFF # We prefer our phonon, but see below + cmake-options -DWITH_ASF=TRUE -DWITH_MP4=TRUE end module # Phonon, the KDE multimedia interface, is required for KDE. It is present in