From e2f5d3d365ced3da2005792c69d7e1cdbe5ece50 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>

Date: Fri, 25 Nov 2016 20:25:27 +0000

Subject: [PATCH] change from glew to epoxy

cause that works under wayland out of the box and gtk3 uses it already

Change-Id: Iefaac31e325534a81a5389f752804af917c1baef

---

 Makefile.fetch                                     |  2 +-

 RepositoryExternal.mk                              | 46 +++++------

 avmedia/Library_avmedia.mk                         |  2 +-

 avmedia/Library_avmediaogl.mk                      |  6 +-

 bin/check-elf-dynamic-objects                      |  2 +-

 bin/lo-all-static-libs                             |  2 +-

 canvas/Library_oglcanvas.mk                        |  7 +-

 canvas/source/opengl/ogl_buffercontext.hxx         |  2 +-

 canvas/source/opengl/ogl_canvascustomsprite.cxx    |  2 +-

 canvas/source/opengl/ogl_canvashelper.cxx          |  2 +-

 canvas/source/opengl/ogl_canvastools.cxx           |  2 +-

 canvas/source/opengl/ogl_texturecache.cxx          |  2 +-

 canvas/source/opengl/ogl_tools.hxx                 |  3 +-

 chart2/Library_chartcore.mk                        |  9 +--

 chart2/Library_chartopengl.mk                      |  4 +-

 chart2/inc/pch/precompiled_chartcore.hxx           |  2 +-

 chart2/source/view/charttypes/GL3DBarChart.cxx     |  2 +-

 chart2/source/view/main/GL3DRenderer.cxx           |  8 +-

 chart2/source/view/main/OpenGLRender.cxx           |  2 +-

 config_host.mk.in                                  |  6 +-

 config_host/config_opengl.h.in                     | 10 ---

 configure.ac                                       | 21 ++---

 cui/Library_cui.mk                                 |  2 +-

 distro-configs/LibreOfficeFlatpak.conf             |  1 -

 download.lst                                       |  7 +-

 external/Module_external.mk                        |  2 +-

 external/epoxy/Library_epoxy.mk                    | 63 +++++++++++++++

 external/{glew => epoxy}/Makefile                  |  0

 .../{glew/Module_glew.mk => epoxy/Module_epoxy.mk} |  9 +--

 external/epoxy/README                              |  5 ++

 external/epoxy/UnpackedTarball_epoxy.mk            | 20 +++++

 external/epoxy/epoxy.windows.api.patch             | 90 ++++++++++++++++++++++

 external/glew/ExternalPackage_glew.mk              | 33 --------

 external/glew/ExternalProject_glew.mk              | 36 ---------

 external/glew/README                               |  6 --

 external/glew/UnpackedTarball_glew.mk              | 48 ------------

 external/glew/glew-macosx-install-name.patch.1     | 13 ----

 external/glew/glew-msvc-disable-sse2.patch.1       | 10 ---

 external/glew/glew-static-only.patch.1             | 12 ---

 external/glew/glew-tmpdir.patch.1                  | 13 ----

 external/glew/glew_use_CC_variable.patch.1         | 24 ------

 external/libgltf/ExternalProject_libgltf.mk        | 10 +--

 external/libgltf/libgltf-msvc-x64.patch.1          | 31 ++++----

 include/vcl/opengl/OpenGLContext.hxx               |  6 +-

 include/vcl/opengl/OpenGLHelper.hxx                |  2 +-

 include/vcl/opengl/OpenGLWrapper.hxx               |  2 +-

 slideshow/Library_OGLTrans.mk                      |  9 +--

 slideshow/Library_slideshow.mk                     |  2 +-

 slideshow/source/engine/opengl/TransitionImpl.cxx  |  1 -

 slideshow/source/engine/opengl/TransitionImpl.hxx  |  3 +-

 .../source/engine/opengl/TransitionerImpl.cxx      |  2 +-

 svx/Library_svxcore.mk                             |  2 +-

 toolkit/Library_tk.mk                              |  2 +-

 vcl/CppunitTest_vcl_bitmap_test.mk                 |  2 +-

 vcl/CppunitTest_vcl_wmf_test.mk                    |  4 +-

 vcl/Executable_icontest.mk                         |  2 +-

 vcl/Executable_vcldemo.mk                          |  2 +-

 vcl/Executable_visualbackendtest.mk                |  1 -

 vcl/Library_vcl.mk                                 |  3 +-

 vcl/Library_vclplug_gen.mk                         |  3 +-

 vcl/Library_vclplug_gtk.mk                         |  2 +-

 vcl/Library_vclplug_gtk3.mk                        |  2 +-

 vcl/Library_vclplug_kde4.mk                        |  2 +-

 vcl/inc/opengl/LineRenderUtils.hxx                 |  1 -

 vcl/inc/opengl/VertexUtils.hxx                     |  2 +-

 vcl/inc/opengl/framebuffer.hxx                     |  1 -

 vcl/inc/opengl/program.hxx                         |  1 -

 vcl/inc/opengl/texture.hxx                         |  2 +-

 vcl/inc/pch/precompiled_vcl.hxx                    |  2 +-

 vcl/inc/unx/saldisp.hxx                            |  2 +-

 vcl/opengl/x11/gdiimpl.cxx                         | 31 ++++----

 vcl/osx/salobj.cxx                                 |  4 +-

 vcl/source/opengl/OpenGLContext.cxx                | 34 ++------

 vcl/source/opengl/OpenGLHelper.cxx                 |  8 +-

 vcl/unx/generic/app/saldisp.cxx                    |  1 -

 vcl/workben/icontest.cxx                           |  2 -

 77 files changed, 340 insertions(+), 418 deletions(-)

 delete mode 100644 config_host/config_opengl.h.in

 create mode 100644 external/epoxy/Library_epoxy.mk

 rename external/{glew => epoxy}/Makefile (100%)

 rename external/{glew/Module_glew.mk => epoxy/Module_epoxy.mk} (69%)

 create mode 100644 external/epoxy/README

 create mode 100644 external/epoxy/UnpackedTarball_epoxy.mk

 create mode 100644 external/epoxy/epoxy.windows.api.patch

 delete mode 100644 external/glew/ExternalPackage_glew.mk

 delete mode 100644 external/glew/ExternalProject_glew.mk

 delete mode 100644 external/glew/README

 delete mode 100644 external/glew/UnpackedTarball_glew.mk

 delete mode 100644 external/glew/glew-macosx-install-name.patch.1

 delete mode 100644 external/glew/glew-msvc-disable-sse2.patch.1

 delete mode 100644 external/glew/glew-static-only.patch.1

 delete mode 100644 external/glew/glew-tmpdir.patch.1

 delete mode 100644 external/glew/glew_use_CC_variable.patch.1

