upgrade to 0.12.1

Also switches to a local patch

3 files changed, 309 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed1e102c1027..078f78773828 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-torchaudio
 	pkgdesc = Data manipulation and transformation for audio signal processing, powered by PyTorch
-	pkgver = 0.12.0
+	pkgver = 0.12.1
 	pkgrel = 1
 	url = https://github.com/pytorch/audio
 	arch = x86_64
@@ -26,15 +26,15 @@ pkgbase = python-torchaudio
 	depends = zlib
 	optdepends = python-kaldi-io
 	conflicts = python-torchaudio-git
-	source = git+https://github.com/pytorch/audio#tag=v0.12.0
+	source = git+https://github.com/pytorch/audio#tag=v0.12.1
 	source = git+https://github.com/kaldi-asr/kaldi.git
 	source = git+https://github.com/kpu/kenlm.git
 	source = https://downloads.sourceforge.net/project/sox/sox/14.4.2/sox-14.4.2.tar.bz2
-	source = python-torchaudio-use-system-libs.diff::https://github.com/yan12125/torchaudio/commit/8d10b1646767f45be9cd2ceaf50e401bb010127f.diff
+	source = use-system-libs.diff
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 81a6956d4330e75b5827316e44ae381e6f1e8928003c6aa45896da9041ea149c
-	sha256sums = b576b8e9311128d652727e65d79c58869a024d20fc541af62c6ceb403b2ef598
+	sha256sums = 02e7c503a8b876246801d8d9e223992928ee7df8c2009239ffce96583faf52a0
 
 pkgname = python-torchaudio
diff --git a/PKGBUILD b/PKGBUILD
index 7fcd95909eb5..e76fe3e3d830 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=python-torchaudio
 _pkgname=audio
-pkgver=0.12.0
+pkgver=0.12.1
 _sox_ver=14.4.2
 pkgrel=1
 pkgdesc="Data manipulation and transformation for audio signal processing, powered by PyTorch"
