diff --git a/.vscode/settings.json b/.vscode/settings.json index 7b9a5c4..8f4a4b8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -97,9 +97,12 @@ "cSpell.words": [ "Guitarix", "hostapd", + "pipedal", + "pipedal_0", "pipedalconfig", "pipedald", "pipedalshutdownd", - "pipedaltest" + "pipedaltest", + "ToobAmp" ] } \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index b6c91b7..f42fee1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,12 @@ cmake_minimum_required(VERSION 3.16.0) project(pipedal - VERSION 0.1.3 + VERSION 0.1.4 DESCRIPTION "PiPedal Guitar Effect Pedal For Raspberry Pi" HOMEPAGE_URL "https://github.com/rerdavies/pipedal" ) -set (DISPLAY_VERSION "v0.1.3-alpha.2") +set (DISPLAY_VERSION "v0.1.4-alpha.3") + +set (CMAKE_INSTALL_PREFIX "/usr/") include(CTest) enable_testing() @@ -20,7 +22,7 @@ add_subdirectory("src") # select LV2 source directory for the current build architecture message(STATUS "CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}") -set(LV2_SOURCE_DIRECTORY ${PROJECT_SOURCE_DIR}/lv2/${CMAKE_SYSTEM_PROCESSOR}) +set(LV2_SOURCE_DIRECTORY ${PROJECT_SOURCE_DIR}/lv2/${CMAKE_SYSTEM_PROCESSOR}/ToobAmp.lv2) if (NOT EXISTS ${LV2_SOURCE_DIRECTORY}) message(FATAL_ERROR "Lv2 Binaries for architecture '${CMAKE_SYSTEM_PROCESSOR}' have not been provisioned. See lv2/Readme.md") @@ -37,7 +39,7 @@ install( DIRECTORY config/ DESTINATION /etc/pipedal/config ) install( - FILES ${PROJECT_SOURCE_DIR}/debian/copyright DESTINATION /usr/share/doc/pipedal/copyright + FILES ${PROJECT_SOURCE_DIR}/debian/copyright DESTINATION /usr/share/doc/pipedal ) install ( DIRECTORY ${REACT_BUILD_DIRECTORY} DESTINATION /etc/pipedal/react @@ -51,7 +53,7 @@ install (FILES ${PROJECT_SOURCE_DIR}/src/template.service DESTINATION /etc/pipedal ) install (DIRECTORY ${LV2_SOURCE_DIRECTORY} - DESTINATION /usr/lib/liv2 + DESTINATION /usr/lib/lv2 ) install(CODE [[ @@ -75,8 +77,9 @@ set(CPACK_DEBIAN_PACKAGE_SECTION sound) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_PREDEPENDS hostapd authbind ) set(CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION TRUE) +set(CPACK_DEBIAN_PACKAGE_DEPENDS "libstdc++6 (>= 9)") #set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm64") -set(CPACK_PACKAGING_INSTALL_PREFIX /usr/local) +set(CPACK_PACKAGING_INSTALL_PREFIX /usr) set(CPACK_PROJECT_NAME ${PROJECT_NAME}) set(CPACK_PROJECT_VERSION ${PROJECT_VERSION}) set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT) diff --git a/README.md b/README.md index dc85509..695f46a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Title](docs/PiPedal-logo.png) -v0.1.3-alpha.2 +[v0.1.4-alpha.3](docs/download.md) Use your Raspberry Pi as a guitar effects pedal. PiPedal allows you to control and configure your guitar effects via a web interface, using your phone, tablet, or computer. @@ -15,7 +15,7 @@ PiPedal provides a pre-installed selection of LV2 plugins from the ToobAmp colle If your USB audio adapter has midi connectors, you can use midi devices (keyboards or midi floor boards) to control PiPedal while performing. A simple interface allows you to select how you would like to bind PiPedal controls to midi messages. -![Screenshot](artifacts/PiPedalSshots.png) +![Screenshot](artifacts/PiPedalScreenshots.png) ### [System Requirements](docs/SystemRequirements.md) ### [Installing PiPedal](docs/Installing.md) diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..ce587f0 --- /dev/null +++ b/debian/control @@ -0,0 +1,14 @@ +Architecture: arm64 +Depends: libstdc++6 (>= 9), libasound2 (>= 1.0.16), libc6 (>= 2.34), libgcc-s1 (>= 4.0), libjack-jackd2-0 (>= 1.9.10+20150825) | libjack-0.125, liblilv-0-0 (>= 0.22.0~dfsg0), libnl-3-200 (>= 3.2.7), libnl-genl-3-200 (>= 3.2.7), libstdc++6 (>= 11), libsystemd0 +Description: IoT guitar effect for Raspberry Pi + IoT guitar effect pedal for Raspberry Pi, with phone-friendly web interface. +Homepage: https://github.com/rerdavies/pipedal +Maintainer: Robin Davies= 2.34), libgcc-s1 (>= 4.0), libstdc++6 (>= 9) diff --git a/docs/Installing.md b/docs/Installing.md index bb74454..473f0c6 100644 --- a/docs/Installing.md +++ b/docs/Installing.md @@ -1,15 +1,15 @@ ## Installing PiPedal -### Install for Ubuntu or Rasbian (64-bit) +### Install for Ubuntu or Raspberry Pi OS (64-bit) Download the most recent Debian (.deb) package for your platform: -- [Ubuntu or Raspberry Pi OS (64-bit)](https://github.com/rerdavies/pipedal/releases/download/v0.1.3-alpha.2/pipedal_0.1.3_arm64.deb) v0.1.3-alpha.2 +- [Ubuntu or Raspberry Pi OS (64-bit)](https://github.com/rerdavies/pipedal/releases/download/v0.1.4-alpha.3/pipedal_0.1.4_arm64.deb) v0.1.4-alpha.3 Install the package by running ``` sudo apt update cd ~/Downloads - sudo apt-get install ./pipedal_0.1.3_arm64.deb + sudo apt-get install ./pipedal_0.1.4_arm64.deb ``` diff --git a/docs/PiPedalSshots.png b/docs/PiPedalScreenshots.png similarity index 100% rename from docs/PiPedalSshots.png rename to docs/PiPedalScreenshots.png diff --git a/docs/WhichLv2PluginsAreSupported.md b/docs/WhichLv2PluginsAreSupported.md index 86c914e..155522a 100644 --- a/docs/WhichLv2PluginsAreSupported.md +++ b/docs/WhichLv2PluginsAreSupported.md @@ -13,5 +13,5 @@ If you install new LV2 plugins, you will have to restart the PiPedal web service sudo pipedalconfig --restart -Although most LV2 plugins provide GUI interfaces, when running on a LINUX desktop, the LV2 plugin standard is specifically designed to allow remote control +Although most LV2 plugins provide GUI interfaces, when running on a Linux desktop, the LV2 plugin standard is specifically designed to allow remote control without using the provided desktop GUI interface. And all but a tiny minority of LV2 plugins (most of them analyzers, unfortunately) support this. diff --git a/docs/download.md b/docs/download.md index bb7d669..43e80a7 100644 --- a/docs/download.md +++ b/docs/download.md @@ -1,15 +1,15 @@ ## Download -### Install for Ubuntu or Rasbian (64-bit) +### Install for Ubuntu or Raspberry Pi OS (64-bit) Download the most recent Debian (.deb) package for your platform: -- [Ubuntu or Raspberry Pi OS (64-bit)](https://github.com/rerdavies/pipedal/releases/download/v0.1.3-alpha.2/pipedal_0.1.3_arm64.deb) v0.1.3-alpha.2 +- [Ubuntu or Raspberry Pi OS (64-bit)](https://github.com/rerdavies/pipedal/releases/download/v0.1.4-alpha.3/pipedal_0.1.4_arm64.deb) v0.1.4-alpha.3 Install the package by running ``` sudo apt update cd ~/Downloads - sudo apt-get install ./pipedal_0.1.3_arm64.deb + sudo apt-get install ./pipedal_0.1.4_arm64.deb ``` diff --git a/docs/index.md b/docs/index.md index 297d2ba..b34751e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@ -v0.1.3-alpha.2 +v0.1.4-alpha.3 Use your Raspberry Pi as a guitar effects pedal. PiPedal allows you to control and configure your guitar effects via a web interface, using your phone, tablet, or computer. @@ -15,7 +15,7 @@ PiPedal provides a pre-installed selection of LV2 plugins from the ToobAmp colle If your USB audio adapter has midi connectors, you can use midi devices (keyboards or midi floor boards) to control PiPedal while performing. A simple interface allows you to select how you would like to bind PiPedal controls to midi messages. -![Screenshot](PiPedalSshots.png) +![Screenshot](PiPedalScreenshots.png) ### [System Requirements](SystemRequirements.md) ### [Installing PiPedal](Installing.md) diff --git a/install b/install index 8b72fb4..7f3db98 100755 --- a/install +++ b/install @@ -1 +1 @@ -cmake --install build --prefix /usr/local --config Release -v +cmake --install build --prefix /usr --config Release -v diff --git a/lv2/aarch64/ToobAmp.lv2/ToobAmp.so.0.0.2 b/lv2/aarch64/ToobAmp.lv2/ToobAmp.so.0.0.2 deleted file mode 100644 index 9b4d178..0000000 Binary files a/lv2/aarch64/ToobAmp.lv2/ToobAmp.so.0.0.2 and /dev/null differ diff --git a/lv2/x86_64/CabSim.ttl b/lv2/x86_64/ToobAmp.lv2/CabSim.ttl similarity index 100% rename from lv2/x86_64/CabSim.ttl rename to lv2/x86_64/ToobAmp.lv2/CabSim.ttl diff --git a/provisionLv2 b/provisionLv2 index dada1bc..d09ee04 100755 --- a/provisionLv2 +++ b/provisionLv2 @@ -1 +1,4 @@ + +rm -rf ./lv2/aarch64/* + cp -R /usr/lib/lv2/ToobAmp.lv2/ ./lv2/aarch64/ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 39317d2..41d394d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,7 @@ set(VERBOSE true) cmake_minimum_required(VERSION 3.16.0) +set (CMAKE_INSTALL_PREFIX "/usr/") include(FindPkgConfig) diff --git a/uninstall b/uninstall index bf3a5ae..54cacf3 100755 --- a/uninstall +++ b/uninstall @@ -1,4 +1,4 @@ -export PREFIX=/usr/local +export PREFIX=/usr/ rm $PREFIX/bin/pipedal*.* rm -rf /etc/pipedal/