diff --git a/Makefile.fetch b/Makefile.fetch

index 3e21be3..cf31e5b 100644

--- a/Makefile.fetch

+++ b/Makefile.fetch

@@ -129,7 +129,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)

 		$(call fetch_Optional,FONTCONFIG,FONTCONFIG_TARBALL) \

 		$(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \

 		$(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \

-		$(call fetch_Optional,GLEW,GLEW_TARBALL) \

+		$(call fetch_Optional,EPOXY,EPOXY_TARBALL) \

 		$(call fetch_Optional,GLM,GLM_TARBALL) \

 		$(call fetch_Optional_pack,GOOGLE_DOCS_EXTENSION_PACK) \

 		$(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk

index 109b924..16ba7a8 100644

--- a/RepositoryExternal.mk

+++ b/RepositoryExternal.mk

@@ -183,51 +183,43 @@ endef

 endif # SYSTEM_CPPUNIT

-ifneq ($(SYSTEM_GLEW),)

+ifneq ($(SYSTEM_EPOXY),)

-define gb_LinkTarget__use_glew

+define gb_LinkTarget__use_epoxy

 $(call gb_LinkTarget_set_include,$(1),\

 	$$(INCLUDE) \

-    $(GLEW_CFLAGS) \

+    $(EPOXY_CFLAGS) \

 )

-$(call gb_LinkTarget_add_libs,$(1),$(GLEW_LIBS))

+$(call gb_LinkTarget_add_libs,$(1),$(EPOXY_LIBS))

 endef

-gb_ExternalProject__use_glew :=

+gb_ExternalProject__use_epoxy :=

-else # !SYSTEM_GLEW

+else # !SYSTEM_EPOXY

-$(eval $(call gb_Helper_register_packages_for_install,ooo,\

-	glew \

-))

-

-define gb_LinkTarget__use_glew

-$(call gb_LinkTarget_use_package,$(1),glew)

+define gb_LinkTarget__use_epoxy

 $(call gb_LinkTarget_set_include,$(1),\

-	-I$(call gb_UnpackedTarball_get_dir,glew/include) \

-	-DGLEW_NO_GLU \

-	$$(INCLUDE) \

+       -I$(call gb_UnpackedTarball_get_dir,epoxy/include) \

+       $$(INCLUDE) \

 )

-ifeq ($(COM),MSC)

-$(call gb_LinkTarget_add_libs,$(1),\

-	$(call gb_UnpackedTarball_get_dir,glew)/lib/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/$(wnt_arch_subdir_mandatory)/glew32d.lib,Release/$(wnt_arch_subdir_mandatory)/glew32.lib) \

-)

-else

-$(call gb_LinkTarget_add_libs,$(1),\

-	-L$(call gb_UnpackedTarball_get_dir,glew)/lib/ -lGLEW \

+$(call gb_LinkTarget_use_libraries,$(1),\

+    epoxy \

 )

-endif

 endef

-define gb_ExternalProject__use_glew

-$(call gb_ExternalProject_use_external_project,$(1),glew)

+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\

+	epoxy \

+))

+

+define gb_ExternalProject__use_epoxy

+$(call gb_ExternalProject_use_external_project,$(1),epoxy)

 endef

-endif # SYSTEM_GLEW

+endif # SYSTEM_EPOXY

 define gb_LinkTarget__use_iconv

 $(call gb_LinkTarget_add_libs,$(1),-liconv)

@@ -3444,7 +3436,7 @@ $(call gb_LinkTarget_add_libs,$(1),\

 )

 else

 $(call gb_LinkTarget_add_libs,$(1),\

-	$(call gb_UnpackedTarball_get_dir,libgltf)/src/.libs/libgltf-0.0$(gb_StaticLibrary_PLAINEXT) \

+	$(call gb_UnpackedTarball_get_dir,libgltf)/src/.libs/libgltf-0.1$(gb_StaticLibrary_PLAINEXT) \

 )

 endif

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk

index 4e8f3b1..e662fc3 100644

--- a/avmedia/Library_avmedia.mk

+++ b/avmedia/Library_avmedia.mk

@@ -29,7 +29,7 @@ $(eval $(call gb_Library_use_externals,avmedia,\

 ifeq ($(ENABLE_HEADLESS),)

 $(eval $(call gb_Library_use_externals,avmedia,\

-    glew \

+    epoxy \

 ))

 endif

diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk

index b7498bf..191fb75 100644

--- a/avmedia/Library_avmediaogl.mk

+++ b/avmedia/Library_avmediaogl.mk

@@ -16,7 +16,7 @@ $(eval $(call gb_Library_use_sdk_api,avmediaogl))

 $(eval $(call gb_Library_use_externals,avmediaogl, \

     boost_headers \

     libgltf \

-    glew \

+    epoxy \

     glm_headers \

 ))

@@ -51,10 +51,6 @@ else ifeq ($(OS),MACOSX)

 $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaogl,\

 	OpenGL \

 ))

-else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))

