[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdesupport/phonon
From: Helio Chissini de Castro <helio () kde ! org>
Date: 2008-08-21 14:12:52
Message-ID: 1219327972.137307.5518.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 850431 by helio:
- Clean all old PKGCONFIG macros
- Move xine plugin install to proper plugin path
M +11 -10 cmake/FindGLIB2.cmake
M +10 -14 cmake/FindGObject.cmake
M +8 -15 cmake/FindGStreamer.cmake
M +13 -15 cmake/FindGStreamerPlugins.cmake
M +4 -5 cmake/FindXCB.cmake
M +15 -27 cmake/FindXine.cmake
M +1 -1 xine/CMakeLists.txt
--- trunk/kdesupport/phonon/cmake/FindGLIB2.cmake #850430:850431
@@ -5,37 +5,38 @@
# GLIB2_INCLUDE_DIR - the glib2 include directory
# GLIB2_LIBRARIES - glib2 library
+
if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
# Already in cache, be silent
set(GLIB2_FIND_QUIETLY TRUE)
endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
if (NOT WIN32)
- include(UsePkgConfig)
- pkgconfig(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags \
_LibGLIB2Cflags) + find_package(PkgConfig REQUIRED)
+ pkg_check_modules(PKG_GLIB REQUIRED glib-2.0)
endif(NOT WIN32)
find_path(GLIB2_MAIN_INCLUDE_DIR glib.h
PATH_SUFFIXES glib-2.0
- PATHS ${_LibGLIB2IncDir} )
+ PATHS ${PKG_GLIB_INCLUDE_DIRS} )
# search the glibconfig.h include dir under the same root where the library is found
-find_library(GLIB2_LIBRARIES
- NAMES glib-2.0
- PATHS ${_LibGLIB2LinkDir} )
+find_library(GLIB2_LIBRARIES
+ NAMES glib-2.0
+ PATHS ${PKG_GLIB_LIBRARY_DIRS} )
-get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH)
+get_filename_component(glib2LibDir ${PKG_GLIB_LIBRARIES} PATH)
find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
PATH_SUFFIXES glib-2.0/include
- PATHS ${_LibGLIB2IncDir} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH})
+ PATHS ${PKG_GLIB_INCLUDE_DIRS} ${PKG_GLIB_LIBRARIES} \
${CMAKE_SYSTEM_LIBRARY_PATH})
-set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}")
+set(GLIB2_INCLUDE_DIR ${GLIB2_MAIN_INCLUDE_DIR})
# not sure if this include dir is optional or required
# for now it is optional
if(GLIB2_INTERNAL_INCLUDE_DIR)
- set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} "${GLIB2_INTERNAL_INCLUDE_DIR}")
+ set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} ${GLIB2_INTERNAL_INCLUDE_DIR})
endif(GLIB2_INTERNAL_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
--- trunk/kdesupport/phonon/cmake/FindGObject.cmake #850430:850431
@@ -17,43 +17,39 @@
ENDIF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
IF (NOT WIN32)
+ FIND_PACKAGE(PkgConfig REQUIRED)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
- INCLUDE(UsePkgConfig)
- PKGCONFIG(gobject-2.0 _GObjectIncDir _GObjectLinkDir _GObjectLinkFlags \
_GObjectCflags)
- #MESSAGE(STATUS "DEBUG: GObject include directory = ${_GObjectIncDir}")
- #MESSAGE(STATUS "DEBUG: GObject link directory = ${_GObjectLinkDir}")
- #MESSAGE(STATUS "DEBUG: GObject link flags = ${_GObjectLinkFlags}")
- #MESSAGE(STATUS "DEBUG: GObject CFlags = ${_GObjectCflags}")
- SET(GOBJECT_DEFINITIONS ${_GObjectCflags})
+ PKG_CHECK_MODULES(PKG_GOBJECT2 REQUIRED gobject-2.0)
+ SET(GOBJECT_DEFINITIONS ${PKG_GOBJECT2_CFLAGS})
ENDIF (NOT WIN32)
FIND_PATH(GOBJECT_INCLUDE_DIR gobject.h
PATHS
- ${_GObjectIncDir}
- ${_GObjectIncDir}/glib-2.0/gobject/
+ ${PKG_GOBJECT2_INCLUDE_DIRS}
+ ${PKG_GOBJECT2_INCLUDE_DIRS}/glib-2.0/gobject/
/usr/include/glib-2.0/gobject/
#PATH_SUFFIXES gst
)
FIND_LIBRARY(_GObjectLibs NAMES gobject-2.0
PATHS
- ${_GObjectLinkDir}
+ ${PKG_GOBJECT2_LIBRARY_DIRS}
)
FIND_LIBRARY(_GModuleLibs NAMES gmodule-2.0
PATHS
- ${_GObjectLinkDir}
+ ${PKG_GOBJECT2_LIBRARY_DIRS}
)
FIND_LIBRARY(_GThreadLibs NAMES gthread-2.0
PATHS
- ${_GObjectLinkDir}
+ ${PKG_GOBJECT2_LIBRARY_DIRS}
)
FIND_LIBRARY(_GLibs NAMES glib-2.0
PATHS
- ${_GObjectLinkDir}
+ ${PKG_GOBJECT2_LIBRARY_DIRS}
)
-SET( GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs} )
+SET( GOBJECT_LIBRARIES ${PKG_GOBJECT2_LIBRARIES} )
IF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
SET(GOBJECT_FOUND TRUE)
--- trunk/kdesupport/phonon/cmake/FindGStreamer.cmake #850430:850431
@@ -10,6 +10,7 @@
# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and \
GSTREAMER_0_10_FOUND etc)
+
IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND \
GSTREAMER_INTERFACE_LIBRARY) # in cache already
SET(GStreamer_FIND_QUIETLY TRUE)
@@ -18,52 +19,44 @@
ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND \
GSTREAMER_INTERFACE_LIBRARY)
IF (NOT WIN32)
+ FIND_PACKAGE(PkgConfig REQUIRED)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
- INCLUDE(UsePkgConfig)
- PKGCONFIG(gstreamer-0.10 _GStreamerIncDir _GStreamerLinkDir _GStreamerLinkFlags \
_GStreamerCflags)
- #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${_GStreamerIncDir}")
- #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${_GStreamerLinkDir}")
- #MESSAGE(STATUS "DEBUG: GStreamer link flags = ${_GStreamerLinkFlags}")
- #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${_GStreamerCflags}")
- SET(GSTREAMER_DEFINITIONS ${_GStreamerCflags})
+ PKG_CHECK_MODULES(PKG_GSTREAMER REQUIRED gstreamer-0.10)
+ SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
ENDIF (NOT WIN32)
FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
PATHS
- ${_GStreamerIncDir}
- #PATH_SUFFIXES gst
+ ${PKG_GSTREAMER_INCLUDE_DIRS}
)
FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10
PATHS
- ${_GStreamerLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10
PATHS
- ${_GStreamerLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10
PATHS
- ${_GStreamerLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
IF (GSTREAMER_INCLUDE_DIR)
- #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIR}")
ELSE (GSTREAMER_INCLUDE_DIR)
MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
ENDIF (GSTREAMER_INCLUDE_DIR)
IF (GSTREAMER_LIBRARIES)
- #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}")
ELSE (GSTREAMER_LIBRARIES)
MESSAGE(STATUS "GStreamer: WARNING: library not found")
ENDIF (GSTREAMER_LIBRARIES)
IF (GSTREAMER_INTERFACE_LIBRARY)
- #MESSAGE(STATUS "DEBUG: Found GStreamer interface library: \
${GSTREAMER_INTERFACE_LIBRARY}") ELSE (GSTREAMER_INTERFACE_LIBRARY)
MESSAGE(STATUS "GStreamer: WARNING: interface library not found")
ENDIF (GSTREAMER_INTERFACE_LIBRARY)
--- trunk/kdesupport/phonon/cmake/FindGStreamerPlugins.cmake #850430:850431
@@ -8,12 +8,10 @@
#
# (c)2007, Trolltech ASA
+FIND_PACKAGE(PkgConfig REQUIRED)
+
IF (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- INCLUDE(UsePkgConfig)
- PKGCONFIG(gstreamer-plugins-base-0.10 _GStreamer_PluginsIncDir \
_GStreamer_PluginsLinkDir _GStreamer_PluginsLinkFlags \
_GStreamer_PluginsCflags)
- SET(GSTREAMERPLUGINS_DEFINITIONS ${_GStreamer_PluginsCflags})
+ PKG_CHECK_MODULES( PKG_GSTREAMER REQUIRED gstreamer-plugins-base-0.10 )
ENDIF (NOT WIN32)
#
@@ -34,43 +32,43 @@
FIND_LIBRARY(GSTREAMER_PLUGIN_AUDIO_LIBRARIES NAMES gstaudio-0.10
PATHS
- ${_GStreamer_PluginsLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
FIND_LIBRARY(GSTREAMER_PLUGIN_CDDA_LIBRARIES NAMES gstcdda-0.10
PATHS
- ${_GStreamer_PluginsLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
FIND_LIBRARY(GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES NAMES gstnetbuffer-0.10
PATHS
- ${_GStreamer_PluginsLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
FIND_LIBRARY(GSTREAMER_PLUGIN_PBUTILS_LIBRARIES NAMES gstpbutils-0.10
PATHS
- ${_GStreamer_PluginsLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
FIND_LIBRARY(GSTREAMER_PLUGIN_RIFF_LIBRARIES NAMES gstriff-0.10
PATHS
- ${_GStreamer_PluginsLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
FIND_LIBRARY(GSTREAMER_PLUGIN_RTP_LIBRARIES NAMES gstrtp-0.10
PATHS
- ${_GStreamer_PluginsLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
FIND_LIBRARY(GSTREAMER_PLUGIN_RTSP_LIBRARIES NAMES gstrtsp-0.10
PATHS
- ${_GStreamer_PluginsLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
FIND_LIBRARY(GSTREAMER_PLUGIN_SDP_LIBRARIES NAMES gstsdp-0.10
PATHS
- ${_GStreamer_PluginsLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
FIND_LIBRARY(GSTREAMER_PLUGIN_TAG_LIBRARIES NAMES gsttag-0.10
PATHS
- ${_GStreamer_PluginsLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
FIND_LIBRARY(GSTREAMER_PLUGIN_VIDEO_LIBRARIES NAMES gstvideo-0.10
PATHS
- ${_GStreamer_PluginsLinkDir}
+ ${PKG_GSTREAMER_LIBRARY_DIRS}
)
IF (GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND
--- trunk/kdesupport/phonon/cmake/FindXCB.cmake #850430:850431
@@ -20,18 +20,17 @@
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
- INCLUDE(UsePkgConfig)
- PKGCONFIG(xcb _LibXCBIncDir _LibXCBLinkDir _LibXCBLinkFlags _LibXCBCflags)
+ PKG_CHECK_MODULES(PKG_XCB REQUIRED xcb)
- SET(LIBXCB_DEFINITIONS ${_LibXCBCflags})
+ SET(LIBXCB_DEFINITIONS ${PKG_XCB_CFLAGS})
FIND_PATH(LIBXCB_INCLUDE_DIR xcb/xcb.h
- ${_LibXCBIncDir}
+ ${PKG_XCB_INCLUDE_DIRS}
)
FIND_LIBRARY(LIBXCB_LIBRARIES NAMES xcb libxcb
PATHS
- ${_LibXCBLinkDir}
+ ${PKG_XCB_LIBRARY_DIRS}
)
include(FindPackageHandleStandardArgs)
--- trunk/kdesupport/phonon/cmake/FindXine.cmake #850430:850431
@@ -18,34 +18,26 @@
# Already in cache, be silent
set(Xine_FIND_QUIETLY TRUE)
endif (XINE_INCLUDE_DIR AND XINE_LIBRARY)
- IF (NOT WIN32)
- INCLUDE(UsePkgConfig)
- PKGCONFIG(libxine _LibXineIncDir _LibXineLinkDir _LibXineLinkFlags _LibXineCflags)
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS "--variable=prefix libxine" \
OUTPUT_VARIABLE _LibXinePrefix)
- ENDIF (NOT WIN32)
-FIND_PATH(XINE_INCLUDE_DIR NAMES xine.h
- PATHS
- ${_LibXineIncDir}
- NO_DEFAULT_PATH)
-FIND_LIBRARY(XINE_LIBRARY NAMES xine
- PATHS
- ${_LibXineLinkDir}
- NO_DEFAULT_PATH
-)
+IF (NOT WIN32)
+ FIND_PACKAGE(PkgConfig REQUIRED)
+ PKG_CHECK_MODULES(PKG_XINE REQUIRED libxine)
+ENDIF (NOT WIN32)
-FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES xine-config PATHS
- ${_LibXinePrefix}/bin
-)
+FIND_PATH(XINE_INCLUDE_DIR NAMES xine.h
+ PATHS ${PKG_XINE_INCLUDE_DIRS} )
-if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
- EXEC_PROGRAM(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE \
OUTPUT_VARIABLE XINE_VERSION)
- macro_ensure_version(1.1.1 ${XINE_VERSION} XINE_VERSION_OK)
+FIND_LIBRARY(XINE_LIBRARY NAMES xine
+ PATHS ${PKG_XINE_LIBRARY_DIRS} )
+
+if (XINE_INCLUDE_DIR AND XINE_LIBRARY)
+ macro_ensure_version(1.1.9 ${PKG_XINE_VERSION} XINE_VERSION_OK)
if (XINE_VERSION_OK)
set(XINE_FOUND TRUE)
- string(REGEX REPLACE "[0-9].[0-9]." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
+ string(REGEX REPLACE "[0-9].[0-9]." "" XINE_BUGFIX_VERSION \
${PKG_XINE_VERSION}) + set(XINE_VERSION ${PKG_XINE_VERSION})
endif (XINE_VERSION_OK)
-endif (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
+endif (XINE_INCLUDE_DIR AND XINE_LIBRARY)
if( XINE_FOUND )
@@ -59,13 +51,9 @@
if (NOT Xine_FIND_QUIETLY)
message(STATUS "Found XINE: ${XINE_LIBRARY}")
endif (NOT Xine_FIND_QUIETLY)
- # if(XINECONFIG_EXECUTABLE)
- # EXEC_PROGRAM(${XINECONFIG_EXECUTABLE} ARGS --plugindir RETURN_VALUE \
_return_VALUE OUTPUT_VARIABLE XINEPLUGINSDIR)
- # MESSAGE(STATUS "XINEPLUGINSDIR :<${XINEPLUGINSDIR}>")
- # endif(XINECONFIG_EXECUTABLE)
else (XINE_FOUND)
if (Xine_FIND_REQUIRED)
- message(FATAL_ERROR "Could NOT find XINE 1.1.1 or greater")
+ message(FATAL_ERROR "Could NOT find XINE 1.1.9 or greater")
endif (Xine_FIND_REQUIRED)
endif (XINE_FOUND)
--- trunk/kdesupport/phonon/xine/CMakeLists.txt #850430:850431
@@ -58,5 +58,5 @@
target_link_libraries(phonon_xine ${LIBXCB_LIBRARIES})
endif(XCB_FOUND AND XINE_XCB_FOUND)
-install(TARGETS phonon_xine DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS phonon_xine DESTINATION \
${PLUGIN_INSTALL_DIR}/plugins/phonon_backend) install(FILES xine.desktop DESTINATION \
${SERVICES_INSTALL_DIR}/phononbackends)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic