[arch-commits] Commit in ecasound/trunk (PKGBUILD ruby2.patch)

[David Runge]

    Date: Thursday, June 20, 2019 @ 20:01:06
  Author: dvzrv
Revision: 482531

upgpkg: ecasound 2.9.2-1

Upgrading to 2.9.2. Removing ruby2.patch, as the current required fix only needs to replace one word (and that's better done in configure.ac).
Adding fix for lv2 discovery (lv2core is deprecated). Extending fix for python2 shebang to all python scripts. Minor cleanup.

Modified:
  ecasound/trunk/PKGBUILD
Deleted:
  ecasound/trunk/ruby2.patch

-------------+
 PKGBUILD    |   45 +++++++++++++++++++++++++--------------------
 ruby2.patch |   12 ------------
 2 files changed, 25 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-20 19:30:14 UTC (rev 482530)
+++ PKGBUILD	2019-06-20 20:01:06 UTC (rev 482531)
@@ -4,15 +4,15 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=ecasound
-pkgver=2.9.1
-pkgrel=13
+pkgver=2.9.2
+pkgrel=1
 pkgdesc="Command-line multitrack audio processor"
 arch=('x86_64')
 url="https://ecasound.seul.org/ecasound/"
 license=('GPL' 'LGPL')
 groups=('pro-audio')
-depends=('audiofile' 'liblo>=0.28' 'lilv')
-makedepends=('python2' 'ruby')
+depends=('audiofile' 'liblo' 'lilv')
+makedepends=('lv2' 'python2' 'ruby')
 optdepends=('python2: ecamonitor, ECI API'
             'ruby: ECI API'
             'mpg123: MP3 decoding'
@@ -22,31 +22,36 @@
             'faac: AAC encoding'
             'timidity++: MIDI file input'
             'libmikmod: tracker module')
-source=("https://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz"
-        'ruby2.patch')
+source=("https://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz")
 options=('staticlibs')
-sha512sums=('b91fd68cb4809fdf62b25323fbf52c9bb7de6663287d5aa2576cc4fb28e322850b7020df2718ed6087f5d9f5f96692a476287378ea65853d01834523e8eb7033'
-            'aa1553e81acc41917cc8e62b7e2569106183b4500d687fc17e0b56c8f70e78ae63cd65c4940ef83a13dbb0b320ba51573b6eb43da54b141f846623962838d639')
+sha512sums=('fca6b37b5f669ba8616e48afe24fbfd53da3cb4987d2d6a2d6167843de34371a4c2cdceb6faf677462d6efb4069dd1d27ffafc1ceb19de56f4a051f077ada07b')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
-  # fix python2 shebang
-  sed -e 's:bin/env python:bin/env python2:' \
-      -i "ecatools/ecamonitor"
+  # install ruby integration to vendor_ruby
+  sed -e 's/sitedir/vendordir/' -i configure.ac
 
-  # fix ruby 2.0 incompatibility + use vendor_ruby for ruby files
-  patch -Np1 -i "$srcdir/ruby2.patch"
+  # lv2core is deprecated in favor of lv2:
+  # https://sourceforge.net/p/ecasound/bugs/52/
+  sed -e 's/lv2core/lv2/g' -i configure.ac
+
+  # fix python2 shebang:
+  # https://sourceforge.net/p/ecasound/mailman/message/36698740/
+  sed -e 's/env python/env python2/' \
+      -i 'ecatools/ecamonitor' \
+      -i "examples/"*.py \
+      -i "pyecasound/"*.py
+
+  autoreconf -vfi
 }
 build() {
   cd "$pkgname-$pkgver"
-
-  PYTHONPATH=/usr/bin/python2 ./configure \
-    --prefix=/usr \
-    --with-python-includes=/usr/include/python2.7 \
-    --with-python-modules=/usr/lib/python2.7 \
-    --enable-liboil=no
-
+  export PYTHONPATH="/usr/bin/python2"
+  ./configure --prefix=/usr \
+              --with-python-includes=/usr/include/python2.7 \
+              --with-python-modules=/usr/lib/python2.7 \
+              --enable-liboil=no
   make
 }
 

Deleted: ruby2.patch
===================================================================
--- ruby2.patch	2019-06-20 19:30:14 UTC (rev 482530)
+++ ruby2.patch	2019-06-20 20:01:06 UTC (rev 482531)
@@ -1,12 +0,0 @@
-diff -aur ecasound-2.9.0.orig/configure ecasound-2.9.0/configure
---- ecasound-2.9.0.orig/configure	2013-03-26 17:14:51.759045636 +0800
-+++ ecasound-2.9.0/configure	2013-03-26 17:15:50.502060731 +0800
-@@ -6535,7 +6535,7 @@
-   rubyecasound_support=no
-   ECA_S_RUBY_SITEDIR=""
- else
--  ECA_S_RUBY_SITEDIR="`ruby -e 'require "rbconfig"; include Config; print CONFIG["sitedir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`"
-+  ECA_S_RUBY_SITEDIR="`ruby -e 'include RbConfig; print CONFIG["vendordir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`"
- fi
- 
-