-$(eval $(call gb_Library_add_libs,avmediaogl,\

-    -lGL \

-))

 endif

 # vim: set noet sw=4 ts=4:

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects

index f05d513..d189c1b 100755

--- a/bin/check-elf-dynamic-objects

+++ b/bin/check-elf-dynamic-objects

@@ -110,7 +110,7 @@ local file="$1"

         */libdesktop_detectorlo.so|*/ui-previewer|*/oosplash|*/gengal.bin)

             whitelist="${whitelist} ${x11whitelist}"

         ;;

-        */libvclplug_genlo.so|*/libGLEW.so.*|*/libchartcorelo.so|*/libavmediaogl.so|*/libOGLTranslo.so|*/liboglcanvaslo.so|*/libchartopengllo.so)

+        */libvclplug_genlo.so|*/libchartcorelo.so|*/libavmediaogl.so|*/libOGLTranslo.so|*/liboglcanvaslo.so|*/libchartopengllo.so)

             whitelist="${whitelist} ${x11whitelist} ${openglwhitelist}"

         ;;

         */libvcllo.so|*/libsofficeapp.so)

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs

index 813241e..9faa042 100755

--- a/bin/lo-all-static-libs

+++ b/bin/lo-all-static-libs

@@ -63,7 +63,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \

      $WORKDIR/UnpackedTarball/coinmp/CoinMP/src/.libs/*.a \

      $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a \

      $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \

-     $WORKDIR/UnpackedTarball/glew/lib/*.a \

+     $WORKDIR/UnpackedTarball/epoxy/lib/*.a \

      $WORKDIR/UnpackedTarball/icu/source/lib/*.a \

      $WORKDIR/UnpackedTarball/langtag/liblangtag/.libs/*.a \

      $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \

diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk

index 0118eb1..9d1042d 100644

--- a/canvas/Library_oglcanvas.mk

+++ b/canvas/Library_oglcanvas.mk

@@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_exception_objects,oglcanvas,\

 $(eval $(call gb_Library_use_externals,oglcanvas,\

 	boost_headers \

-	glew \

+	epoxy \

 ))

 ifeq ($(strip $(OS)),MACOSX)

@@ -58,11 +58,6 @@ $(eval $(call gb_Library_use_system_win32_libs,oglcanvas,\

     opengl32 \

 ))

-else

-$(eval $(call gb_Library_add_libs,oglcanvas,\

-    -lGL \

-    -lX11 \

-))

 endif

 # vim: set noet sw=4 ts=4:

diff --git a/canvas/source/opengl/ogl_buffercontext.hxx b/canvas/source/opengl/ogl_buffercontext.hxx

index 202e063..7f2066a 100644

--- a/canvas/source/opengl/ogl_buffercontext.hxx

+++ b/canvas/source/opengl/ogl_buffercontext.hxx

@@ -10,7 +10,7 @@

 #ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX

 #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX

-#include <GL/glew.h>

+#include <epoxy/gl.h>

 #include <sal/config.h>

 #include <memory>

diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx

index 8d38177..6b23d45 100644

--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx

+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx

@@ -9,7 +9,7 @@

 #include <sal/config.h>

-#include <GL/glew.h>

+#include <epoxy/gl.h>

 #include <basegfx/matrix/b2dhommatrix.hxx>

 #include <basegfx/point/b2dpoint.hxx>

diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx

index 84a96ce..175a02b 100644

--- a/canvas/source/opengl/ogl_canvashelper.cxx

+++ b/canvas/source/opengl/ogl_canvashelper.cxx

@@ -11,7 +11,7 @@

 #include <memory>

 #include <functional>

-#include <GL/glew.h>

+#include <epoxy/gl.h>

 #include <basegfx/polygon/b2dpolygontriangulator.hxx>

 #include <basegfx/polygon/b2dpolypolygon.hxx>

diff --git a/canvas/source/opengl/ogl_canvastools.cxx b/canvas/source/opengl/ogl_canvastools.cxx

index 657a220..3d9448b 100644

--- a/canvas/source/opengl/ogl_canvastools.cxx

+++ b/canvas/source/opengl/ogl_canvastools.cxx

@@ -9,7 +9,7 @@

 #include <sal/config.h>

-#include <GL/glew.h>

+#include <epoxy/gl.h>

 #include <basegfx/matrix/b2dhommatrix.hxx>

 #include <basegfx/polygon/b2dpolygontriangulator.hxx>

diff --git a/canvas/source/opengl/ogl_texturecache.cxx b/canvas/source/opengl/ogl_texturecache.cxx

index 08cdd2f..43fb7d8 100644

--- a/canvas/source/opengl/ogl_texturecache.cxx

+++ b/canvas/source/opengl/ogl_texturecache.cxx

@@ -9,7 +9,7 @@

 #include <sal/config.h>

-#include <GL/glew.h>

+#include <epoxy/gl.h>

 #include <com/sun/star/geometry/IntegerSize2D.hpp>

diff --git a/canvas/source/opengl/ogl_tools.hxx b/canvas/source/opengl/ogl_tools.hxx

index 8133212..469a5be 100644

--- a/canvas/source/opengl/ogl_tools.hxx

+++ b/canvas/source/opengl/ogl_tools.hxx

@@ -11,8 +11,7 @@

 #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TOOLS_HXX

 #include <sal/config.h>

-#include <GL/glew.h>

-

+#include <epoxy/gl.h>

 namespace oglcanvas

 {

diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk

index b15f634..cc06fbd 100644

--- a/chart2/Library_chartcore.mk

+++ b/chart2/Library_chartcore.mk

@@ -32,7 +32,7 @@ $(eval $(call gb_Library_use_externals,chartcore,\

 ifeq ($(ENABLE_HEADLESS),)

 $(eval $(call gb_Library_use_externals,chartcore,\

-    glew \

+    epoxy \

 ))

 endif

@@ -264,13 +264,6 @@ else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))

 $(eval $(call gb_Library_add_libs,chartcore,\

 	$(DLOPEN_LIBS) \

 ))

-ifeq ($(ENABLE_HEADLESS),)

-$(eval $(call gb_Library_add_libs,chartcore,\

-    -lGL \

-    -lX11 \

-))

-endif #!ENABLE_HEADLESS

-

 endif

 # vim: set noet sw=4 ts=4:

diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk

index 95ea58d..53056aa 100644

--- a/chart2/Library_chartopengl.mk

+++ b/chart2/Library_chartopengl.mk

@@ -22,7 +22,7 @@ $(eval $(call gb_Library_set_precompiled_header,chartopengl,$(SRCDIR)/chart2/inc

 $(eval $(call gb_Library_use_externals,chartopengl,\

 	boost_headers \

 	glm_headers \

-	glew \

+	epoxy \

 ))

 $(eval $(call gb_Library_use_sdk_api,chartopengl))

@@ -68,8 +68,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\

 else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))

 $(eval $(call gb_Library_add_libs,chartopengl,\

 	$(DLOPEN_LIBS) \

-	-lGL \

-	-lX11 \

 ))

 endif

diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx

index 8d02451..908d7ac 100644

--- a/chart2/inc/pch/precompiled_chartcore.hxx

+++ b/chart2/inc/pch/precompiled_chartcore.hxx

@@ -73,7 +73,6 @@

 #include <vcl/virdev.hxx>

 #include <vcl/wall.hxx>

 #include <ChartModel.hxx>

-#include <GL/glew.h>

 #include <basegfx/basegfxdllapi.h>

 #include <basegfx/matrix/b3dhommatrix.hxx>

 #include <basegfx/numeric/ftools.hxx>

@@ -169,6 +168,7 @@

 #include <cppuhelper/weak.hxx>

 #include <editeng/editengdllapi.h>

 #include <editeng/unoprnms.hxx>

+#include <epoxy/gl.h>

 #include <i18nlangtag/i18nlangtagdllapi.h>

 #include <i18nlangtag/lang.h>

 #include <i18nlangtag/languagetag.hxx>

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx

index a4193da..401b664 100644

--- a/chart2/source/view/charttypes/GL3DBarChart.cxx

+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx

@@ -9,7 +9,7 @@

 #include <GL3DBarChart.hxx>

-#include <GL/glew.h>

+#include <epoxy/gl.h>

 #include <glm/glm.hpp>

 #include <glm/gtx/transform.hpp>

diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx

index fb4fb13..e1e4c01 100644

--- a/chart2/source/view/main/GL3DRenderer.cxx

+++ b/chart2/source/view/main/GL3DRenderer.cxx

@@ -7,7 +7,7 @@

  * file, You can obtain one at http://mozilla.org/MPL/2.0/.

  */

