system_libuv.patch

   1 diff -dur zynaddsubfx-3.0.3.orig/mruby-zest-build/build_config.rb zynaddsubfx-3.0.3/mruby-zest-build/build_config.rb
   2 --- zynaddsubfx-3.0.3.orig/mruby-zest-build/build_config.rb     2018-08-06 09:01:21.000000000 +0200
   3 +++ zynaddsubfx-3.0.3/mruby-zest-build/build_config.rb  2018-08-07 14:32:40.000000000 +0200
   4 @@ -92,7 +92,6 @@
   5    conf.cc do |cc|
   6        cc.include_paths << "#{`pwd`.strip}/../deps/nanovg/src"
   7        cc.include_paths << "#{`pwd`.strip}/../deps/pugl/"
   8 -      cc.include_paths << "#{`pwd`.strip}/../deps/libuv-v1.9.1/include/"
   9        cc.include_paths << "/usr/share/mingw-w64/include/" if windows
  10        cc.include_paths << "/usr/x86_64-w64-mingw32/include/" if windows
  11        cc.flags << "-DLDBL_EPSILON=1e-6" if windows
  12 @@ -110,7 +109,7 @@
  13        #linker.library_paths  << "#{`pwd`.strip}/../deps/rtosc/build/"
  14        linker.library_paths  << "#{`pwd`.strip}/../src/osc-bridge/"
  15        linker.libraries << 'osc-bridge'
  16 -      linker.flags_after_libraries  << "#{`pwd`.strip}/../deps/libuv.a"
  17 +      linker.flags_after_libraries  << "-luv"
  18        linker.flags_after_libraries  << "#{`pwd`.strip}/../deps/pugl/build/libpugl-0.a"
  19        linker.flags_after_libraries  << "#{`pwd`.strip}/../deps/libnanovg.a"
  20        if(!windows)
  21 diff -dur zynaddsubfx-3.0.3.orig/mruby-zest-build/Makefile zynaddsubfx-3.0.3/mruby-zest-build/Makefile
  22 --- zynaddsubfx-3.0.3.orig/mruby-zest-build/Makefile    2018-08-06 09:01:21.000000000 +0200
  23 +++ zynaddsubfx-3.0.3/mruby-zest-build/Makefile 2018-08-07 14:31:35.000000000 +0200
  24 @@ -10,12 +10,12 @@
  25  #      cd deps/pugl         && ./waf configure --no-cairo --static
  26         cd deps/pugl         && ./waf configure --no-cairo --static --debug
  27         cd deps/pugl         && ./waf
  28 -       cd src/osc-bridge    && CFLAGS="-I ../../deps/libuv-v1.9.1/include " make lib
  29 +       cd src/osc-bridge    && make lib
  30         cd mruby             && MRUBY_CONFIG=../build_config.rb rake
  31         $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \
  32                 ./deps/libnanovg.a \
  33                 src/osc-bridge/libosc-bridge.a \
  34 -               ./deps/libuv-v1.9.1/.libs/libuv.a  -lm -lX11 -lGL -lpthread
  35 +               -luv -lm -lX11 -lGL -lpthread
  36         $(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99
  37
  38  osx:
  39 @@ -49,20 +49,13 @@
  40
  41
  42  builddep:
  43 -       cd deps/$(UV_DIR)    && ./autogen.sh
  44 -       cd deps/$(UV_DIR)    && CFLAGS=-fPIC ./configure
  45 -       cd deps/$(UV_DIR)    && CFLAGS=-fPIC make
  46 -       cp deps/$(UV_DIR)/.libs/libuv.a deps/
  47
  48  builddepwin:
  49         cd deps/$(UV_DIR)   && ./autogen.sh
  50         cd deps/$(UV_DIR)   && CFLAGS="-mstackrealign" ./configure  --host=x86_64-w64-mingw32
  51         cd deps/$(UV_DIR)   && LD=x86_64-w64-mingw32-gcc make
  52 -       cp deps/$(UV_DIR)/.libs/libuv.a deps/
  53
  54  setup:
  55 -       cd deps              && wget -4 $(UV_URL)
  56 -       cd deps              && tar xvf $(UV_FILE)
  57
  58  setupwin:
  59         cd deps              && wget -4 $(UV_URL)