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

[John W. Eaton]

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

I needed the following changes to enable llvm for the Windows build of the
mesa package:


diff --git a/src/mesa.mk b/src/mesa.mk
--- a/src/mesa.mk
+++ b/src/mesa.mk
@@ -7,11 +7,10 @@ PKG             := mesa
 $(PKG)_SUBDIR   := mesa-$($(PKG)_VERSION)
 $(PKG)_FILE     := mesa-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-mako expat zlib
+$(PKG)_DEPS     := build-mako expat zlib llvm s2tc
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   ifeq ($(USE_SYSTEM_OPENGL),no)
     $(PKG)_SCONS_OPENGL_OPTIONS := libgl-gdi
-    $(PKG)_DEPS += s2tc
   endif
 else
   ifeq ($(USE_SYSTEM_OPENGL),yes)
@@ -28,7 +27,6 @@ else
     ifeq ($(USE_SYSTEM_X11_LIBS),no)
       $(PKG)_DEPS += dri2proto glproto libdrm libxshmfence x11 xdamage xext
xfixes
     endif
-    $(PKG)_DEPS += llvm s2tc
   endif
 endif
 
@@ -44,7 +42,7 @@ ifeq ($(MXE_WINDOWS_BUILD),yes)
     $(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)' && scons platform=windows toolchain=crossmingw
machine=$($(PKG)_MACHINE) verbose=1 build=release llvm=True osmesa
$($(PKG)_SCONS_OPENGL_OPTIONS)
 
     ## Do the scons config files have useful install targets?
     $(INSTALL) -d '$(3)$(HOST_INCDIR)/GL';


The real change here is to add llvm=True to the scons command.

But then it failed with the following messages:


In file included from src/gallium/auxiliary/gallivm/lp_bld_type.h:42:0,
                 from src/gallium/drivers/llvmpipe/lp_bld_alpha.c:37:
src/gallium/auxiliary/gallivm/lp_bld.h:54:2: error: #error "HAVE_LLVM should
be set with LLVM's version number, e.g. (0x0207 for 2.7)"
 #error "HAVE_LLVM should be set with LLVM's version number, e.g. (0x0207 for
2.7)"
  ^~~~~
src/gallium/auxiliary/gallivm/lp_bld.h:57:2: error: #error "LLVM 3.3 or newer
required"
 #error "LLVM 3.3 or newer required"
  ^~~~~
In file included from src/gallium/auxiliary/gallivm/lp_bld_init.h:36:0,
                 from src/gallium/auxiliary/gallivm/lp_bld_const.h:42,
                 from src/gallium/drivers/llvmpipe/lp_bld_alpha.c:38:
/scratch/build/mxe-octave-w32/usr/i686-w64-mingw32/include/llvm-c/ExecutionEngine.h:42:46:
error: conflicting types for 'LLVMMCJITMemoryManagerRef'
 typedef struct LLVMOpaqueMCJITMemoryManager *LLVMMCJITMemoryManagerRef;
                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from src/gallium/auxiliary/gallivm/lp_bld_type.h:42:0,
                 from src/gallium/drivers/llvmpipe/lp_bld_alpha.c:37:
src/gallium/auxiliary/gallivm/lp_bld.h:65:15: note: previous declaration of
'LLVMMCJITMemoryManagerRef' was here
 typedef void *LLVMMCJITMemoryManagerRef;
               ^~~~~~~~~~~~~~~~~~~~~~~~~


So maybe this version isn't suitable?  Or is there a newer verions of mesa
that will work with llvm 6?

    _______________________________________________________

Reply to this item at:

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

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