mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-16 14:20:24 +08:00
73 lines
2.8 KiB
Diff
73 lines
2.8 KiB
Diff
From 5bb2ac31805de9710a66f2fa3faf35ce64983f30 Mon Sep 17 00:00:00 2001
|
|
From: Alin Elena <alinm.elena@gmail.com>
|
|
Date: Wed, 29 Jan 2014 11:53:48 +0100
|
|
Subject: [PATCH 2/2] Update FindGStreamer0.10 -> FindGStreamer1.0
|
|
|
|
Reviewed-by: David Edmundson
|
|
---
|
|
cmake/modules/FindGStreamer.cmake | 22 ++++++----------------
|
|
1 file changed, 6 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
|
|
index f6c5681..63fb41c 100644
|
|
--- a/cmake/modules/FindGStreamer.cmake
|
|
+++ b/cmake/modules/FindGStreamer.cmake
|
|
@@ -24,7 +24,7 @@ IF (NOT WIN32)
|
|
# use pkg-config to get the directories and then use these values
|
|
# in the FIND_PATH() and FIND_LIBRARY() calls
|
|
FIND_PACKAGE(PkgConfig)
|
|
- PKG_CHECK_MODULES(PC_GSTREAMER gstreamer-0.10)
|
|
+ PKG_CHECK_MODULES(PC_GSTREAMER gstreamer-1.0)
|
|
#MESSAGE(STATUS "DEBUG: GStreamer include directory = ${GSTREAMER_INCLUDE_DIRS}")
|
|
#MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_LIBRARY_DIRS}")
|
|
#MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS_OTHER}")
|
|
@@ -35,26 +35,21 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
|
|
PATHS
|
|
${PC_GSTREAMER_INCLUDEDIR}
|
|
${PC_GSTREAMER_INCLUDE_DIRS}
|
|
- PATH_SUFFIXES gstreamer-0.10
|
|
+ PATH_SUFFIXES gstreamer-1.0
|
|
)
|
|
|
|
-FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10
|
|
+FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
|
|
PATHS
|
|
${PC_GSTREAMER_LIBDIR}
|
|
${PC_GSTREAMER_LIBRARY_DIRS}
|
|
)
|
|
|
|
-FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10
|
|
+FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-1.0
|
|
PATHS
|
|
${PC_GSTREAMER_LIBDIR}
|
|
${PC_GSTREAMER_LIBRARY_DIRS}
|
|
)
|
|
|
|
-FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10
|
|
- PATHS
|
|
- ${PC_GSTREAMER_LIBDIR}
|
|
- ${PC_GSTREAMER_LIBRARY_DIRS}
|
|
- )
|
|
|
|
IF (GSTREAMER_INCLUDE_DIR)
|
|
#MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIR}")
|
|
@@ -68,13 +63,8 @@ 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)
|
|
|
|
INCLUDE(FindPackageHandleStandardArgs)
|
|
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY)
|
|
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY)
|
|
|
|
-MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY)
|
|
+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
|
|
--
|
|
1.8.3.1
|
|
|