[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdereview/phonon/gstreamer
From:       Thiago Macieira <thiago () kde ! org>
Date:       2008-01-18 13:41:37
Message-ID: 1200663697.242762.13509.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 763069 by thiago:

Re-apply 760682


 M  +6 -3      ConfigureChecks.cmake  
 M  +1 -0      medianodeevent.h  


--- trunk/kdereview/phonon/gstreamer/ConfigureChecks.cmake #763068:763069
@@ -27,8 +27,11 @@
 macro_optional_find_package(LibXml2)
 macro_log_feature(LIBXML2_FOUND "LibXml2" "LibXml2 is required to compile the \
gstreamer backend for Phonon" "http://xmlsoft.org/downloads.html" FALSE)  
-if (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GLIB2_FOUND AND \
GOBJECT_FOUND AND LIBXML2_FOUND) +macro_optional_find_package(OpenGL)
+macro_log_feature(OPENGL_FOUND "OpenGL" "OpenGL support is required to compile the \
gstreamer backend for Phonon" "" FALSE) +
+if (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GLIB2_FOUND AND \
GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)  set(BUILD_PHONON_GSTREAMER TRUE)
-else (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GLIB2_FOUND AND \
GOBJECT_FOUND AND LIBXML2_FOUND) +else (GSTREAMER_FOUND AND \
GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND \
AND OPENGL_FOUND)  set(BUILD_PHONON_GSTREAMER FALSE)
-endif (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GLIB2_FOUND AND \
GOBJECT_FOUND AND LIBXML2_FOUND) +endif (GSTREAMER_FOUND AND \
GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND \
                AND OPENGL_FOUND)
--- trunk/kdereview/phonon/gstreamer/medianodeevent.h #763068:763069
@@ -18,6 +18,7 @@
 #ifndef Phonon_Gstreamer_MEDIANODEEVENT_H
 #define Phonon_Gstreamer_MEDIANODEEVENT_H
 
+#include <phonon/phonon_export.h>
 #include <QtCore>
 
 QT_BEGIN_NAMESPACE


[prev in list] [next in list] [prev in thread] [next in thread]