setbfree: 0.8.8 -> 0.8.11

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2020-11-18 23:32:17 +01:00
parent e3c934a484
commit 940c935e3e
3 changed files with 15 additions and 15 deletions

View File

@@ -16,10 +16,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/common.mak b/common.mak
index e17b007..569b0b6 100644
index fb8ad0d..c112e82 100644
--- a/common.mak
+++ b/common.mak
@@ -170,7 +170,7 @@ ifeq ($(LV2AVAIL)$(HAVE_UI)$(HAVE_IDLE), yesyesyes)
@@ -172,7 +172,7 @@ ifeq ($(LV2AVAIL)$(HAVE_UI)$(HAVE_IDLE), yesyesyes)
UICFLAGS+=-DFONTFILE=\"$(FONTFILE)\"
endif
endif
@@ -29,18 +29,18 @@ index e17b007..569b0b6 100644
#NOTE: midi.c and cfgParser.c needs to be re-compiled w/o HAVE_ASEQ
diff --git a/robtk/robtk.mk b/robtk/robtk.mk
index d6d84dd..c787364 100644
index 13b4789..8153caf 100644
--- a/robtk/robtk.mk
+++ b/robtk/robtk.mk
@@ -65,7 +65,6 @@ ROBGTK = $(RW)robtk.mk $(UITOOLKIT) $(RW)ui_gtk.c \
@@ -70,7 +70,6 @@ ROBGTK = $(RW)robtk.mk $(UITOOLKIT) $(RW)ui_gtk.c \
%UI_gl.o:: $(ROBGL)
@mkdir -p $(@D)
$(CXX) -c $(CPPFLAGS) $(CFLAGS) $(GLUICFLAGS) \
$(CXX) -c $(CPPFLAGS) $(CFLAGS) $(GLUICFLAGS) $(PTHREADCFLAGS) \
- -DUINQHACK="$(shell date +%s$$$$)" \
-DPLUGIN_SOURCE="\"gui/$(*F).c\"" \
-DRTK_DESCRIPTOR="$(value gl_$(subst -,_,$(*F))_LV2DESC)" \
-o $@ $(RW)ui_gl.c
@@ -73,7 +72,6 @@ ROBGTK = $(RW)robtk.mk $(UITOOLKIT) $(RW)ui_gtk.c \
@@ -78,7 +77,6 @@ ROBGTK = $(RW)robtk.mk $(UITOOLKIT) $(RW)ui_gtk.c \
%pugl.o:: $(ROBGL)
@mkdir -p $(@D)
$(CXX) -c $(CPPFLAGS) $(CFLAGS) $(GLUICFLAGS) \
@@ -48,14 +48,14 @@ index d6d84dd..c787364 100644
-o $@ $(PUGL_SRC)
%_glui.so %_glui.dylib %_glui.dll::
@@ -89,7 +87,6 @@ ROBGTK = $(RW)robtk.mk $(UITOOLKIT) $(RW)ui_gtk.c \
@@ -94,7 +92,6 @@ ROBGTK = $(RW)robtk.mk $(UITOOLKIT) $(RW)ui_gtk.c \
%UI_gl.so %UI_gl.dylib %UI_gl.dll:: $(ROBGL)
@mkdir -p $(@D)
$(CXX) $(CPPFLAGS) $(CFLAGS) $(GLUICFLAGS) \
$(CXX) $(CPPFLAGS) $(CFLAGS) $(GLUICFLAGS) $(PTHREADCFLAGS) \
- -DUINQHACK="$(shell date +%s$$$$)" \
-DPLUGIN_SOURCE="\"gui/$(*F).c\"" \
-o $@ $(RW)ui_gl.c \
$(PUGL_SRC) \
--
2.14.3
2.26.2

View File

@@ -31,10 +31,10 @@ index ae47d88..4501f93 100644
-o $(LV2GUI)$(LIB_EXT) ui.c -DCONFIGDOCONLY -D XKEYFOCUSGRAB \
../src/midi.c \
diff --git a/common.mak b/common.mak
index 569b0b6..7731490 100644
index c112e82..f98b685 100644
--- a/common.mak
+++ b/common.mak
@@ -116,15 +116,7 @@ endif
@@ -118,15 +118,7 @@ endif
#LV2 / GL-GUI
@@ -52,11 +52,11 @@ index 569b0b6..7731490 100644
ifeq ($(MOD),)
HAVE_UI=$(shell pkg-config --exists $(PKG_GL_LIBS) ftgl && echo $(FONT_FOUND))
diff --git a/ui/Makefile b/ui/Makefile
index 739e92a..3fba31b 100644
index 207158f..f669224 100644
--- a/ui/Makefile
+++ b/ui/Makefile
@@ -56,7 +56,7 @@ setBfreeUI$(EXE_EXT): $(RW)jackwrap.c $(LV2OBJ) $(OSXJACKWRAP) $(RW)weakjack/wea
../b_synth/lv2.c ../b_synth/uris.h \
../b_synth/lv2.c ../b_synth/uris.h desc.h \
../b_synth/ui.c $(UIDEPS) \
../src/cfgParser.h ../src/midi.h
- $(MAKE) -C ../b_synth $(FONTFILE)

View File

@@ -25,9 +25,9 @@ SRC_URI = " \
file://setbfree.desktop \
file://x42-whirl.desktop \
"
SRCREV = "9a4783cd91739d5ead118227bfeaaa651b0def5f"
SRCREV = "93e7f154bee67590d6d321a572a1b107f8fc36e1"
S = "${WORKDIR}/git"
PV = "0.8.8"
PV = "0.8.11"
EXTRA_OEMAKE += " \
STRIP=echo \