commit sphinxbase for openSUSE:Factory
Hello community,
here is the log from the commit of package sphinxbase for openSUSE:Factory
checked in at 2020-03-26 23:38:01
Comparing /work/SRC/openSUSE:Factory/sphinxbase (Old)
and /work/SRC/openSUSE:Factory/.sphinxbase.new.3160 (New)
Package is "sphinxbase"
Thu Mar 26 23:38:01 2020 rev:5 rq:788657 version:0.8
Changes:
--- /work/SRC/openSUSE:Factory/sphinxbase/sphinxbase.changes2020-03-25
23:50:50.052012024 +0100
+++ /work/SRC/openSUSE:Factory/.sphinxbase.new.3160/sphinxbase.changes
2020-03-26 23:38:07.294880060 +0100
@@ -1,0 +2,9 @@
+Thu Mar 26 15:34:45 UTC 2020 - Antonio Larrosa
+
+- sphinxbase-devel now conflicts with sphinxbase5-devel
+- python3-sphinxbase now conflicts with python3-sphinxbase5 and
+ python3-pocketsphinx-python <= 0.1.3
+- Fix some symbol-not-found errors in the python3 port. Updated patch:
+ * use-python3.patch
+
+---
Other differences:
--
++ sphinxbase.spec ++
--- /var/tmp/diff_new_pack.rc9IGn/_old 2020-03-26 23:38:08.198880386 +0100
+++ /var/tmp/diff_new_pack.rc9IGn/_new 2020-03-26 23:38:08.202880388 +0100
@@ -72,6 +72,7 @@
Requires: alsa-devel
Requires: lapack-devel
Requires: libsndfile-devel
+Conflicts: sphinxbase5-devel
%description devel
devel files for %{name}-%{version}
@@ -83,6 +84,8 @@
Summary:Python3 bindings for sphinxbase
Group: Development/Languages/Python
Requires: %{name} = %{version}
+Conflicts: python3-sphinxbase5
+Conflicts: python3-pocketsphinx-python <= 0.1.3
%description -n python3-sphinxbase
Python3 bindings for %{name}-%{version}
++ use-python3.patch ++
--- /var/tmp/diff_new_pack.rc9IGn/_old 2020-03-26 23:38:08.238880400 +0100
+++ /var/tmp/diff_new_pack.rc9IGn/_new 2020-03-26 23:38:08.238880400 +0100
@@ -26,15 +26,16 @@
===
--- sphinxbase-0.8.orig/python/sphinxbase.pyx
+++ sphinxbase-0.8/python/sphinxbase.pyx
-@@ -6,6 +6,7 @@
+@@ -6,6 +6,8 @@
# notice is not removed.
#
# Author: David Huggins-Daines
+import io
++from libc.stdio cimport fdopen
cdef class LogMath:
"""
-@@ -534,19 +535,19 @@ cdef class HuffCode:
+@@ -534,20 +536,20 @@ cdef class HuffCode:
ckd_free(symbols)
def read(self, infile):
@@ -43,24 +44,37 @@
+if not isinstance(infile, io.IOBase):
+infile = open(infile, "rb")
huff_code_free(self.hc)
- self.hc = huff_code_read(PyFile_AsFile(infile))
+-self.hc = huff_code_read(PyFile_AsFile(infile))
++self.hc = huff_code_read(fdopen(PyObject_AsFileDescriptor(infile),
"rb"))
def write(self, outfile):
-if not isinstance(outfile, file):
-outfile = file(outfile, "wb")
+-huff_code_write(self.hc, PyFile_AsFile(outfile))
+if not isinstance(outfile, io.IOBase):
+outfile = open(outfile, "wb")
- huff_code_write(self.hc, PyFile_AsFile(outfile))
++huff_code_write(self.hc, fdopen(PyObject_AsFileDescriptor(outfile),
"wb"))
def dump(self, outfile):
-if not isinstance(outfile, file):
-outfile = file(outfile, "w")
+-huff_code_dump(self.hc, PyFile_AsFile(outfile))
+if not isinstance(outfile, io.IOBase):
+outfile = open(outfile, "w")
- huff_code_dump(self.hc, PyFile_AsFile(outfile))
++huff_code_dump(self.hc, fdopen(PyObject_AsFileDescriptor(outfile),
"w"))
def encode(self, seq):
-@@ -648,8 +649,8 @@ cdef class HuffCode:
+ """
+@@ -619,7 +621,7 @@ cdef class HuffCode:
+ nbits += offset
+ i += 1
+ #print "output:", binstr(output, nbits)
+-outstr = PyString_FromStringAndSize(output, nbytes)
++outstr = PyBytes_FromStringAndSize(output, nbytes)
+ PyMem_Free(output)
+ return (outstr, offset)
+
+@@ -648,10 +650,10 @@ cdef class HuffCode:
return (output, offset)
def attach(self, fh, char *mode):
@@ -69,8 +83,11 @@
+if not isinstance(fh, io.IOBase):
+fh = open(fh, mode)
self.fh = fh
- huff_code_attach(self.hc, PyFile_AsFile(fh), mode)
+-huff_code_attach(self.hc, PyFile_AsFile(fh), mode)
++huff_code_attach(self.hc, fdopen(PyObject_AsFileDescriptor(fh),
mode), mode)
+ def detach(self):
+ huff_code_detach(self.hc)
Index: sphinxbase-0.8/python/setup.py.in
===
--- sphinxbase-0.8.orig/python/setup.py.in
@@ -98,3 +115,20 @@
for f in files: os.unlink(f)
os.rmdir(d)
commit sphinxbase for openSUSE:Factory
Hello community,
here is the log from the commit of package sphinxbase for openSUSE:Factory
checked in at 2020-03-25 23:49:52
Comparing /work/SRC/openSUSE:Factory/sphinxbase (Old)
and /work/SRC/openSUSE:Factory/.sphinxbase.new.3160 (New)
Package is "sphinxbase"
Wed Mar 25 23:49:52 2020 rev:4 rq:788306 version:0.8
Changes:
--- /work/SRC/openSUSE:Factory/sphinxbase/sphinxbase.changes2019-03-04
09:22:33.812577354 +0100
+++ /work/SRC/openSUSE:Factory/.sphinxbase.new.3160/sphinxbase.changes
2020-03-25 23:50:50.052012024 +0100
@@ -1,0 +2,11 @@
+Wed Mar 25 10:20:48 UTC 2020 - Antonio Larrosa
+
+- spec file cleanup
+
+---
+Wed Jan 15 11:59:52 UTC 2020 - Antonio Larrosa
+
+- Generate python3 bindings instead of python2.
+- Add use-python3.patch
+
+---
New:
use-python3.patch
Other differences:
--
++ sphinxbase.spec ++
--- /var/tmp/diff_new_pack.k9FvL5/_old 2020-03-25 23:50:52.132011473 +0100
+++ /var/tmp/diff_new_pack.k9FvL5/_new 2020-03-25 23:50:52.136011472 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sphinxbase
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,13 +16,14 @@
#
+%define sover 1
Name: sphinxbase
Version:0.8
Release:0
Summary:Support library required by Pocketsphinx
License:BSD-2-Clause AND MIT
Group: Productivity/Office/Other
-Url:http://cmusphinx.sourceforge.net/wiki/download/
+URL:http://cmusphinx.sourceforge.net/wiki/download/
Source:
http://downloads.sourceforge.net/project/cmusphinx/%{name}/%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM remove __DATE and __TIME
Patch0: sphinxbase-no-date.patch
@@ -34,32 +35,33 @@
Patch3: sphinxbase-uninit.patch
# PATCH-FIX-UPSTREAM boo#1127564
Patch4: workaround-gcc-issue-on-i586.patch
+Patch5: use-python3.patch
BuildRequires: alsa-devel
BuildRequires: bison
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: libsndfile-devel
BuildRequires: pkgconfig
-BuildRequires: python-Cython
-BuildRequires: python-devel
BuildRequires: python-rpm-macros
+BuildRequires: python3-Cython
+BuildRequires: python3-devel
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
%if 0%{?suse_version} <= 1210
BuildRequires: liblapack3
%else
BuildRequires: lapack-devel
%endif
-Requires(post): update-alternatives
-Requires(postun): update-alternatives
%description
CMU Sphinx toolkit is a speech recognition tool and has a number of packages
for
different tasks and applications.
-%package -n libsphinxbase1
+%package -n libsphinxbase%{sover}
Summary:Sphinxbase speech recognizer library
Group: System/Libraries
-%description -n libsphinxbase1
+%description -n libsphinxbase%{sover}
CMU Sphinx toolkit is a speech recognition tool and has a number of packages
for
different tasks and applications.
@@ -77,13 +79,13 @@
CMU Sphinx toolkit is a speech recognition tool and has a number of packages
for
different tasks and applications.
-%package -n python2-sphinxbase
-Summary:Python bindings for sphinxbase required by python-pocketsphinx
+%package -n python3-sphinxbase
+Summary:Python3 bindings for sphinxbase
Group: Development/Languages/Python
Requires: %{name} = %{version}
-%description -n python2-sphinxbase
-Python2 bindings for %{name}-%{version}
+%description -n python3-sphinxbase
+Python3 bindings for %{name}-%{version}
CMU Sphinx toolkit is a speech recognition tool and has a number of packages
for
different tasks and applications.
@@ -97,13 +99,14 @@
%ifarch i586
%patch4 -p1
%endif
+%patch5 -p1
# It has to be regenerated by cython
rm python/sphinxbase.c
-sed -ie "s,\#\!/usr/bin/env perl,#!/usr/bin/perl,"
src/sphinx_lmtools/sphinx_lm_sort
+sed -ie "s,\#\!%{_bindir}/env perl,#!%{_bindir}/perl,"
src/sphinx_lmtools/sphinx_lm_sort
%build
-%configure --disable-static
-make %{?_smp_mflags}
+%configure --disable-static --with-python=%{_bindir}/python3
+%make_build
%install
%make_install
@@ -120,7 +123,7 @@
%ifarch x86_64 i586
%check
-make check
+%make_build check
%endif
%post
@@ -136,8 +139,8 @@
update-alternatives --remove sphinx_pitch
%{_bindir}/sphinx_pitch-%{version}
fi
-%post -n libsphinxbase1 -p /sbin/ldconfig
-%postun -n libsphinxbase1 -p /sbin/ldconfig
+%post -n
commit sphinxbase for openSUSE:Factory
Hello community,
here is the log from the commit of package sphinxbase for openSUSE:Factory
checked in at 2019-03-04 09:22:30
Comparing /work/SRC/openSUSE:Factory/sphinxbase (Old)
and /work/SRC/openSUSE:Factory/.sphinxbase.new.28833 (New)
Package is "sphinxbase"
Mon Mar 4 09:22:30 2019 rev:3 rq:680770 version:0.8
Changes:
--- /work/SRC/openSUSE:Factory/sphinxbase/sphinxbase.changes2019-02-26
22:22:17.294068560 +0100
+++ /work/SRC/openSUSE:Factory/.sphinxbase.new.28833/sphinxbase.changes
2019-03-04 09:22:33.812577354 +0100
@@ -1,0 +2,11 @@
+Fri Mar 1 19:16:29 UTC 2019 - Antonio Larrosa
+
+- Add workaround-gcc-issue-on-i586.patch to circumvent
+ boo#1127564 while it's fixed in gcc
+
+---
+Wed Feb 27 10:33:58 UTC 2019 - Antonio Larrosa
+
+- Add %check section to run tests
+
+---
New:
workaround-gcc-issue-on-i586.patch
Other differences:
--
++ sphinxbase.spec ++
--- /var/tmp/diff_new_pack.KFvvG2/_old 2019-03-04 09:22:34.560577220 +0100
+++ /var/tmp/diff_new_pack.KFvvG2/_new 2019-03-04 09:22:34.564577219 +0100
@@ -32,6 +32,8 @@
Patch2: sphinxbase-largefile.patch
# PATCH-FIX-UPSTREAM initialize a variable
Patch3: sphinxbase-uninit.patch
+# PATCH-FIX-UPSTREAM boo#1127564
+Patch4: workaround-gcc-issue-on-i586.patch
BuildRequires: alsa-devel
BuildRequires: bison
BuildRequires: doxygen
@@ -92,6 +94,9 @@
%patch1
%patch2
%patch3
+%ifarch i586
+%patch4 -p1
+%endif
# It has to be regenerated by cython
rm python/sphinxbase.c
sed -ie "s,\#\!/usr/bin/env perl,#!/usr/bin/perl,"
src/sphinx_lmtools/sphinx_lm_sort
@@ -113,6 +118,11 @@
ln -s %{_sysconfdir}/alternatives/$binary %{buildroot}%{_bindir}/$binary
done
+%ifarch x86_64 i586
+%check
+make check
+%endif
+
%post
update-alternatives --install %{_bindir}/sphinx_pitch sphinx_pitch
%{_bindir}/sphinx_pitch-%{version} 10 \
--slave %{_bindir}/sphinx_cepview sphinx_cepview
%{_bindir}/sphinx_cepview-%{version} \
++ workaround-gcc-issue-on-i586.patch ++
From: Antonio Larrosa
Subject: Workaround a gcc issue on i586
This is a workaround to circumvent
https://bugzilla.opensuse.org/show_bug.cgi?id=1127564
Index: sphinxbase-0.8/src/libsphinxbase/util/logmath.c
===
--- sphinxbase-0.8.orig/src/libsphinxbase/util/logmath.c
+++ sphinxbase-0.8/src/libsphinxbase/util/logmath.c
@@ -449,7 +449,9 @@ logmath_log(logmath_t *lmath, float64 p)
if (p <= 0) {
return lmath->zero;
}
-return (int)(log(p) * lmath->inv_log_of_base) >> lmath->t.shift;
+double g1 = log(p);
+double g3 = g1 * lmath->inv_log_of_base;
+return (int)g3 >> lmath->t.shift;
}
float64
Index: sphinxbase-0.8/include/sphinxbase/logmath.h
===
--- sphinxbase-0.8.orig/include/sphinxbase/logmath.h
+++ sphinxbase-0.8/include/sphinxbase/logmath.h
@@ -197,7 +197,7 @@ int logmath_add(logmath_t *lmath, int lo
* Convert linear floating point number to integer log in base B.
*/
SPHINXBASE_EXPORT
-int logmath_log(logmath_t *lmath, float64 p);
+int logmath_log(logmath_t *lmath, float64 p) __attribute__((optimize("-O0")));
/**
* Convert integer log in base B to linear floating point.
commit sphinxbase for openSUSE:Factory
Hello community,
here is the log from the commit of package sphinxbase for openSUSE:Factory
checked in at 2019-02-26 22:20:47
Comparing /work/SRC/openSUSE:Factory/sphinxbase (Old)
and /work/SRC/openSUSE:Factory/.sphinxbase.new.28833 (New)
Package is "sphinxbase"
Tue Feb 26 22:20:47 2019 rev:2 rq:679058 version:0.8
Changes:
--- /work/SRC/openSUSE:Factory/sphinxbase/sphinxbase.changes2018-08-31
10:41:32.702997238 +0200
+++ /work/SRC/openSUSE:Factory/.sphinxbase.new.28833/sphinxbase.changes
2019-02-26 22:22:17.294068560 +0100
@@ -1,0 +2,6 @@
+Sat Feb 23 12:36:39 UTC 2019 - alarr...@suse.com
+
+- Use alternatives for some binaries to make it possible to have the package
+ coinstallable with sphinxbase5 5prealpha
+
+---
Other differences:
--
++ sphinxbase.spec ++
--- /var/tmp/diff_new_pack.5aL0pV/_old 2019-02-26 22:22:17.898068346 +0100
+++ /var/tmp/diff_new_pack.5aL0pV/_new 2019-02-26 22:22:17.902068344 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sphinxbase
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,14 +12,15 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
Name: sphinxbase
Version:0.8
Release:0
Summary:Support library required by Pocketsphinx
-License:BSD-2-Clause and MIT
+License:BSD-2-Clause AND MIT
Group: Productivity/Office/Other
Url:http://cmusphinx.sourceforge.net/wiki/download/
Source:
http://downloads.sourceforge.net/project/cmusphinx/%{name}/%{version}/%{name}-%{version}.tar.gz
@@ -37,14 +38,16 @@
BuildRequires: fdupes
BuildRequires: libsndfile-devel
BuildRequires: pkgconfig
-BuildRequires: python-devel
BuildRequires: python-Cython
+BuildRequires: python-devel
BuildRequires: python-rpm-macros
%if 0%{?suse_version} <= 1210
BuildRequires: liblapack3
%else
BuildRequires: lapack-devel
%endif
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
%description
CMU Sphinx toolkit is a speech recognition tool and has a number of packages
for
@@ -102,13 +105,48 @@
find %{buildroot} -type f -name "*.la" -delete -print
%fdupes %{buildroot}
+# Prepare for alternatives
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+for binary in sphinx_cepview sphinx_fe sphinx_jsgf2fsg sphinx_lm_convert \
+ sphinx_lm_eval sphinx_pitch ; do
+mv %{buildroot}%{_bindir}/$binary %{buildroot}%{_bindir}/$binary-%{version}
+ln -s %{_sysconfdir}/alternatives/$binary %{buildroot}%{_bindir}/$binary
+done
+
+%post
+update-alternatives --install %{_bindir}/sphinx_pitch sphinx_pitch
%{_bindir}/sphinx_pitch-%{version} 10 \
+ --slave %{_bindir}/sphinx_cepview sphinx_cepview
%{_bindir}/sphinx_cepview-%{version} \
+ --slave %{_bindir}/sphinx_fe sphinx_fe %{_bindir}/sphinx_fe-%{version} \
+ --slave %{_bindir}/sphinx_jsgf2fsg sphinx_jsgf2fsg
%{_bindir}/sphinx_jsgf2fsg-%{version} \
+ --slave %{_bindir}/sphinx_lm_convert sphinx_lm_convert
%{_bindir}/sphinx_lm_convert-%{version} \
+ --slave %{_bindir}/sphinx_lm_eval sphinx_lm_eval
%{_bindir}/sphinx_lm_eval-%{version}
+
+%postun
+if [ ! -f %{_bindir}/sphinx_pitch ]; then
+update-alternatives --remove sphinx_pitch
%{_bindir}/sphinx_pitch-%{version}
+fi
+
%post -n libsphinxbase1 -p /sbin/ldconfig
%postun -n libsphinxbase1 -p /sbin/ldconfig
%files
%doc AUTHORS ChangeLog README NEWS
%license COPYING
-%{_bindir}/sphinx_*
+%ghost %{_sysconfdir}/alternatives/sphinx_cepview
+%ghost %{_sysconfdir}/alternatives/sphinx_fe
+%ghost %{_sysconfdir}/alternatives/sphinx_jsgf2fsg
+%ghost %{_sysconfdir}/alternatives/sphinx_lm_convert
+%ghost %{_sysconfdir}/alternatives/sphinx_lm_eval
+%ghost %{_sysconfdir}/alternatives/sphinx_pitch
+%{_bindir}/sphinx_cepview*
+%{_bindir}/sphinx_fe*
+%{_bindir}/sphinx_jsgf2fsg*
+%{_bindir}/sphinx_lm_convert*
+%{_bindir}/sphinx_lm_eval*
+%{_bindir}/sphinx_pitch*
+%{_bindir}/sphinx_cont_adseg
+%{_bindir}/sphinx_cont_fileseg
+%{_bindir}/sphinx_lm_sort
%files -n libsphinxbase1
%{_libdir}/*.so.*
