Merge branch 'release/6.13.0'

.gitignore

@@ -209,4 +209,12 @@ emscripten/dist-wasm
 # Alleged copyright violation.
 vst4cs/src
 
-compile_commands.json
+compile_commands.json
+
+# cmake related files generated by qtcreator
+CMakeLists.txt.user
+
+*.autosave
+
+# emacs autosaved files
+\#*\#

.travis.yml

@@ -5,6 +5,10 @@ matrix:
       dist: trusty
       sudo: false
       compiler: gcc
+    - os: linux
+      dist: xenial 
+      sudo: false
+      compiler: clang 
     - os: osx
       compiler: clang
 env:
@@ -78,4 +82,4 @@ notifications:
 #  file: $HOME/csound-$TRAVIS_OS_NAME-build.tgz
 #  on:
 #    repo: csound/csound
-#    branch: feature/realtime
+#    branch: feature/realtime

Android/.gitignore

@@ -1,2 +1,85 @@
 csound-android-6*
 *.o.d
+
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/

Android/BUILDING_ON_ANDROID.txt

@@ -34,8 +34,7 @@ git clone git://git.code.sf.net/p/csound/csound6-git csound-csound6-git
 
 In the android directory, execute ./downloadDependencies.sh. This will
 use git to clone or pull source code for libsndfile, which is required by
-Csound, and for other optional third party libraries such as Fluidsynth
-and LuaJIT.
+Csound, and for other optional third party libraries such as Fluidsynth.
 
 In your operating system shell, you should use the following shell script or other
 facility to set the environment variables that are used by the Android build:
@@ -62,7 +61,7 @@ Once the above environment variables are set, you can use the following
 scripts to build the Csound library as well as plugin libraries:
 
 1. downloadDependencies.sh: Running this script will download the libraries
-that libcsound and the plugin libs depend on (LuaJIT, Fluidsynth, and
+that libcsound and the plugin libs depend on (Fluidsynth and
 libsndfile). It will also patch projects so that they can be used together
 with the plugin libraries.
 
@@ -105,23 +104,6 @@ Change to $(CSOUND_SRC_ROOT)/android/pluginlibs/libfluidsynth/jni and execute:
 
 You may need to touch config.h first.
 
-BUILD THE LUAJIT MODULE (OPTIONAL, REQUIRED BY LUACSOUND OPCODES)
-
-LuaJIT is a version of the excellent lightweight dynamic language Lua,
-extended with a just-in-time (JIT) compiler that runs Lua code as fast as
-compiled C code, and with a highly useful foreigh function interface (FFI).
-
-Change to $(NDK_MODULE_PATH) and use Git to clone the LuaJIT head there.
-Change to the LuaJIT directory and execute:
-
-    make HOST_CC="gcc -m32" CROSS=$NDKP TARGET_FLAGS="$NDKF $NDKARCH" TARGET_SYS=linux DEFAULT_CC=gcc
-
-BUILD AND INSTALL LUA OPCODES (OPTIONAL, USEFUL FOR ALGORITHMIC COMPOSITION IN CSOUND)
-
-Change to $(CSOUND_SRC_ROOT)/android/pluginlibs/LuaCsound/jni and execute:
-
-    $NDK/ndk-build
-
 BUILD THE CSOUND NATIVE LIBRARY FOR ANDROID
 
 Change to $(CSOUND_SRC_ROOT)/android/CsoundAndroid and execute:

Android/CsoundAndroid/jni/Android.mk

@@ -14,12 +14,12 @@ LOCAL_CFLAGS := -std=c99 -O3 -DENABLE_OPCODEDIR_WARNINGS -D__BUILDING_LIBCSOUND
 endif
 
 LOCAL_CPPFLAGS += -std=c++11 -pthread -frtti -fexceptions
-LOCAL_LDFLAGS += -Wl,--export-dynamic -L$(NDK_MODULE_PATH)/luajit-2.0/src -L$(LIBSNDFILE_SRC_DIR)
+LOCAL_LDFLAGS += -Wl,--export-dynamic -L$(LIBSNDFILE_SRC_DIR)
 
-ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI), armeabi-v7a x86))
+ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI), armeabi-v7a arm64-v8a x86))
 LOCAL_ARM_NEON  := true
 LOCAL_CFLAGS += -DHAVE_NEON
-endif # TARGET_ARCH_ABI == armeabi-v7a || x86
+endif # TARGET_ARCH_ABI == armeabi-v7a |arm64-v8a | x86
 
 ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI), armeabi))
 LOCAL_CFLAGS += -DPFFFT_SIMD_DISABLE
@@ -264,15 +264,15 @@ $(CSOUND_SRC_ROOT)/Opcodes/paulstretch.c
 
 #CsoundObj.cpp
 
-LOCAL_LDLIBS += -llog -lOpenSLES -ldl -lm -lc -latomic
+LOCAL_LDLIBS += -llog -lOpenSLES -ldl -lm -lc 
 
 # For building with all plugins use:
 
 #LOCAL_SHARED_LIBRARIES += LuaCsound fluidOpcodes signalflowgraph stdutil gnustl_shared sndfile
 
 # For building without plugins, but with support for plugins that may depend on GNU STL, use:
 
-LOCAL_SHARED_LIBRARIES += c++_shared sndfile
+LOCAL_SHARED_LIBRARIES += c++_shared sndfile 
 #LOCAL_STATIC_LIBRARIES += sndfile
 
 # Prevents stripping needed exports from the shared library.
@@ -284,7 +284,6 @@ $(call import-module,libsndfile-android/jni)
 #$(call import-module,libstdutil/jni)
 #$(call import-module,libfluidsynth/jni)
 #$(call import-module,signalflowgraph/jni)
-#$(call import-module,luajit-2.0/jni)
 #$(call import-module,LuaCsound/jni)
 
 

Android/CsoundForAndroid/.gitignore

@@ -1,7 +1,85 @@
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
+csound-android-6*
+*.o.d
+
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/