[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [phonon-gstreamer/1.0-porting] /: Search for gst-1.0, and remove the removed gstinterfaces lib
From: Trever Fischer <tdfischer () fedoraproject ! org>
Date: 2013-01-13 15:01:29
Message-ID: 20130113150129.BF106A6091 () git ! kde ! org
[Download RAW message or body]
Git commit 4c60ca895312a83e734273a38a25b2ae2c4e8474 by Trever Fischer.
Committed on 13/01/2013 at 16:01.
Pushed by tdfischer into branch '1.0-porting'.
Search for gst-1.0, and remove the removed gstinterfaces lib
M +12 -22 cmake/FindGStreamer.cmake
M +4 -4 cmake/FindGStreamerPlugins.cmake
M +4 -4 gstreamer/ConfigureChecks.cmake
http://commits.kde.org/phonon-gstreamer/4c60ca895312a83e734273a38a25b2ae2c4=
e8474
diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake
index 4341ea1..efb6563 100644
--- a/cmake/FindGStreamer.cmake
+++ b/cmake/FindGStreamer.cmake
@@ -13,19 +13,19 @@
# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOU=
ND and GSTREAMER_0_10_FOUND etc)
=
=
-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRA=
RY AND GSTREAMER_INTERFACE_LIBRARY AND GSTREAMER_APP_LIBRARY)
+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRA=
RY AND GSTREAMER_APP_LIBRARY)
# in cache already
SET(GStreamer_FIND_QUIETLY TRUE)
-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIB=
RARY AND GSTREAMER_INTERFACE_LIBRARY AND GSTREAMER_APP_LIBRARY)
+ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIB=
RARY AND GSTREAMER_APP_LIBRARY)
SET(GStreamer_FIND_QUIETLY FALSE)
-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LI=
BRARY AND GSTREAMER_INTERFACE_LIBRARY AND GSTREAMER_APP_LIBRARY)
+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LI=
BRARY AND GSTREAMER_APP_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
# don't make this check required - otherwise you can't use macro_option=
al_find_package on this one
- PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-0.11)
+ PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-1.0)
SET(GSTREAMER_VERSION ${PKG_GSTREAMER_VERSION})
SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
ENDIF (NOT WIN32)
@@ -33,25 +33,20 @@ ENDIF (NOT WIN32)
FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
PATHS
${PKG_GSTREAMER_INCLUDE_DIRS}
- PATH_SUFFIXES gstreamer-0.11
+ PATH_SUFFIXES gstreamer-1.0
)
=
-FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.11
+FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
PATHS
${PKG_GSTREAMER_LIBRARY_DIRS}
)
=
-FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.11
+FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-1.0
PATHS
${PKG_GSTREAMER_LIBRARY_DIRS}
)
=
-FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.11
- PATHS
- ${PKG_GSTREAMER_LIBRARY_DIRS}
- )
-
-FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES gstapp-0.11
+FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES gstapp-1.0
PATHS
${PKG_GSTREAMER_LIBRARY_DIRS}
)
@@ -66,21 +61,16 @@ ELSE (GSTREAMER_LIBRARIES)
MESSAGE(STATUS "GStreamer: WARNING: library not found")
ENDIF (GSTREAMER_LIBRARIES)
=
-IF (GSTREAMER_INTERFACE_LIBRARY)
-ELSE (GSTREAMER_INTERFACE_LIBRARY)
- MESSAGE(STATUS "GStreamer: WARNING: interface library not found")
-ENDIF (GSTREAMER_INTERFACE_LIBRARY)
-
if (GSTREAMER_APP_LIBRARY)
ELSE (GSTREAMER_APP_LIBRARY)
MESSAGE(STATUS "GStreamer: WARNING: app library not found")
ENDIF (GSTREAMER_APP_LIBRARY)
=
-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRA=
RY AND GSTREAMER_INTERFACE_LIBRARY AND GSTREAMER_APP_LIBRARY)
+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRA=
RY AND GSTREAMER_APP_LIBRARY)
SET(GSTREAMER_FOUND TRUE)
-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIB=
RARY AND GSTREAMER_INTERFACE_LIBRARY AND GSTREAMER_APP_LIBRARY)
+ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIB=
RARY AND GSTREAMER_APP_LIBRARY)
SET(GSTREAMER_FOUND FALSE)
-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LI=
BRARY AND GSTREAMER_INTERFACE_LIBRARY AND GSTREAMER_APP_LIBRARY)
+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LI=
BRARY AND GSTREAMER_APP_LIBRARY)
=
IF (GSTREAMER_FOUND)
IF (NOT GStreamer_FIND_QUIETLY)
@@ -92,4 +82,4 @@ ELSE (GSTREAMER_FOUND)
ENDIF (GStreamer_FIND_REQUIRED)
ENDIF (GSTREAMER_FOUND)
=
-MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_=
LIBRARY GSTREAMER_INTERFACE_LIBRARY GSTREAMER_APP_LIBRARY)
+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_=
LIBRARY GSTREAMER_APP_LIBRARY)
diff --git a/cmake/FindGStreamerPlugins.cmake b/cmake/FindGStreamerPlugins.=
cmake
index 5454afa..898b149 100644
--- a/cmake/FindGStreamerPlugins.cmake
+++ b/cmake/FindGStreamerPlugins.cmake
@@ -18,17 +18,17 @@ FIND_PACKAGE(PkgConfig REQUIRED)
=
IF (NOT WIN32)
# don't make this check required - otherwise you can't use macro_option=
al_find_package on this one
- PKG_CHECK_MODULES( PKG_GSTREAMER_PLUGINSBASE gstreamer-plugins-base-0.1=
1 )
+ PKG_CHECK_MODULES( PKG_GSTREAMER_PLUGINSBASE gstreamer-plugins-base-1.0=
)
ENDIF (NOT WIN32)
=
MACRO(MACRO_FIND_GSTREAMER_PLUGIN _plugin _header)
STRING(TOUPPER ${_plugin} _upper)
IF (NOT WIN32)
# don't make this check required - otherwise you can't use macro_opt=
ional_find_package on this one
- PKG_CHECK_MODULES( PKG_GSTREAMER_${_upper} gstreamer-${_plugin}-0.11=
)
+ PKG_CHECK_MODULES( PKG_GSTREAMER_${_upper} gstreamer-${_plugin}-1.0 )
ENDIF (NOT WIN32)
=
- FIND_LIBRARY(GSTREAMER_PLUGIN_${_upper}_LIBRARY NAMES gst${_plugin}-0.11
+ FIND_LIBRARY(GSTREAMER_PLUGIN_${_upper}_LIBRARY NAMES gst${_plugin}-1.0
PATHS
${PKG_GSTREAMER_PLUGINSBASE_LIBRARY_DIRS}
${PKG_GSTREAMER_${_upper}_LIBRARY_DIRS}
@@ -72,7 +72,7 @@ ENDMACRO(MACRO_FIND_GSTREAMER_PLUGIN)
# tag
# video
#
-# The gstinterfaces-0.11 library is found by FindGStreamer.cmake
+# The gstinterfaces-1.0 library is found by FindGStreamer.cmake
#
=
SET(GSTREAMER_PLUGINSBASE_FOUND TRUE)
diff --git a/gstreamer/ConfigureChecks.cmake b/gstreamer/ConfigureChecks.cm=
ake
index 6c56b8d..8bda9d5 100644
--- a/gstreamer/ConfigureChecks.cmake
+++ b/gstreamer/ConfigureChecks.cmake
@@ -13,12 +13,12 @@
# along with this library. If not, see <http://www.gnu.org/licenses/>.
=
find_package(GStreamer REQUIRED)
-macro_log_feature(GSTREAMER_FOUND "GStreamer" "gstreamer 0.11 is required =
for the multimedia backend" "http://gstreamer.freedesktop.org/modules/" TRU=
E "0.11")
+macro_log_feature(GSTREAMER_FOUND "GStreamer" "gstreamer 1.0 is required f=
or the multimedia backend" "http://gstreamer.freedesktop.org/modules/" TRUE=
"1.0")
=
find_package(GStreamerPlugins REQUIRED)
-macro_log_feature(GSTREAMER_PLUGIN_VIDEO_FOUND "GStreamer video plugin" "T=
he gstreamer video plugin (part of gstreamer-plugins-base 0.11) is required=
for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/mo=
dules/" TRUE "0.11")
-macro_log_feature(GSTREAMER_PLUGIN_AUDIO_FOUND "GStreamer audio plugin" "T=
he gstreamer audio plugin (part of gstreamer-plugins-base 0.11) is required=
for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/mo=
dules/" TRUE "0.11")
-macro_log_feature(GSTREAMER_PLUGIN_PBUTILS_FOUND "GStreamer pbutils plugin=
" "The gstreamer pbutils plugin (part of gstreamer-plugins-base 0.11) is re=
quired for the multimedia gstreamer backend" "http://gstreamer.freedesktop.=
org/modules/" TRUE "0.11")
+macro_log_feature(GSTREAMER_PLUGIN_VIDEO_FOUND "GStreamer video plugin" "T=
he gstreamer video plugin (part of gstreamer-plugins-base 1.0) is required =
for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/mod=
ules/" TRUE "1.0")
+macro_log_feature(GSTREAMER_PLUGIN_AUDIO_FOUND "GStreamer audio plugin" "T=
he gstreamer audio plugin (part of gstreamer-plugins-base 1.0) is required =
for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/mod=
ules/" TRUE "1.0")
+macro_log_feature(GSTREAMER_PLUGIN_PBUTILS_FOUND "GStreamer pbutils plugin=
" "The gstreamer pbutils plugin (part of gstreamer-plugins-base 1.0) is req=
uired for the multimedia gstreamer backend" "http://gstreamer.freedesktop.o=
rg/modules/" TRUE "1.0")
=
find_package(GLIB2 REQUIRED)
macro_log_feature(GLIB2_FOUND "GLib2" "GLib 2 is required to compile the g=
streamer backend for Phonon" "http://www.gtk.org/download/" TRUE)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic