⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 181527 in webkit


Ignore:
Timestamp:
Mar 16, 2015, 1:16:23 AM (11 years ago)
Author:
Carlos Garcia Campos
Message:

Merge r181385 - [CMake][GStreamer] Building EFL or GTK with ENABLE_VIDEO and without ENABLE_WEB_AUDIO is broken.
​https://bugs.webkit.org/show_bug.cgi?id=142577

Reviewed by Carlos Garcia Campos.

No new tests, this is a build fix.

  • PlatformEfl.cmake: Include GSTREAMER_AUDIO_LIBRARIES on the link step both for ENABLE_VIDEO and ENABLE_WEB_AUDIO.
  • PlatformGTK.cmake: Idem.
Location:
releases/WebKitGTK/webkit-2.8/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog

    r181381 r181527  
     12015-03-11  Carlos Alberto Lopez Perez  <clopez@igalia.com>
     2
     3        [CMake][GStreamer] Building EFL or GTK with ENABLE_VIDEO and without ENABLE_WEB_AUDIO is broken.
     4        https://bugs.webkit.org/show_bug.cgi?id=142577
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        No new tests, this is a build fix.
     9
     10        * PlatformEfl.cmake: Include GSTREAMER_AUDIO_LIBRARIES on the link step both for ENABLE_VIDEO and ENABLE_WEB_AUDIO.
     11        * PlatformGTK.cmake: Idem.
     12
    1132015-03-10  Carlos Garcia Campos  <cgarcia@igalia.com>
    214

  • releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformEfl.cmake

    r177942 r181527  
    348348        ${GSTREAMER_LIBRARIES}
    349349        ${GSTREAMER_PBUTILS_LIBRARIES}
     350        ${GSTREAMER_AUDIO_LIBRARIES}
    350351    )
    351352    # Avoiding a GLib deprecation warning due to GStreamer API using deprecated classes.
    … …  
    429430    )
    430431    list(APPEND WebCore_LIBRARIES
    431         ${GSTREAMER_AUDIO_LIBRARIES}
    432432        ${GSTREAMER_FFT_LIBRARIES}
    433433    )

  • releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformGTK.cmake

    r181379 r181527  
    322322        ${GSTREAMER_LIBRARIES}
    323323        ${GSTREAMER_PBUTILS_LIBRARIES}
     324        ${GSTREAMER_AUDIO_LIBRARIES}
    324325    )
    325326    # Avoiding a GLib deprecation warning due to GStreamer API using deprecated classes.
    … …  
    355356    )
    356357    list(APPEND WebCore_LIBRARIES
    357         ${GSTREAMER_AUDIO_LIBRARIES}
    358358        ${GSTREAMER_FFT_LIBRARIES}
    359359    )
Note: See TracChangeset for help on using the changeset viewer.