From bbd5211afc51b08b9bd3dbf6df0b193db446bb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 13 Mar 2019 22:47:07 +0100
Subject: [PATCH] mruby-zest: upgrade 3.02 -> 3.0.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 recipes-musicians/zyn/mruby-zest.inc          |  5 +-
 .../0001-mruby-Align-build-to-our-needs.patch | 47 ++++++++-----------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/recipes-musicians/zyn/mruby-zest.inc b/recipes-musicians/zyn/mruby-zest.inc
index 0d45867a..bd19c66b 100644
--- a/recipes-musicians/zyn/mruby-zest.inc
+++ b/recipes-musicians/zyn/mruby-zest.inc
@@ -8,8 +8,9 @@ SRC_URI = " \
     file://0002-mruby-zest-Align-build-to-our-needs.patch \
     file://0003-src-osc-bridge-Align-build-to-our-needs.patch \
 "
-SRCREV = "b312953ba991b15d1076ba819ca5a44ed4386b28"
-PV = "3.02+git${SRCPV}"
+SRCREV = "3f112eeb6a0d7b6ce65c1be3f591e02fde965923"
+PV = "3.0.4+git${SRCPV}"
+PE = "1"
 S = "${WORKDIR}/git"
 
 DEPENDS += " \
diff --git a/recipes-musicians/zyn/mruby-zest/0001-mruby-Align-build-to-our-needs.patch b/recipes-musicians/zyn/mruby-zest/0001-mruby-Align-build-to-our-needs.patch
index 7cccec53..48ab1703 100644
--- a/recipes-musicians/zyn/mruby-zest/0001-mruby-Align-build-to-our-needs.patch
+++ b/recipes-musicians/zyn/mruby-zest/0001-mruby-Align-build-to-our-needs.patch
@@ -1,10 +1,7 @@
 From 84ec8305a0e4c67277929a812e6796d9f054cb02 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 12 Sep 2018 21:23:52 +0200
+Date: Wed, 13 Mar 2019 22:26:35 +0100
 Subject: [PATCH 1/2] mruby: Align build to our needs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
 
 * Add build flags
 
@@ -12,23 +9,15 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- build_config.rb | 11 +++++++++--
+ build_config.rb | 11 ++++++++++-
  mruby/tasks/toolchains/gcc.rake |  2 +-
- 3 files changed, 30 insertions(+), 19 deletions(-)
+ 1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/build_config.rb b/build_config.rb
-index f2c053e..5abc53c 100644
+index 664e84a..fda7fd7 100644
 --- a/build_config.rb
 +++ b/build_config.rb
-@@ -38,7 +38,6 @@ build_type.new(build_name) do |conf|
-   enable_debug
- 
-   conf.cc.defines = %w(MRUBY_NANOVG_GL2 MRB_ENABLE_DEBUG_HOOK)
--  conf.cc.flags << '-O3'
- 
-   #No default gems
-   # Use standard print/puts/p
-@@ -102,15 +101,19 @@ build_type.new(build_name) do |conf|
+@@ -102,18 +102,22 @@ build_type.new(build_name) do |conf|
        cc.flags << "-mstackrealign"      if windows
        cc.flags << "-mwindows"           if windows
        cc.flags << "-Wno-declaration-after-statement"
@@ -38,28 +27,32 @@ index f2c053e..5abc53c 100644
    end
  
    conf.linker do |linker|
-+      linker.command = ENV['CC']
-+      linker.flags = [ENV['LDFLAGS'] || []]
        #linker.library_paths  << "#{`pwd`.strip}/../deps/nanovg/build/"
        #linker.library_paths  << "#{`pwd`.strip}/../deps/rtosc/build/"
++      linker.command = ENV['CC']
++      linker.flags = [ENV['LDFLAGS'] || []]
        linker.library_paths  << "#{`pwd`.strip}/../src/osc-bridge/"
        linker.libraries << 'osc-bridge'
--      linker.flags_after_libraries  << "#{`pwd`.strip}/../deps/libuv.a"
-+      linker.flags_after_libraries  << "-luv"
        linker.flags_after_libraries  << "#{`pwd`.strip}/../deps/pugl/build/libpugl-0.a"
        linker.flags_after_libraries  << "#{`pwd`.strip}/../deps/libnanovg.a"
        if(!windows)
-@@ -124,6 +127,10 @@ build_type.new(build_name) do |conf|
-         linker.flags_after_libraries  << "-lglu32 -lgdi32 -lopengl32"
-       end
-   end
+-        linker.flags_after_libraries  << "#{`pwd`.strip}/../deps/libuv.a"
++        linker.flags_after_libraries  << "-luv"
+         if(ENV['OS'] != "Mac")
+           linker.libraries << 'GL'
+           linker.libraries << 'X11'
+@@ -135,6 +139,11 @@ build_type.new(build_name) do |conf|
+   conf.gem 'src/mruby-widget-lib'
+ 
+   #conf.gem 'deps/mruby-profiler'
++
 +  # Archiver settings
 +  conf.archiver do |archiver|
 +    archiver.command = ENV['AR']
 +  end
+ end
  
-   #Custom Gems
-   conf.gem 'src/mruby-qml-spawn'
+ MRuby::Build.new('host-debug') do |conf|
 diff --git a/mruby/tasks/toolchains/gcc.rake b/mruby/tasks/toolchains/gcc.rake
 index f370c0ab..a2ab5ed4 100644
 --- a/mruby/tasks/toolchains/gcc.rake
@@ -74,5 +67,5 @@ index f370c0ab..a2ab5ed4 100644
      linker.libraries = %w(m)
      linker.library_paths = []
 -- 
-2.14.4
+2.20.1