fix cpuid.h conditionalization to be more complete
This commit is contained in:
parent
87e298da65
commit
6badd133b9
12
julius-4.4.2.1-cpuidfix.patch
Normal file
12
julius-4.4.2.1-cpuidfix.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up julius-4.4.2.1/libsent/src/phmm/calc_dnn.c.cpuidfix julius-4.4.2.1/libsent/src/phmm/calc_dnn.c
|
||||
--- julius-4.4.2.1/libsent/src/phmm/calc_dnn.c.cpuidfix 2017-11-08 09:47:21.953747290 -0500
|
||||
+++ julius-4.4.2.1/libsent/src/phmm/calc_dnn.c 2017-11-08 09:50:32.508379963 -0500
|
||||
@@ -12,7 +12,7 @@
|
||||
#ifdef _WIN32
|
||||
#include <intrin.h>
|
||||
#else
|
||||
-#if defined(__arm__) || TARGET_OS_IPHONE
|
||||
+#if defined(__arm__) || defined(__aarch64__) || defined(__s390__) || defined(__powerpc__) || defined(__powerpc64__) || TARGET_OS_IPHONE
|
||||
#else
|
||||
#include <cpuid.h>
|
||||
#endif
|
@ -2,7 +2,7 @@
|
||||
|
||||
Name: julius
|
||||
Version: 4.4.2.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Large vocabulary continuous speech recognition (LVCSR) decoder software
|
||||
License: Julius
|
||||
URL: https://github.com/julius-speech/julius
|
||||
@ -18,6 +18,7 @@ Source0: https://github.com/julius-speech/julius/archive/v%{version}.tar.gz
|
||||
Source1: dictation-kit-%{dkcommit}.tar.xz
|
||||
Patch0: julius-4.4.2.1-DESTDIR.patch
|
||||
Patch1: julius-4.4.2.1-sharedlibs.patch
|
||||
Patch2: julius-4.4.2.1-cpuidfix.patch
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: perl(Jcode), alsa-lib-devel, libsndfile-devel, pulseaudio-libs-devel, zlib-devel, readline-devel
|
||||
BuildRequires: SDL2-devel
|
||||
@ -60,6 +61,7 @@ models (Phonetic tied-mixture triphone / monophone) for use with Julius.
|
||||
%setup -q -a 1
|
||||
%patch0 -p1 -b .DESTDIR
|
||||
%patch1 -p1 -b .shared
|
||||
%patch2 -p1 -b .cpuidfix
|
||||
# Fix end-of-line encoding
|
||||
sed -i 's/\r//' Release.txt
|
||||
autoreconf -ifv || :
|
||||
@ -133,6 +135,9 @@ mv %{buildroot}%{_bindir}/jcontrol %{buildroot}%{_bindir}/julius-jcontrol
|
||||
%{_datadir}/julius/model/
|
||||
|
||||
%changelog
|
||||
* Wed Nov 8 2017 Tom Callaway <spot@fedoraproject.org> - 4.4.2.1-2
|
||||
- fix cpuid.h conditionalization to be more complete
|
||||
|
||||
* Tue Nov 7 2017 Tom Callaway <spot@fedoraproject.org> - 4.4.2.1-1
|
||||
- update to 4.4.2.1
|
||||
- rename jcontrol to julius-jcontrol to avoid conflict with oracle java
|
||||
|
Loading…
Reference in New Issue
Block a user