Appimage: add tap-plugins, fix ladspa.

Fixes !212

packaging/appimage/3rdparty/CMakeLists.txt

@@ -87,6 +87,7 @@ add_subdirectory( ext_sdl2 )
 add_subdirectory( ext_sox )
 add_subdirectory( ext_jack )
 add_subdirectory( ext_ladspa )
+add_subdirectory( ext_tap-plugins )
 add_subdirectory( ext_x264 )
 add_subdirectory( ext_x265 )
 add_subdirectory( ext_libvpx )

packaging/appimage/3rdparty/ext_bigshot/CMakeLists.txt

@@ -4,15 +4,12 @@ ExternalProject_Add(
   GIT_REPOSITORY https://bitbucket.org/leo_sutic/bigsh0t.git
   GIT_TAG 9533c9caa6b583f8c5f2cba50c4713eec057c371
   CMAKE_ARGS ${CMAKE_GLOBAL_PROFILE}
-
+  BUILD_IN_SOURCE 1
   INSTALL_COMMAND ""
-  COMMAND ${CMAKE_COMMAND} -E echo FILE ${BUILD_DIR}/bigsh0t_eq_mask.so  >> ${EXT_INSTALL_DIR}/lib/frei0r-1/bigsh0t_eq_mask.so
-  COMMAND ${CMAKE_COMMAND} -E echo FILE ${BUILD_DIR}/bigsh0t_eq_to_rect.so  >> ${EXT_INSTALL_DIR}/lib/frei0r-1/bigsh0t_eq_to_rect.so
-  COMMAND ${CMAKE_COMMAND} -E echo FILE ${BUILD_DIR}/bigsh0t_rect_to_eq.so  >> ${EXT_INSTALL_DIR}/lib/frei0r-1/bigsh0t_rect_to_eq.so
-  COMMAND ${CMAKE_COMMAND} -E echo FILE ${BUILD_DIR}/bigsh0t_stabilize_360.so  >> ${EXT_INSTALL_DIR}/lib/frei0r-1/bigsh0t_stabilize_360.so
-  COMMAND ${CMAKE_COMMAND} -E echo FILE ${BUILD_DIR}/bigsh0t_hemi_to_eq.so  >> ${EXT_INSTALL_DIR}/lib/frei0r-1/bigsh0t_hemi_to_eq.so
-  COMMAND ${CMAKE_COMMAND} -E echo FILE ${BUILD_DIR}/bigsh0t_transform_360.so  >> ${EXT_INSTALL_DIR}/lib/frei0r-1/bigsh0t_transform_360.so
-
-  #INSTALL_COMMAND cp ${BUILD_DIR}/{bigsh0t_eq_mask.so,bigsh0t_rect_to_eq.so,bigsh0t_eq_to_rect.so,bigsh0
-  #t_stabilize_360.so,bigsh0t_hemi_to_eq.so,bigsh0t_transform_360.so} ${EXT_INSTALL_DIR}/lib/frei0r-1/
+  COMMAND ${CMAKE_COMMAND} -E copy bigsh0t_eq_mask.so ${EXT_INSTALL_DIR}/lib/frei0r-1/
+  COMMAND ${CMAKE_COMMAND} -E copy bigsh0t_eq_to_rect.so ${EXT_INSTALL_DIR}/lib/frei0r-1/
+  COMMAND ${CMAKE_COMMAND} -E copy bigsh0t_rect_to_eq.so ${EXT_INSTALL_DIR}/lib/frei0r-1/
+  COMMAND ${CMAKE_COMMAND} -E copy bigsh0t_stabilize_360.so ${EXT_INSTALL_DIR}/lib/frei0r-1/
+  COMMAND ${CMAKE_COMMAND} -E copy bigsh0t_hemi_to_eq.so ${EXT_INSTALL_DIR}/lib/frei0r-1/
+  COMMAND ${CMAKE_COMMAND} -E copy bigsh0t_transform_360.so ${EXT_INSTALL_DIR}/lib/frei0r-1/
 )

packaging/appimage/3rdparty/ext_ladspa/CMakeLists.txt

@@ -6,9 +6,10 @@ ExternalProject_Add(
   BUILD_IN_SOURCE 1
   CONFIGURE_COMMAND <SOURCE_DIR>/autogen.sh --prefix=${EXT_INSTALL_DIR} ${AT_HOST} ${AT_SHARED_ONLY}
 #  CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${EXT_INSTALL_DIR}
-# TODO: ladspa.h header does not seem to be installed and should be manually copied
+# ladspa.h header has to be manually copied
   BUILD_ALWAYS TRUE
   BUILD_COMMAND $(MAKE) clean
   COMMAND $(MAKE)
   INSTALL_COMMAND $(MAKE) install
+          COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/ladspa.h ${EXT_INSTALL_DIR}/include/
 )

