1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
|
We want to use the system-provided sphinxbase files
---
setup.py | 4 ++--
sphinxbase/__init__.py | 44 --------------------------------------------
2 files changed, 2 insertions(+), 46 deletions(-)
--- a/setup.py
+++ b/setup.py
@@ -85,8 +85,8 @@ ps_sources = (
)
sb_include_dirs = [
- 'deps/sphinxbase/include',
- 'deps/sphinxbase/include/sphinxbase'
+ '/usr/include/sphinxbase',
+ '/usr/share/sphinxbase/swig',
]
ps_include_dirs = ['deps/pocketsphinx/include']
--- a/sphinxbase/__init__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 1999-2016 Carnegie Mellon University. All rights
-# reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# This work was supported in part by funding from the Defense Advanced
-# Research Projects Agency and the National Science Foundation of the
-# United States of America, and the CMU Sphinx Speech Consortium.
-#
-# THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND
-# ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
-# NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import sys
-
-if sys.platform.startswith('win'):
- from .ad_win32 import *
-elif sys.platform.startswith('darwin'):
- from .ad_openal import *
-elif sys.platform.startswith('linux'):
- try:
- from .ad_pulse import *
- except:
- from .ad_alsa import *
-
-from .sphinxbase import *
|