diff options
Diffstat (limited to 'use-system-libs.diff')
-rw-r--r-- | use-system-libs.diff | 165 |
1 files changed, 0 insertions, 165 deletions
diff --git a/use-system-libs.diff b/use-system-libs.diff deleted file mode 100644 index 1c83367799a0..000000000000 --- a/use-system-libs.diff +++ /dev/null @@ -1,165 +0,0 @@ -diff --git a/third_party/sox/CMakeLists.txt b/third_party/sox/CMakeLists.txt -index 50e5cc91..1e841ad4 100644 ---- a/third_party/sox/CMakeLists.txt -+++ b/third_party/sox/CMakeLists.txt -@@ -17,129 +17,6 @@ set(envs - "CFLAGS=-I${INSTALL_DIR}/include -fvisibility=hidden $ENV{CFLAGS}" - ) - --ExternalProject_Add(amr -- PREFIX ${CMAKE_CURRENT_BINARY_DIR} -- DOWNLOAD_DIR ${ARCHIVE_DIR} -- URL https://sourceforge.net/projects/opencore-amr/files/opencore-amr/opencore-amr-0.1.5.tar.gz -- URL_HASH SHA256=2c006cb9d5f651bfb5e60156dbff6af3c9d35c7bbcc9015308c0aff1e14cd341 -- PATCH_COMMAND cp ${patch_dir}/config.guess ${patch_dir}/config.sub ${CMAKE_CURRENT_BINARY_DIR}/src/amr/ -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${envs} ${CMAKE_CURRENT_BINARY_DIR}/src/amr/configure ${COMMON_ARGS} -- DOWNLOAD_NO_PROGRESS ON -- LOG_DOWNLOAD ON -- LOG_UPDATE ON -- LOG_CONFIGURE ON -- LOG_BUILD ON -- LOG_INSTALL ON -- LOG_MERGED_STDOUTERR ON -- LOG_OUTPUT_ON_FAILURE ON --) -- --ExternalProject_Add(lame -- PREFIX ${CMAKE_CURRENT_BINARY_DIR} -- DOWNLOAD_DIR ${ARCHIVE_DIR} -- URL https://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz -- URL_HASH SHA256=24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff -- PATCH_COMMAND cp ${patch_dir}/config.guess ${patch_dir}/config.sub ${CMAKE_CURRENT_BINARY_DIR}/src/lame/ -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${envs} ${CMAKE_CURRENT_BINARY_DIR}/src/lame/configure ${COMMON_ARGS} --enable-nasm -- DOWNLOAD_NO_PROGRESS ON -- LOG_DOWNLOAD ON -- LOG_UPDATE ON -- LOG_CONFIGURE ON -- LOG_BUILD ON -- LOG_INSTALL ON -- LOG_MERGED_STDOUTERR ON -- LOG_OUTPUT_ON_FAILURE ON --) -- --ExternalProject_Add(ogg -- PREFIX ${CMAKE_CURRENT_BINARY_DIR} -- DOWNLOAD_DIR ${ARCHIVE_DIR} -- URL https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-1.3.3.tar.gz -- URL_HASH SHA256=c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985 -- PATCH_COMMAND cp ${patch_dir}/config.guess ${patch_dir}/config.sub ${CMAKE_CURRENT_BINARY_DIR}/src/ogg/ -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${envs} ${CMAKE_CURRENT_BINARY_DIR}/src/ogg/configure ${COMMON_ARGS} -- DOWNLOAD_NO_PROGRESS ON -- LOG_DOWNLOAD ON -- LOG_UPDATE ON -- LOG_CONFIGURE ON -- LOG_BUILD ON -- LOG_INSTALL ON -- LOG_MERGED_STDOUTERR ON -- LOG_OUTPUT_ON_FAILURE ON --) -- --ExternalProject_Add(flac -- PREFIX ${CMAKE_CURRENT_BINARY_DIR} -- DEPENDS ogg -- DOWNLOAD_DIR ${ARCHIVE_DIR} -- URL https://ftp.osuosl.org/pub/xiph/releases/flac/flac-1.3.2.tar.xz -- URL_HASH SHA256=91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f -- PATCH_COMMAND cp ${patch_dir}/config.guess ${patch_dir}/config.sub ${CMAKE_CURRENT_BINARY_DIR}/src/flac/ -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${envs} ${CMAKE_CURRENT_BINARY_DIR}/src/flac/configure ${COMMON_ARGS} --with-ogg --disable-cpplibs -- DOWNLOAD_NO_PROGRESS ON -- LOG_DOWNLOAD ON -- LOG_UPDATE ON -- LOG_CONFIGURE ON -- LOG_BUILD ON -- LOG_INSTALL ON -- LOG_MERGED_STDOUTERR ON -- LOG_OUTPUT_ON_FAILURE ON --) -- --ExternalProject_Add(vorbis -- PREFIX ${CMAKE_CURRENT_BINARY_DIR} -- DEPENDS ogg -- DOWNLOAD_DIR ${ARCHIVE_DIR} -- URL https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.6.tar.gz -- URL_HASH SHA256=6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb -- PATCH_COMMAND cp ${patch_dir}/config.guess ${patch_dir}/config.sub ${CMAKE_CURRENT_BINARY_DIR}/src/vorbis/ -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${envs} ${CMAKE_CURRENT_BINARY_DIR}/src/vorbis/configure ${COMMON_ARGS} --with-ogg -- DOWNLOAD_NO_PROGRESS ON -- LOG_DOWNLOAD ON -- LOG_UPDATE ON -- LOG_CONFIGURE ON -- LOG_BUILD ON -- LOG_INSTALL ON -- LOG_MERGED_STDOUTERR ON -- LOG_OUTPUT_ON_FAILURE ON --) -- --ExternalProject_Add(opus -- PREFIX ${CMAKE_CURRENT_BINARY_DIR} -- DEPENDS ogg -- DOWNLOAD_DIR ${ARCHIVE_DIR} -- URL https://ftp.osuosl.org/pub/xiph/releases/opus/opus-1.3.1.tar.gz -- URL_HASH SHA256=65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d -- PATCH_COMMAND cp ${patch_dir}/config.guess ${patch_dir}/config.sub ${CMAKE_CURRENT_BINARY_DIR}/src/opus/ -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${envs} ${CMAKE_CURRENT_BINARY_DIR}/src/opus/configure ${COMMON_ARGS} --with-ogg -- DOWNLOAD_NO_PROGRESS ON -- LOG_DOWNLOAD ON -- LOG_UPDATE ON -- LOG_CONFIGURE ON -- LOG_BUILD ON -- LOG_INSTALL ON -- LOG_MERGED_STDOUTERR ON -- LOG_OUTPUT_ON_FAILURE ON --) -- --ExternalProject_Add(opusfile -- PREFIX ${CMAKE_CURRENT_BINARY_DIR} -- DEPENDS opus -- DOWNLOAD_DIR ${ARCHIVE_DIR} -- URL https://ftp.osuosl.org/pub/xiph/releases/opus/opusfile-0.12.tar.gz -- URL_HASH SHA256=118d8601c12dd6a44f52423e68ca9083cc9f2bfe72da7a8c1acb22a80ae3550b -- PATCH_COMMAND cp ${patch_dir}/config.guess ${patch_dir}/config.sub ${CMAKE_CURRENT_BINARY_DIR}/src/opusfile/ -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${envs} ${CMAKE_CURRENT_BINARY_DIR}/src/opusfile/configure ${COMMON_ARGS} --disable-http -- DOWNLOAD_NO_PROGRESS ON -- LOG_DOWNLOAD ON -- LOG_UPDATE ON -- LOG_CONFIGURE ON -- LOG_BUILD ON -- LOG_INSTALL ON -- LOG_MERGED_STDOUTERR ON -- LOG_OUTPUT_ON_FAILURE ON --) -- - # OpenMP is by default compiled against GNU OpenMP, which conflicts with the version of OpenMP that PyTorch uses. - # See https://github.com/pytorch/audio/pull/1026 - # TODO: Add flags like https://github.com/suphoff/pytorch_parallel_extension_cpp/blob/master/setup.py -@@ -171,20 +48,16 @@ set(SOX_OPTIONS - - set(SOX_LIBRARIES - ${INSTALL_DIR}/lib/libsox.a -- ${INSTALL_DIR}/lib/libopencore-amrnb.a -- ${INSTALL_DIR}/lib/libopencore-amrwb.a -- ${INSTALL_DIR}/lib/libmp3lame.a -- ${INSTALL_DIR}/lib/libFLAC.a -- ${INSTALL_DIR}/lib/libopusfile.a -- ${INSTALL_DIR}/lib/libopus.a -- ${INSTALL_DIR}/lib/libvorbisenc.a -- ${INSTALL_DIR}/lib/libvorbisfile.a -- ${INSTALL_DIR}/lib/libvorbis.a -- ${INSTALL_DIR}/lib/libogg.a -- ) -- --set(sox_depends -- ogg flac vorbis opusfile lame amr -+ -lopencore-amrnb -+ -lopencore-amrwb -+ -lmp3lame -+ -lFLAC -+ -lopusfile -+ -lopus -+ -lvorbisenc -+ -lvorbisfile -+ -lvorbis -+ -logg - ) - - ExternalProject_Add(sox |