Commit 6d776ac8 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Appimage dependency: path frameworks to build without phonon, get rid of libcanberra

parent 3f405794
Pipeline #51996 canceled with stage
......@@ -120,7 +120,6 @@ add_subdirectory( ext_gavl )
add_subdirectory( ext_frei0r )
add_subdirectory( ext_bigshot )
add_subdirectory( ext_opencv )
add_subdirectory( ext_canberra )
add_subdirectory( ext_opus )
add_subdirectory( ext_vidstab )
add_subdirectory( ext_rubberband )
......
ExternalProject_Add(
ext_canberra
DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
URL http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz
URL_MD5 34cb7e4430afaf6f447c4ebdb9b42072
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${EXT_INSTALL_DIR} ${AT_HOST} ${AT_SHARED_ONLY}
BUILD_IN_SOURCE 1
BUILD_ALWAYS TRUE
BUILD_COMMAND $(MAKE) clean
COMMAND $(MAKE)
INSTALL_COMMAND $(MAKE) install
)
......@@ -235,8 +235,8 @@ InstallKF5Component(kxmlgui ${KF5_VERSION} ""
InstallKF5Component(kbookmarks ${KF5_VERSION} "" "")
InstallKF5Component(kdoctools ${KF5_VERSION} "" "")
InstallKF5Component(kimageformats ${KF5_VERSION} "" "")
InstallKF5Component(knotifyconfig ${KF5_VERSION} "" "")
InstallKF5Component(knotifications ${KF5_VERSION} "" "")
InstallKF5Component(knotifyconfig ${KF5_VERSION} "" "knotifyconfig-drop-phonon.patch")
InstallKF5Component(knotifications ${KF5_VERSION} "" "knotifications-drop-phonon.patch")
InstallKF5Component(kjobwidgets ${KF5_VERSION} "" "")
InstallKF5Component(sonnet ${KF5_VERSION} "" "")
InstallKF5Component(ktextwidgets ${KF5_VERSION} "" "")
......
......@@ -155,7 +155,6 @@ export CC=/usr/bin/gcc-6
export CXX=/usr/bin/g++-6
cmake --build . --target ext_canberra
cmake --build . --target ext_ruby
cmake --build . --target ext_frameworks
cmake --build . --config RelWithDebInfo --target ext_extra-cmake-modules -- -j$CPU_CORES
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment