LV2 mods in build + 4 Calf LV2 removals

diff --git a/cinelerra-5.1/blds/termux_dyn.bld b/cinelerra-5.1/blds/termux_dyn.bld
index c24f686a607700371a99a95ed10133e91d8791ab..252d3192425106ac344e30b684d89f13f0a7be74 100755 (executable)
--- a/cinelerra-5.1/blds/termux_dyn.bld
+++ b/cinelerra-5.1/blds/termux_dyn.bld
@@ -4,6 +4,6 @@
 export CFLAGS
 ./configure --with-single-user --without-thirdparty \
     --without-dv \
-    --without-firewire  --without-vaapi \
-    --without-vdpau --without-lv2 --without-libdpx --without-ogg \
+    --without-firewire --without-vaapi \
+    --without-vdpau --without-libdpx \
     --without-gl

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index 5822d5a28b80a77b02a56922cfe97b3354307615..fe3e67a767db76c2507a36d8c7f08923e52a5365 100644 (file)
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -483,6 +483,7 @@ LV2OBJS = \
        $(OBJDIR)/pluginlv2ui.o \
        $(OBJDIR)/pluginlv2config.o \
        $(OBJDIR)/forkbase.o
+LIBS += `pkg-config --libs lilv-0`
 endif
 
 CFLAGS := \
@@ -588,6 +589,7 @@ $(OBJDIR)/%.o:              %.C
 ifneq ($(WANT_LV2),no)
 GTK2_INCS := `pkg-config --cflags gtk+-2.0` -Wno-deprecated-declarations
 GTK2_LIBS := `pkg-config --libs gtk+-2.0`
+LV2_LIBS  := `pkg-config --libs lilv-0` `pkg-config --libs suil-0`
 
 $(OBJDIR)/pluginlv2ui.o:       pluginlv2ui.C
 $(OBJDIR)/lv2ui.o:     lv2ui.C
@@ -596,7 +598,7 @@ $(OBJDIR)/pluginlv2ui.o $(OBJDIR)/lv2ui.o:
 
 $(OBJDIR)/lv2ui: $(LV2OBJS)
        @echo $(CXX) \`cat $(OBJDIR)/c_flags\` $^ -o $@
-       @$(CXX) `cat $(OBJDIR)/c_flags` $^ -o $@ $(LIBS) $(GTK2_LIBS)
+       @$(CXX) `cat $(OBJDIR)/c_flags` $^ -o $@ $(LIBS) $(LV2_LIBS) $(GTK2_LIBS)
        $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(LV2UI) $(LV2UI).debuginfo)
        $(if $(findstring -ggdb,$(CFLAGS)),,strip $(LV2UI))
 

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index f1414a795e66db0f5ccfc6f50de41cb41bf063b3..cfde734550d5e041ad496176fa413b7e44e0435a 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -793,19 +793,29 @@ CHECK_WANT([SHUTTLE_USB], [yes], [use libusb-1.0], [
  CHECK_HEADERS([libusbx], [libusb headers], [libusb-1.0/libusb.h])])
 
 CHECK_WANT([LV2], [auto], [use lv2], [
+ AC_MSG_CHECKING([for lv2 availability])
+ saved_LIBS="$LIBS"
  saved_CFLAGS="$CFLAGS"
+ LIBS=" $(pkg-config --libs lilv-0)"
  CHECK_LIB([lilv], [lilv-0], [lilv_world_new])
  CHECK_LIB([sord], [sord-0], [sord_world_new])
  CHECK_LIB([serd], [serd-0], [serd_reader_new])
  CHECK_LIB([sratom], [sratom-0], [sratom_new])
- CFLAGS="-I/usr/include/lilv-0 -I/usr/local/include/lilv-0"
- CHECK_HEADERS([lv2], [lilv headers], [lilv/lilv.h])
+ CFLAGS="-I/usr/include/lilv-0 -I/usr/local/include/lilv-0 `pkg-config --cflags lilv-0`"
+ CHECK_HEADERS([lilv], [lilv headers], [lilv/lilv.h])
+ CFLAGS="-I/usr/include/serd-0 -I/usr/local/include/serd-0 `pkg-config --cflags serd-0`"
+ CHECK_HEADERS([serd], [serd headers], [serd/serd.h])
+ CFLAGS="-I/usr/include/sord-0 -I/usr/local/include/sord-0 `pkg-config --cflags sord-0`"
+ CHECK_HEADERS([sord], [sord headers], [sord/sord.h])
+ CFLAGS="-I/usr/include/sratom-0 -I/usr/local/include/sratom-0 `pkg-config --cflags sratom-0`"
+ CHECK_HEADERS([sratom], [sratom headers], [sratom/sratom.h])
  CHECK_LIB([suil], [suil-0], [suil_instance_new])
- CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0"
- CHECK_HEADERS([lv2], [suil headers], [suil/suil.h])
+ CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0 `pkg-config --cflags  suil-0`"
+ CHECK_HEADERS([suil], [suil headers], [suil/suil.h])
+ CFG_CFLAGS+=" $(pkg-config --cflags lilv-0) $(pkg-config --cflags suil-0)"
+ LIBS="$saved_LIBS"
  CFLAGS="$saved_CFLAGS"])
 # have all or none
-test "x$HAVE_lv2" = "xyes" && \
 test "x$HAVE_lilv" = "xyes" && \
 test "x$HAVE_sord" = "xyes" && \
 test "x$HAVE_serd" = "xyes" && \
@@ -883,6 +893,12 @@ HAVE_openexr=no \
 HAVE_ilmbase=no \
   HAVE_OPENEXR=no
 
+if test "x$WANT_CIN_3RDPARTY" = "xno"; then
+ if test "x$HAVE_LV2" != "xyes" -a "x$WANT_LV2" = "xyes"; then
+  AC_MSG_ERROR([lv2 requested but no lv2 headers found])
+ fi
+fi
+
 # build global_config
 OBJDIR=`uname -m`
 AC_SUBST(OBJDIR)

diff --git a/cinelerra-5.1/lv2_blacklist.txt b/cinelerra-5.1/lv2_blacklist.txt
index ecd3f7c60d67b9280239e68668290b4dd4285af0..148e86ec5f517f7d6cdb0d4be9b4452bd28e00f8 100644 (file)
--- a/cinelerra-5.1/lv2_blacklist.txt
+++ b/cinelerra-5.1/lv2_blacklist.txt
@@ -82,4 +82,8 @@ urn:juced:DrumSynth
 # gives several "invalid argument" errors.
 #
 http://calf.sourceforge.net/plugins/Vinyl
+http://calf.sourceforge.net/plugins/Fluidsynth
+http://calf.sourceforge.net/plugins/Monosynth
+http://calf.sourceforge.net/plugins/Organ
+http://calf.sourceforge.net/plugins/Wavetable