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

another round of appimage dependency fixes

parent ff1148d9
Pipeline #51866 passed with stage
in 10 minutes and 22 seconds
...@@ -120,6 +120,7 @@ add_subdirectory( ext_gavl ) ...@@ -120,6 +120,7 @@ add_subdirectory( ext_gavl )
add_subdirectory( ext_frei0r ) add_subdirectory( ext_frei0r )
add_subdirectory( ext_bigshot ) add_subdirectory( ext_bigshot )
add_subdirectory( ext_opencv ) add_subdirectory( ext_opencv )
add_subdirectory( ext_canberra )
add_subdirectory( ext_opus ) add_subdirectory( ext_opus )
add_subdirectory( ext_vidstab ) add_subdirectory( ext_vidstab )
add_subdirectory( ext_rubberband ) 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
)
ExternalProject_Add( ExternalProject_Add(
ext_ffmpeg ext_ffmpeg
DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXT_DOWNLOAD_DIR}
GIT_REPOSITORY https://anonscm.debian.org/git/pkg-multimedia/ffmpeg.git GIT_REPOSITORY https://anonscm.debian.org/git/pkg-multimedia/ffmpeg.git
# A stupid crlf issue prevents changing branch using normal pipeline, so # A stupid crlf issue prevents changing branch using normal pipeline, so
# we have a crazy workaround to delete offending file and checkout the wanted branch # we have a crazy workaround to delete offending file and checkout the wanted branch
UPDATE_COMMAND git checkout debian/7%4.3-3 UPDATE_COMMAND git checkout debian/7%4.3-3
# PATCH_COMMAND rm <SOURCE_DIR>/tests/ref/fate/sub-scc # PATCH_COMMAND rm <SOURCE_DIR>/tests/ref/fate/sub-scc
GIT_TAG debian/master GIT_TAG debian/master
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${EXT_INSTALL_DIR} --extra-ldflags="-L${EXT_INSTALL_DIR}/lib -lstdc++ -lm -lrt -ldl" --extra-cflags="-I$EXT_INSTALL_DIR/include" --enable-shared --enable-avfilter --enable-gpl --enable-avresample --enable-libx265 --enable-libvpx --enable-libx264 --disable-doc --enable-libmp3lame --enable-libopus --enable-libvorbis --enable-nvenc --enable-vaapi --enable-amf --enable-libass CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${EXT_INSTALL_DIR} --extra-ldflags="-L${EXT_INSTALL_DIR}/lib" --extra-cflags="-I${EXT_INSTALL_DIR}/include" --enable-shared --enable-avfilter --enable-gpl --enable-avresample --enable-libx265 --enable-libvpx --enable-libx264 --disable-doc --enable-libmp3lame --enable-libopus --enable-libvorbis --enable-nvenc --enable-vaapi --enable-amf --enable-libass
BUILD_ALWAYS TRUE BUILD_ALWAYS TRUE
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_COMMAND $(MAKE) clean BUILD_COMMAND $(MAKE) clean
......
...@@ -155,6 +155,7 @@ export CC=/usr/bin/gcc-6 ...@@ -155,6 +155,7 @@ export CC=/usr/bin/gcc-6
export CXX=/usr/bin/g++-6 export CXX=/usr/bin/g++-6
cmake --build . --target ext_canberra
cmake --build . --target ext_ruby cmake --build . --target ext_ruby
cmake --build . --target ext_frameworks cmake --build . --target ext_frameworks
cmake --build . --config RelWithDebInfo --target ext_extra-cmake-modules -- -j$CPU_CORES 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