-#include <GL/glew.h>

+#include <epoxy/gl.h>

 #include "GL3DRenderer.hxx"

@@ -244,8 +244,8 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders()

         m_3DBatchNormalID = glGetAttribLocation(m_3DBatchProID, "vertexNormalModelspace");

         m_3DBatchColorID = glGetAttribLocation(m_3DBatchProID, "barColor");

 #if !defined MACOSX

-        //check whether the texture array is support

-        mbTexBatchSupport = GLEW_EXT_texture_array;

+        //check whether the texture array is supported

+        mbTexBatchSupport = epoxy_has_gl_extension("GL_EXT_texture_array");

 #endif

         CHECK_GL_ERROR();

         if (mbTexBatchSupport)

@@ -401,7 +401,7 @@ void OpenGL3DRenderer::init()

     m_fViewAngle = 30.0f;

     m_3DProjection = glm::perspective(m_fViewAngle, (float)m_iWidth / (float)m_iHeight, 0.01f, 6000.0f);

-    maResources.m_b330Support = GLEW_VERSION_3_3;

+    maResources.m_b330Support = epoxy_gl_version() >= 33;

     CHECK_GL_ERROR();

     maResources.LoadShaders();

     maPickingResources.LoadShaders();

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx

index 3182e66..91a3763 100644

