[gnome-continuous] patches: Attempt to remove weird FindGStreamer.cmake change
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] patches: Attempt to remove weird FindGStreamer.cmake change
- Date: Mon, 25 Jan 2016 22:32:21 +0000 (UTC)
commit 8397e268d156ec6d74f37468ac31fae4c9f0d68c
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Mon Jan 25 16:29:34 2016 -0600
patches: Attempt to remove weird FindGStreamer.cmake change
I don't see any explaination for why pkg-config should not come up with
the right include directories, nor can I think of any reason why it
shouldn't work, so let's try removing it.
patches/webkitgtk-cmake-buildapi.patch | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/patches/webkitgtk-cmake-buildapi.patch b/patches/webkitgtk-cmake-buildapi.patch
index ec43339..c404d81 100644
--- a/patches/webkitgtk-cmake-buildapi.patch
+++ b/patches/webkitgtk-cmake-buildapi.patch
@@ -6,24 +6,10 @@ Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
See https://github.com/cgwalters/build-api
---
- Source/cmake/FindGStreamer.cmake | 2 ++
configure | 58 ++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 60 insertions(+)
+ 1 file changed, 58 insertions(+)
create mode 100755 configure
-diff --git a/Source/cmake/FindGStreamer.cmake b/Source/cmake/FindGStreamer.cmake
-index acd1243..6a66a56 100644
---- a/Source/cmake/FindGStreamer.cmake
-+++ b/Source/cmake/FindGStreamer.cmake
-@@ -103,6 +103,8 @@ foreach (_component ${GStreamer_FIND_COMPONENTS})
- list(APPEND _GSTREAMER_REQUIRED_VARS ${_UPPER_NAME}_INCLUDE_DIRS ${_UPPER_NAME}_LIBRARIES)
- endforeach ()
-
-+list(APPEND GSTREAMER_INCLUDE_DIRS ${prefix}/lib/gstreamer-1.0/include/)
-+
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer REQUIRED_VARS _GSTREAMER_REQUIRED_VARS
- VERSION_VAR GSTREAMER_VERSION)
diff --git a/configure b/configure
new file mode 100755
index 0000000..f53a4f9
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]