Many fixes by critiqjo

3 files changed, 63 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 79a0f93c62be..6570d8f981d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 # Generated by mksrcinfo v8
-# Wed Feb 22 16:10:01 UTC 2017
+# Sat Mar 25 07:49:50 UTC 2017
 pkgbase = kaldi
 	pkgdesc = Speech recognition research toolkit
-	pkgver = 5.1.r7247.9866a4c4d
+	pkgver = 5.1.r7282.0d0316b48
 	pkgrel = 1
 	url = https://github.com/kaldi-asr/kaldi
 	arch = x86_64
 	arch = i686
 	license = APACHE
-	makedepends = cuda
+	makedepends = gcc5
 	makedepends = git
 	makedepends = wget
 	makedepends = subversion
@@ -18,8 +18,10 @@ pkgbase = kaldi
 	noextract = srilm.tgz
 	source = kaldi::git+https://github.com/kaldi-asr/kaldi
 	source = srilm.tgz::https://www.dropbox.com/s/41y27or8lco4fju/srilm-1.7.2.tar.gz?dl=1
-	sha512sums = SKIP
-	sha512sums = e67ec78d2271e8da5f2dd2ba8e54db64e4d9ff02ad6cb36887835a1532dcc89ec90fff2a95c7dcc1b7f0956df5fc00d5ee3c864012c452d37b81a4e42ef98e62
+	source = env.sh
+	sha256sums = SKIP
+	sha256sums = a528a778f881c679233f94d7b26d6f795129fa6009b32305c8ce769f66e223b4
+	sha256sums = c5a6996059077a2988a10344e07ad278f17552cc0d9ea0a3f074fa27c1ed387a
 
 pkgname = kaldi
 
diff --git a/PKGBUILD b/PKGBUILD
index c2c235962c26..aba4b03d38cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,28 @@
 # Maintainer: Jingbei Li <i@jingbei.lli>
 pkgname='kaldi'
 pkgdesc='Speech recognition research toolkit'
-pkgver=5.1.r7247.9866a4c4d
+pkgver=5.1.r7282.0d0316b48
 pkgrel=1
-makedepends=('cuda' 'git' 'wget' 'subversion')
+makedepends=('gcc5' 'git' 'wget' 'subversion')
 depends=('python2' 'openblas-lapack')
-optdepends=('cuda:	For GPU support')
+optdepends=('cuda: For GPU support')
 arch=('x86_64' 'i686')
 url='https://github.com/kaldi-asr/kaldi'
 license=('APACHE')
 source=("${pkgname}::git+${url}"
-	"srilm.tgz::https://www.dropbox.com/s/41y27or8lco4fju/srilm-1.7.2.tar.gz?dl=1")
+"srilm.tgz::https://www.dropbox.com/s/41y27or8lco4fju/srilm-1.7.2.tar.gz?dl=1"
+"env.sh")
 noextract=('srilm.tgz')
-sha512sums=('SKIP'
-            'e67ec78d2271e8da5f2dd2ba8e54db64e4d9ff02ad6cb36887835a1532dcc89ec90fff2a95c7dcc1b7f0956df5fc00d5ee3c864012c452d37b81a4e42ef98e62')
+sha256sums=('SKIP'
+'a528a778f881c679233f94d7b26d6f795129fa6009b32305c8ce769f66e223b4'
+'c5a6996059077a2988a10344e07ad278f17552cc0d9ea0a3f074fa27c1ed387a')
 
 pkgver () {
 	cd "${pkgname}"
 	(
-		set -o pipefail
-		echo -n `cat src/.version`.
-		git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+	set -o pipefail
+	echo -n `cat src/.version`.
+	git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
 		printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 	)
 }
