[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-04-11 14:40:34
Message-ID: 1207924834.906680.4083.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 795832 by thiago:
Update CMakeLists.txt to match the fact that we link to the audio plugin \
too
M +1 -1 CMakeLists.txt
M +4 -3 ConfigureChecks.cmake
--- trunk/kdereview/phonon/gstreamer/CMakeLists.txt #795831:795832
@@ -48,7 +48,7 @@
${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY}
${KDE4_PHONON_LIBS} ${OPENGL_gl_LIBRARY}
${GSTREAMER_LIBRARIES} ${GSTREAMER_BASE_LIBRARY} \
${GSTREAMER_INTERFACE_LIBRARY}
- ${GSTREAMER_PLUGIN_VIDEO_LIBRARIES}
+ ${GSTREAMER_PLUGIN_VIDEO_LIBRARIES} ${GSTREAMER_PLUGIN_AUDIO_LIBRARIES}
${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES})
install(TARGETS phonon_gstreamer DESTINATION \
${PLUGIN_INSTALL_DIR}/plugins/phonon_backend)
install(FILES gstreamer.desktop DESTINATION \
${SERVICES_INSTALL_DIR}/phononbackends)
--- trunk/kdereview/phonon/gstreamer/ConfigureChecks.cmake #795831:795832
@@ -17,6 +17,7 @@
macro_optional_find_package(GStreamerPlugins)
macro_log_feature(GSTREAMER_PLUGIN_VIDEO_LIBRARIES "GStreamer video \
plugin" "The gstreamer video plugin (part of gstreamer-plugins-base 0.10) \
is required for the multimedia gstreamer backend" \
"http://gstreamer.freedesktop.org/modules/" FALSE "0.10") \
+macro_log_feature(GSTREAMER_PLUGIN_AUDIO_LIBRARIES "GStreamer audio \
plugin" "The gstreamer audio plugin (part of gstreamer-plugins-base 0.10) \
is required for the multimedia gstreamer backend" \
"http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
macro_optional_find_package(GLIB2)
macro_log_feature(GLIB2_FOUND "GLib2" "GLib 2 is required to compile the \
gstreamer backend for Phonon" "http://www.gtk.org/download/" FALSE) @@ \
-30,8 +31,8 @@ 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) +if (GSTREAMER_FOUND \
AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_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 AND OPENGL_FOUND) +else \
(GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND \
GSTREAMER_PLUGIN_AUDIO_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 AND OPENGL_FOUND) +endif \
(GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND \
GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND \
LIBXML2_FOUND AND OPENGL_FOUND)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic