[arch-commits] Commit in julius/trunk (PKGBUILD configure.patch)

[Evgeniy Alekseev]

    Date: Wednesday, September 7, 2016 @ 16:00:12
  Author: arcanis
Revision: 188938

upgpkg: julius 4.4.1-1

Modified:
  julius/trunk/PKGBUILD
  julius/trunk/configure.patch

-----------------+
 PKGBUILD        |   16 +++++-----------
 configure.patch |   18 +++++++++++++++---
 2 files changed, 20 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-07 15:56:47 UTC (rev 188937)
+++ PKGBUILD	2016-09-07 16:00:12 UTC (rev 188938)
@@ -4,7 +4,7 @@
 # Contributor: Muhammad Qadri <Muhammad dot A dot Qadri at gmail dot com>
 
 pkgname=julius
-pkgver=4.4
+pkgver=4.4.1
 pkgrel=1
 pkgdesc="A high-performance, two-pass large vocabulary continuous speech recognition decoder software"
 arch=("i686" "x86_64")
@@ -13,21 +13,13 @@
 depends=("libpulse" "sdl2")
 optdepends=("voxforge-am-julius: acoustic models")
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/julius-speech/julius/archive/v${pkgver}.tar.gz"
-        "avx-compilation-p1.patch::https://github.com/julius-speech/julius/commit/80fb587284575c6925a4344a2867301c7ba085a2.patch"
-        "avx-compilation-p2.patch::https://github.com/julius-speech/julius/commit/ec71ead6c5798fe1e89438cfcf750625f643f9cb.patch"
         "configure.patch")
-md5sums=('4724b259adef4160eb3b1fe864d88768'
-         '9f8a5f15103bc3eae21d9fa87c8323f1'
-         'ac2d405f4355f88076a12782cafe8c47'
-         '1b9291772f3d79f85e622f79d650e3cf')
+md5sums=('56ac27520078c7d8fcfa538f41f34166'
+         '5222c95d41cf2e27e885363c77f954d1')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # see https://github.com/julius-speech/julius/issues/36
-  patch -p1 -i "${srcdir}/avx-compilation-p1.patch"
-  patch -p1 -i "${srcdir}/avx-compilation-p2.patch"
-
   # configure error
   patch -p1 -i "${srcdir}/configure.patch"
 }
@@ -59,3 +51,5 @@
 }
 
 # vim:set ts=2 sw=2 et:
+md5sums=('56ac27520078c7d8fcfa538f41f34166'
+         '9fe2a29fdec779104f69539ad4d1cce0')

Modified: configure.patch
===================================================================
--- configure.patch	2016-09-07 15:56:47 UTC (rev 188937)
+++ configure.patch	2016-09-07 16:00:12 UTC (rev 188938)
@@ -35,14 +35,13 @@
 diff -ruN julius-4.4-orig/libjulius/Makefile.in julius-4.4/libjulius/Makefile.in
 --- julius-4.4-orig/libjulius/Makefile.in	2016-09-04 16:35:54.009006591 +0300
 +++ julius-4.4/libjulius/Makefile.in	2016-09-04 16:35:13.733693061 +0300
-@@ -94,12 +94,13 @@
+@@ -94,12 +94,12 @@
  
  install.lib: $(TARGET)
  	${INSTALL} -d ${libdir}
-+	${INSTALL} -d ${pkgconfigdir}
  	${INSTALL_DATA} $(TARGET) ${libdir}
 -	${INSTALL_DATA} $(PKGCONF_FILE) ${pkgconfigdir}
-+	${INSTALL_DATA} $(PKGCONF_FILE) ${pkgconfigdir}/libjulius.pc
++	${INSTALL_DATA} -D $(PKGCONF_FILE) ${pkgconfigdir}/libjulius.pc
  
  install.include:
  	${INSTALL} -d ${includedir}/julius
@@ -50,3 +49,16 @@
  
  install.bin: libjulius-config-dist
  	${INSTALL} -d ${bindir}
+diff -ruN julius-4.4.1-orig/libsent/Makefile.in julius-4.4.1/libsent/Makefile.in
+--- julius-4.4.1-orig/libsent/Makefile.in	2016-09-07 18:01:52.948127111 +0300
++++ julius-4.4.1/libsent/Makefile.in	2016-09-07 18:03:50.985347850 +0300
+@@ -152,8 +152,8 @@
+ 
+ install.lib: $(TARGET)
+ 	${INSTALL} -d ${libdir}
+ 	${INSTALL_DATA} $(TARGET) ${libdir}
+-	${INSTALL_DATA} $(PKGCONF_FILE) ${pkgconfigdir}
++	${INSTALL_DATA} -D $(PKGCONF_FILE) ${pkgconfigdir}/libsent.pc
+ 
+ install.include:
+ 	${INSTALL} -d ${includedir}/sent