Build LV2 toolkits within the repo. No binary downloads anymore.

Fixes #11

serd, sord, sratom and lilv are now built as part of libandroidaudioplugin-lv2.so. We don't need pkg-config anymore, so any related scripts are gone.

Also, this completely eliminates need for debuggable builds in README and
relevant scripts.

Author: atsushieno

.gitignore

@@ -1,25 +1,12 @@
 *.iml
 .idea
 .gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+local.properties
 .DS_Store
-/build
+build
 /captures
 .externalNativeBuild
 .cxx
 *.so
 *.lv2
-build
-cmake-build-debug
-symlinked-dist
-android-lv2-binaries.zip
-android-fluidsynth-dist.zip
-android-libsndfile-binaries.zip
-aap-guitarix-binaries.zip
 aap_metadata.xml

.gitmodules

@@ -4,3 +4,18 @@
 [submodule "dependencies/android-audio-plugin-framework"]
 	path = dependencies/android-audio-plugin-framework
 	url = https://github.com/atsushieno/android-audio-plugin-framework.git
+[submodule "dependencies/serd"]
+	path = dependencies/serd
+	url = https://github.com/atsushieno/serd.git
+[submodule "dependencies/sord"]
+	path = dependencies/sord
+	url = https://github.com/atsushieno/sord.git
+[submodule "dependencies/sratom"]
+	path = dependencies/sratom
+	url = https://github.com/atsushieno/sratom.git
+[submodule "dependencies/lilv"]
+	path = dependencies/lilv
+	url = https://github.com/atsushieno/lilv.git
+[submodule "dependencies/lv2"]
+	path = dependencies/lv2
+	url = https://github.com/lv2/lv2.git

Makefile

@@ -5,45 +5,17 @@ all: build-all
 
 build-all: \
 	build-aap-core \
-	get-lv2-deps \
-	import-lv2-deps \
+	build-lv2-importer \
 	build-java
 
 build-non-app: \
 	build-aap-core \
-	get-lv2-deps \
-	import-lv2-deps \
 	build-lv2-importer \
 	build-java-core
 
 build-aap-core:
 	cd dependencies/android-audio-plugin-framework && make all-no-desktop
 
-## downloads
-
-get-lv2-deps: dependencies/lv2-deps/dist/stamp
-
-dependencies/lv2-deps/dist/stamp: android-lv2-binaries.zip
-	mkdir -p dependencies/lv2-deps
-	unzip android-lv2-binaries -d dependencies/lv2-deps/
-	./rewrite-pkg-config-paths.sh lv2-deps
-	if [ ! -d androidaudioplugin-lv2/src/main/cpp/symlinked-dist ] ; then \
-		ln -s `pwd`/dependencies/lv2-deps/dist androidaudioplugin-lv2/src/main/cpp/symlinked-dist ; \
-	fi
-	if [ ! -d aap-ayumi/src/main/symlinked-dist ] ; then \
-		mkdir -p aap-ayumi/src/main ; \
-		ln -s `pwd`/dependencies/lv2-deps/dist aap-ayumi/src/main/symlinked-dist ; \
-	fi
-	touch dependencies/lv2-deps/dist/stamp
-
-android-lv2-binaries.zip:
-	wget https://github.com/atsushieno/android-native-audio-builders/releases/download/r8.3/android-lv2-binaries.zip
-
-# Run importers
-
-import-lv2-deps: build-lv2-importer
-	./import-lv2-deps.sh
-
 ## Build utility
 
 build-lv2-importer:

README.md

