ENH: soundfileの更新 (#769)

VOICEVOX · Oct 18, 2023 · 37962e2 · 37962e2
1 parent 94ef095
commit 37962e2
Show file tree

Hide file tree

Showing 14 changed files with 833 additions and 54 deletions.
diff --git a/.github/workflows/release-test-docker.yml b/.github/workflows/release-test-docker.yml
@@ -47,11 +47,6 @@ jobs:
           python-version: "3.11.3"
           cache: pip
 
-      - name: Install libsndfile1
-        run: |
-          sudo apt-get update
-          sudo apt-get install libsndfile1
-
       - name: Install requirements
         run: |
           pip install -r requirements-test.txt

diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
@@ -78,12 +78,6 @@ jobs:
         if: startsWith(matrix.target, 'linux') || startsWith(matrix.target, 'macos')
         run: chmod +x dist/run
 
-      - name: Install libsndfile1
-        if: startsWith(matrix.target, 'linux')
-        run: |
-          sudo apt-get update
-          sudo apt-get install libsndfile1
-
       - name: Install requirements
         run: |
           pip install -r requirements-test.txt

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,12 +28,6 @@ jobs:
           python-version: ${{ matrix.python }}
           cache: pip
 
-      - name: Install libraries for ubuntu
-        if: matrix.os == 'ubuntu-20.04'
-        run: |
-          sudo apt-get update
-          sudo apt-get install libsndfile1
-
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip setuptools wheel

diff --git a/.github/workflows/upload-gh-pages.yml b/.github/workflows/upload-gh-pages.yml
@@ -28,11 +28,6 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           cache: pip
 
-      - name: Install libraries for ubuntu
-        run: |
-          sudo apt-get update
-          sudo apt-get install libsndfile1
-
       - name: Install Python dependencies
         run: |
           pip install -r requirements.txt

diff --git a/Dockerfile b/Dockerfile
@@ -183,7 +183,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 WORKDIR /opt/voicevox_engine
 
-# libsndfile1: soundfile shared object
 # ca-certificates: pyopenjtalk dictionary download
 # build-essential: pyopenjtalk local build
 RUN <<EOF
@@ -194,7 +193,6 @@ RUN <<EOF
         git \
         wget \
         cmake \
-        libsndfile1 \
         ca-certificates \
         build-essential \
         gosu

diff --git a/README.md b/README.md
@@ -328,16 +328,6 @@ options:
 
 エンジンディレクトリ内にあるファイルを全て消去し、新しいものに置き換えてください。
 
-## 実行環境
-
-Ubuntuをお使いの場合、実行時に`soundfile.py`起因のライブラリの不足エラーが出る場合があります。
-その場合は`libsndfile1`ライブラリインストールを行ってください。
-
-```bash
-sudo apt update
-sudo apt install libsndfile1
-```
-
 ## Docker イメージ
 
 ### CPU

diff --git a/docs/licenses/mpg123/COPYING b/docs/licenses/mpg123/COPYING
diff --git a/generate_licenses.py b/generate_licenses.py
@@ -244,56 +244,94 @@ def generate_licenses() -> List[License]:
 
     # libsndfile-binaries
     with urllib.request.urlopen(
-        "https://raw.githubusercontent.com/bastibe/libsndfile-binaries/84cb164928f17c7ca0c1e5c40342c20ce2b90e8c/COPYING"  # noqa: B950
+        "https://raw.githubusercontent.com/bastibe/libsndfile-binaries/d9887ef926bb11cf1a2526be4ab6f9dc690234c0/COPYING"  # noqa: B950
     ) as res:
         licenses.append(
             License(
                 name="libsndfile-binaries",
-                version="1.0.28",
+                version="1.2.0",
                 license="LGPL-2.1 license",
                 text=res.read().decode(),
             )
         )
 
     # libogg
     with urllib.request.urlopen(
-        "https://raw.githubusercontent.com/xiph/ogg/v1.3.2/COPYING"
+        "https://raw.githubusercontent.com/xiph/ogg/v1.3.5/COPYING"
     ) as res:
         licenses.append(
             License(
                 name="libogg",
-                version="1.3.2",
+                version="1.3.5",
                 license="BSD 3-clause license",
                 text=res.read().decode(),
             )
         )
 
     # libvorbis
     with urllib.request.urlopen(
-        "https://raw.githubusercontent.com/xiph/vorbis/v1.3.5/COPYING"
+        "https://raw.githubusercontent.com/xiph/vorbis/v1.3.7/COPYING"
     ) as res:
         licenses.append(
             License(
                 name="libvorbis",
-                version="1.3.5",
+                version="1.3.7",
                 license="BSD 3-clause license",
                 text=res.read().decode(),
             )
         )
 
     # libflac
     with urllib.request.urlopen(
-        "https://raw.githubusercontent.com/xiph/flac/1.3.2/COPYING.Xiph"
+        "https://raw.githubusercontent.com/xiph/flac/1.4.2/COPYING.Xiph"
     ) as res:
         licenses.append(
             License(
                 name="FLAC",
-                version="1.3.2",
+                version="1.4.2",
                 license="Xiph.org's BSD-like license",
                 text=res.read().decode(),
             )
         )
 
+    # libopus
+    with urllib.request.urlopen(
+        "https://raw.githubusercontent.com/xiph/opus/v1.3.1/COPYING"
+    ) as res:
+        licenses.append(
+            License(
+                name="Opus",
+                version="1.3.1",
+                license="BSD 3-clause license",
+                text=res.read().decode(),
+            )
+        )
+
+    # mpg123
+    # https://sourceforge.net/projects/mpg123/files/mpg123/1.30.2/
+    licenses.append(
+        License(
+            name="mpg123",
+            version="1.30.2",
+            license="LGPL-2.1 license",
+            text=Path("docs/licenses/mpg123/COPYING").read_text(encoding="utf-8"),
+        )
+    )
+
+    # liblame
+    # https://sourceforge.net/projects/lame/files/lame/3.100/
+    with urllib.request.urlopen(
+        "https://svn.code.sf.net/p/lame/svn/tags/RELEASE__3_100/lame/COPYING"
+    ) as res:
+        licenses.append(
+            License(
+                name="lame",
+                version="3.100",
+                license="LGPL-2.0 license",
+                text=res.read().decode(),
+            )
+        )
+
     # cuda
     # license text from CUDA 11.8.0
     # https://developer.nvidia.com/cuda-11-8-0-download-archive?target_os=Windows&target_arch=x86_64&target_version=10&target_type=exe_local # noqa: B950

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -46,7 +46,7 @@ fastapi = "^0.103.2"
 python-multipart = "^0.0.5"
 uvicorn = "^0.15.0"
 aiofiles = "^0.7.0"
-soundfile = "^0.10.3.post1"
+soundfile = "^0.12.1"
 pyyaml = "^6.0"
 pyworld = "^0.3.0"
 requests = "^2.28.1"

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -66,7 +66,7 @@ setuptools==68.1.2 ; python_version >= "3.11" and python_version < "3.12"
 shellingham==1.5.3 ; python_version >= "3.11" and python_version < "3.12"
 six==1.16.0 ; python_version >= "3.11" and python_version < "3.12"
 sniffio==1.3.0 ; python_version >= "3.11" and python_version < "3.12"
-soundfile==0.10.3.post1 ; python_version >= "3.11" and python_version < "3.12"
+soundfile==0.12.1 ; python_version >= "3.11" and python_version < "3.12"
 soxr==0.3.6 ; python_version >= "3.11" and python_version < "3.12"
 starlette==0.27.0 ; python_version >= "3.11" and python_version < "3.12"
 tomlkit==0.12.1 ; python_version >= "3.11" and python_version < "3.12"

diff --git a/requirements-license.txt b/requirements-license.txt
@@ -26,7 +26,7 @@ requests==2.31.0 ; python_version >= "3.11" and python_version < "3.12"
 semver==3.0.1 ; python_version >= "3.11" and python_version < "3.12"
 six==1.16.0 ; python_version >= "3.11" and python_version < "3.12"
 sniffio==1.3.0 ; python_version >= "3.11" and python_version < "3.12"
-soundfile==0.10.3.post1 ; python_version >= "3.11" and python_version < "3.12"
+soundfile==0.12.1 ; python_version >= "3.11" and python_version < "3.12"
 soxr==0.3.6 ; python_version >= "3.11" and python_version < "3.12"
 starlette==0.27.0 ; python_version >= "3.11" and python_version < "3.12"
 tqdm==4.66.1 ; python_version >= "3.11" and python_version < "3.12"

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -81,7 +81,7 @@ shellingham==1.5.3 ; python_version >= "3.11" and python_version < "3.12"
 six==1.16.0 ; python_version >= "3.11" and python_version < "3.12"
 smmap==5.0.0 ; python_version >= "3.11" and python_version < "3.12"
 sniffio==1.3.0 ; python_version >= "3.11" and python_version < "3.12"
-soundfile==0.10.3.post1 ; python_version >= "3.11" and python_version < "3.12"
+soundfile==0.12.1 ; python_version >= "3.11" and python_version < "3.12"
 soxr==0.3.6 ; python_version >= "3.11" and python_version < "3.12"
 starlette==0.27.0 ; python_version >= "3.11" and python_version < "3.12"
 toml==0.10.2 ; python_version >= "3.11" and python_version < "3.12"

diff --git a/requirements.txt b/requirements.txt
@@ -24,7 +24,7 @@ requests==2.31.0 ; python_version >= "3.11" and python_version < "3.12"
 semver==3.0.1 ; python_version >= "3.11" and python_version < "3.12"
 six==1.16.0 ; python_version >= "3.11" and python_version < "3.12"
 sniffio==1.3.0 ; python_version >= "3.11" and python_version < "3.12"
-soundfile==0.10.3.post1 ; python_version >= "3.11" and python_version < "3.12"
+soundfile==0.12.1 ; python_version >= "3.11" and python_version < "3.12"
 soxr==0.3.6 ; python_version >= "3.11" and python_version < "3.12"
 starlette==0.27.0 ; python_version >= "3.11" and python_version < "3.12"
 tqdm==4.66.1 ; python_version >= "3.11" and python_version < "3.12"