--- a/chart2/source/view/main/OpenGLRender.cxx

+++ b/chart2/source/view/main/OpenGLRender.cxx

@@ -7,7 +7,7 @@

  * file, You can obtain one at http://mozilla.org/MPL/2.0/.

  */

-#include <GL/glew.h>

+#include <epoxy/gl.h>

 #include <vector>

 #include "OpenGLRender.hxx"

 #include <vcl/graph.hxx>

diff --git a/config_host.mk.in b/config_host.mk.in

index 3d39dcd..2a8fe3d 100644

--- a/config_host.mk.in

+++ b/config_host.mk.in

@@ -201,8 +201,8 @@ export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@

 export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@

 export GIT_LINK_SRC=@GIT_LINK_SRC@

 export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@

-export GLEW_CFLAGS=$(gb_SPACE)@GLEW_CFLAGS@

-export GLEW_LIBS=$(gb_SPACE)@GLEW_LIBS@

+export EPOXY_CFLAGS=$(gb_SPACE)@EPOXY_CFLAGS@

+export EPOXY_LIBS=$(gb_SPACE)@EPOXY_LIBS@

 export GLM_CFLAGS=$(gb_SPACE)@GLM_CFLAGS@

 export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@

 export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@

@@ -514,7 +514,7 @@ export SYSTEM_FIREBIRD=@SYSTEM_FIREBIRD@

 export SYSTEM_GENBRK=@SYSTEM_GENBRK@

 export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@

 export SYSTEM_GENCMN=@SYSTEM_GENCMN@