@@ -9,6 +9,7 @@ There are also dedicated repos for non-trivial LV2 plugin ports and so on:
 - [aap-lv2-sfizz](https://github.com/atsushieno/aap-lv2-sfizz)
 - [aap-lv2-guitarix](https://github.com/atsushieno/aap-lv2-guitarix)
 
+
 ## Building
 
 There is a normative build script for GitHub Actions (see its `workflows.yml`), including dependencies.
@@ -164,8 +165,6 @@ External software projects:
 
 To avoid further dependencies like cairo, we skip some samples in mda-lv2 port (they are actually skipped at android-native-audio-builders repo).
 
-Also, unlike before, we don't build LV2 for desktop anymore. They are regarded as the installed packages on the system. Ubuntu 20.04 has those minimum requirement versions. If they don't exist for your distribution, build and install them from source and make it possible to be resolved via pkg-config.
-
 ### cerbero fork
 
 The external dependencies are built using cerbero build system. Cerbero is a comprehensive build system that cares all standard Android ABIs and builds some complicated projects like glib (which has many dependencies) and cairo.
@@ -178,33 +177,14 @@ There are couple of lv2 related source repositories, namely serd and lilv. Their
 
 And note that access to assets is not as simple as that to filesystem. It is impossible to enumerate assets at runtime. They have to be explicitly named and given. Therefore there are some plugin loader changes in our lilv fork.
 
-
-## Debugging with LV2 toolkit internals
-
-To wrap this section up, we have `setup-hackable-environment.sh` bash script now. Now you can mostly skip the rest of this section if it just works for you. It will get outdated quite often though.
-
-Sometimes having binary-only LV2 toolkits makes debugging difficult.
-To improve such a situation, we can build lilv and all the dependencies together
-within libandroidaudioplugin-lv2.so. 
-This is a patch @atsushieno created for making it possible: https://gist.github.com/atsushieno/969eedaeefb51d99309a3234c2f9b8de
-
-To use it, you will have to:
-
-- create a directory `lilv_direct` in `androidaudioplugin-lv2/src/main/cpp/src` and go there. In that directory...
-  - `ln -s /path/to/android-native-audio-builders/serd serd` as well as `sord`, `sratom` and `lilv`.
-  - `cp /path/to/android-native-audio-builders/build/x86/serd/build/serd_config.h .` as well as `sord/build/sord_config.h`, `sratom/build/sratom_config.h` and `lilv/build/lilv_config.h` (it may require exact ABI, I used `x86` here)
-  - Put these additional sources to the directory.
-    - `abstract_io.c` https://raw.githubusercontent.com/atsushieno/serd/android/src/abstract_io.c
-    - `abstract_io.h` https://raw.githubusercontent.com/atsushieno/serd/android/src/abstract_io.h
-- go back to topdir, and `rm -rf androidaudioplugin-lv2/src/main/jniLibs/`
-
-Also note that depending on the build approaches, the gradle build scripts may not reach the tasks for copying lv2 resources. If they are missing in the apk, then it will fail to retrieve TTL files at instantiation time. Some `Makefile` lines do those jobs in normal builds, and sometimes you may have to do that manually here.
+Another thing to note is that we check in `serd_config.h`, `sord_config.h`, `sratom_config.h` and `lilv_config.h` directly in the source tree, which are generated from x86 build of android-native-audio-builders. If they have to be rebuilt (for e.g. updated submodules), rebuild and copy the generated headers again.
 
 
 ## Performance measuring
 
 `android-audio-plugin-lv2-bridge.cpp` has a simple performance measurement aid which can be enabled with JUCEAAP_LOG_PERF variable.
 
+
 ## Licensing notice
 
 aap-lv2 codebase is distributed under the MIT license.

aap-ayumi/src/main/CMakeLists.txt

@@ -8,31 +8,23 @@ project(ayumi-lv2 VERSION 0.1 LANGUAGES C)
 
 if (ANDROID)
 
-get_filename_component (LV2_DEP_DIST "${CMAKE_CURRENT_LIST_DIR}/symlinked-dist/${CMAKE_ANDROID_ARCH_ABI}" ABSOLUTE)
-set (ENV{PKG_CONFIG_PATH} "${LV2_DEP_DIST}/lib/pkgconfig/")
-
 else (ANDROID)
 
 get_filename_component (AAPDIR "${CMAKE_CURRENT_LIST_DIR}/../../../../dependencies/android-audio-plugin-framework" ABSOLUTE)
-get_filename_component (LV2_DEP_DIST "${AAPDIR}/dependencies/lv2-desktop/dist" ABSOLUTE)
 
 set (androidaudioplugin-lv2_INCLUDES
         "${AAPDIR}/native/plugin-api/include"
         "${AAPDIR}/native/androidaudioplugin/core/include")
 
 endif (ANDROID)
 
-find_package ( PkgConfig REQUIRED )
-
-pkg_search_module ( LV2 REQUIRED lv2>=1.16.0 )
-
 set (ayumi-lv2_INCLUDES
-        ${LV2_INCLUDE_DIRS}
+	../../../dependencies/lv2
         )
 
 set (ayumi-lv2_SOURCES
-        ${CMAKE_CURRENT_LIST_DIR}/../../../dependencies/ayumi-lv2/ayumi.c
-        ${CMAKE_CURRENT_LIST_DIR}/../../../dependencies/ayumi-lv2/ayumi-lv2.c
+        ../../../dependencies/ayumi-lv2/ayumi.c
+        ../../../dependencies/ayumi-lv2/ayumi-lv2.c
         )
 
 add_library ( # Specifies the name of the library.

androidaudioplugin-lv2/src/main/cpp/.gitignore

@@ -4,29 +4,25 @@
 
 cmake_minimum_required(VERSION 3.6)
 
-project(androidaudioplugin-lv2 VERSION 0.1 LANGUAGES CXX)
+project(androidaudioplugin-lv2 VERSION 0.1 LANGUAGES C CXX)
+
+set(DEPBASE ../../../../dependencies)
 
-# Android Studio is stupid. It tries to index your home directory if it references ancestor directories.
-# https://issuetracker.google.com/issues/159719671
-# Now it references descendant directory via symlink instead.
 if (ANDROID)
 
 if (NOT (BUILD_WITH_PREFAB))
-get_filename_component (AAPDIR "${CMAKE_CURRENT_LIST_DIR}/../../../../dependencies/android-audio-plugin-framework" ABSOLUTE)
+get_filename_component (AAPDIR "${DEPBASE}/android-audio-plugin-framework" ABSOLUTE)
 set (androidaudioplugin-lv2_INCLUDES
 		"${AAPDIR}/native/plugin-api/include"
 		"${AAPDIR}/native/androidaudioplugin/core/include")
 link_directories (
 		"${AAPDIR}/java/androidaudioplugin/build/intermediates/merged_native_libs/debug/out/lib/${CMAKE_ANDROID_ARCH_ABI}"
 )
 endif ()
-get_filename_component (LV2_DEP_DIST "${CMAKE_CURRENT_LIST_DIR}/symlinked-dist/${CMAKE_ANDROID_ARCH_ABI}" ABSOLUTE)
-set (ENV{PKG_CONFIG_PATH} "${LV2_DEP_DIST}/lib/pkgconfig/")
 
 else (ANDROID)
 
-get_filename_component (AAPDIR "${CMAKE_CURRENT_LIST_DIR}/../../../../dependencies/android-audio-plugin-framework" ABSOLUTE)
-get_filename_component (LV2_DEP_DIST "${AAPDIR}/dependencies/lv2-desktop/dist" ABSOLUTE)
+get_filename_component (AAPDIR "${CMAKE_CURRENT_LIST_DIR}/../../../${DEPBASE}/android-audio-plugin-framework" ABSOLUTE)
 
 set (androidaudioplugin-lv2_INCLUDES
 		"${AAPDIR}/native/plugin-api/include"
@@ -36,41 +32,77 @@ endif (ANDROID)
 
 # resolve dependencies via pkg-config
 
-find_package ( PkgConfig REQUIRED )
-
-pkg_search_module ( LV2 REQUIRED lv2>=1.18.0 )
-pkg_search_module ( SERD REQUIRED serd-0>=0.28.0 )
-pkg_search_module ( SORD REQUIRED sord-0>=0.16.0 )
-pkg_search_module ( SRATOM REQUIRED sratom-0>=0.6.0 )
-pkg_search_module ( LILV REQUIRED lilv-0>=0.24.0 )
-
 # set INCLUDE_DIRS and LIBRARY_DIRS
 
 set (androidaudioplugin-lv2_INCLUDES
 		${androidaudioplugin-lv2_INCLUDES}
 		"src"
-		${LV2_INCLUDE_DIRS}
-		${SERD_INCLUDE_DIRS}
-		${SORD_INCLUDE_DIRS}
-		${SRATOM_INCLUDE_DIRS}
-		${LILV_INCLUDE_DIRS}
+		${DEPBASE}/serd/include
+		${DEPBASE}/sord
+		${DEPBASE}/lv2
+		${DEPBASE}/sratom/include
+		${DEPBASE}/lilv
 		)
 
 # target_link_directories is not usable until cmake 3.14...
 link_directories (
-		${SERD_LIBRARY_DIRS}
-		${SORD_LIBRARY_DIRS}
-		${SRATOM_LIBRARY_DIRS}
-		${LILV_LIBRARY_DIRS}
 )
 
 # set SOURCES. Android build has some additional ones.
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set (androidaudioplugin-lv2_INCLUDES
+    ${DEPBASE}
+	${DEPBASE}/serd/src
+	${DEPBASE}/sord/src
+	${DEPBASE}/lilv/src
+	${androidaudioplugin-lv2_INCLUDES}
+	)
+
 set (androidaudioplugin-lv2_SOURCES
 		"src/android-audio-plugin-lv2-bridge.cpp"
 		"src/AudioPluginLV2LocalHost_native.cpp"
 		"src/symap.cpp"
 		"src/zix/ring.cpp"
+
+		"${DEPBASE}/lilv/src/plugin.c"
+		"${DEPBASE}/lilv/src/pluginclass.c"
+		"${DEPBASE}/lilv/src/filesystem.c"
+		"${DEPBASE}/lilv/src/ui.c"
+		"${DEPBASE}/lilv/src/util.c"
+		"${DEPBASE}/lilv/src/state.c"
+		"${DEPBASE}/lilv/src/lib.c"
+		"${DEPBASE}/lilv/src/zix/tree.c"
+		"${DEPBASE}/lilv/src/abstract_io.c"
+		"${DEPBASE}/lilv/src/instance.c"
+		"${DEPBASE}/lilv/src/node.c"
+		"${DEPBASE}/lilv/src/world.c"
+		"${DEPBASE}/lilv/src/query.c"
+		"${DEPBASE}/lilv/src/scalepoint.c"
+		"${DEPBASE}/lilv/src/collections.c"
+		"${DEPBASE}/lilv/src/port.c"
+		"${DEPBASE}/serd/src/base64.c"
+		"${DEPBASE}/serd/src/writer.c"
+		"${DEPBASE}/serd/src/system.c"
+		"${DEPBASE}/serd/src/reader.c"
+		"${DEPBASE}/serd/src/n3.c"
+		# "${DEPBASE}/serd/src/abstract_io.c"
+		# "${DEPBASE}/serd/src/serdi.c"
+		"${DEPBASE}/serd/src/byte_source.c"
+		"${DEPBASE}/serd/src/uri.c"
+		"${DEPBASE}/serd/src/env.c"
+		"${DEPBASE}/serd/src/node.c"
+		"${DEPBASE}/serd/src/string.c"
+		# "${DEPBASE}/sord/src/sordi.c"
+		"${DEPBASE}/sord/src/sord_test.c"
+		"${DEPBASE}/sord/src/syntax.c"
+		# "${DEPBASE}/sord/src/sord_validate.c"
+		"${DEPBASE}/sord/src/zix/hash.c"
+		"${DEPBASE}/sord/src/zix/digest.c"
+		"${DEPBASE}/sord/src/zix/btree.c"
+		"${DEPBASE}/sord/src/sord.c"
+		"${DEPBASE}/sratom/src/sratom.c"
 		)
 
 
@@ -84,18 +116,15 @@ if (ANDROID)
 		set (androidaudioplugin-lv2_LIBS
 				android
 				log
-				${LILV_LIBRARIES}
 				androidaudioplugin::androidaudioplugin)
 	else (BUILD_WOTH_PREFAB)
 		set (androidaudioplugin-lv2_LIBS
 				android
 				log
-				${LILV_LIBRARIES}
 				androidaudioplugin)
 	endif (BUILD_WITH_PREFAB)
 else (ANDROID)
 	set (androidaudioplugin-lv2_LIBS
-			${LILV_LIBRARIES}
 			androidaudioplugin)
 endif (ANDROID)
 
@@ -106,7 +135,6 @@ target_include_directories (androidaudioplugin-lv2
 
 target_compile_options (androidaudioplugin-lv2
         PRIVATE
-        -std=c++17
         -Wall
         -Wshadow
         )

androidaudioplugin-lv2/src/main/cpp/CMakeLists.txt

@@ -17,6 +17,8 @@
 
 #if ANDROID
 
+extern AAssetManager *current_asset_manager;
+
 namespace aaplv2 {
 
 typedef void (*set_io_context_func)(void *);
@@ -40,9 +42,11 @@ void ensureDLLoaded() {
 }
 
 void set_io_context(AAssetManager *am) {
-    ensureDLLoaded();
-    libserd_set_context(am);
-    liblilv_set_context(am);
+    //ensureDLLoaded();
+    //libserd_set_context(am);
+    //liblilv_set_context(am);
+
+    current_asset_manager = am;
 }
 
 void cleanup() {

androidaudioplugin-lv2/src/main/cpp/src/AudioPluginLV2LocalHost_native.cpp

@@ -0,0 +1,24 @@
+/* WARNING! All changes made to this file will be lost! */
+
+#ifndef W_LILV_CONFIG_H_WAF
+#define W_LILV_CONFIG_H_WAF
+
+#define LILV_CXX 1
+#define PYTHONDIR "/media/atsushi/extssd0/sources/android-native-audio-builders/dist/x86/lib/python3.8/site-packages"
+#define PYTHONARCHDIR "/media/atsushi/extssd0/sources/android-native-audio-builders/dist/x86/lib/python3.8/site-packages"
+#define LILV_VERSION "0.24.11"
+#define HAVE_LV2 1
+#define HAVE_SERD 1
+#define HAVE_SORD 1
+#define HAVE_SRATOM 1
+#define HAVE_SNDFILE 1
+#define HAVE_LSTAT 1
+#define HAVE_FLOCK 1
+#define HAVE_FILENO 1
+/* #undef HAVE_CLOCK_GETTIME */
+#define HAVE_LIBDL 1
+#define LILV_PATH_SEP ":"
+#define LILV_DIR_SEP "/"
+#define LILV_DEFAULT_LV2_PATH "~/.lv2:/usr/lib/lv2:/usr/local/lib/lv2"
+
+#endif /* W_LILV_CONFIG_H_WAF */