| 1 |
eva 08/12/27 12:08:05 |
| 2 |
|
| 3 |
Added: workrave-1.9.0-nosoundplayer.patch |
| 4 |
Log: |
| 5 |
Fix compilation with no sound framework enabled, bug #249683. Add missing cheetah dependency, bug #251275. |
| 6 |
(Portage version: 2.2_rc18/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-misc/workrave/files/workrave-1.9.0-nosoundplayer.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-nosoundplayer.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-nosoundplayer.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: workrave-1.9.0-nosoundplayer.patch |
| 15 |
=================================================================== |
| 16 |
--- |
| 17 |
frontend/common/src/SoundPlayer.cc | 43 +++++++++++++++++++------------------ |
| 18 |
1 file changed, 23 insertions(+), 20 deletions(-) |
| 19 |
|
| 20 |
Index: b/frontend/common/src/SoundPlayer.cc |
| 21 |
=================================================================== |
| 22 |
--- a/frontend/common/src/SoundPlayer.cc |
| 23 |
+++ b/frontend/common/src/SoundPlayer.cc |
| 24 |
@@ -26,37 +26,40 @@ static const char rcsid[] = "$Id: SoundP |
| 25 |
#include "debug.hh" |
| 26 |
#include "nls.h" |
| 27 |
|
| 28 |
+#ifdef HAVE_REALPATH |
| 29 |
+#include <limits.h> |
| 30 |
+#include <stdlib.h> |
| 31 |
+#endif |
| 32 |
+ |
| 33 |
#include <list> |
| 34 |
|
| 35 |
-#include "SoundPlayer.hh" |
| 36 |
#include "Thread.hh" |
| 37 |
+ |
| 38 |
#include "Sound.hh" |
| 39 |
+#include "SoundPlayer.hh" |
| 40 |
+#include "ISoundDriver.hh" |
| 41 |
|
| 42 |
#include "IConfigurator.hh" |
| 43 |
#include "CoreFactory.hh" |
| 44 |
#include "Util.hh" |
| 45 |
|
| 46 |
-#ifdef HAVE_GNOME |
| 47 |
+#if defined HAVE_GNOME |
| 48 |
#include <gdk/gdk.h> |
| 49 |
#include "GnomeSoundPlayer.hh" |
| 50 |
-#endif |
| 51 |
-#ifdef HAVE_KDE |
| 52 |
+#elif defined HAVE_KDE |
| 53 |
#include "KdeSoundPlayer.hh" |
| 54 |
-#endif |
| 55 |
-#ifdef PLATFORM_OS_UNIX |
| 56 |
+#elif defined PLATFORM_OS_UNIX |
| 57 |
#include <X11/Xlib.h> |
| 58 |
-#endif |
| 59 |
-#ifdef PLATFORM_OS_WIN32 |
| 60 |
+#elif defined PLATFORM_OS_WIN32 |
| 61 |
#include <windows.h> |
| 62 |
#include "W32SoundPlayer.hh" |
| 63 |
-#endif |
| 64 |
-#ifdef PLATFORM_OS_OSX |
| 65 |
+#elif defined PLATFORM_OS_OSX |
| 66 |
#include "OSXSoundPlayer.hh" |
| 67 |
-#endif |
| 68 |
-#ifdef HAVE_GSTREAMER |
| 69 |
+#elif defined HAVE_GSTREAMER |
| 70 |
#include "GstSoundPlayer.hh" |
| 71 |
#endif |
| 72 |
|
| 73 |
+ |
| 74 |
const char *SoundPlayer::CFG_KEY_SOUND_ENABLED = "sound/enabled"; |
| 75 |
const char *SoundPlayer::CFG_KEY_SOUND_DEVICE = "sound/device"; |
| 76 |
const char *SoundPlayer::CFG_KEY_SOUND_VOLUME = "sound/volume"; |
| 77 |
@@ -296,16 +299,16 @@ SpeakerPlayer::run() |
| 78 |
SoundPlayer::SoundPlayer() |
| 79 |
{ |
| 80 |
driver = |
| 81 |
-#if defined(PLATFORM_OS_WIN32) |
| 82 |
- new W32SoundPlayer() |
| 83 |
-#elif defined(HAVE_KDE) |
| 84 |
- new KdeSoundPlayer() |
| 85 |
-#elif defined(HAVE_GSTREAMER) |
| 86 |
- new GstSoundPlayer() |
| 87 |
-#elif defined(HAVE_GNOME) |
| 88 |
+#if defined HAVE_GNOME |
| 89 |
new GnomeSoundPlayer() |
| 90 |
-#elif defined(PLATFORM_OS_OSX) |
| 91 |
+#elif defined HAVE_KDE |
| 92 |
+ new KdeSoundPlayer() |
| 93 |
+#elif defined PLATFORM_OS_WIN32 |
| 94 |
+ new W32SoundPlayer() |
| 95 |
+#elif defined PLATFORM_OS_OSX |
| 96 |
new OSXSoundPlayer() |
| 97 |
+#elif defined HAVE_GSTREAMER |
| 98 |
+ new GstSoundPlayer() |
| 99 |
#else |
| 100 |
# warning Sound card support disabled. |
| 101 |
NULL |
Archives