-export SYSTEM_GLEW=@SYSTEM_GLEW@

+export SYSTEM_EPOXY=@SYSTEM_EPOXY@

 export SYSTEM_GLM=@SYSTEM_GLM@

 export SYSTEM_GRAPHITE=@SYSTEM_GRAPHITE@

 export SYSTEM_HARFBUZZ=@SYSTEM_HARFBUZZ@

diff --git a/config_host/config_opengl.h.in b/config_host/config_opengl.h.in

deleted file mode 100644

index 67b9e47..0000000

--- a/config_host/config_opengl.h.in

+++ /dev/null

@@ -1,10 +0,0 @@

-/*

-Settings for OpenGL

-*/

-

-#ifndef CONFIG_OPENGL_H

-#define CONFIG_OPENGL_H

-

-#define HAVE_GLEW_1_12 0

-

-#endif

diff --git a/configure.ac b/configure.ac

index 079e856..0f8e58d 100644

--- a/configure.ac

+++ b/configure.ac

@@ -1634,6 +1634,11 @@ AC_ARG_WITH(system-cairo,

         [Use cairo libraries already on system.  Happens automatically for

          (implicit) --enable-gtk and for --enable-gtk3.]))

+AC_ARG_WITH(system-epoxy,

+    AS_HELP_STRING([--with-system-epoxy],

+        [Use epoxy libraries already on system.  Happens automatically for

+         --enable-gtk3.]))

