zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zynaddsubfx: update 3.0.1 -> 3.0.2

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2017-08-23 01:20:16 +02:00
parent 4f2ab32780
commit 89b515440a
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
recipes-misc/recipes-multimedia/zynaddsubfx/files/0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch
View File

@@ -15,16 +15,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ExternalPrograms/Controller/Makefile b/ExternalPrograms/Controller/Makefile
index 549607f..8d35e9d 100644
index ff747fa..d55921b 100644
--- a/ExternalPrograms/Controller/Makefile
+++ b/ExternalPrograms/Controller/Makefile
@@ -1,17 +1,17 @@
@@ -1,5 +1,5 @@
controller: main.o Controller.o ControllerUI.o
- gcc -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm -lstdc++
+ $(CC) -o controller *.o -lfltk -lm -lX11 -lXext -lpthread -lXft -lXrender -lfontconfig -ldl -lasound -lpthread -lm -lstdc++ $(LDFLAGS)
ControllerUI.cxx ControllerUI.h: ControllerUI.fl
ControllerUI.h: ControllerUI.fl
fluid -c ControllerUI.fl
@@ -8,13 +8,13 @@ ControllerUI.cxx: ControllerUI.h
echo ControllerUI.cxx
ControllerUI.o: ControllerUI.cxx ControllerUI.h
- gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o
@@ -41,21 +43,21 @@ index 549607f..8d35e9d 100644
clean:
rm -f *.o controller ControllerUI.cxx ControllerUI.h
diff --git a/ExternalPrograms/Spliter/Makefile b/ExternalPrograms/Spliter/Makefile
index fe610d4..e60ce91 100644
index c98fc41..ba6cf99 100644
--- a/ExternalPrograms/Spliter/Makefile
+++ b/ExternalPrograms/Spliter/Makefile
@@ -1,17 +1,17 @@
@@ -1,5 +1,5 @@
spliter: main.o Spliter.o SpliterUI.o
- gcc -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++
+ $(CC) -o spliter *.o -lfltk -lm -lX11 -lXext -lpthread -lXft -lXrender -lfontconfig -ldl -lasound -lstdc++ $(LDFLAGS)
-SplitterUI.cxx SpliterUI.h: SpliterUI.fl
+SpliterUI.cxx SpliterUI.h: SpliterUI.fl
SpliterUI.h: SpliterUI.fl
fluid -c SpliterUI.fl
@@ -8,13 +8,13 @@ SpliterUI.cxx: SpliterUI.h
echo SpliterUI.cxx
-SpliterUI.o: SplitterUI.cxx SpliterUI.h
SpliterUI.o: SpliterUI.cxx SpliterUI.h
- gcc -g `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o
+SpliterUI.o: SpliterUI.cxx SpliterUI.h
+ $(CC) $(CFLAGS) -c $< -o $@
Spliter.o: Spliter.C Spliter.h
@@ -69,5 +71,5 @@ index fe610d4..e60ce91 100644
clean:
rm -f *.o spliter SpliterUI.cxx SpliterUI.h
--
2.9.3
2.9.4

4
recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx_3.0.1.bb → recipes-misc/recipes-multimedia/zynaddsubfx/zynaddsubfx_3.0.2.bb
View File

@@ -32,8 +32,8 @@ SRC_URI = " \
file://0004-Keep-our-build-flags.patch \
file://0005-Set-UI-optimization-to-O1-explicitly.patch \
"
SRC_URI[md5sum] = "bca8fc104bf31103d603a3d2bcc10027"
SRC_URI[sha256sum] = "a8017f382be5af9e46e6e8771fb7d7c1fd2e480cf099bbb0c29606b217dd32e2"
SRC_URI[md5sum] = "2884773e3ef8ed46b7517a7321d3e250"
SRC_URI[sha256sum] = "95defd8250b79fbe7fb69be860df6df05d82263cabf83cf53b391486e910b926"
do_configure_prepend() {
# We cannot run lv2-ttl-generator in cross environment so keep commands in