[Octave-bug-tracker] [bug #54396] Removing Opengl32.dll speeds up plot navigation, but it prevents saving plots using saveas or print

[Markus Mützel]

Follow-up Comment #15, bug #54396 (project octave):

I got a little bit further with these changes:

diff -r e0dbadd553c6 src/mesa.mk
--- a/src/mesa.mk       Sun Jul 29 12:06:04 2018 +0200
+++ b/src/mesa.mk       Mon Jul 30 06:03:43 2018 +0200
@@ -2,8 +2,8 @@
 # See index.html for further information.
 
 PKG             := mesa
-$(PKG)_VERSION  := 17.2.1
-$(PKG)_CHECKSUM := 7429e74a0ef12ea9d60b41b2b852898b3da0b238
+$(PKG)_VERSION  := 18.0.5
+$(PKG)_CHECKSUM := 4f6f87d47336536b4c1864cd3e39e42bbc4ec158
 $(PKG)_SUBDIR   := mesa-$($(PKG)_VERSION)
 $(PKG)_FILE     := mesa-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE)
@@ -11,7 +11,7 @@
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   ifeq ($(USE_SYSTEM_OPENGL),no)
     $(PKG)_SCONS_OPENGL_OPTIONS := libgl-gdi
-    $(PKG)_DEPS += s2tc
+    $(PKG)_DEPS += llvm s2tc pthreads
   endif
 else
   ifeq ($(USE_SYSTEM_OPENGL),yes)
@@ -44,7 +44,7 @@
     $(PKG)_MACHINE := x86
   endif
   define $(PKG)_BUILD
-    cd '$(1)' && scons platform=windows toolchain=crossmingw
machine=$($(PKG)_MACHINE) verbose=1 build=release osmesa
$($(PKG)_SCONS_OPENGL_OPTIONS)
+    cd '$(1)' && LLVM=$(HOST_PREFIX) LDFLAGS="-static -s
-L$(HOST_LIBDIR)/gcc/$(TARGET)/$(native-gcc_VERSION)" scons platform=windows
toolchain=crossmingw machine=$($(PKG)_MACHINE) verbose=1 build=release
$($(PKG)_SCONS_OPENGL_OPTIONS)
 
     ## Do the scons config files have useful install targets?
     $(INSTALL) -d '$(3)$(HOST_INCDIR)/GL';
@@ -52,12 +52,6 @@
       $(INSTALL) -m 644 $$f '$(3)$(HOST_INCDIR)/GL'; \
     done
 
-    $(INSTALL) -d '$(3)$(HOST_LIBDIR)';
-    $(INSTALL) -m 644
'$(1)/build/windows-$($(PKG)_MACHINE)/gallium/targets/osmesa/libosmesa.a'
'$(3)$(HOST_LIBDIR)/libOSMesa.a';
-
-    $(INSTALL) -d '$(3)$(HOST_BINDIR)';
-    $(INSTALL) -m 755
'$(1)/build/windows-$($(PKG)_MACHINE)/gallium/targets/osmesa/osmesa.dll'
'$(3)$(HOST_BINDIR)/osmesa.dll';
-
     if [ -f
'$(1)/build/windows-$($(PKG)_MACHINE)/gallium/targets/libgl-gdi/opengl32.dll'
]; then \
       $(INSTALL) -m 755
'$(1)/build/windows-$($(PKG)_MACHINE)/gallium/targets/libgl-gdi/opengl32.dll'
'$(3)$(HOST_BINDIR)/opengl32.dll'; \
     fi


I (temporary#) removed osmesa to see whether I could get just llvmpipe to
compile.

But it also failed with a link error (could not find pthread).
At least it detected llvm. I think LLVM has to be set to the correct path in
the environment.
When I removed the static linking, I got different linker errors that were
zlib related.
Maybe the built LLVM just isn't functional.


    _______________________________________________________

Reply to this item at:

  <http://savannah.gnu.org/bugs/?54396>

_______________________________________________
  Message sent via Savannah
  https://savannah.gnu.org/