[cmusphinx3] Different approach to the -largefile patch to fix problems with the original. Drop -aarch64 patch si
Jerry James
jjames at fedoraproject.org
Wed Sep 4 18:08:20 UTC 2013
commit 33ae8bb830843c38ec76895570b668e32c042c53
Author: Jerry James <jamesjer at betterlinux.com>
Date: Wed Sep 4 12:07:38 2013 -0600
Different approach to the -largefile patch to fix problems with the
original.
Drop -aarch64 patch since we now run autoreconf.
Split the models out into a noarch package due to their size.
Mark the -doc subpackage as noarch.
cmusphinx3.spec | 34 +-
sphinx3-aarch64.patch | 1625 -----------------------------------------------
sphinx3-largefile.patch | 402 +++++++++++-
3 files changed, 413 insertions(+), 1648 deletions(-)
---
diff --git a/cmusphinx3.spec b/cmusphinx3.spec
index f9955ee..1837126 100644
--- a/cmusphinx3.spec
+++ b/cmusphinx3.spec
@@ -1,6 +1,6 @@
Name: cmusphinx3
Version: 0.8
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Large vocabulary speech recognition in C
Group: Applications/Multimedia
@@ -30,16 +30,17 @@ Patch4: sphinx3-cpychecker.patch
Patch5: sphinx3-format.patch
# Sent upstream 28 Mar 2013. Enable large file support.
Patch6: sphinx3-largefile.patch
-# Sent upstream 28 Mar 2013. Enable building on aarch64.
-Patch7: sphinx3-aarch64.patch
BuildRequires: alsa-lib-devel
BuildRequires: doxygen
BuildRequires: libbsd-devel
+BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: python2-devel
BuildRequires: sphinxbase-devel
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-models = %{version}-%{release}
+Requires: grep
Requires: procps-ng
%global __provides_exclude_from ^%{_libdir}/python.*\\.so$
@@ -78,10 +79,19 @@ Requires: sphinxbase-python%{?_isa}
%description python
Python interface to cmusphinx3.
+%package models
+Summary: Language models and dictionaries for cmusphinx3
+Group: Applications/Multimedia
+BuildArch: noarch
+
+%description models
+Language models and dictionaries for cmusphinx3.
+
%package doc
Summary: Doxygen documentation for cmusphinx3
Group: Documentation
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+BuildArch: noarch
%description doc
Doxygen documentation for cmusphinx3.
@@ -95,10 +105,14 @@ Doxygen documentation for cmusphinx3.
%patch4
%patch5
%patch6
-%patch7
+
+# Regenerate files due to patch 6
+autoreconf -fi
# Adapt to sphinxbase 0.7+
-sed -i 's/heap_t /heap_t */' src/libs3decoder/libsearch/vithist.c
+sed 's/heap_t /heap_t */' src/libs3decoder/libsearch/vithist.c > foo
+touch -r src/libs3decoder/libsearch/vithist.c foo
+mv -f foo src/libs3decoder/libsearch/vithist.c
# Remove executable bits from the documentation
find doc -type f | xargs chmod a-x
@@ -155,7 +169,6 @@ rm -f doc/images/Makefile doc/s3/*.fig
%files
%{_bindir}/*
-%{_datadir}/sphinx3
%files devel
%{_includedir}/sphinx3
@@ -170,11 +183,20 @@ rm -f doc/images/Makefile doc/s3/*.fig
%{python_sitearch}/Sphinx3*.egg-info
%{python_sitearch}/_sphinx3.so
+%files models
+%{_datadir}/sphinx3
+
%files doc
%doc doc/images doc/s3 doc/s3-2_files doc/*.doc doc/*.htm* doc/*.pdf doc/*.ppt
%doc doc/*.txt doc/sphinx3.4.code.tracing doc/sphinx3.5_refactoring.note html
%changelog
+* Wed Sep 4 2013 Jerry James <loganjerry at gmail.com> - 0.8-17
+- Different approach to the -largefile patch to fix problems with the original
+- Drop -aarch64 patch since we now run autoreconf
+- Split the models out into a noarch package due to their size
+- Mark the -doc subpackage as noarch
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sphinx3-largefile.patch b/sphinx3-largefile.patch
index d1369e2..f299e57 100644
--- a/sphinx3-largefile.patch
+++ b/sphinx3-largefile.patch
@@ -1,21 +1,290 @@
+--- ./doc/Makefile.am.orig 2008-12-31 11:28:52.000000000 -0700
++++ ./doc/Makefile.am 2013-09-04 10:56:46.820427924 -0600
+@@ -1,7 +1,7 @@
+
+ docdir = $(prefix)/share/sphinx3/doc
+
+-doc_DATA = @docdata@
++nobase_doc_DATA = @docdata@
+
+ EXTRA_DIST = @docdata@
+
+--- ./configure.in.orig 2008-12-31 21:23:23.000000000 -0700
++++ ./configure.in 2013-09-04 11:37:38.049004984 -0600
+@@ -1,8 +1,9 @@
+ dnl Welcome to the Sphinx-3 automated build system.
+ dnl try not to hurt yourself ;)
+
+-AC_INIT(configure.in)
+-AM_INIT_AUTOMAKE(sphinx3,0.8)
++AC_INIT([sphinx3],[0.8])
++AC_CONFIG_SRCDIR([configure.in])
++AM_INIT_AUTOMAKE
+
+ CFLAGS=${CFLAGS:--g -O2 -Wall}
+
+@@ -19,9 +20,7 @@ case $host in
+ ;;
+ esac
+
+-AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_C_BIGENDIAN
+ AC_HEADER_STDC
+
+@@ -29,8 +28,14 @@ AC_C_CONST
+ AC_TYPE_SIZE_T
+ AC_CHECK_FUNCS(memmove bcopy)
+
+-AC_TYPE_SIGNAL
+-
++AC_SYS_LARGEFILE
++AC_FUNC_FSEEKO
++AC_TYPE_OFF_T
++AC_CHECK_TYPES(long long)
++AC_CHECK_SIZEOF(long long)
++AC_CHECK_SIZEOF(long)
++AC_CHECK_SIZEOF(int)
++AC_CHECK_SIZEOF(off_t)
+
+ dnl
+ dnl Check whether visibility is supported
+@@ -42,7 +47,7 @@ AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [
+ AC_CACHE_CHECK([if compiler supports __attribute__((visibility("default")))],
+ [cc_cv_attribute_visibility],
+ [AC_COMPILE_IFELSE([
+- void __attribute__((visibility("default"))) visibility_function() { }
++ AC_LANG_SOURCE([void __attribute__((visibility("default"))) visibility_function() { }])
+ ],
+ [cc_cv_attribute_visibility=yes],
+ [cc_cv_attribute_visibility=no])
+@@ -62,19 +67,19 @@ AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [
+
+ CC_ATTRIBUTE_VISIBILITY
+
+-epdata=`ls -1 $srcdir/model/ep | egrep -v '(Makefile|CVS)'`
++epdata=`ls -1 $srcdir/model/ep | grep -Ev 'Makefile|\.svn'`
+ epdata=`echo $epdata`
+
+-hmmdata=`ls -1 $srcdir/model/hmm/hub4_cd_continuous_8gau_1s_c_d_dd | egrep -v '(Makefile|CVS)'`
++hmmdata=`ls -1 $srcdir/model/hmm/hub4_cd_continuous_8gau_1s_c_d_dd | grep -Ev 'Makefile|\.svn'`
+ hmmdata=`echo $hmmdata`
+
+-tidigitsdata=`(cd $srcdir/model/hmm/tidigits && find . -type f -print | egrep -v '(Makefile|CVS|\.svn)')`
++tidigitsdata=`cd $srcdir/model/hmm/tidigits && find . -type f | grep -Ev 'Makefile|\.svn'`
+ tidigitsdata=`echo $tidigitsdata`
+
+-lmdata=`ls -1 $srcdir/model/lm/an4 | egrep -v '(Makefile|CVS)' | sed 's/\.in//g'`
++lmdata=`ls -1 $srcdir/model/lm/an4 | grep -Ev 'Makefile|\.svn|\.in$'`
+ lmdata=`echo $lmdata`
+
+-docdata=`ls -1 $srcdir/doc | egrep -v '(Makefile|CVS)'`
++docdata=`cd $srcdir/doc && find . -type f | grep -Ev 'Makefile|\.svn'`
+ docdata=`echo $docdata`
+
+ dnl
+@@ -126,22 +131,23 @@ if test x$sphinxbase != x && test x$cros
+ fi
+ if test x$sphinxbase != x && test x$cross_compiling != xyes; then
+ AC_CHECK_FILE($sphinxbase/include/prim_type.h,CPPFLAGS="-I$sphinxbase/include $CPPFLAGS",
+- AC_ERROR(
+-[SphinxBase headers not found in $sphinxbase. Please use the
++ AC_MSG_ERROR(
++SphinxBase headers not found in $sphinxbase. Please use the
+ --with-sphinxbase option to `configure' to specify the location of
+-SphinxBase. Run $0 --help for more information.]))
++SphinxBase. Run $0 --help for more information.))
+ fi
+ if test x$sphinxbasebuild != x && test x$cross_compiling != xyes; then
+ AC_CHECK_FILE($sphinxbasebuild/src/libsphinxbase/libsphinxbase.la,
+ [CPPFLAGS="-I$sphinxbasebuild/include $CPPFLAGS"
+ LDFLAGS="$LDFLAGS -L$sphinxbasebuild/src/libsphinxfe -L$sphinxbasebuild/src/libsphinxad \
+ -L$sphinxbasebuild/src/libsphinxbase"],
+- AC_ERROR(
+-[SphinxBase libraries were not found in $sphinxbasebuild.
++ AC_MSG_ERROR(
++SphinxBase libraries were not found in $sphinxbasebuild.
+ Use the --with-sphinxbase-build option to `configure' to specify
+-the build directory for SphinxBase. Run $0 --help for more information.]))
++the build directory for SphinxBase. Run $0 --help for more information.))
+ fi
+
++AM_PROG_AR
+ AC_PATH_PROG(PERL,perl)
+ AC_PATH_PROG(CSH,csh)
+ AC_SUBST(sphinxbase)
+@@ -156,9 +162,9 @@ AC_SUBST(ad_backend)
+ AC_SUBST(PERL)
+ AC_SUBST(CSH)
+
+-AM_PROG_LIBTOOL
++LT_INIT()
+
+-AC_OUTPUT([
++AC_CONFIG_FILES([
+ sphinx3.pc
+ Makefile
+ src/Makefile
+@@ -208,6 +214,7 @@ model/lm/an4/args.an4.test.fsg
+ model/lm/an4/an4.ug.cls.lmctl
+ include/Makefile
+ doc/Makefile])
++AC_OUTPUT
+
+ chmod +x scripts/sphinx3-simple
+ chmod +x src/tests/regression/*.sh
+--- ./src/tests/performance/tidigits/Makefile.am.orig 2008-12-31 11:27:56.000000000 -0700
++++ ./src/tests/performance/tidigits/Makefile.am 2013-03-29 11:30:32.427889654 -0600
+@@ -35,7 +35,7 @@
+ #
+ # ====================================================================
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+
+--- ./src/tests/performance/wsj5k/Makefile.am.orig 2008-12-31 11:27:57.000000000 -0700
++++ ./src/tests/performance/wsj5k/Makefile.am 2013-03-29 11:30:45.499869557 -0600
+@@ -35,7 +35,7 @@
+ #
+ # ====================================================================
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+
+--- ./src/tests/performance/ti46/Makefile.am.orig 2008-12-31 11:27:57.000000000 -0700
++++ ./src/tests/performance/ti46/Makefile.am 2013-03-29 11:30:56.773852224 -0600
+@@ -35,7 +35,7 @@
+ #
+ # ====================================================================
+
+-INCLUDES = -I$(top_srcdir) \
++AM_CPPFLAGS = -I$(top_srcdir) \
+ -I$(top_builddir)/include
+
+
+--- ./src/tests/performance/spoke3/Makefile.am.orig 2008-12-31 11:27:57.000000000 -0700
++++ ./src/tests/performance/spoke3/Makefile.am 2013-03-29 11:31:06.900836655 -0600
+@@ -35,7 +35,7 @@
+ #
+ # ====================================================================
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+
+--- ./src/tests/performance/Communicator/Makefile.am.orig 2008-12-31 11:27:56.000000000 -0700
++++ ./src/tests/performance/Communicator/Makefile.am 2013-03-29 11:31:25.764807653 -0600
+@@ -35,7 +35,7 @@
+ #
+ # ====================================================================
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+
+--- ./src/tests/performance/ICSI/Makefile.am.orig 2008-12-31 11:27:57.000000000 -0700
++++ ./src/tests/performance/ICSI/Makefile.am 2013-03-29 11:31:35.828792180 -0600
+@@ -35,7 +35,7 @@
+ #
+ # ====================================================================
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+
+--- ./src/tests/performance/wsj20k/Makefile.am.orig 2008-12-31 11:27:56.000000000 -0700
++++ ./src/tests/performance/wsj20k/Makefile.am 2013-03-29 11:31:50.740769255 -0600
+@@ -35,7 +35,7 @@
+ #
+ # ====================================================================
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+
+--- ./src/tests/performance/an4/Makefile.am.orig 2008-12-31 11:27:57.000000000 -0700
++++ ./src/tests/performance/an4/Makefile.am 2013-03-29 11:32:01.029753118 -0600
+@@ -35,7 +35,7 @@
+ #
+ # ====================================================================
+
+-INCLUDES = -I$(top_srcdir) \
++AM_CPPFLAGS = -I$(top_srcdir) \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/libs3decoder \
+ -I$(top_srcdir)/src/libs3audio \
+--- ./src/tests/performance/hub4/Makefile.am.orig 2008-12-31 11:27:57.000000000 -0700
++++ ./src/tests/performance/hub4/Makefile.am 2013-03-29 11:32:11.476735479 -0600
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+
+--- ./src/tests/performance/rm1/Makefile.am.orig 2008-12-31 11:27:56.000000000 -0700
++++ ./src/tests/performance/rm1/Makefile.am 2013-03-29 11:32:21.108719270 -0600
+@@ -35,7 +35,7 @@
+ #
+ # ====================================================================
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+
+--- ./src/tests/unit_tests/test_logs3/Makefile.am.orig 2008-12-31 21:08:51.000000000 -0700
++++ ./src/tests/unit_tests/test_logs3/Makefile.am 2013-09-04 09:57:27.247897918 -0600
+@@ -1,11 +1,9 @@
+ check_PROGRAMS = testlogs3
+
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+ LDADD = ${top_builddir}/src/libs3decoder/libs3decoder.la \
+ -lsphinxbase -lm @ad_libs@
+-
+-TESTS = $(wildcard _*.test)
+--- ./src/programs/Makefile.am.orig 2008-12-31 11:27:58.000000000 -0700
++++ ./src/programs/Makefile.am 2013-03-29 11:33:11.652634979 -0600
+@@ -35,5 +35,5 @@ LDADD = $(top_builddir)/src/libs3decoder
+ sphinx3_livedecode_LDADD = $(top_builddir)/src/libs3decoder/libs3decoder.la \
+ -lsphinxbase -lsphinxad -lm -lpthread @ad_libs@
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
--- ./src/programs/main_ep.c.orig 2008-12-31 11:27:58.000000000 -0700
-+++ ./src/programs/main_ep.c 2013-03-28 13:15:48.933906386 -0600
-@@ -163,10 +163,10 @@ main(int _argc, char **_argv)
++++ ./src/programs/main_ep.c 2013-03-29 11:29:37.403974252 -0600
+@@ -163,11 +163,11 @@ main(int _argc, char **_argv)
E_FATAL("MFCC file must start with total vector size\n");
}
- if ((int) (n_floats * sizeof(float32) + 4) != statbuf.st_size) {
-+ if ((off_t) (n_floats * sizeof(float32) + 4) != statbuf.st_size) {
++ if ((OFF_T) (n_floats * sizeof(float32) + 4) != statbuf.st_size) {
SWAP_INT32(&n_floats);
- if ((int) (n_floats * sizeof(float32) + 4) != statbuf.st_size)
- E_FATAL("MFCC indicated size (%d) and actual (%d) size are"
-+ if ((off_t) (n_floats * sizeof(float32) + 4) != statbuf.st_size)
-+ E_FATAL("MFCC indicated size (%d) and actual (%zd) size are"
- "different\n",
+- "different\n",
++ if ((OFF_T) (n_floats * sizeof(float32) + 4) != statbuf.st_size)
++ E_FATAL("MFCC indicated size (%d) and actual (%" PRIdOFF_T
++ ") size are different\n",
n_floats * sizeof(float32) + 4, statbuf.st_size);
swap = 1;
+ }
--- ./src/libs3decoder/libcommon/corpus.c.orig 2008-12-31 11:27:54.000000000 -0700
-+++ ./src/libs3decoder/libcommon/corpus.c 2013-03-28 13:11:35.263578955 -0600
++++ ./src/libs3decoder/libcommon/corpus.c 2013-03-29 11:27:15.292192768 -0600
@@ -689,7 +689,7 @@ ctl_process_utt(const char *uttfile, int
char uttid[4096];
char base[16384];
@@ -25,14 +294,58 @@
ptmr_t tm;
utt_res_t *ur;
+--- ./src/libs3decoder/libcommon/Makefile.am.orig 2008-12-31 11:27:54.000000000 -0700
++++ ./src/libs3decoder/libcommon/Makefile.am 2013-03-29 11:33:28.059607868 -0600
+@@ -12,7 +12,7 @@ libcommon_la_SOURCES = \
+ stat.c \
+ vector.c
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+ LIBOBJS = @LIBOBJS@
+--- ./src/libs3decoder/libdict/Makefile.am.orig 2008-12-31 11:27:55.000000000 -0700
++++ ./src/libs3decoder/libdict/Makefile.am 2013-03-29 11:33:38.852590095 -0600
+@@ -13,7 +13,7 @@ libdict_la_SOURCES = \
+ noinst_HEADERS = \
+ cmu6_lts_rules.h
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+ LIBOBJS = @LIBOBJS@
+--- ./src/libs3decoder/libcfg/Makefile.am.orig 2008-12-31 11:27:55.000000000 -0700
++++ ./src/libs3decoder/libcfg/Makefile.am 2013-03-29 11:33:48.820573720 -0600
+@@ -9,7 +9,7 @@ libcfg_la_SOURCES = \
+ s3_arraylist.c \
+ s3_cfg_convert.c
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+ LIBOBJS = @LIBOBJS@
+--- ./src/libs3decoder/libam/Makefile.am.orig 2008-12-31 11:27:55.000000000 -0700
++++ ./src/libs3decoder/libam/Makefile.am 2013-03-29 11:33:59.550556136 -0600
+@@ -25,7 +25,7 @@ libam_la_SOURCES = \
+ log_add.c \
+ s2_semi_mgau.c
+
+-INCLUDES = -I$(top_srcdir) \
++AM_CPPFLAGS = -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
--- ./src/libs3decoder/liblm/lm_3g_dmp.c.orig 2008-12-31 11:27:54.000000000 -0700
-+++ ./src/libs3decoder/liblm/lm_3g_dmp.c 2013-03-28 13:14:05.734152532 -0600
++++ ./src/libs3decoder/liblm/lm_3g_dmp.c 2013-03-29 11:28:42.220059099 -0600
@@ -238,7 +238,7 @@ void
lm3g_dump_write_fmtdesc(FILE * fp)
{
int32 i, k;
- long pos;
-+ off_t pos;
++ OFF_T pos;
/* Write file format description into header */
for (i = 0; fmtdesc[i] != NULL; i++) {
@@ -41,7 +354,7 @@
}
/* Pad it out in order to achieve 32-bit alignment */
- pos = ftell(fp);
-+ pos = ftello(fp);
++ pos = FTELL(fp);
k = pos & 3;
if (k) {
fwrite_int32(fp, 4-k);
@@ -50,7 +363,7 @@
if (lm->n_bg > 0) {
- lm->bgoff = ftell(lm->fp);
-+ lm->bgoff = ftello(lm->fp);
++ lm->bgoff = FTELL(lm->fp);
if (lm->isLM_IN_MEMORY) {
if (is32bits) {
@@ -59,7 +372,7 @@
}
else {
- fseek(lm->fp, (lm->n_bg + 1) * mem_sz, SEEK_CUR);
-+ fseeko(lm->fp, (lm->n_bg + 1) * mem_sz, SEEK_CUR);
++ FSEEK(lm->fp, (lm->n_bg + 1) * mem_sz, SEEK_CUR);
E_INFO("%8d bigrams [on disk]\n", lm->n_bg);
}
@@ -68,7 +381,7 @@
if (lm->n_tg > 0) { /* Read bigrams; remember sentinel at the end */
- lm->tgoff = ftell(lm->fp);
-+ lm->tgoff = ftello(lm->fp);
++ lm->tgoff = FTELL(lm->fp);
if (lm->isLM_IN_MEMORY) {
if (is32bits) {
@@ -77,18 +390,29 @@
}
else {
- fseek(lm->fp, (lm->n_tg) * mem_sz, SEEK_CUR);
-+ fseeko(lm->fp, (lm->n_tg) * mem_sz, SEEK_CUR);
++ FSEEK(lm->fp, (lm->n_tg) * mem_sz, SEEK_CUR);
E_INFO("%8d bigrams [on disk]\n", lm->n_tg);
}
}
+--- ./src/libs3decoder/liblm/Makefile.am.orig 2008-12-31 11:27:54.000000000 -0700
++++ ./src/libs3decoder/liblm/Makefile.am 2013-03-29 11:34:09.387540052 -0600
+@@ -15,7 +15,7 @@ liblm_la_SOURCES = \
+ lmclass.c \
+ lmset.c
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+ LIBOBJS = @LIBOBJS@
--- ./src/libs3decoder/liblm/lm.c.orig 2008-12-31 11:27:54.000000000 -0700
-+++ ./src/libs3decoder/liblm/lm.c 2013-03-28 13:12:44.007384178 -0600
++++ ./src/libs3decoder/liblm/lm.c 2013-03-29 11:27:52.109136152 -0600
@@ -1084,7 +1084,7 @@ load_bg(lm_t * lm, s3lmwid32_t lw1)
else
bg = lm->membg[lw1].bg = (bg_t *) ckd_calloc(n + 1, mem_sz);
- if (fseek(lm->fp, lm->bgoff + b * mem_sz, SEEK_SET) < 0)
-+ if (fseeko(lm->fp, lm->bgoff + b * mem_sz, SEEK_SET) < 0)
++ if (FSEEK(lm->fp, lm->bgoff + b * mem_sz, SEEK_SET) < 0)
E_FATAL_SYSTEM("fseek failed\n");
@@ -97,7 +421,51 @@
- if (fseek(lm->fp, lm->tgoff + t * mem_sz_tg, SEEK_SET) < 0)
-+ if (fseeko(lm->fp, lm->tgoff + t * mem_sz_tg, SEEK_SET) < 0)
++ if (FSEEK(lm->fp, lm->tgoff + t * mem_sz_tg, SEEK_SET) < 0)
E_FATAL_SYSTEM("fseek failed\n");
+--- ./src/libs3decoder/libsearch/Makefile.am.orig 2008-12-31 11:27:56.000000000 -0700
++++ ./src/libs3decoder/libsearch/Makefile.am 2013-03-29 11:34:21.524520253 -0600
+@@ -38,7 +38,7 @@ libsearch_la_SOURCES = \
+ noinst_HEADERS = \
+ srch_flat_fwd_internal.h
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+ LIBOBJS = @LIBOBJS@
+--- ./src/libs3decoder/libAPI/Makefile.am.orig 2008-12-31 11:27:54.000000000 -0700
++++ ./src/libs3decoder/libAPI/Makefile.am 2013-03-29 11:34:36.331496165 -0600
+@@ -8,7 +8,7 @@ libAPI_la_SOURCES = \
+ s3_decode.c \
+ utt.c
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+ LIBOBJS = @LIBOBJS@
+--- ./src/libs3decoder/libconfidence/Makefile.am.orig 2008-12-31 11:27:55.000000000 -0700
++++ ./src/libs3decoder/libconfidence/Makefile.am 2013-03-29 11:34:48.011477212 -0600
+@@ -7,7 +7,7 @@ libconfidence_la_LDFLAGS = -version-info
+ libconfidence_la_SOURCES = \
+ confidence.c
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+ LIBOBJS = @LIBOBJS@
+--- ./src/libs3decoder/libep/Makefile.am.orig 2008-12-31 11:27:55.000000000 -0700
++++ ./src/libs3decoder/libep/Makefile.am 2013-03-29 11:35:00.540456927 -0600
+@@ -8,7 +8,7 @@ libep_la_LDFLAGS = -version-info 0:6:0
+ libep_la_SOURCES = \
+ s3_endpointer.c
+
+-INCLUDES = -I$(top_srcdir)/include \
++AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_builddir)/include
+
+ LIBOBJS = @LIBOBJS@
More information about the scm-commits
mailing list