Merge pull request #225528 from mweinelt/espeak-phonemizer-1.2.0
python310Packages.espeak-phonemizer: 1.1.0 -> 1.2.0
This commit is contained in:
commit
16a5839b7e
2 changed files with 4 additions and 10 deletions
|
@ -1,15 +1,11 @@
|
||||||
diff --git a/espeak_phonemizer/__init__.py b/espeak_phonemizer/__init__.py
|
diff --git a/espeak_phonemizer/__init__.py b/espeak_phonemizer/__init__.py
|
||||||
index a09472e..730a7f9 100644
|
index 44cd943..adeaeba 100644
|
||||||
--- a/espeak_phonemizer/__init__.py
|
--- a/espeak_phonemizer/__init__.py
|
||||||
+++ b/espeak_phonemizer/__init__.py
|
+++ b/espeak_phonemizer/__init__.py
|
||||||
@@ -163,14 +163,10 @@ class Phonemizer:
|
@@ -150,11 +150,7 @@ class Phonemizer:
|
||||||
# Already initialized
|
# Already initialized
|
||||||
return
|
return
|
||||||
|
|
||||||
- self.libc = ctypes.cdll.LoadLibrary("libc.so.6")
|
|
||||||
+ self.libc = ctypes.cdll.LoadLibrary("@libc@")
|
|
||||||
self.libc.open_memstream.restype = ctypes.POINTER(ctypes.c_char)
|
|
||||||
|
|
||||||
- try:
|
- try:
|
||||||
- self.lib_espeak = ctypes.cdll.LoadLibrary("libespeak-ng.so")
|
- self.lib_espeak = ctypes.cdll.LoadLibrary("libespeak-ng.so")
|
||||||
- except OSError:
|
- except OSError:
|
||||||
|
|
|
@ -2,27 +2,25 @@
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, substituteAll
|
, substituteAll
|
||||||
, glibc
|
|
||||||
, espeak-ng
|
, espeak-ng
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "espeak-phonemizer";
|
pname = "espeak-phonemizer";
|
||||||
version = "1.1.0";
|
version = "1.2.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rhasspy";
|
owner = "rhasspy";
|
||||||
repo = "espeak-phonemizer";
|
repo = "espeak-phonemizer";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-qnJtS5iIARdg+umolzLHT3/nLon9syjxfTnMWHOmYPU=";
|
hash = "sha256-FiajWpxSDRxTiCj8xGHea4e0voqOvaX6oQYB72FkVbw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./cdll.patch;
|
src = ./cdll.patch;
|
||||||
libc = "${lib.getLib glibc}/lib/libc.so.6";
|
|
||||||
libespeak_ng = "${lib.getLib espeak-ng}/lib/libespeak-ng.so";
|
libespeak_ng = "${lib.getLib espeak-ng}/lib/libespeak-ng.so";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in a new issue