@@ -19,12 +19,12 @@ source=("git+$url#tag=v${pkgver}"
         "git+https://github.com/kpu/kenlm.git"
         # Files downloaded by ExternalProject_Add
         "https://downloads.sourceforge.net/project/sox/sox/$_sox_ver/sox-$_sox_ver.tar.bz2"
-        "$pkgname-use-system-libs.diff::https://github.com/yan12125/torchaudio/commit/8d10b1646767f45be9cd2ceaf50e401bb010127f.diff")
+        "use-system-libs.diff")
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             '81a6956d4330e75b5827316e44ae381e6f1e8928003c6aa45896da9041ea149c'
-            'b576b8e9311128d652727e65d79c58869a024d20fc541af62c6ceb403b2ef598')
+            '02e7c503a8b876246801d8d9e223992928ee7df8c2009239ffce96583faf52a0')
 
 prepare() {
   cd "$srcdir/${_pkgname}"
@@ -32,7 +32,7 @@ prepare() {
   mkdir -p third_party/archives
   ln -s "$srcdir"/sox-$_sox_ver.tar.bz2 third_party/archives/
 
-  patch -Np1 -i ../$pkgname-use-system-libs.diff
+  patch -Np1 -i ../use-system-libs.diff
 
   # loop stolen from python-onnxruntime :)
   git submodule init
diff --git a/use-system-libs.diff b/use-system-libs.diff
new file mode 100644
index 000000000000..f3449fae0853
--- /dev/null
+++ b/use-system-libs.diff
@@ -0,0 +1,301 @@
+diff --git a/third_party/bzip2/CMakeLists.txt b/third_party/bzip2/CMakeLists.txt
+index dfccfc7b..7d4a8d66 100644
+--- a/third_party/bzip2/CMakeLists.txt
++++ b/third_party/bzip2/CMakeLists.txt
+@@ -1,34 +1 @@
+-include(ExternalProject)
+-
+-set(INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../install)
+-set(ARCHIVE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../archives)
+-
+-set(
+-  BZIP_LIBRARIES
+-  ${INSTALL_DIR}/lib/libbz2.a
+-  )
+-
+-ExternalProject_Add(bzip2-
+-  PREFIX ${CMAKE_CURRENT_BINARY_DIR}
+-  DOWNLOAD_DIR ${ARCHIVE_DIR}
+-  URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+-  URL_HASH SHA256=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
+-  BUILD_BYPRODUCTS ${BZIP_LIBRARIES}
+-  BUILD_IN_SOURCE 1
+-  CONFIGURE_COMMAND ""
+-  BUILD_COMMAND make VERBOSE=1 "CFLAGS=-fPIC -fvisibility=hidden -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64"
+-  INSTALL_COMMAND make install PREFIX=${INSTALL_DIR}
+-  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
+-)
+-
+ add_library(bzip2 INTERFACE)
+-add_dependencies(bzip2 bzip2-)
+-target_include_directories(bzip2 INTERFACE ${INSTALL_DIR}/include)
+-target_link_libraries(bzip2 INTERFACE ${BZIP_LIBRARIES})
+diff --git a/third_party/lzma/CMakeLists.txt b/third_party/lzma/CMakeLists.txt
+index e8d8cb87..b6c9dd79 100644
+--- a/third_party/lzma/CMakeLists.txt
++++ b/third_party/lzma/CMakeLists.txt
+@@ -1,45 +1 @@
+-include(ExternalProject)
+-
+-set(INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../install)
+-set(ARCHIVE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../archives)
+-set(patch_dir ${PROJECT_SOURCE_DIR}/third_party/patches)
+-
+-# To pass custom environment variables to ExternalProject_Add command,
+-# we need to do `${CMAKE_COMMAND} -E env ${envs} <COMMANAD>`.
+-# https://stackoverflow.com/a/62437353
+-# We constrcut the custom environment variables here
+-set(envs
+-  "PKG_CONFIG_PATH=${INSTALL_DIR}/lib/pkgconfig"
+-  "LDFLAGS=-L${INSTALL_DIR}/lib $ENV{LDFLAGS}"
+-  "CFLAGS=-I${INSTALL_DIR}/include -fvisibility=hidden -fPIC $ENV{CFLAGS}"
+-)
+-
+-set(
+-  LZMA_LIBRARIES
+-  ${INSTALL_DIR}/lib/liblzma.a
+-  )
+-
+-ExternalProject_Add(lzma-
+-  PREFIX ${CMAKE_CURRENT_BINARY_DIR}
+-  DOWNLOAD_DIR ${ARCHIVE_DIR}
+-  URL https://tukaani.org/xz/xz-5.2.5.tar.gz
+-  URL_HASH SHA256=f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10
+-  BUILD_BYPRODUCTS ${LZMA_LIBRARIES}
+-  PATCH_COMMAND cp ${patch_dir}/config.guess ${patch_dir}/config.sub ${CMAKE_CURRENT_BINARY_DIR}/src/lzma-/build-aux/
+-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${envs} ${CMAKE_CURRENT_BINARY_DIR}/src/lzma-/configure --prefix=${INSTALL_DIR} --disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts --disable-doc --enable-static --disable-shared
+-  BUILD_COMMAND  ${CMAKE_COMMAND} -E env ${envs} make VERBOSE=1
+-  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
+-)
+-
+-
+ add_library(lzma INTERFACE)
+-add_dependencies(lzma lzma-)
+-target_include_directories(lzma INTERFACE ${INSTALL_DIR}/include)
+-target_link_libraries(lzma INTERFACE ${LZMA_LIBRARIES})
+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
+diff --git a/third_party/zlib/CMakeLists.txt b/third_party/zlib/CMakeLists.txt
+index 77551b12..e10d6a42 100644
+--- a/third_party/zlib/CMakeLists.txt
++++ b/third_party/zlib/CMakeLists.txt
+@@ -1,42 +1 @@
+-include(ExternalProject)
+-
+-set(INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../install)
+-set(ARCHIVE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../archives)
+-
+-# To pass custom environment variables to ExternalProject_Add command,
+-# we need to do `${CMAKE_COMMAND} -E env ${envs} <COMMANAD>`.
+-# https://stackoverflow.com/a/62437353
+-# We constrcut the custom environment variables here
+-set(envs
+-  "PKG_CONFIG_PATH=${INSTALL_DIR}/lib/pkgconfig"
+-  "LDFLAGS=-L${INSTALL_DIR}/lib $ENV{LDFLAGS}"
+-  "CFLAGS=-I${INSTALL_DIR}/include -fvisibility=hidden -fPIC $ENV{CFLAGS}"
+-  "prefix=${INSTALL_DIR}"
+-)
+-
+-set(
+-  ZLIB_LIBRARIES
+-  ${INSTALL_DIR}/lib/libz.a
+-  )
+-
+-ExternalProject_Add(zlib-
+-  PREFIX ${CMAKE_CURRENT_BINARY_DIR}
+-  DOWNLOAD_DIR ${ARCHIVE_DIR}
+-  URL https://github.com/madler/zlib/archive/refs/tags/v1.2.12.tar.gz
+-  URL_HASH SHA256=d8688496ea40fb61787500e863cc63c9afcbc524468cedeb478068924eb54932
+-  BUILD_BYPRODUCTS ${ZLIB_LIBRARIES}
+-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${envs} ${CMAKE_CURRENT_BINARY_DIR}/src/zlib-/configure --static
+-  BUILD_COMMAND ${CMAKE_COMMAND} -E env ${envs} make VERBOSE=1
+-  LOG_DOWNLOAD ON
+-  LOG_UPDATE ON
+-  LOG_CONFIGURE ON
+-  LOG_BUILD ON
+-  LOG_INSTALL ON
+-  LOG_MERGED_STDOUTERR ON
+-  LOG_OUTPUT_ON_FAILURE ON
+-)
+-
+ add_library(zlib INTERFACE)
+-add_dependencies(zlib zlib-)
+-target_include_directories(zlib INTERFACE ${INSTALL_DIR}/include)
+-target_link_libraries(zlib INTERFACE ${ZLIB_LIBRARIES})