diff --git a/.gitignore b/.gitignore index 4ea33f4..1fcc3f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /julius-4.2.2.tar.gz /japanese-models.tar.gz +/v4.4.2.1.tar.gz +/dictation-kit-bf4f024.tar.xz diff --git a/julius-4.4.2.1-DESTDIR.patch b/julius-4.4.2.1-DESTDIR.patch new file mode 100644 index 0000000..2f39a53 --- /dev/null +++ b/julius-4.4.2.1-DESTDIR.patch @@ -0,0 +1,368 @@ +diff -up julius-4.4.2.1/adinrec/Makefile.in.DESTDIR julius-4.4.2.1/adinrec/Makefile.in +--- julius-4.4.2.1/adinrec/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/adinrec/Makefile.in 2017-11-07 11:53:46.827786050 -0500 +@@ -36,8 +36,8 @@ $(TARGET): adinrec.c $(LIBSENT)/libsent. + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + ############################################################ + +diff -up julius-4.4.2.1/adintool/Makefile.in.DESTDIR julius-4.4.2.1/adintool/Makefile.in +diff -up julius-4.4.2.1/generate-ngram/Makefile.in.DESTDIR julius-4.4.2.1/generate-ngram/Makefile.in +--- julius-4.4.2.1/generate-ngram/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/generate-ngram/Makefile.in 2017-11-07 11:53:46.827786050 -0500 +@@ -33,8 +33,8 @@ $(TARGET): $(OBJ) $(LIBSENT)/libsent.a + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + clean: + $(RM) $(OBJ) *~ core +diff -up julius-4.4.2.1/gramtools/accept_check/Makefile.in.DESTDIR julius-4.4.2.1/gramtools/accept_check/Makefile.in +--- julius-4.4.2.1/gramtools/accept_check/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/gramtools/accept_check/Makefile.in 2017-11-07 11:53:46.827786050 -0500 +@@ -36,8 +36,8 @@ $(TARGET): $(OBJ) + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + ############################################################ + +diff -up julius-4.4.2.1/gramtools/dfa_determinize/Makefile.in.DESTDIR julius-4.4.2.1/gramtools/dfa_determinize/Makefile.in +--- julius-4.4.2.1/gramtools/dfa_determinize/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/gramtools/dfa_determinize/Makefile.in 2017-11-07 11:53:46.828786027 -0500 +@@ -35,8 +35,8 @@ $(TARGET): $(OBJ) + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + ############################################################ + +diff -up julius-4.4.2.1/gramtools/dfa_minimize/Makefile.in.DESTDIR julius-4.4.2.1/gramtools/dfa_minimize/Makefile.in +--- julius-4.4.2.1/gramtools/dfa_minimize/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/gramtools/dfa_minimize/Makefile.in 2017-11-07 11:53:46.828786027 -0500 +@@ -34,8 +34,8 @@ $(TARGET): $(OBJ) + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + ############################################################ + +diff -up julius-4.4.2.1/gramtools/generate/Makefile.in.DESTDIR julius-4.4.2.1/gramtools/generate/Makefile.in +--- julius-4.4.2.1/gramtools/generate/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/gramtools/generate/Makefile.in 2017-11-07 11:53:46.828786027 -0500 +@@ -35,8 +35,8 @@ $(TARGET): $(OBJ) + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + ############################################################ + +diff -up julius-4.4.2.1/gramtools/gram2sapixml/Makefile.in.DESTDIR julius-4.4.2.1/gramtools/gram2sapixml/Makefile.in +--- julius-4.4.2.1/gramtools/gram2sapixml/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/gramtools/gram2sapixml/Makefile.in 2017-11-07 11:53:46.829786004 -0500 +@@ -17,8 +17,8 @@ all: + install: install.bin + + install.bin: +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + clean: + echo nothing to do +diff -up julius-4.4.2.1/gramtools/mkdfa/Makefile.in.DESTDIR julius-4.4.2.1/gramtools/mkdfa/Makefile.in +--- julius-4.4.2.1/gramtools/mkdfa/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/gramtools/mkdfa/Makefile.in 2017-11-07 11:53:46.829786004 -0500 +@@ -18,13 +18,13 @@ all: + + install: + (cd $(SUBDIR); $(MAKE) install) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + install.bin: + (cd $(SUBDIR); $(MAKE) install.bin) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + clean: + (cd $(SUBDIR); $(MAKE) clean) +diff -up julius-4.4.2.1/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in.DESTDIR julius-4.4.2.1/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in +--- julius-4.4.2.1/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in 2017-11-07 11:53:46.830785981 -0500 +@@ -43,8 +43,8 @@ $(TARGET): $(OBJS) + install: install.bin + + install.bin: +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + clean: + $(RM) *.o *~ core +diff -up julius-4.4.2.1/gramtools/nextword/Makefile.in.DESTDIR julius-4.4.2.1/gramtools/nextword/Makefile.in +--- julius-4.4.2.1/gramtools/nextword/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/gramtools/nextword/Makefile.in 2017-11-07 11:53:46.830785981 -0500 +@@ -36,8 +36,8 @@ $(TARGET): $(OBJ) + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + ############################################################ + +diff -up julius-4.4.2.1/gramtools/yomi2voca/Makefile.in.DESTDIR julius-4.4.2.1/gramtools/yomi2voca/Makefile.in +--- julius-4.4.2.1/gramtools/yomi2voca/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/gramtools/yomi2voca/Makefile.in 2017-11-07 11:53:46.830785981 -0500 +@@ -17,8 +17,8 @@ all: + install: install.bin + + install.bin: +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + clean: + echo nothing to do +diff -up julius-4.4.2.1/jclient-perl/Makefile.in.DESTDIR julius-4.4.2.1/jclient-perl/Makefile.in +--- julius-4.4.2.1/jclient-perl/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/jclient-perl/Makefile.in 2017-11-07 11:53:46.830785981 -0500 +@@ -17,8 +17,8 @@ all: + install: install.bin + + install.bin: +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + clean: + echo nothing to do +diff -up julius-4.4.2.1/jcontrol/Makefile.in.DESTDIR julius-4.4.2.1/jcontrol/Makefile.in +--- julius-4.4.2.1/jcontrol/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/jcontrol/Makefile.in 2017-11-07 11:53:46.830785981 -0500 +@@ -31,8 +31,8 @@ $(TARGET): $(OBJ) + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + clean: + $(RM) $(OBJ) +diff -up julius-4.4.2.1/julius/Makefile.in.DESTDIR julius-4.4.2.1/julius/Makefile.in +--- julius-4.4.2.1/julius/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/julius/Makefile.in 2017-11-07 11:53:46.831785958 -0500 +@@ -61,8 +61,8 @@ $(TARGET): $(LIBSENT)/libsent.a $(LIBJUL + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- ${INSTALL_PROGRAM} $(TARGET) ${bindir}/${INSTALLTARGET} ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ ${INSTALL_PROGRAM} $(TARGET) ${DESTDIR}${bindir}/${INSTALLTARGET} + + depend: + makedepend -- $(CFLAGS) -- $(OBJSENT) +diff -up julius-4.4.2.1/libjulius/Makefile.in.DESTDIR julius-4.4.2.1/libjulius/Makefile.in +--- julius-4.4.2.1/libjulius/Makefile.in.DESTDIR 2017-11-07 11:53:46.831785958 -0500 ++++ julius-4.4.2.1/libjulius/Makefile.in 2017-11-07 11:57:02.898463306 -0500 +@@ -93,17 +93,17 @@ $(TARGET): $(OBJ) + install: install.lib install.include install.bin + + install.lib: $(TARGET) +- ${INSTALL} -d ${libdir} +- ${INSTALL_DATA} $(TARGET) ${libdir} +- ${INSTALL_DATA} $(PKGCONF_FILE) ${pkgconfigdir} ++ ${INSTALL} -d ${DESTDIR}${libdir} ++ ${INSTALL_DATA} $(TARGET) ${DESTDIR}${libdir} ++ ${INSTALL_DATA} $(PKGCONF_FILE) ${DESTDIR}${pkgconfigdir} + + install.include: +- ${INSTALL} -d ${includedir}/julius +- ${INSTALL_DATA} include/julius/*.h ${includedir}/julius ++ ${INSTALL} -d ${DESTDIR}${includedir}/julius ++ ${INSTALL_DATA} include/julius/*.h ${DESTDIR}${includedir}/julius + + install.bin: libjulius-config-dist +- ${INSTALL} -d ${bindir} +- ${INSTALL_PROGRAM} libjulius-config-dist ${bindir}/libjulius-config ++ ${INSTALL} -d ${DESTDIR}${bindir} ++ ${INSTALL_PROGRAM} libjulius-config-dist ${DESTDIR}${bindir}/libjulius-config + + depend: + makedepend -- $(CFLAGS) -- $(OBJSENT) +diff -up julius-4.4.2.1/libsent/Makefile.in.DESTDIR julius-4.4.2.1/libsent/Makefile.in +--- julius-4.4.2.1/libsent/Makefile.in.DESTDIR 2017-11-07 11:53:46.831785958 -0500 ++++ julius-4.4.2.1/libsent/Makefile.in 2017-11-07 11:57:52.041386676 -0500 +@@ -168,17 +168,17 @@ src/phmm/calc_dnn_neon.o: src/phmm/calc_ + install: install.lib install.include install.bin + + install.lib: $(TARGET) +- ${INSTALL} -d ${libdir} +- ${INSTALL_DATA} $(TARGET) ${libdir} +- ${INSTALL_DATA} $(PKGCONF_FILE) ${pkgconfigdir} ++ ${INSTALL} -d ${DESTDIR}${libdir} ++ ${INSTALL_DATA} $(TARGET) ${DESTDIR}${libdir} ++ ${INSTALL_DATA} $(PKGCONF_FILE) ${DESTDIR}${pkgconfigdir} + + install.include: +- ${INSTALL} -d ${includedir}/sent +- ${INSTALL_DATA} include/sent/*.h ${includedir}/sent ++ ${INSTALL} -d ${DESTDIR}${includedir}/sent ++ ${INSTALL_DATA} include/sent/*.h ${DESTDIR}${includedir}/sent + + install.bin: libsent-config-dist +- ${INSTALL} -d ${bindir} +- ${INSTALL_PROGRAM} libsent-config-dist ${bindir}/libsent-config ++ ${INSTALL} -d ${DESTDIR}${bindir} ++ ${INSTALL_PROGRAM} libsent-config-dist ${DESTDIR}${bindir}/libsent-config + + clean: + $(RM) *~ src/*/*~ src/*/*.o src/*/*/*.o src/*/*/*/*.o src/*/*/*/*/*.o include/sent/*~ +diff -up julius-4.4.2.1/man/Makefile.in.DESTDIR julius-4.4.2.1/man/Makefile.in +--- julius-4.4.2.1/man/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/man/Makefile.in 2017-11-07 11:53:46.831785958 -0500 +@@ -19,16 +19,16 @@ all: + install: install.man install.man.ja + + install.man: +- ${INSTALL} -d @mandir@/man1 ++ ${INSTALL} -d ${DESTDIR}@mandir@/man1 + for f in *.1; do \ +- @INSTALL_DATA@ $$f @mandir@/man1/$$f; \ ++ @INSTALL_DATA@ $$f ${DESTDIR}@mandir@/man1/$$f; \ + done + + install.man.ja: +- ${INSTALL} -d @mandir@/ja/man1 ++ ${INSTALL} -d ${DESTDIR}@mandir@/ja/man1 + cd ja; + for f in *.1; do \ +- @INSTALL_DATA@ $$f @mandir@/ja/man1/$$f; \ ++ @INSTALL_DATA@ $$f ${DESTDIR}@mandir@/ja/man1/$$f; \ + done + cd .. + +diff -up julius-4.4.2.1/mkbingram/Makefile.in.DESTDIR julius-4.4.2.1/mkbingram/Makefile.in +--- julius-4.4.2.1/mkbingram/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/mkbingram/Makefile.in 2017-11-07 11:53:46.831785958 -0500 +@@ -30,8 +30,8 @@ $(TARGET): $(OBJ) $(LIBSENT)/libsent.a + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + clean: + $(RM) $(OBJ) +diff -up julius-4.4.2.1/mkbinhmm/Makefile.in.DESTDIR julius-4.4.2.1/mkbinhmm/Makefile.in +--- julius-4.4.2.1/mkbinhmm/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/mkbinhmm/Makefile.in 2017-11-07 11:53:46.831785958 -0500 +@@ -32,8 +32,8 @@ mkbinhmmlist@EXEEXT@: mkbinhmmlist.o $(L + install: install.bin + + install.bin: mkbinhmm@EXEEXT@ mkbinhmmlist@EXEEXT@ +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ mkbinhmm@EXEEXT@ mkbinhmmlist@EXEEXT@ @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ mkbinhmm@EXEEXT@ mkbinhmmlist@EXEEXT@ ${DESTDIR}@bindir@ + + clean: + $(RM) mkbinhmm.o mkbinhmmlist.o +diff -up julius-4.4.2.1/mkgshmm/Makefile.in.DESTDIR julius-4.4.2.1/mkgshmm/Makefile.in +--- julius-4.4.2.1/mkgshmm/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/mkgshmm/Makefile.in 2017-11-07 11:53:46.831785958 -0500 +@@ -23,8 +23,8 @@ $(TARGET): + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + ############################################################ + +diff -up julius-4.4.2.1/mkss/Makefile.in.DESTDIR julius-4.4.2.1/mkss/Makefile.in +--- julius-4.4.2.1/mkss/Makefile.in.DESTDIR 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/mkss/Makefile.in 2017-11-07 11:53:46.832785936 -0500 +@@ -36,8 +36,8 @@ $(TARGET): mkss.c $(LIBSENT)/libsent.a $ + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + ############################################################ + +diff -up julius-4.4.2.1/adintool/Makefile.in.DESTDIR julius-4.4.2.1/adintool/Makefile.in +--- julius-4.4.2.1/adintool/Makefile.in.DESTDIR 2017-11-07 12:56:50.579801642 -0500 ++++ julius-4.4.2.1/adintool/Makefile.in 2017-11-07 12:57:24.699986491 -0500 +@@ -46,8 +46,8 @@ adintool-gui@EXEEXT@: $(GUIOBJ) $(LIBSEN + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + clean: + $(RM) $(OBJ) $(GUIOBJ) +diff -up julius-4.4.2.1/binlm2arpa/Makefile.in.DESTDIR julius-4.4.2.1/binlm2arpa/Makefile.in +--- julius-4.4.2.1/binlm2arpa/Makefile.in.DESTDIR 2017-11-07 13:09:36.538708271 -0500 ++++ julius-4.4.2.1/binlm2arpa/Makefile.in 2017-11-07 13:09:58.698187990 -0500 +@@ -30,8 +30,8 @@ $(TARGET): $(OBJ) $(LIBSENT)/libsent.a + install: install.bin + + install.bin: $(TARGET) +- ${INSTALL} -d @bindir@ +- @INSTALL_PROGRAM@ $(TARGET) @bindir@ ++ ${INSTALL} -d ${DESTDIR}@bindir@ ++ @INSTALL_PROGRAM@ $(TARGET) ${DESTDIR}@bindir@ + + clean: + $(RM) $(OBJ) diff --git a/julius-4.4.2.1-sharedlibs.patch b/julius-4.4.2.1-sharedlibs.patch new file mode 100644 index 0000000..d1880c2 --- /dev/null +++ b/julius-4.4.2.1-sharedlibs.patch @@ -0,0 +1,198 @@ +diff -up julius-4.4.2.1/adinrec/Makefile.in.shared julius-4.4.2.1/adinrec/Makefile.in +--- julius-4.4.2.1/adinrec/Makefile.in.shared 2017-11-07 12:39:25.800762025 -0500 ++++ julius-4.4.2.1/adinrec/Makefile.in 2017-11-07 12:39:25.802761977 -0500 +@@ -28,7 +28,7 @@ TARGET=adinrec@EXEEXT@ + + all: $(TARGET) + +-$(TARGET): adinrec.c $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a ++$(TARGET): adinrec.c $(LIBSENT)/libsent.so.0.0.0 $(LIBJULIUS)/libjulius.so.0.0.0 + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ adinrec.c $(LDFLAGS) + + ############################################################ +diff -up julius-4.4.2.1/adintool/Makefile.in.shared julius-4.4.2.1/adintool/Makefile.in +--- julius-4.4.2.1/adintool/Makefile.in.shared 2016-12-21 10:16:05.000000000 -0500 ++++ julius-4.4.2.1/adintool/Makefile.in 2017-11-07 12:39:25.803761953 -0500 +@@ -37,10 +37,10 @@ TARGET=adintool@EXEEXT@ $(GUITARGET) + + all: $(TARGET) + +-adintool@EXEEXT@: $(OBJ) $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a ++adintool@EXEEXT@: $(OBJ) $(LIBSENT)/libsent.so.0.0.0 $(LIBJULIUS)/libjulius.so.0.0.0 + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(OBJ) $(LDFLAGS) + +-adintool-gui@EXEEXT@: $(GUIOBJ) $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a ++adintool-gui@EXEEXT@: $(GUIOBJ) $(LIBSENT)/libsent.so.0.0.0 $(LIBJULIUS)/libjulius.so.0.0.0 + $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -o $@ $(GUIOBJ) $(LDFLAGS) $(SDL_LDFLAGS) + + install: install.bin +diff -up julius-4.4.2.1/binlm2arpa/Makefile.in.shared julius-4.4.2.1/binlm2arpa/Makefile.in +--- julius-4.4.2.1/binlm2arpa/Makefile.in.shared 2017-11-07 12:41:04.097413660 -0500 ++++ julius-4.4.2.1/binlm2arpa/Makefile.in 2017-11-07 12:41:19.443047044 -0500 +@@ -24,7 +24,7 @@ TARGET=binlm2arpa@EXEEXT@ + + all: $(TARGET) + +-$(TARGET): $(OBJ) $(LIBSENT)/libsent.a ++$(TARGET): $(OBJ) $(LIBSENT)/libsent.so.0.0.0 + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(OBJ) $(LDFLAGS) + + install: install.bin +diff -up julius-4.4.2.1/generate-ngram/Makefile.in.shared julius-4.4.2.1/generate-ngram/Makefile.in +--- julius-4.4.2.1/generate-ngram/Makefile.in.shared 2017-11-07 12:39:25.800762025 -0500 ++++ julius-4.4.2.1/generate-ngram/Makefile.in 2017-11-07 12:39:25.803761953 -0500 +@@ -27,7 +27,7 @@ TARGET=generate-ngram@EXEEXT@ + + all: $(TARGET) + +-$(TARGET): $(OBJ) $(LIBSENT)/libsent.a ++$(TARGET): $(OBJ) $(LIBSENT)/libsent.so.0.0.0 + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(OBJ) $(LDFLAGS) + + install: install.bin +diff -up julius-4.4.2.1/julius/Makefile.in.shared julius-4.4.2.1/julius/Makefile.in +--- julius-4.4.2.1/julius/Makefile.in.shared 2017-11-07 12:39:25.801762001 -0500 ++++ julius-4.4.2.1/julius/Makefile.in 2017-11-07 12:39:25.803761953 -0500 +@@ -53,7 +53,7 @@ record.o \ + + all: $(TARGET) + +-$(TARGET): $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a $(OBJ) ++$(TARGET): $(LIBSENT)/libsent.so.0.0.0 $(LIBJULIUS)/libjulius.so.0.0.0 $(OBJ) + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(OBJ) $(LDFLAGS) $(GTK_LIBS) + + ############################################################ +diff -up julius-4.4.2.1/libjulius/Makefile.in.shared julius-4.4.2.1/libjulius/Makefile.in +--- julius-4.4.2.1/libjulius/Makefile.in.shared 2017-11-07 12:39:25.801762001 -0500 ++++ julius-4.4.2.1/libjulius/Makefile.in 2017-11-07 12:39:25.803761953 -0500 +@@ -16,8 +16,8 @@ SHELL=/bin/sh + LIBSENT=../libsent + + CC=@CC@ +-CFLAGS=@CFLAGS@ +-CPPFLAGS=-Iinclude -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags` ++CFLAGS=@CFLAGS@ -fPIC ++CPPFLAGS=-Iinclude -I$(LIBSENT)/include @CPPFLAGS@ -fPIC `$(LIBSENT)/libsent-config --cflags` + LDFLAGS=@LDFLAGS@ @LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` + RM=@RM@ -f + AR=@AR@ r +@@ -37,7 +37,9 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ + ############################################################ + + PKGCONF_FILE = julius-@JULIUS_MAJOR_VERSION@.pc +-TARGET = libjulius.a ++BASESHAREDLIB=libjulius.so ++SHAREDLIB=$(BASESHAREDLIB).0 ++TARGET=$(SHAREDLIB).0.0 + + OBJ = \ + src/recogmain.o \ +@@ -85,8 +87,11 @@ src/version.o + all: $(TARGET) + + $(TARGET): $(OBJ) +- $(AR) $@ $? +- $(RANLIB) $@ ++ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHAREDLIB) -o $@ $? ++ ln -s $(TARGET) $(SHAREDLIB) ++ ln -s $(TARGET) $(BASESHAREDLIB) ++ # $(AR) $@ $? ++ # $(RANLIB) $@ + + ############################################################ + +@@ -96,6 +101,8 @@ install.lib: $(TARGET) + ${INSTALL} -d ${DESTDIR}${libdir} + ${INSTALL_DATA} $(TARGET) ${DESTDIR}${libdir} + ${INSTALL_DATA} $(PKGCONF_FILE) ${DESTDIR}${pkgconfigdir} ++ ln -s $(TARGET) ${DESTDIR}${libdir}/$(SHAREDLIB) ++ ln -s $(TARGET) ${DESTDIR}${libdir}/$(BASESHAREDLIB) + + install.include: + ${INSTALL} -d ${DESTDIR}${includedir}/julius +diff -up julius-4.4.2.1/libsent/Makefile.in.shared julius-4.4.2.1/libsent/Makefile.in +--- julius-4.4.2.1/libsent/Makefile.in.shared 2017-11-07 12:39:25.801762001 -0500 ++++ julius-4.4.2.1/libsent/Makefile.in 2017-11-07 12:39:25.803761953 -0500 +@@ -12,14 +12,16 @@ SHELL=/bin/sh + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< + + CC=@CC@ +-CFLAGS=@CFLAGS@ +-CPPFLAGS=-Iinclude @CPPFLAGS@ @SOUNDINC@ @DEFS@ ++CFLAGS=@CFLAGS@ -fPIC ++CPPFLAGS=-Iinclude @CPPFLAGS@ -fPIC @SOUNDINC@ @DEFS@ + # LDFLAGS=@LDFLAGS@ @LIBS@ + RM=@RM@ -f + AR=@AR@ r + RANLIB=@RANLIB@ + PKGCONF_FILE = sent-@LIBSENT_MAJOR_VERSION@.pc +-TARGET=libsent.a ++BASESHAREDLIB=libsent.so ++SHAREDLIB=$(BASESHAREDLIB).0 ++TARGET=$(SHAREDLIB).0.0 + + ## install + prefix=@prefix@ +@@ -144,8 +146,11 @@ src/wav2mfcc/para.o \ + all: $(TARGET) + + $(TARGET): $(OBJ) +- $(AR) $@ $? +- $(RANLIB) $@ ++ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHAREDLIB) -o $@ $? ++ ln -s $(TARGET) $(SHAREDLIB) ++ ln -s $(TARGET) $(BASESHAREDLIB) ++ # $(AR) $@ $? ++ # $(RANLIB) $@ + + src/phmm/calc_dnn_fma.o: src/phmm/calc_dnn_fma.c + $(CC) $(CFLAGS) $(CPPFLAGS) @SIMD_FMA_CFLAGS@ -o $@ -c $< +@@ -171,6 +176,8 @@ install.lib: $(TARGET) + ${INSTALL} -d ${DESTDIR}${libdir} + ${INSTALL_DATA} $(TARGET) ${DESTDIR}${libdir} + ${INSTALL_DATA} $(PKGCONF_FILE) ${DESTDIR}${pkgconfigdir} ++ ln -s $(TARGET) ${DESTDIR}${libdir}/$(SHAREDLIB) ++ ln -s $(TARGET) ${DESTDIR}${libdir}/$(BASESHAREDLIB) + + install.include: + ${INSTALL} -d ${DESTDIR}${includedir}/sent +diff -up julius-4.4.2.1/mkbingram/Makefile.in.shared julius-4.4.2.1/mkbingram/Makefile.in +--- julius-4.4.2.1/mkbingram/Makefile.in.shared 2017-11-07 12:39:25.801762001 -0500 ++++ julius-4.4.2.1/mkbingram/Makefile.in 2017-11-07 12:39:25.803761953 -0500 +@@ -24,7 +24,7 @@ TARGET=mkbingram@EXEEXT@ + + all: $(TARGET) + +-$(TARGET): $(OBJ) $(LIBSENT)/libsent.a ++$(TARGET): $(OBJ) $(LIBSENT)/libsent.so.0.0.0 + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(OBJ) $(LDFLAGS) + + install: install.bin +diff -up julius-4.4.2.1/mkbinhmm/Makefile.in.shared julius-4.4.2.1/mkbinhmm/Makefile.in +--- julius-4.4.2.1/mkbinhmm/Makefile.in.shared 2017-11-07 12:39:25.801762001 -0500 ++++ julius-4.4.2.1/mkbinhmm/Makefile.in 2017-11-07 12:39:25.803761953 -0500 +@@ -23,10 +23,10 @@ INSTALL=@INSTALL@ + + all: mkbinhmm@EXEEXT@ mkbinhmmlist@EXEEXT@ + +-mkbinhmm@EXEEXT@: mkbinhmm.o $(LIBSENT)/libsent.a ++mkbinhmm@EXEEXT@: mkbinhmm.o $(LIBSENT)/libsent.so.0.0.0 + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ mkbinhmm.o $(LDFLAGS) + +-mkbinhmmlist@EXEEXT@: mkbinhmmlist.o $(LIBSENT)/libsent.a ++mkbinhmmlist@EXEEXT@: mkbinhmmlist.o $(LIBSENT)/libsent.so.0.0.0 + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ mkbinhmmlist.o $(LDFLAGS) + + install: install.bin +diff -up julius-4.4.2.1/mkss/Makefile.in.shared julius-4.4.2.1/mkss/Makefile.in +--- julius-4.4.2.1/mkss/Makefile.in.shared 2017-11-07 12:39:25.802761977 -0500 ++++ julius-4.4.2.1/mkss/Makefile.in 2017-11-07 12:39:25.803761953 -0500 +@@ -28,7 +28,7 @@ TARGET=mkss@EXEEXT@ + + all: $(TARGET) + +-$(TARGET): mkss.c $(LIBSENT)/libsent.a $(LIBJULIUS)/libjulius.a ++$(TARGET): mkss.c $(LIBSENT)/libsent.so.0.0.0 $(LIBJULIUS)/libjulius.so.0.0.0 + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ mkss.c $(LDFLAGS) + + ############################################################ diff --git a/julius.spec b/julius.spec index 3597f9b..b1db9a6 100644 --- a/julius.spec +++ b/julius.spec @@ -1,16 +1,28 @@ +%global dkcommit bf4f024 + Name: julius -Version: 4.2.2 -Release: 13%{?dist} +Version: 4.4.2.1 +Release: 1%{?dist} Summary: Large vocabulary continuous speech recognition (LVCSR) decoder software License: Julius -URL: http://julius.sourceforge.jp/ -Source0: http://dl.sourceforge.jp/julius/56549/%{name}-%{version}.tar.gz -Source1: http://julius.sourceforge.jp/archive/japanese-models.tar.gz -Patch0: julius-4.2.2-DESTDIR.patch -Patch1: julius-4.2.2-sharedlibs.patch +URL: https://github.com/julius-speech/julius +Source0: https://github.com/julius-speech/julius/archive/v%{version}.tar.gz +# Source1: http://julius.sourceforge.jp/archive/japanese-models.tar.gz +# Need to generate from git +# BE SURE YOU HAVE git-lfs installed before doing a clone +# git checkout https://github.com/julius-speech/dictation-kit.git +# cd dictation-kit +# rm -rf bin src +# cd .. +# tar --exclude-vcs -cJf dictation-kit-%%{dkcommit}.tar.xz dictation-kit +Source1: dictation-kit-%{dkcommit}.tar.xz +Patch0: julius-4.4.2.1-DESTDIR.patch +Patch1: julius-4.4.2.1-sharedlibs.patch BuildRequires: perl-generators BuildRequires: perl(Jcode), alsa-lib-devel, libsndfile-devel, pulseaudio-libs-devel, zlib-devel, readline-devel +BuildRequires: SDL-devel BuildRequires: bison, flex, nkf +BuildRequires: autoconf, automake, libtool # Requires: %description @@ -45,40 +57,52 @@ A Japanese language model (20k-word trained by newspaper article) and acoustic models (Phonetic tied-mixture triphone / monophone) for use with Julius. %prep -%setup -q +%setup -q -a 1 %patch0 -p1 -b .DESTDIR %patch1 -p1 -b .shared # Fix end-of-line encoding sed -i 's/\r//' Release.txt -tar xvf %{SOURCE1} +autoreconf -ifv || : %build %configure -make %{?_smp_mflags} +# this fails +# make %{?_smp_mflags} +make %install +mkdir -p %{buildroot}%{_libdir}/pkgconfig/ make install DESTDIR=%{buildroot} chmod +x %{buildroot}%{_libdir}/*.so.* mkdir -p %{buildroot}%{_datadir}/julius/ cp -a Sample.jconf %{buildroot}%{_datadir}/julius/ -cp -a japanese-models/ %{buildroot}%{_datadir}/julius/ +pushd dictation-kit +cp *conf %{buildroot}%{_datadir}/julius/ +cp -a model/ %{buildroot}%{_datadir}/julius/ +popd + +# rename to avoid conflict with Oracle Java +mv %{buildroot}%{_bindir}/jcontrol %{buildroot}%{_bindir}/julius-jcontrol %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%doc ChangeLog LICENSE.txt Release.txt Release-ja.txt +%doc ChangeLog Release.txt Release-ja.txt +%license LICENSE.txt %{_bindir}/accept_check %{_bindir}/adinrec %{_bindir}/adintool +%{_bindir}/adintool-gui +%{_bindir}/binlm2arpa %{_bindir}/dfa_determinize %{_bindir}/dfa_minimize %{_bindir}/generate %{_bindir}/generate-ngram %{_bindir}/gram2sapixml.pl %{_bindir}/jclient.pl -%{_bindir}/jcontrol +%{_bindir}/julius-jcontrol %{_bindir}/julius %{_bindir}/mkbingram %{_bindir}/mkbinhmm @@ -94,7 +118,7 @@ cp -a japanese-models/ %{buildroot}%{_datadir}/julius/ %lang(ja) %{_mandir}/ja/man1/* %{_mandir}/man1/* %dir %{_datadir}/julius/ -%{_datadir}/julius/Sample.jconf +%{_datadir}/julius/*conf %files devel %{_bindir}/libjulius-config @@ -103,11 +127,16 @@ cp -a japanese-models/ %{buildroot}%{_datadir}/julius/ %{_includedir}/sent/ %{_libdir}/libjulius.so %{_libdir}/libsent.so +%{_libdir}/pkgconfig/*.pc %files japanese-models -%{_datadir}/julius/japanese-models/ +%{_datadir}/julius/model/ %changelog +* Tue Nov 7 2017 Tom Callaway - 4.4.2.1-1 +- update to 4.4.2.1 +- rename jcontrol to julius-jcontrol to avoid conflict with oracle java + * Thu Aug 03 2017 Fedora Release Engineering - 4.2.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index ef686a3..c61e715 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7b72003bdf0012b06cbf226c29058351 julius-4.2.2.tar.gz -da98652f69c49e2a1ae666343c099823 japanese-models.tar.gz +SHA512 (v4.4.2.1.tar.gz) = 5057a9043db3315136e56e383e3b48db0085f0cde16ebaef07aa5b1e922bd202107a5fa3bf6b391aa28cb7b9328ffe3c506b13fd0a115783a2e52c3e2eb93c61 +SHA512 (dictation-kit-bf4f024.tar.xz) = d072aa55e988481785a551de95de3ff5ae4b336b5c5d097da56729ddeaa7ecee612018acb1854fcb7b6ff93d6d0c00813799bc37d15d879e5843252bb0ab3292