packaging/appimage/3rdparty/ext_tap-plugins/CMakeLists.txt

+ExternalProject_Add(
+  ext_tap-plugins
+  DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
+  GIT_REPOSITORY https://github.com/tomszilagyi/tap-plugins.git
+  PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/fix_install.diff
+  CONFIGURE_COMMAND ""
+  BUILD_IN_SOURCE 1
+  BUILD_ALWAYS TRUE
+  BUILD_COMMAND $(MAKE)
+  INSTALL_COMMAND $(MAKE) install EXT_INSTALL_DIR=${EXT_INSTALL_DIR}
+)

packaging/appimage/3rdparty/ext_tap-plugins/fix_install.diff

+--- a/Makefile  2021-06-11 06:05:44.926255559 +0000
++++ b/Makefile  2021-06-11 07:17:48.437611770 +0000
+@@ -23,8 +23,8 @@
+ # Change this if you want to install somewhere else. In particular
+ # you may wish to remove the middle "local/" part of the path.
+
+-INSTALL_PLUGINS_DIR    =       /usr/local/lib/ladspa/
+-INSTALL_LRDF_DIR       =       /usr/local/share/ladspa/rdf/
++INSTALL_PLUGINS_DIR    =       $(EXT_INSTALL_DIR)/lib/ladspa/
++INSTALL_LRDF_DIR       =       $(EXT_INSTALL_DIR)/share/ladspa/rdf/
+
+ # NO EDITING below this line is required
+ # if all you want to do is install and use the plugins.

packaging/appimage/build-dependencies.sh

@@ -146,6 +146,7 @@ cmake --build . --target ext_ffmpeg  -j$CPU_CORES
 cmake --build . --target ext_sox  -j$CPU_CORES
 cmake --build . --target ext_jack  -j$CPU_CORES
 cmake --build . --target ext_ladspa  -j$CPU_CORES
+cmake --build . --target ext_tap-plugins  -j$CPU_CORES
 cmake --build . --target ext_gavl  -j$CPU_CORES
 cmake --build . --target ext_frei0r  -j$CPU_CORES
 cmake --build . --target ext_vidstab  -j$CPU_CORES

packaging/appimage/build-image.sh

@@ -71,7 +71,8 @@ cp -r $DEPS_INSTALL_PREFIX/lib/mlt  $APPDIR/usr/lib
 cp -r $DEPS_INSTALL_PREFIX/lib/libharfbuzz*  $APPDIR/usr/lib
 cp -r $DEPS_INSTALL_PREFIX/lib/libfribidi*  $APPDIR/usr/lib
 cp -r $DEPS_INSTALL_PREFIX/lib/libpango*  $APPDIR/usr/lib
-cp -r $DEPS_INSTALL_PREFIX/lib/libmlt*  $APPDIR/usr/lib
+cp -r $DEPS_INSTALL_PREFIX/lib/ladspa  $APPDIR/usr/lib || true
+cp -r $DEPS_INSTALL_PREFIX/lib/libmlt*  $APePDIR/usr/lib
 cp -r $DEPS_INSTALL_PREFIX/lib/frei0r-1  $APPDIR/usr/lib
 cp -r $DEPS_INSTALL_PREFIX/bin/melt  $APPDIR/usr/bin
 cp -r $DEPS_INSTALL_PREFIX/bin/ffmpeg  $APPDIR/usr/bin
@@ -84,7 +85,7 @@ cp -r $DEPS_INSTALL_PREFIX/plugins/audio  $APPIMAGEPLUGINS
 cp -r $DEPS_INSTALL_PREFIX/plugins/org.kde.kdecoration2 $APPIMAGEPLUGINS
 cp -r $DEPS_INSTALL_PREFIX/plugins/kstyle_breeze_config.so $APPIMAGEPLUGINS
 
-cp $BUILD_PREFIX/deps-build/ext_bigshot/ext_bigshot-prefix/src/ext_bigshot-build/*.so $APPDIR/usr/lib/frei0r-1 || true
+#cp $BUILD_PREFIX/deps-build/ext_bigshot/ext_bigshot-prefix/src/ext_bigshot-build/*.so $APPDIR/usr/lib/frei0r-1 || true
 mkdir -p $APPDIR/usr/libexec
 
 cp -r $DEPS_INSTALL_PREFIX/lib/x86_64-linux-gnu/libexec/kf5/*  $APPDIR/usr/libexec/

[Julius Künzel]

@mardelle APePDIR seems to be a spelling mistake!!?