+

 AC_ARG_WITH(myspell-dicts,

     AS_HELP_STRING([--with-myspell-dicts],

         [Adds myspell dictionaries to the LibreOffice installation set]),

@@ -8941,14 +8946,6 @@ AC_SUBST([GLM_CFLAGS])

 AC_SUBST([SYSTEM_GLM])

 dnl ===================================================================

-dnl Check for system glew

-dnl ===================================================================

-libo_CHECK_SYSTEM_MODULE([glew], [GLEW], [glew >= 1.10.0])

-AS_IF([test "$with_system_glew" = "yes"],

-    [PKG_CHECK_EXISTS([glew >= 1.12.0], [AC_DEFINE([HAVE_GLEW_1_12])])],

-    [AC_DEFINE([HAVE_GLEW_1_12])])

-

-dnl ===================================================================

 dnl Check for system odbc

 dnl ===================================================================

 AC_MSG_CHECKING([which odbc headers to use])

@@ -10497,7 +10494,7 @@ if test "x$enable_gltf" != "xno" -a $_os != iOS -a $_os != Android -a "$ENABLE_H

     AC_DEFINE(HAVE_FEATURE_GLTF,1)

     if test "$with_system_libgltf" = "yes"; then

         SYSTEM_LIBGLTF=TRUE

-        PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.0 >= 0.0.1] )

+        PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.1 >= 0.1.0] )

         FilterLibs "${LIBGLTF_LIBS}"

         LIBGLTF_LIBS="${filteredlibs}"

     else

@@ -11728,6 +11725,11 @@ AC_SUBST(CAIRO_CFLAGS)

 AC_SUBST(CAIRO_LIBS)

 dnl ===================================================================

+dnl Check for system epoxy

+dnl ===================================================================

+libo_CHECK_SYSTEM_MODULE([epoxy], [EPOXY], [epoxy >= 1.3.1], ["-I${WORKDIR}/UnpackedTarball/epoxy/include"])

+

+dnl ===================================================================

 dnl Test whether to use avahi

 dnl ===================================================================

 if test "$_os" = "WINNT"; then

@@ -12886,7 +12888,6 @@ AC_CONFIG_HEADERS([config_host/config_mpl.h])

 AC_CONFIG_HEADERS([config_host/config_orcus.h])

 AC_CONFIG_HEADERS([config_host/config_kde4.h])

 AC_CONFIG_HEADERS([config_host/config_oox.h])

-AC_CONFIG_HEADERS([config_host/config_opengl.h])

 AC_CONFIG_HEADERS([config_host/config_options.h])

 AC_CONFIG_HEADERS([config_host/config_options_calc.h])

 AC_CONFIG_HEADERS([config_host/config_test.h])

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk

index 6a63a1d..64f7844 100644

--- a/cui/Library_cui.mk

+++ b/cui/Library_cui.mk

@@ -72,7 +72,7 @@ $(eval $(call gb_Library_use_externals,cui,\

 ))

 ifeq ($(ENABLE_HEADLESS),)

 $(eval $(call gb_Library_use_externals,cui,\

-     glew \

+     epoxy \

  ))

 endif

diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf

index d5d6686..121d198 100644

--- a/distro-configs/LibreOfficeFlatpak.conf

+++ b/distro-configs/LibreOfficeFlatpak.conf

@@ -11,7 +11,6 @@

 --without-system-coinmp

 --without-system-cppunit

 --without-system-firebird

---without-system-glew

 --without-system-glm

 --without-system-libabw

 --without-system-libcdr

diff --git a/download.lst b/download.lst

index 3e3313b..9d7af4f 100644

--- a/download.lst

+++ b/download.lst

@@ -29,6 +29,8 @@ export CURL_TARBALL := curl-7.51.0.tar.gz

 export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll

 export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78

 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2

+export EPOXY_MD5SUM := 96f6620a9b005a503e7b44b0b528287d