@@ -28,44 +30,73 @@ pkgver () {
 prepare(){
 	cd $srcdir/$pkgname
 	find . -name '*.py' -exec sed '1s/python/python2/' -i {} \;
+
+	if (pacman -Q cuda &> /dev/null); then
+		msg2 "Compiling with CUDA support"
+		_cuda_config_opts="--cudatk-dir=/opt/cuda"
+	else
+		msg2 "Compiling _without_ CUDA support"
+	fi
 }
 
 build () {
 	cd $srcdir/$pkgname/tools
-	sed \
-		-e '/^sclite_compiled/s/ sctk_configured//' \
+	sed -e '/^sclite_compiled/s/ sctk_configured//' \
+		-e 's?^\(\tcd openfst-[^\s]* \./configure --prefix\)=`pwd`?\1=/opt/'$pkgname'/tools/openfst-$(OPENFST_VERSION)?' \
+		-e 's?^\(\t\$(MAKE) -C openfst-[^\s]*\) \(install\)?\1 DESTDIR='$srcdir/$pkgname' \2?' \
 		-i Makefile
 	sed 's/^exit/# exit/' -i extras/check_dependencies.sh
 	make CXX=g++-5 sph2pipe openfst sctk_configured
+
+	OPENFST=../opt/$pkgname/tools/openfst-*
+	mv openfst-*/Makefile $OPENFST/
+	rm -r openfst-*/
+	mv $OPENFST ./
+
 	sed '/^DEFS/s/ -Dsize_t=unsigned//' -i sctk/src/sclite/makefile
 	make sclite
+
 	CXX=g++-5 extras/install_irstlm.sh
 	extras/install_kaldi_lm.sh
+	chmod +rx kaldi_lm
+
 	ln -sf $srcdir/srilm.tgz .
 	extras/install_srilm.sh
 
 	cd $srcdir/$pkgname/src
-	./configure \
+	./configure $_cuda_config_opts \
 		--shared \
 		--openblas-root=/usr \
-		--threaded-math=yes \
-		--cudatk-dir=/opt/cuda
+		--threaded-math=yes
 	make CXX=g++-5 depend
 	make CXX=g++-5
 }
 
 package () {
 	cd $srcdir/$pkgname
-	for i in "*.tar*" "*.c" "*.cc" "*.cu" "*.cpp" "*.h" "*.o" "*.a" "*.lo" "*.la" "*.mk" "Makefile*" "makefile*" "*.bak"
+	for i in "*.tar*" "*.c" "*.cc" "*.cu" "*.cpp" "*.h" "*.o" "*.a" "*.lo" "*.la" "*.mk" "Makefile*" "makefile*" "*.bak" "*.log" "*.status" "*.~*"
 	do
 		find . -type f -name "$i" -exec rm -f {} \;
 	done
 
-	find . -name 'path.sh' -exec sed 's/^export KALDI_ROOT=.*$/export KALDI_ROOT=\/opt\/kaldi/' -i {} \;
+	find . -name 'path.sh' -exec sed 's?^\(export KALDI_ROOT\)=.*$?\1=/opt/'$pkgname'?' -i {} \;
+
+	rm tools/srilm.tgz
+	rm tools/srilm/lm/src/Dependencies.i686-m64
 
-	mkdir -p $pkgdir/opt/$pkgname
+	mkdir -p $pkgdir/opt/$pkgname/tools
 	cp -rL src $pkgdir/opt/$pkgname
-	cp -r misc egs tools $pkgdir/opt/$pkgname
+	cp -r misc egs $pkgdir/opt/$pkgname
+	cp -r tools/CLAPACK \
+		tools/config \
+		$startdir/env.sh \
+		tools/extras \
+		tools/irstlm \
+		tools/kaldi_lm \
+		tools/liblbfgs* \
+		tools/openfst* \
+		tools/s* \
+		$pkgdir/opt/$pkgname/tools
 
 	install -dm755 "$pkgdir"/etc/ld.so.conf.d/
 	echo '/opt/kaldi/src/lib' > "$pkgdir"/etc/ld.so.conf.d/kaldi.conf
diff --git a/env.sh b/env.sh
new file mode 100644
index 000000000000..9d553cea793e
--- /dev/null
+++ b/env.sh
@@ -0,0 +1,7 @@
+export IRSTLM=/opt/kaldi/tools/irstlm
+export PATH=${PATH}:${IRSTLM}/bin
+export PATH=${PATH}:/opt/kaldi/tools/kaldi_lm
+export LIBLBFGS=/opt/kaldi/tools/liblbfgs-1.10
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${LIBLBFGS}/lib/.libs
+export SRILM=/opt/kaldi/tools/srilm
+export PATH=${PATH}:${SRILM}/bin:${SRILM}/bin/i686-m64