Skip to content

Commit a039780

Browse files
committed
rm qastool
1 parent 6e6622f commit a039780

11 files changed

Lines changed: 86 additions & 191 deletions

File tree

README.md

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,34 @@ Used for LyricFA, only supports Chinese. [jp&&en version(beta)](https://github.c
2828

2929
[FblModel](https://github.com/openvpi/dataset-tools/releases/tag/FblModel)
3030

31-
Currently, FoxBreatheLabeler only supports annotating breathing using TextGrid files output from SOFA(i.e. overlaying new "AP" annotations on intervals already marked as "SP").
31+
Currently, FoxBreatheLabeler only supports annotating breathing using TextGrid files output from SOFA(i.e. overlaying
32+
new "AP" annotations on intervals already marked as "SP").
3233

3334
## Build from source
3435

3536
### Requirements
3637

3738
| Component | Requirement | Detailed |
3839
|:---------:|:-----------:|:--------------------------------:|
39-
| Qt | \>=5.15.2 | Core, Gui, Widgets, Svg, Network |
40-
| Compiler | \>=C++17 | MSVC 2019, GCC, Clang |
40+
| Qt | \>=6.8.0 | Core, Gui, Widgets, Svg, Network |
41+
| Compiler | \>=C++17 | MSVC 2022, GCC, Clang |
4142
| CMake | \>=3.17 | >=3.20 is recommended |
42-
<!-- | Python | \>=3.8 | / | -->
43+
| Python | \>=3.8 | |
4344

4445
### Setup Environment
4546

46-
You need to install Qt libraries first. (Tested on Qt 5.15.2 only)
47+
You need to install Qt libraries first. (Tested on Qt 6.8.3 only)
4748

4849
#### Windows
4950

5051
```sh
51-
git submodule init --recursive
5252
cd /D src/libs
5353
cmake -Dep=dml -P ../../scripts/setup-onnxruntime.cmake
5454

5555
cd ../../
56-
set QT_DIR=<dir> # directory `Qt5Config.cmake` locates
57-
set Qt5_DIR=%QT_DIR%
58-
set VCPKG_KEEP_ENV_VARS=QT_DIR;Qt5_DIR
56+
set QT_DIR=<dir> # directory `Qt6Config.cmake` locates
57+
set Qt6_DIR=%QT_DIR%
58+
set VCPKG_KEEP_ENV_VARS=QT_DIR;Qt6_DIR
5959

6060
git clone https://github.com/microsoft/vcpkg.git
6161
cd /D vcpkg
@@ -70,14 +70,13 @@ vcpkg install ^
7070
#### Unix
7171

7272
```sh
73-
git submodule init --recursive
7473
cd src/libs
7574
cmake -Dep=cpu -P ../../scripts/setup-onnxruntime.cmake
7675

7776
cd ../../
78-
export QT_DIR=<dir> # directory `Qt5Config.cmake` locates
79-
export Qt5_DIR=$QT_DIR
80-
export VCPKG_KEEP_ENV_VARS="QT_DIR;Qt5_DIR"
77+
export QT_DIR=<dir> # directory `Qt6Config.cmake` locates
78+
export Qt6_DIR=$QT_DIR
79+
export VCPKG_KEEP_ENV_VARS="QT_DIR;Qt6_DIR"
8180

8281
git clone https://github.com/microsoft/vcpkg.git
8382
cd vcpkg
@@ -119,7 +118,7 @@ cmake --build build --target install
119118

120119
### Dependencies
121120

122-
+ [Qt 5.15.2](https://www.qt.io/)
121+
+ [Qt 6.8.3](https://www.qt.io/)
123122
+ GNU LGPL v2.1 or later
124123
+ [FFmpeg](https://github.com/FFmpeg/FFmpeg)
125124
+ GNU LGPL v2.1 or later
@@ -131,8 +130,6 @@ cmake --build build --target install
131130
+ GNU LGPL v2.1 or later
132131
+ [vcpkg](https://github.com/microsoft/vcpkg)
133132
+ MIT License
134-
+ [qastool](https://github.com/SineStriker/qt-json-autogen)
135-
+ Apache 2.0 License
136133
+ [r8brain-free-src](https://github.com/avaneev/r8brain-free-src)
137134
+ MIT License
138135
+ [FunASR](https://github.com/alibaba-damo-academy/FunASR)
@@ -144,7 +141,7 @@ cmake --build build --target install
144141
+ [FoxBreatheLabeler](https://github.com/autumn-DL/FoxBreatheLabeler)
145142
+ GNU AGPL v3.0
146143
+ [textgrid.hpp](https://github.com/eiichiroi/textgrid.hpp)
147-
+ MIT License
144+
+ MIT License
148145

149146
## License
150147

scripts/vcpkg-manifest/vcpkg.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
33
"dependencies": [
44
"sdl2",
5-
{
6-
"name": "libsndfile",
7-
"default-features": false
8-
},
9-
"qastool",
105
"ffmpeg-fake",
116
"mecab",
127
"fftw3",

scripts/vcpkg/ports/qastool/portfile.cmake

Lines changed: 0 additions & 30 deletions
This file was deleted.

scripts/vcpkg/ports/qastool/vcpkg.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/apps/MinLabel/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
1818
cpp-pinyin::cpp-pinyin
1919
cpp-kana::cpp-kana
2020
QMCore SDLPlayback FFmpegDecoder
21-
qastool::core
2221
)
2322

2423
target_compile_definitions(${PROJECT_NAME} PRIVATE
@@ -27,8 +26,6 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
2726

2827
target_include_directories(${PROJECT_NAME} PRIVATE .)
2928

30-
include(qasc_exec.cmake)
31-
3229
if (WIN32)
3330
include(${PROJECT_CMAKE_MODULES_DIR}/winrc.cmake)
3431

0 commit comments

Comments
 (0)