add tools

3 files changed, 53 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a47996303dd5..0dae8f797799 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Nov 23 04:58:50 UTC 2016
+# Thu Jan  5 10:28:20 UTC 2017
 pkgbase = kaldi
 	pkgdesc = Speech recognition research toolkit
-	pkgver = r6845.2e1974b
+	pkgver = r6998.f51c984
 	pkgrel = 1
 	url = https://github.com/kaldi-asr/kaldi
 	arch = x86_64
@@ -11,11 +11,13 @@ pkgbase = kaldi
 	makedepends = cuda
 	makedepends = git
 	depends = python2
-	depends = openfst-kaldi
 	depends = openblas-lapack
 	optdepends = cuda: For GPU support
+	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
 
 pkgname = kaldi
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..2ef7c6b264c8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+#dolphin
+.directory
+
+#pkg building files
+
+*.7z
+*.tar.xz
+*.tar.gz
+*.tgz
+
+src/
+pkg/
+*/
diff --git a/PKGBUILD b/PKGBUILD
index 3430a98bc0e8..19c28a60d42a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,19 @@
 # Maintainer: Jingbei Li <i@jingbei.lli>
 pkgname='kaldi'
 pkgdesc='Speech recognition research toolkit'
-pkgver=r6845.2e1974b
+pkgver=r6998.f51c984
 pkgrel=1
 makedepends=('cuda' 'git')
-depends=('python2' 'openfst-kaldi' 'openblas-lapack')
+depends=('python2' 'openblas-lapack')
 optdepends=('cuda:	For GPU support')
 arch=('x86_64' 'i686')
 url='https://github.com/kaldi-asr/kaldi'
 license=('APACHE')
-source=("${pkgname}::git+${url}")
-sha512sums=('SKIP')
+source=("${pkgname}::git+${url}"
+	"srilm.tgz::https://www.dropbox.com/s/41y27or8lco4fju/srilm-1.7.2.tar.gz?dl=1")
+noextract=('srilm.tgz')
+sha512sums=('SKIP'
+            'e67ec78d2271e8da5f2dd2ba8e54db64e4d9ff02ad6cb36887835a1532dcc89ec90fff2a95c7dcc1b7f0956df5fc00d5ee3c864012c452d37b81a4e42ef98e62')
 
 pkgver () {
 	cd "${pkgname}"
@@ -27,27 +30,46 @@ prepare(){
 }
 
 build () {
+	cd $srcdir/$pkgname/tools
+	sed \
+		-e 's/^OPENFST_VERSION = 1\.3\.4$/OPENFST_VERSION = 1.4.1/' \
+		-e '/^sclite_compiled/s/ sctk_configured//' \
+		-i Makefile
+	sed 's/^exit/# exit/' -i extras/check_dependencies.sh
+	make sph2pipe openfst sctk_configured
+	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
+	ln -sf $srcdir/srilm.tgz .
+	extras/install_srilm.sh
+
 	cd $srcdir/$pkgname/src
 	./configure \
 		--shared \
-		--fst-root=/usr \
 		--openblas-root=/usr \
 		--threaded-math=yes \
-		--mathlib=OPENBLAS \
 		--use-cuda=yes \
 		--cudatk-dir=/opt/cuda
-	sed '/^OPENFST_VER = /s/$/1.4.1/' -i kaldi.mk
-	echo 'CXXFLAGS += -DHAVE_OPENFST_GE_10400 -O2' >> kaldi.mk
 	make depend
 	make
+
+	make test
 }
 
 package () {
-	cd $srcdir/$pkgname/src
-	mkdir -p $pkgdir/opt/$pkgname/bin
-	find *bin -executable -type f -exec install -Dm755 {} $pkgdir/opt/$pkgname/bin/ \;
-	cp -rL lib doc ../egs $pkgdir/opt/$pkgname
+	cd $srcdir/$pkgname
+	for i in "*.tar*" "*.c" "*.cc" "*.cu" "*.cpp" "*.h" "*.o" "*.a" "*.lo" "*.la" "*.mk" "Makefile*" "makefile*" "*.bak"
+	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 {} \;
+
+	mkdir -p $pkgdir/opt/$pkgname
+	cp -rL src $pkgdir/opt/$pkgname
+	cp -r misc egs tools $pkgdir/opt/$pkgname
 
 	install -dm755 "$pkgdir"/etc/ld.so.conf.d/
-	echo '/opt/kaldi/lib' > "$pkgdir"/etc/ld.so.conf.d/kaldi.conf
+	echo '/opt/kaldi/src/lib' > "$pkgdir"/etc/ld.so.conf.d/kaldi.conf
 }