Hello community, here is the log from the commit of package cmuclmtk for openSUSE:Factory checked in at 2014-03-14 15:13:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmuclmtk (Old) and /work/SRC/openSUSE:Factory/.cmuclmtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmuclmtk" Changes: -------- --- /work/SRC/openSUSE:Factory/cmuclmtk/cmuclmtk.changes 2014-03-02 18:22:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmuclmtk.new/cmuclmtk.changes 2014-03-14 15:13:55.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Mar 11 01:26:19 CET 2014 - r...@suse.de + +- add patch 0002-Fix-includes.patch from upstream +- add patch 0003-Fix-endian-check.patch +- add patch 0004-Fix-vocab_size.patch +- run testsuite (but ignore errors for now, completes only + on little-endian 64bit) + +------------------------------------------------------------------- New: ---- 0002-Fix-includes.patch 0003-Fix-endian-check.patch 0004-Fix-vocab_size.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmuclmtk.spec ++++++ --- /var/tmp/diff_new_pack.VkFjyZ/_old 2014-03-14 15:13:55.000000000 +0100 +++ /var/tmp/diff_new_pack.VkFjyZ/_new 2014-03-14 15:13:55.000000000 +0100 @@ -24,8 +24,14 @@ Group: System/Libraries Url: http://cmusphinx.sourceforge.net Source: %{name}-%{version}.tar.gz -Patch: decl-mismatch.patch +Patch1: decl-mismatch.patch +Patch2: 0002-Fix-includes.patch +Patch3: 0003-Fix-endian-check.patch +Patch4: 0004-Fix-vocab_size.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: gdb +BuildRequires: less +BuildRequires: vim %description The CMU-Cambridge Language Modeling Toolkit is a free set of tools @@ -66,7 +72,10 @@ %prep %setup -q -%patch -p1 +%patch1 -p1 +%patch2 +%patch3 +%patch4 %build %configure @@ -78,6 +87,9 @@ rm -rf %{buildroot}%{_libdir}/*.a rm -rf %{buildroot}%{_libdir}/*.la +%check +make check || true + %post -n libcmuclmtk0 -p /sbin/ldconfig %postun -n libcmuclmtk0 -p /sbin/ldconfig ++++++ 0002-Fix-includes.patch ++++++ --- src/liblmest/generate.c +++ src/liblmest/generate.c @@ -99,8 +99,8 @@ int i,j,bo_case,initial_history_id; id__t sought_trigram[3]; double p,acc,trigram_prob; - vocab_sz_t lm_vocab_sz; - char** lm_vocab; + vocab_sz_t lm_vocab_sz = 0; + char** lm_vocab = NULL; if(png!=NULL && pang!=NULL) quit(-1,"Confused by multiple input type.\n"); --- src/libs/rr_mkdtemp.c +++ src/libs/rr_mkdtemp.c @@ -36,6 +36,8 @@ #include <stdio.h> #include <stdlib.h> +#include <sys/types.h> +#include <sys/stat.h> #include <../win32/compat.h> --- src/programs/text2idngram.c +++ src/programs/text2idngram.c @@ -51,7 +51,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/types.h> +#include <unistd.h> #include <errno.h> #include "../liblmest/toolkit.h" --- src/programs/text2wngram.c +++ src/programs/text2wngram.c @@ -36,10 +36,10 @@ #define DEFAULT_MAX_FILES 20 -#include <sys/types.h> #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <unistd.h> #include <errno.h> #include "../liblmest/toolkit.h" @@ -70,6 +70,15 @@ fprintf(stderr," < .text > .wngram\n"); } +void merge_tempfiles (int start_file, + int end_file, + char *temp_file_root, + char *temp_file_ext, + int max_files, + FILE *outfile, + int n, + int verbosity); + int main (int argc, char **argv) { int n; --- src/programs/wngram2idngram.c +++ src/programs/wngram2idngram.c @@ -45,7 +45,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/types.h> +#include <unistd.h> #include <errno.h> #include "../liblmest/toolkit.h" @@ -361,7 +361,7 @@ }else { /* Write to temporary file */ for (i=0;i<=n-1;i++) - rr_fwrite((char*)¤t_ngram[i],sizeof(unsigned short),1, + rr_fwrite((char*)¤t_ngram[i],sizeof(wordid_t),1, non_unk_fp,"temporary n-gram ids"); rr_fwrite((char*)¤t_count,sizeof(int),1,non_unk_fp, ++++++ 0003-Fix-endian-check.patch ++++++ --- src/libs/mips_swap.h +++ src/libs/mips_swap.h @@ -20,8 +20,8 @@ #include "general.h" -#ifndef WORDS_BIGENDIAN /* reverse byteorder */ - +#if __BYTE_ORDER == __LITTLE_ENDIAN +/* reverse byteorder */ /* the following works even for badly aligned pointers */ #define SWAPFIELD(x) {if (sizeof(*(x))==sizeof(short)) {SWAPHALF((x))} \ ++++++ 0004-Fix-vocab_size.patch ++++++ --- src/liblmest/load_lm.c +++ src/liblmest/load_lm.c @@ -84,6 +84,7 @@ char *lm_filename) { int i; + wordid_t vocab_size; ng->disc_meth=NULL; ng->vocab_size = 0; ng->bin_fp = rr_iopen(lm_filename); @@ -98,7 +99,8 @@ /* Scalar parameters */ rr_fread((char*)&ng->n,sizeof(unsigned short),1,ng->bin_fp,"n",0); - rr_fread((char*)&ng->vocab_size,sizeof(wordid_t),1,ng->bin_fp,"vocab_size",0); + rr_fread((char*)&vocab_size,sizeof(wordid_t),1,ng->bin_fp,"vocab_size",0); + ng->vocab_size = (vocab_sz_t) vocab_size; rr_fread((char*)&ng->no_of_ccs,sizeof(unsigned short),1,ng->bin_fp,"no_of_ccs",0); rr_fread((char*)&ng->vocab_type,sizeof(unsigned short),1,ng->bin_fp,"vocab_type",0); --- src/liblmest/write_lms.c +++ src/liblmest/write_lms.c @@ -432,6 +432,7 @@ int l_chunk; int from_rec; int i; + wordid_t vocab_size = (wordid_t)ng->vocab_size; pc_message(verbosity,1,"Binary %d-gram language model will be written to %s\n",ng->n,ng->bin_filename); @@ -442,7 +443,7 @@ rr_fwrite((char*)&ng->version,sizeof(int),1,ng->bin_fp,"version"); rr_fwrite((char*)&ng->n,sizeof(unsigned short),1,ng->bin_fp,"n"); - rr_fwrite((char*)&ng->vocab_size,sizeof(wordid_t),1,ng->bin_fp,"vocab_size"); + rr_fwrite((char*)&vocab_size,sizeof(wordid_t),1,ng->bin_fp,"vocab_size"); rr_fwrite((char*)&ng->no_of_ccs,sizeof(unsigned short),1,ng->bin_fp,"no_of_ccs"); rr_fwrite((char*)&ng->vocab_type,sizeof(unsigned short),1,ng->bin_fp,"vocab_type"); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
