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

[Evgeniy Alekseev]

    Date: Sunday, September 4, 2016 @ 15:14:51
  Author: arcanis
Revision: 188542

upgpkg: julius 4.4-1

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

-----------------+
 PKGBUILD        |   45 +++++++++++++++++++++++++--------------------
 configure.patch |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-04 14:56:35 UTC (rev 188541)
+++ PKGBUILD	2016-09-04 15:14:51 UTC (rev 188542)
@@ -4,37 +4,42 @@
 # Contributor: Muhammad Qadri <Muhammad dot A dot Qadri at gmail dot com>
 
 pkgname=julius
-pkgver=4.3.1
+pkgver=4.4
 pkgrel=1
 pkgdesc="A high-performance, two-pass large vocabulary continuous speech recognition decoder software"
 arch=("i686" "x86_64")
 url="http://julius.sourceforge.jp/"
 license=("custom")
-depends=("libpulse")
+depends=("libpulse" "sdl2")
 optdepends=("voxforge-am-julius: acoustic models")
-source=("http://dl.sourceforge.jp/${pkgname}/60273/${pkgname}-${pkgver}.tar.gz")
-md5sums=("7868d89ac1fa729f477a7c700efaf087")
+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')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  # replace /lib/cpp with /usr/bin/cpp since Arch Linux doesn't have /lib/cpp anymore
-  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "julius/configure"
-  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "jcontrol/configure"
-  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "libjulius/configure"
-  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "gramtools/configure"
-  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "libsent/configure"
-  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "configure"
-  
-  # Add -02 to CPPFLAGS to prevent issue with -D_FORTIFY_SOURCE=2
-  CPPFLAGS="$CPPFLAGS -O2"
+
+  # 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"
 }
 
 build() {
+  # redefine makeflags, coz it could not build in parallel
+  export MAKEFLAGS="-j1"
+
   cd "${srcdir}/${pkgname}-${pkgver}/"
   ./configure \
     --prefix="/usr/" \
-    --mandir='${prefix}/share/man' \
+    --mandir='${prefix}/share/man'\
     --enable-words-int \
     --enable-msd \
     --enable-gmm-vad \
@@ -46,11 +51,11 @@
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}/"
-  
+
+  # leave static libraries since julius does not support
+  # shared ones at the moment. See also FS#50599
   make prefix="${pkgdir}/usr" install
-  install -D "LICENSE.txt" "${pkgdir}/usr/share/licenses/julius/LICENSE"
-  # remove empty lib directory
-  rm -r "${pkgdir}/usr/lib"
+  install -Dm644 "LICENSE.txt" "${pkgdir}/usr/share/licenses/julius/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:

Added: configure.patch
===================================================================
--- configure.patch	                        (rev 0)
+++ configure.patch	2016-09-04 15:14:51 UTC (rev 188542)
@@ -0,0 +1,52 @@
+diff -ruN julius-4.4-orig/jcontrol/configure julius-4.4/jcontrol/configure
+--- julius-4.4-orig/jcontrol/configure	2016-09-04 16:03:39.610663560 +0300
++++ julius-4.4/jcontrol/configure	2016-09-04 16:05:14.054157193 +0300
+@@ -380,13 +380,6@@
+     ;;
+ 
+   *)
+-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+-    fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
+-    nonopt="$ac_option"
+     ;;
+ 
+   esac
+diff -ruN julius-4.4-orig/mkgshmm/configure julius-4.4/mkgshmm/configure
+--- julius-4.4-orig/mkgshmm/configure	2016-09-04 16:03:39.660661881 +0300
++++ julius-4.4/mkgshmm/configure	2016-09-04 16:04:55.021463305 +0300
+@@ -380,13 +380,6 @@
+     ;;
+ 
+   *)
+-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+-    fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
+-    nonopt="$ac_option"
+     ;;
+ 
+   esac
+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 @@
+ 
+ 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.include:
+ 	${INSTALL} -d ${includedir}/julius
+	${INSTALL_DATA} include/julius/*.h ${includedir}/julius 
+ 
+ install.bin: libjulius-config-dist
+ 	${INSTALL} -d ${bindir}