commit b7526106b67c11c676ea9e28570e312fe3b0d58f
Author: Jacek Konieczny <j.koniec...@eggsoft.pl>
Date: Mon Mar 11 08:55:19 2019 +0100
Version: 3.0.4
system_libuv.patch | 73 ++++++++++++++++++++++++-------------------------
zynaddsubfx-fusion.spec | 8 +++---
2 files changed, 39 insertions(+), 42 deletions(-)
---
diff --git a/zynaddsubfx-fusion.spec b/zynaddsubfx-fusion.spec
index 570133a..7bab6c7 100644
--- a/zynaddsubfx-fusion.spec
+++ b/zynaddsubfx-fusion.spec
@@ -5,7 +5,7 @@
#
# Use the provided 'get-fusion.sh' script to generate the Source1 archive
-%define fusion_version 3.0.2_59_gc4c9221
+%define fusion_version 3.0.4
%define mruby_pack_version 383a9c79e191d524a9a2b4107cc5043ecbf6190b
%define mruby_process_version bd288a930d4f61fbda1865deb8997245dc5fd38c
@@ -16,14 +16,14 @@
Summary: Realtime software synthesizer
Summary(pl.UTF-8): Syntezator programowy działający w czasie rzeczywistym
Name: zynaddsubfx-fusion
-Version: 3.0.3
+Version: 3.0.4
Release: 1
License: GPL
Group: X11/Applications/Sound
Source0:
http://downloads.sourceforge.net/zynaddsubfx/zynaddsubfx-%{version}.tar.bz2
-# Source0-md5: 66acae0913108f129aa979f3c4b65473
+# Source0-md5: 090331a1c26f89aa52bd7e35f40ce6b6
Source1: mruby-zest-build-%{fusion_version}.tar.xz
-# Source1-md5: fa7c3b4c46e6155df19cb00d9dc6db0f
+# Source1-md5: 668655c079deecdb9d3a77d961ec7661
Source2:
https://github.com/iij/mruby-pack/archive/%{mruby_pack_version}/mruby-pack-%{mruby_pack_version}.tar.gz
# Source2-md5: b77f2dea16857e64624730ec94beb778
Source3:
https://github.com/iij/mruby-process/archive/%{mruby_process_version}/mruby-process-%{mruby_process_version}.tar.gz
diff --git a/system_libuv.patch b/system_libuv.patch
index da9278b..9cf5797 100644
--- a/system_libuv.patch
+++ b/system_libuv.patch
@@ -1,6 +1,6 @@
-diff -dur zynaddsubfx-3.0.3.orig/mruby-zest-build/build_config.rb
zynaddsubfx-3.0.3/mruby-zest-build/build_config.rb
---- zynaddsubfx-3.0.3.orig/mruby-zest-build/build_config.rb 2018-08-06
09:01:21.000000000 +0200
-+++ zynaddsubfx-3.0.3/mruby-zest-build/build_config.rb 2018-08-07
14:32:40.000000000 +0200
+diff -dur -x '*~' -x '*.orig' -x '*.rej'
zynaddsubfx-3.0.4.orig/mruby-zest-build/build_config.rb
zynaddsubfx-3.0.4/mruby-zest-build/build_config.rb
+--- zynaddsubfx-3.0.4.orig/mruby-zest-build/build_config.rb 2019-03-10
17:25:51.000000000 +0100
++++ zynaddsubfx-3.0.4/mruby-zest-build/build_config.rb 2019-03-11
08:46:58.000000000 +0100
@@ -92,7 +92,6 @@
conf.cc do |cc|
cc.include_paths << "#{`pwd`.strip}/../deps/nanovg/src"
@@ -9,51 +9,48 @@ diff -dur
zynaddsubfx-3.0.3.orig/mruby-zest-build/build_config.rb zynaddsubfx-3.
cc.include_paths << "/usr/share/mingw-w64/include/" if windows
cc.include_paths << "/usr/x86_64-w64-mingw32/include/" if windows
cc.flags << "-DLDBL_EPSILON=1e-6" if windows
-@@ -110,7 +109,7 @@
- #linker.library_paths << "#{`pwd`.strip}/../deps/rtosc/build/"
- 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"
+@@ -113,7 +112,7 @@
linker.flags_after_libraries <<
"#{`pwd`.strip}/../deps/pugl/build/libpugl-0.a"
linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libnanovg.a"
if(!windows)
-diff -dur zynaddsubfx-3.0.3.orig/mruby-zest-build/Makefile
zynaddsubfx-3.0.3/mruby-zest-build/Makefile
---- zynaddsubfx-3.0.3.orig/mruby-zest-build/Makefile 2018-08-06
09:01:21.000000000 +0200
-+++ zynaddsubfx-3.0.3/mruby-zest-build/Makefile 2018-08-07
14:31:35.000000000 +0200
-@@ -10,12 +10,12 @@
- # cd deps/pugl && ./waf configure --no-cairo --static
- cd deps/pugl && ./waf configure --no-cairo --static --debug
- cd deps/pugl && ./waf
-- cd src/osc-bridge && CFLAGS="-I ../../deps/libuv-v1.9.1/include "
make lib
-+ cd src/osc-bridge && make lib
- cd mruby && MRUBY_CONFIG=../build_config.rb rake
+- linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv.a"
++ linker.flags_after_libraries << "-luv"
+ if(ENV['OS'] != "Mac")
+ linker.libraries << 'GL'
+ linker.libraries << 'X11'
+diff -dur -x '*~' -x '*.orig' -x '*.rej'
zynaddsubfx-3.0.4.orig/mruby-zest-build/Makefile
zynaddsubfx-3.0.4/mruby-zest-build/Makefile
+--- zynaddsubfx-3.0.4.orig/mruby-zest-build/Makefile 2019-03-10
17:25:51.000000000 +0100
++++ zynaddsubfx-3.0.4/mruby-zest-build/Makefile 2019-03-11
08:48:11.000000000 +0100
+@@ -15,7 +15,7 @@
$(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e
"\.o$$" | grep -v bin` ./deps/libnanovg.a \
./deps/libnanovg.a \
src/osc-bridge/libosc-bridge.a \
-- ./deps/libuv-v1.9.1/.libs/libuv.a -lm -lX11 -lGL -lpthread
+- ./deps/$(UV_DIR)/.libs/libuv.a -lm -lX11 -lGL -lpthread
+ -luv -lm -lX11 -lGL -lpthread
$(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -lX11
-lGL -lpthread -I deps/pugl -std=gnu99
osx:
-@@ -49,20 +49,13 @@
-
-
- builddep:
-- cd deps/$(UV_DIR) && ./autogen.sh
-- cd deps/$(UV_DIR) && CFLAGS=-fPIC ./configure
-- cd deps/$(UV_DIR) && CFLAGS=-fPIC make
-- cp deps/$(UV_DIR)/.libs/libuv.a deps/
+@@ -30,7 +30,7 @@
+ $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e
"\.o$$" | grep -v bin` ./deps/libnanovg.a \
+ ./deps/libnanovg.a \
+ src/osc-bridge/libosc-bridge.a \
+- ./deps/$(UV_DIR)/.libs/libuv.a -lm -framework OpenGL -lpthread
++ -luv -lm -framework OpenGL -lpthread
+ $(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest
-framework OpenGL -framework AppKit -lpthread -I deps/pugl -std=gnu99
- builddepwin:
- cd deps/$(UV_DIR) && ./autogen.sh
- cd deps/$(UV_DIR) && CFLAGS="-mstackrealign" ./configure
--host=x86_64-w64-mingw32
- cd deps/$(UV_DIR) && LD=x86_64-w64-mingw32-gcc make
-- cp deps/$(UV_DIR)/.libs/libuv.a deps/
+ windows:
+@@ -43,12 +43,12 @@
+ $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find
mruby/build/w64 -type f | grep -e "\.o$$" | grep -v bin` \
+ ./deps/libnanovg.a \
+ src/osc-bridge/libosc-bridge.a \
+- ./deps/libuv-win.a \
++ -luv \
+ -lm -lpthread -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi
-lglu32 -lgdi32 -lopengl32
+ $(CC) -mstackrealign -DWIN32 test-libversion.c
deps/pugl/build/libpugl-0.a -o zest.exe -lpthread -I deps/pugl -std=c99
-lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32
- setup:
-- cd deps && wget -4 $(UV_URL)
-- cd deps && tar xvf $(UV_FILE)
- setupwin:
- cd deps && wget -4 $(UV_URL)
+-builddep: deps/libuv.a
++builddep:
+ deps/libuv.a:
+ cd deps/$(UV_DIR) && ./autogen.sh
+ cd deps/$(UV_DIR) && CFLAGS=-fPIC ./configure
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zynaddsubfx-fusion.git/commitdiff/b7526106b67c11c676ea9e28570e312fe3b0d58f
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