+export EPOXY_TARBALL := libepoxy-1.3.1.tar.bz2

 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz

 export ETONYEK_MD5SUM := 77ff46936dcc83670557274e7dd2aa33

 export ETONYEK_VERSION_MICRO := 6

@@ -54,7 +56,6 @@ export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz

 export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7

 export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2

 export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2

-export GLEW_TARBALL := 3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip

 export GLM_TARBALL := bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip

 export GRAPHITE_TARBALL := 3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz

 export HARFBUZZ_MD5SUM := 5986e1bfcd983d1f6caa53ef64c4abc5

@@ -88,8 +89,8 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip

 export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548

 export LIBEOT_TARBALL := libeot-0.01.tar.bz2

 export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2

-export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424

-export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2

+export LIBGLTF_MD5SUM := 63ae962d0c436909979826fce0fca2fd

+export LIBGLTF_TARBALL := libgltf-0.1.0.tar.gz

 export LIBLANGTAG_MD5SUM := 284f120247323a35122ab32b4b359c45

 export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2

 export LIBTOMMATH_MD5SUM := da283d2e3e72137d0c600ac36b991c9d

diff --git a/external/Module_external.mk b/external/Module_external.mk

index 1dbf97b..c14e668 100644

--- a/external/Module_external.mk

+++ b/external/Module_external.mk

@@ -38,13 +38,13 @@ $(eval $(call gb_Module_add_moduledirs,external,\

 	$(call gb_Helper_optional,CURL,curl) \

 	$(call gb_Helper_optional,EBOOK,libebook) \

 	$(call gb_Helper_optional,EPM,epm) \

+	$(call gb_Helper_optional,EPOXY,epoxy) \

 	$(call gb_Helper_optional,ETONYEK,libetonyek) \

 	$(call gb_Helper_optional,EXPAT,expat) \

 	$(call gb_Helper_optional,FIREBIRD,firebird) \

 	$(call gb_Helper_optional,FONTCONFIG,fontconfig) \

 	$(call gb_Helper_optional,FREEHAND,libfreehand) \

 	$(call gb_Helper_optional,FREETYPE,freetype) \

-	$(call gb_Helper_optional,GLEW,glew) \

 	$(call gb_Helper_optional,GLM,glm) \

 	$(call gb_Helper_optional,GRAPHITE,graphite) \

 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \

diff --git a/external/epoxy/Library_epoxy.mk b/external/epoxy/Library_epoxy.mk

new file mode 100644

index 0000000..28f9dab

--- /dev/null

+++ b/external/epoxy/Library_epoxy.mk

@@ -0,0 +1,63 @@

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-

+#

+# This file is part of the LibreOffice project.

+#

+# This Source Code Form is subject to the terms of the Mozilla Public

+# License, v. 2.0. If a copy of the MPL was not distributed with this

+# file, You can obtain one at http://mozilla.org/MPL/2.0/.

+#

+

+$(eval $(call gb_Library_Library,epoxy))

+

+$(eval $(call gb_Library_use_unpacked,epoxy,epoxy))

+

+$(eval $(call gb_Library_set_warnings_not_errors,epoxy))

+

+$(eval $(call gb_Library_set_include,epoxy,\

+	-I$(WORKDIR)/UnpackedTarball/epoxy/include \

+	-I$(WORKDIR)/UnpackedTarball/epoxy/src \

+	$$(INCLUDE) \

+))

+

+# epoxy is riddled with warnings... let's spare use

+# the pointless spamming

+$(eval $(call gb_Library_add_cxxflags,epoxy,\

+	-w \

+))

+$(eval $(call gb_Library_add_cflags,epoxy,\

+	-w \

+))

+

+ifeq ($(OS),LINUX)

+$(eval $(call gb_Library_add_libs,epoxy,\

+	-ldl \

+))

+endif

+

+$(eval $(call gb_Library_add_generated_cobjects,epoxy,\

+	UnpackedTarball/epoxy/src/dispatch_common \

+	UnpackedTarball/epoxy/src/gl_generated_dispatch \

+))

+