Commit c70e3e77 authored by Alberto Garcia's avatar Alberto Garcia
Browse files

Enable OpenGL ES in arm: cherry-pick the upstream patch instead

parent dc3af9cb
webkit2gtk (2.28.3-3) UNRELEASED; urgency=medium
* Enable OpenGL ES in arm:
+ debian/rules:
- Build with -DENABLE_GLES2=ON in armel/armhf/arm64.
+ debian/patches/use-gles-on-arm.patch:
- Set ENABLE_GLES2_DEFAULT to ON on arm.
+ debian/control:
- Always depend on libgl1-mesa-dev.
......
......@@ -8,3 +8,4 @@ user-agent-branding.patch
prefer-pthread.patch
dont-detect-sse2.patch
reduce-memory-overheads.patch
use-gles-on-arm.patch
From: Alberto Garcia <berto@igalia.com>
Subject: Default to OpenGL ES in arm
Bug: https://bugs.webkit.org/show_bug.cgi?id=214828
Origin: https://trac.webkit.org/changeset/264923/webkit
Index: webkitgtk/Source/cmake/OptionsGTK.cmake
===================================================================
--- webkitgtk.orig/Source/cmake/OptionsGTK.cmake
+++ webkitgtk/Source/cmake/OptionsGTK.cmake
@@ -69,7 +69,7 @@ endif ()
# or OPENGLES2 (ENABLE_GLES2=ON) for building the feature.
set(ENABLE_GLES2_DEFAULT OFF)
-if (NOT OPENGL_FOUND AND OPENGLES2_FOUND)
+if (OPENGLES2_FOUND AND (NOT OPENGL_FOUND OR WTF_CPU_ARM OR WTF_CPU_ARM64))
set(ENABLE_GLES2_DEFAULT ON)
endif ()
......@@ -42,11 +42,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH),sh3 sh4))
CPPFLAGS += -mlra -fno-move-loop-invariants
endif
# Enable OpenGL ES in arm
ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf arm64))
EXTRA_CMAKE_ARGUMENTS += -DENABLE_GLES2
endif
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
EXTRA_CMAKE_ARGUMENTS += -DUSE_SYSTEM_MALLOC=ON
CPPFLAGS += -DRELEASE_WITHOUT_OPTIMIZATIONS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment