Title: [92123] trunk
- Revision
- 92123
- Author
- [email protected]
- Date
- 2011-08-01 04:53:51 -0700 (Mon, 01 Aug 2011)
Log Message
build: Fix finding the headers for GStreamer
The cmake files to find the various GStreamer packages were all
checking for the header gst/gst.h. However if gst-plugins-base is
installed into a separate prefix from gstreamer then all of these
tests would only pick up the gstreamer include path so the build
would fail. This patch changes it to try and find a file
appropriate to each package.
https://bugs.webkit.org/show_bug.cgi?id=64933
Patch by Neil Roberts <[email protected]> on 2011-08-01
Reviewed by Martin Robinson.
* Source/cmake/FindGStreamer-App.cmake:
* Source/cmake/FindGStreamer-Base.cmake:
* Source/cmake/FindGStreamer-Interfaces.cmake:
* Source/cmake/FindGStreamer-Pbutils.cmake:
* Source/cmake/FindGStreamer-Plugins-Base.cmake:
* Source/cmake/FindGStreamer-Video.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (92122 => 92123)
--- trunk/ChangeLog 2011-08-01 11:42:43 UTC (rev 92122)
+++ trunk/ChangeLog 2011-08-01 11:53:51 UTC (rev 92123)
@@ -1,3 +1,25 @@
+2011-08-01 Neil Roberts <[email protected]>
+
+ build: Fix finding the headers for GStreamer
+
+ The cmake files to find the various GStreamer packages were all
+ checking for the header gst/gst.h. However if gst-plugins-base is
+ installed into a separate prefix from gstreamer then all of these
+ tests would only pick up the gstreamer include path so the build
+ would fail. This patch changes it to try and find a file
+ appropriate to each package.
+
+ https://bugs.webkit.org/show_bug.cgi?id=64933
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/FindGStreamer-App.cmake:
+ * Source/cmake/FindGStreamer-Base.cmake:
+ * Source/cmake/FindGStreamer-Interfaces.cmake:
+ * Source/cmake/FindGStreamer-Pbutils.cmake:
+ * Source/cmake/FindGStreamer-Plugins-Base.cmake:
+ * Source/cmake/FindGStreamer-Video.cmake:
+
2011-07-31 Daniel Bates <[email protected]>
Add missing semicolons to build fix attempt in <http://trac.webkit.org/changeset/92080>.
Modified: trunk/Source/cmake/FindGStreamer-App.cmake (92122 => 92123)
--- trunk/Source/cmake/FindGStreamer-App.cmake 2011-08-01 11:42:43 UTC (rev 92122)
+++ trunk/Source/cmake/FindGStreamer-App.cmake 2011-08-01 11:53:51 UTC (rev 92123)
@@ -16,7 +16,7 @@
# Include dir
find_path(GStreamer-App_INCLUDE_DIR
- NAMES gst/gst.h
+ NAMES gst/app/gstappsink.h
PATHS ${GStreamer-App_PKGCONF_INCLUDE_DIRS}
PATH_SUFFIXES gstreamer-0.10
)
Modified: trunk/Source/cmake/FindGStreamer-Base.cmake (92122 => 92123)
--- trunk/Source/cmake/FindGStreamer-Base.cmake 2011-08-01 11:42:43 UTC (rev 92122)
+++ trunk/Source/cmake/FindGStreamer-Base.cmake 2011-08-01 11:53:51 UTC (rev 92123)
@@ -15,7 +15,7 @@
# Include dir
find_path(GStreamer-Base_INCLUDE_DIR
- NAMES gst/gst.h
+ NAMES gst/base/gstbasesrc.h
PATHS ${GStreamer-Base_PKGCONF_INCLUDE_DIRS}
PATH_SUFFIXES gstreamer-0.10
)
Modified: trunk/Source/cmake/FindGStreamer-Interfaces.cmake (92122 => 92123)
--- trunk/Source/cmake/FindGStreamer-Interfaces.cmake 2011-08-01 11:42:43 UTC (rev 92122)
+++ trunk/Source/cmake/FindGStreamer-Interfaces.cmake 2011-08-01 11:53:51 UTC (rev 92123)
@@ -15,7 +15,7 @@
# Include dir
find_path(GStreamer-Interfaces_INCLUDE_DIR
- NAMES gst/gst.h
+ NAMES gst/interfaces/mixer.h
PATHS ${GStreamer-Interfaces_PKGCONF_INCLUDE_DIRS}
PATH_SUFFIXES gstreamer-0.10
)
Modified: trunk/Source/cmake/FindGStreamer-Pbutils.cmake (92122 => 92123)
--- trunk/Source/cmake/FindGStreamer-Pbutils.cmake 2011-08-01 11:42:43 UTC (rev 92122)
+++ trunk/Source/cmake/FindGStreamer-Pbutils.cmake 2011-08-01 11:53:51 UTC (rev 92123)
@@ -15,7 +15,7 @@
# Include dir
find_path(GStreamer-Pbutils_INCLUDE_DIR
- NAMES gst/gst.h
+ NAMES gst/pbutils/pbutils.h
PATHS ${GStreamer-Pbutils_PKGCONF_INCLUDE_DIRS}
PATH_SUFFIXES gstreamer-0.10
)
Modified: trunk/Source/cmake/FindGStreamer-Plugins-Base.cmake (92122 => 92123)
--- trunk/Source/cmake/FindGStreamer-Plugins-Base.cmake 2011-08-01 11:42:43 UTC (rev 92122)
+++ trunk/Source/cmake/FindGStreamer-Plugins-Base.cmake 2011-08-01 11:53:51 UTC (rev 92123)
@@ -15,7 +15,7 @@
# Include dir
find_path(GStreamer-Plugins-Base_INCLUDE_DIR
- NAMES gst/gst.h
+ NAMES gst/audio/audio.h
PATHS ${GStreamer-Plugins-Base_PKGCONF_INCLUDE_DIRS}
PATH_SUFFIXES gstreamer-0.10
)
Modified: trunk/Source/cmake/FindGStreamer-Video.cmake (92122 => 92123)
--- trunk/Source/cmake/FindGStreamer-Video.cmake 2011-08-01 11:42:43 UTC (rev 92122)
+++ trunk/Source/cmake/FindGStreamer-Video.cmake 2011-08-01 11:53:51 UTC (rev 92123)
@@ -16,7 +16,7 @@
# Include dir
find_path(GStreamer-Video_INCLUDE_DIR
- NAMES gst/gst.h
+ NAMES gst/video/video.h
PATHS ${GStreamer-Video_PKGCONF_INCLUDE_DIRS}
PATH_SUFFIXES gstreamer-0.10
)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
