Diff
Modified: releases/WebKitGTK/webkit-2.20/ChangeLog (231612 => 231613)
--- releases/WebKitGTK/webkit-2.20/ChangeLog 2018-05-09 23:59:06 UTC (rev 231612)
+++ releases/WebKitGTK/webkit-2.20/ChangeLog 2018-05-09 23:59:08 UTC (rev 231613)
@@ -1,3 +1,15 @@
+2018-04-24 Zan Dobersek <[email protected]>
+
+ [WPE] Remove libgbm dependency
+ https://bugs.webkit.org/show_bug.cgi?id=184906
+
+ Reviewed by Carlos Garcia Campos.
+
+ Remove the libgbm CMake search module. It's not necessary anymore
+ after r230562.
+
+ * Source/cmake/FindLibGBM.cmake: Removed.
+
2018-04-12 Zan Dobersek <[email protected]>
[WPE] Switch testing process to using WPEBackend-fdo
Deleted: releases/WebKitGTK/webkit-2.20/Source/cmake/FindLibGBM.cmake (231612 => 231613)
--- releases/WebKitGTK/webkit-2.20/Source/cmake/FindLibGBM.cmake 2018-05-09 23:59:06 UTC (rev 231612)
+++ releases/WebKitGTK/webkit-2.20/Source/cmake/FindLibGBM.cmake 2018-05-09 23:59:08 UTC (rev 231613)
@@ -1,47 +0,0 @@
-# - Try to find gbm.
-# Once done, this will define
-#
-# LIBGBM_INCLUDE_DIRS - the gbm include directories
-# LIBGBM_LIBRARIES - link these to use gbm.
-#
-# Copyright (C) 2015 Igalia S.L.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-find_package(PkgConfig)
-pkg_check_modules(PC_LIBGBM gbm)
-
-find_path(LIBGBM_INCLUDE_DIRS
- NAMES gbm.h
- HINTS ${PC_LIBGBM_INCLUDE_DIRS} ${PC_LIBGBM_INCUDEDIR}
-)
-
-find_library(LIBGBM_LIBRARIES
- NAMES gbm
- HINTS ${PC_LIBGBM_LIBRARY_DIRS} ${PC_LIBGBM_LIBDIR}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LibGBM REQUIRED_VARS LIBGBM_LIBRARIES
- FOUND_VAR LIBGBM_FOUND)
-
-mark_as_advanced(LIBGBM_INCLUDE_DIRS LIBGBM_LIBRARIES)
Modified: releases/WebKitGTK/webkit-2.20/Tools/ChangeLog (231612 => 231613)
--- releases/WebKitGTK/webkit-2.20/Tools/ChangeLog 2018-05-09 23:59:06 UTC (rev 231612)
+++ releases/WebKitGTK/webkit-2.20/Tools/ChangeLog 2018-05-09 23:59:08 UTC (rev 231613)
@@ -1,3 +1,18 @@
+2018-04-24 Zan Dobersek <[email protected]>
+
+ [WPE] Remove libgbm dependency
+ https://bugs.webkit.org/show_bug.cgi?id=184906
+
+ Reviewed by Carlos Garcia Campos.
+
+ Stop searching for libgbm, using its compiler flags for the
+ HeadlessViewBackend compilation and linking against the .so object.
+ This is not necessary anymore after r230562 switched to a different
+ backend implementation for testing.
+
+ * wpe/HeadlessViewBackend/CMakeLists.txt:
+ * wpe/install-dependencies:
+
2018-04-12 Zan Dobersek <[email protected]>
[WPE] Switch testing process to using WPEBackend-fdo
Modified: releases/WebKitGTK/webkit-2.20/Tools/wpe/HeadlessViewBackend/CMakeLists.txt (231612 => 231613)
--- releases/WebKitGTK/webkit-2.20/Tools/wpe/HeadlessViewBackend/CMakeLists.txt 2018-05-09 23:59:06 UTC (rev 231612)
+++ releases/WebKitGTK/webkit-2.20/Tools/wpe/HeadlessViewBackend/CMakeLists.txt 2018-05-09 23:59:08 UTC (rev 231613)
@@ -1,4 +1,3 @@
-find_package(LibGBM REQUIRED)
find_package(WPEBackend-fdo REQUIRED)
set(WPEHeadlessViewBackend_SOURCES
@@ -8,7 +7,6 @@
set(WPEHeadlessViewBackend_SYSTEM_INCLUDE_DIRECTORIES
${CAIRO_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
- ${LIBGBM_INCLUDE_DIRS}
${WPEBACKEND_FDO_INCLUDE_DIRS}
)
@@ -15,7 +13,6 @@
set(WPEHeadlessViewBackend_LIBRARIES
${CAIRO_LIBRARIES}
${GLIB_LIBRARIES}
- ${LIBGBM_LIBRARIES}
${WPEBACKEND_FDO_LIBRARIES}
)
Modified: releases/WebKitGTK/webkit-2.20/Tools/wpe/install-dependencies (231612 => 231613)
--- releases/WebKitGTK/webkit-2.20/Tools/wpe/install-dependencies 2018-05-09 23:59:06 UTC (rev 231612)
+++ releases/WebKitGTK/webkit-2.20/Tools/wpe/install-dependencies 2018-05-09 23:59:08 UTC (rev 231613)
@@ -108,7 +108,6 @@
git \
gsettings-desktop-schemas-dev \
libexpat1-dev \
- libgbm-dev \
libgles2-mesa-dev \
libluajit-5.1-dev \
libmount-dev \
@@ -295,7 +294,6 @@
libxcb-devel \
luajit \
luajit-devel \
- mesa-libgbm-devel \
mesa-libGLES-devel \
opus-devel \
orc-devel \
