Changeset 92123 in webkit


Ignore:
Timestamp:
Aug 1, 2011 4:53:51 AM (13 years ago)
Author:
commit-queue@webkit.org
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 <​neil@linux.intel.com> 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:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r92081 r92123  
     12011-08-01  Neil Roberts  <neil@linux.intel.com>
     2
     3        build: Fix finding the headers for GStreamer
     4
     5        The cmake files to find the various GStreamer packages were all
     6        checking for the header gst/gst.h. However if gst-plugins-base is
     7        installed into a separate prefix from gstreamer then all of these
     8        tests would only pick up the gstreamer include path so the build
     9        would fail. This patch changes it to try and find a file
     10        appropriate to each package.
     11
     12        https://bugs.webkit.org/show_bug.cgi?id=64933
     13
     14        Reviewed by Martin Robinson.
     15
     16        * Source/cmake/FindGStreamer-App.cmake:
     17        * Source/cmake/FindGStreamer-Base.cmake:
     18        * Source/cmake/FindGStreamer-Interfaces.cmake:
     19        * Source/cmake/FindGStreamer-Pbutils.cmake:
     20        * Source/cmake/FindGStreamer-Plugins-Base.cmake:
     21        * Source/cmake/FindGStreamer-Video.cmake:
     22
    1232011-07-31  Daniel Bates  <dbates@webkit.org>
    224

  • trunk/Source/cmake/FindGStreamer-App.cmake

    r66980 r92123  
    1717# Include dir
    1818find_path(GStreamer-App_INCLUDE_DIR
    19   NAMES gst/gst.h
     19  NAMES gst/app/gstappsink.h
    2020  PATHS ${GStreamer-App_PKGCONF_INCLUDE_DIRS}
    2121  PATH_SUFFIXES gstreamer-0.10

  • trunk/Source/cmake/FindGStreamer-Base.cmake

    r66980 r92123  
    1616# Include dir
    1717find_path(GStreamer-Base_INCLUDE_DIR
    18   NAMES gst/gst.h
     18  NAMES gst/base/gstbasesrc.h
    1919  PATHS ${GStreamer-Base_PKGCONF_INCLUDE_DIRS}
    2020  PATH_SUFFIXES gstreamer-0.10

  • trunk/Source/cmake/FindGStreamer-Interfaces.cmake

    r66980 r92123  
    1616# Include dir
    1717find_path(GStreamer-Interfaces_INCLUDE_DIR
    18   NAMES gst/gst.h
     18  NAMES gst/interfaces/mixer.h
    1919  PATHS ${GStreamer-Interfaces_PKGCONF_INCLUDE_DIRS}
    2020  PATH_SUFFIXES gstreamer-0.10

  • trunk/Source/cmake/FindGStreamer-Pbutils.cmake

    r66980 r92123  
    1616# Include dir
    1717find_path(GStreamer-Pbutils_INCLUDE_DIR
    18   NAMES gst/gst.h
     18  NAMES gst/pbutils/pbutils.h
    1919  PATHS ${GStreamer-Pbutils_PKGCONF_INCLUDE_DIRS}
    2020  PATH_SUFFIXES gstreamer-0.10

  • trunk/Source/cmake/FindGStreamer-Plugins-Base.cmake

    r66980 r92123  
    1616# Include dir
    1717find_path(GStreamer-Plugins-Base_INCLUDE_DIR
    18   NAMES gst/gst.h
     18  NAMES gst/audio/audio.h
    1919  PATHS ${GStreamer-Plugins-Base_PKGCONF_INCLUDE_DIRS}
    2020  PATH_SUFFIXES gstreamer-0.10

  • trunk/Source/cmake/FindGStreamer-Video.cmake

    r66980 r92123  
    1717# Include dir
    1818find_path(GStreamer-Video_INCLUDE_DIR
    19   NAMES gst/gst.h
     19  NAMES gst/video/video.h
    2020  PATHS ${GStreamer-Video_PKGCONF_INCLUDE_DIRS}
    2121  PATH_SUFFIXES gstreamer-0.10
Note: See TracChangeset for help on using the changeset viewer.