Revert partly "Use less epoxy external headers dependency"

Following these errors:
[LNK] Library/libdeployment.so
ld.lld: error: undefined symbol: epoxy_glBindRenderbuffer
>>> referenced by gtkinst.cxx:2081 (vcl/unx/gtk4/../gtk3/gtkinst.cxx:2081)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk4/gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:2082 (vcl/unx/gtk4/../gtk3/gtkinst.cxx:2082)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk4/gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:1925 (vcl/unx/gtk4/../gtk3/gtkinst.cxx:1925)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk4/gtkinst.o:((anonymous namespace)::GtkOpenGLContext::adjustToNewSize())
>>> referenced 5 more times

ld.lld: error: undefined symbol: epoxy_glBindFramebufferEXT
>>> referenced by gtkinst.cxx:2083 (vcl/unx/gtk4/../gtk3/gtkinst.cxx:2083)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk4/gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:2061 (vcl/unx/gtk4/../gtk3/gtkinst.cxx:2061)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk4/gtkinst.o:((anonymous namespace)::GtkOpenGLContext::restoreDefaultFramebuffer())
>>> referenced by gtkinst.cxx:1929 (vcl/unx/gtk4/../gtk3/gtkinst.cxx:1929)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk4/gtkinst.o:((anonymous namespace)::GtkOpenGLContext::adjustToNewSize())
>>> referenced 2 more times

ld.lld: error: undefined symbol: epoxy_glBindRenderbuffer
>>> referenced by gtkinst.cxx:2081 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2081)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:2082 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2082)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:1925 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:1925)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::adjustToNewSize())
>>> referenced 5 more times

ld.lld: error: undefined symbol: epoxy_glBindFramebufferEXT
>>> referenced by gtkinst.cxx:2083 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2083)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:2061 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2061)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::restoreDefaultFramebuffer())
>>> referenced by gtkinst.cxx:1929 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:1929)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::adjustToNewSize())
>>> referenced 2 more times

ld.lld: error: undefined symbol: epoxy_glFramebufferRenderbufferEXT
>>> referenced by gtkinst.cxx:2084 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2084)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:2086 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2086)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::makeCurrent())
>>> referenced by gtkinst.cxx:2062 (vcl/unx/gtk3_kde5/../gtk3/gtkinst.cxx:2062)
>>>               /home/julien/lo/libreoffice/workdir/CxxObject/vcl/unx/gtk3_kde5/gtk3_kde5_gtkinst.o:((anonymous namespace)::GtkOpenGLContext::restoreDefaultFramebuffer())
>>> referenced 6 more times

Change-Id: Iaba2323e294aba74a74d3ac98679143a68bbd53a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157180
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Julien Nabet
2023-09-23 14:13:29 +02:00
committed by Caolán McNamara
parent 810fdf5e56
commit c81a607153
2 changed files with 2 additions and 0 deletions
+1
View File
@@ -79,6 +79,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3_kde5,\
$(eval $(call gb_Library_use_externals,vclplug_gtk3_kde5,\
boost_headers \
boost_filesystem \
epoxy \
dbus \
graphite \
harfbuzz \
+1
View File
@@ -74,6 +74,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk4,\
$(eval $(call gb_Library_use_externals,vclplug_gtk4,\
boost_headers \
epoxy \
dbus \
graphite \
harfbuzz \