[arch-commits] Commit in lib32-jack2/trunk (PKGBUILD)

2020-10-16 Thread David Runge via arch-commits
Date: Friday, October 16, 2020 @ 23:31:02
  Author: dvzrv
Revision: 725233

upgpkg: lib32-jack2 1.9.16-1: Upgrade to 1.9.16.

Lock required jack2 version.
Add all available sodeps in package() and move the respective packages to 
makedepends.

Modified:
  lib32-jack2/trunk/PKGBUILD

--+
 PKGBUILD |   23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-16 23:23:47 UTC (rev 725232)
+++ PKGBUILD2020-10-16 23:31:02 UTC (rev 725233)
@@ -3,23 +3,23 @@
 
 _name=jack2
 pkgname=lib32-jack2
-pkgver=1.9.14
-pkgrel=3
+pkgver=1.9.16
+pkgrel=1
 pkgdesc="The next-generation JACK with SMP support (32 bit)"
 arch=('x86_64')
 url="http://jackaudio.org/;
 license=('GPL2' 'LGPL2.1')
-depends=('lib32-celt' 'lib32-gcc-libs' 'lib32-glibc' 'lib32-opus' 'jack2')
-makedepends=('lib32-dbus' 'lib32-expat' 'lib32-readline' 'lib32-libsamplerate'
-'lib32-libsndfile' 'waf')
+depends=('lib32-gcc-libs' 'lib32-glibc' 'lib32-opus' "jack2=${pkgver}")
+makedepends=('git' 'lib32-celt' 'lib32-dbus' 'lib32-expat' 'lib32-readline'
+'lib32-libsamplerate' 'lib32-libsndfile' 'waf')
 provides=('lib32-jack' 'libjack.so')
 conflicts=('lib32-jack')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jackaudio/${_name}/archive/v${pkgver}.tar.gz;)
-sha512sums=('ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd')
+source=("git+https://github.com/jackaudio/${_name}.git#tag=v${pkgver}?signed;)
+sha512sums=('SKIP')
+validpgpkeys=('62B11043D2F6EB6672D93103CDBAA37ABC74FBA0') # falkTX 

 
 prepare() {
-  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
-  cd "${pkgname}-${pkgver}"
+  cd "${_name}"
   # copying relevant custom waf scripts and loading them specifically using
   # wscript
   touch __init__.py
@@ -32,7 +32,7 @@
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "${_name}"
   export PYTHONPATH="${PWD}:${PYTHONPATH}"
   export CC="gcc -m32"
   export CXX="g++ -m32"
@@ -47,7 +47,8 @@
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
+  depends+=('libcelt0.so')
+  cd "${_name}"
   export PYTHONPATH="${PWD}:${PYTHONPATH}"
   waf install --destdir="${pkgdir}"
   # remove all non-32bit and those provided by jack2


[arch-commits] Commit in lib32-jack2/trunk (PKGBUILD)

2020-04-08 Thread David Runge via arch-commits
Date: Wednesday, April 8, 2020 @ 07:36:51
  Author: dvzrv
Revision: 612558

upgpkg: lib32-jack2 1.9.14-3: Rebuilding without mixed mode.

Upstream's mixed mode is still broken and also more or less useless.
It was left in the PKGBUILD for testing purposes so the last version 
accidentally was built with it.
This is tracked in FS#66164.
Only pulling in direct library dependencies and build dependencies (db/lib32-db 
is not required).

Modified:
  lib32-jack2/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-08 06:52:10 UTC (rev 612557)
+++ PKGBUILD2020-04-08 07:36:51 UTC (rev 612558)
@@ -4,14 +4,14 @@
 _name=jack2
 pkgname=lib32-jack2
 pkgver=1.9.14
-pkgrel=2
+pkgrel=3
 pkgdesc="The next-generation JACK with SMP support (32 bit)"
 arch=('x86_64')
 url="http://jackaudio.org/;
 license=('GPL2' 'LGPL2.1')
-depends=('lib32-celt' 'lib32-gcc-libs' 'lib32-glibc' 'jack2')
-makedepends=('celt' 'lib32-dbus' 'lib32-expat' 'lib32-libsamplerate'
-'libsamplerate' 'waf')
+depends=('lib32-celt' 'lib32-gcc-libs' 'lib32-glibc' 'lib32-opus' 'jack2')
+makedepends=('lib32-dbus' 'lib32-expat' 'lib32-readline' 'lib32-libsamplerate'
+'lib32-libsndfile' 'waf')
 provides=('lib32-jack' 'libjack.so')
 conflicts=('lib32-jack')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jackaudio/${_name}/archive/v${pkgver}.tar.gz;)
@@ -34,10 +34,14 @@
 build() {
   cd "${pkgname}-${pkgver}"
   export PYTHONPATH="${PWD}:${PYTHONPATH}"
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export CXXFLAGS+=' -m32'
+  export CFLAGS+=' -m32'
   waf configure --prefix=/usr \
 --libdir=/usr/lib32 \
 --classic \
---mixed \
 --dbus
   waf build
 }


[arch-commits] Commit in lib32-jack2/trunk (PKGBUILD)

2020-04-06 Thread David Runge via arch-commits
Date: Monday, April 6, 2020 @ 20:10:12
  Author: dvzrv
Revision: 612097

upgpkg: lib32-jack2 1.9.14-2: Adding soprovides.

Rebuilding to add soprovides (libjack.so).
Removing lib32-db from depends and db from makedepends, as it's not used.
Removing lib32-opus/opus as it is not used either.
Switching back to using --mixed mode for waf configure.

Modified:
  lib32-jack2/trunk/PKGBUILD

--+
 PKGBUILD |   27 ---
 1 file changed, 12 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-06 19:58:42 UTC (rev 612096)
+++ PKGBUILD2020-04-06 20:10:12 UTC (rev 612097)
@@ -1,24 +1,25 @@
 # Maintainer: David Runge 
 # Contributor: speps 
 
+_name=jack2
 pkgname=lib32-jack2
 pkgver=1.9.14
-pkgrel=1
+pkgrel=2
 pkgdesc="The next-generation JACK with SMP support (32 bit)"
 arch=('x86_64')
 url="http://jackaudio.org/;
 license=('GPL2' 'LGPL2.1')
-depends=('lib32-db' 'lib32-celt' 'lib32-gcc-libs' 'lib32-glibc' 'lib32-opus'
-'jack2')
-makedepends=('db' 'celt' 'lib32-dbus' 'lib32-expat' 'lib32-libsamplerate'
-'libsamplerate' 'opus' 'waf')
-provides=('lib32-jack')
+depends=('lib32-celt' 'lib32-gcc-libs' 'lib32-glibc' 'jack2')
+makedepends=('celt' 'lib32-dbus' 'lib32-expat' 'lib32-libsamplerate'
+'libsamplerate' 'waf')
+provides=('lib32-jack' 'libjack.so')
 conflicts=('lib32-jack')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jackaudio/${pkgname#lib32-}/archive/v${pkgver}.tar.gz;)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jackaudio/${_name}/archive/v${pkgver}.tar.gz;)
 
sha512sums=('ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd')
 
 prepare() {
-  cd "${pkgname#lib32-}-${pkgver}"
+  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   # copying relevant custom waf scripts and loading them specifically using
   # wscript
   touch __init__.py
@@ -31,22 +32,18 @@
 }
 
 build() {
-  cd "${pkgname#lib32-}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   export PYTHONPATH="${PWD}:${PYTHONPATH}"
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  export CXXFLAGS+=' -m32'
-  export CFLAGS+=' -m32'
   waf configure --prefix=/usr \
 --libdir=/usr/lib32 \
 --classic \
+--mixed \
 --dbus
   waf build
 }
 
 package() {
-  cd "${pkgname#lib32-}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   export PYTHONPATH="${PWD}:${PYTHONPATH}"
   waf install --destdir="${pkgdir}"
   # remove all non-32bit and those provided by jack2


[arch-commits] Commit in lib32-jack2/trunk (PKGBUILD)

2019-11-19 Thread David Runge via arch-commits
Date: Tuesday, November 19, 2019 @ 19:14:58
  Author: dvzrv
Revision: 530497

upgpkg: lib32-jack2 1.9.14-1

Upgrading to 1.9.14. Updating maintainer info. Minor cleanups.

Modified:
  lib32-jack2/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-19 19:14:09 UTC (rev 530496)
+++ PKGBUILD2019-11-19 19:14:58 UTC (rev 530497)
@@ -1,19 +1,21 @@
-# Maintainer: David Runge 
+# Maintainer: David Runge 
 # Contributor: speps 
 
 pkgname=lib32-jack2
-pkgver=1.9.13
+pkgver=1.9.14
 pkgrel=1
 pkgdesc="The next-generation JACK with SMP support (32 bit)"
 arch=('x86_64')
 url="http://jackaudio.org/;
 license=('GPL2' 'LGPL2.1')
-depends=('lib32-db' 'lib32-celt' 'lib32-gcc-libs' 'lib32-glibc' 'lib32-opus' 
'jack2')
-makedepends=('db' 'celt' 'lib32-dbus' 'lib32-expat' 'lib32-libsamplerate' 
'libsamplerate' 'opus' 'waf')
+depends=('lib32-db' 'lib32-celt' 'lib32-gcc-libs' 'lib32-glibc' 'lib32-opus'
+'jack2')
+makedepends=('db' 'celt' 'lib32-dbus' 'lib32-expat' 'lib32-libsamplerate'
+'libsamplerate' 'opus' 'waf')
 provides=('lib32-jack')
 conflicts=('lib32-jack')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jackaudio/${pkgname#lib32-}/archive/v${pkgver}.tar.gz;)
-sha512sums=('8c578df723f2c0c91e854abf73a35249784c833264c42c340f0e56744bf931bda75ebd941532c80cecc67e2d469becc27498e546b73cc4581379b8ceee1f49c1')
+sha512sums=('ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd')
 
 prepare() {
   cd "${pkgname#lib32-}-${pkgver}"
@@ -30,7 +32,6 @@
 
 build() {
   cd "${pkgname#lib32-}-${pkgver}"
-  # mixed mode is broken: https://github.com/jackaudio/jack2/issues/508
   export PYTHONPATH="${PWD}:${PYTHONPATH}"
   export CC="gcc -m32"
   export CXX="g++ -m32"


[arch-commits] Commit in lib32-jack2/trunk (PKGBUILD)

2019-10-14 Thread David Runge via arch-commits
Date: Monday, October 14, 2019 @ 21:17:37
  Author: dvzrv
Revision: 515926

upgpkg: lib32-jack2 1.9.13-1

Upgrading to 1.9.13. Not using --mixed mode anymore because it's pretty broken. 
Listing all direct library dependencies.

Modified:
  lib32-jack2/trunk/PKGBUILD

--+
 PKGBUILD |   29 +
 1 file changed, 17 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-14 20:59:13 UTC (rev 515925)
+++ PKGBUILD2019-10-14 21:17:37 UTC (rev 515926)
@@ -2,18 +2,18 @@
 # Contributor: speps 
 
 pkgname=lib32-jack2
-pkgver=1.9.12
-pkgrel=3
+pkgver=1.9.13
+pkgrel=1
 pkgdesc="The next-generation JACK with SMP support (32 bit)"
 arch=('x86_64')
 url="http://jackaudio.org/;
 license=('GPL2' 'LGPL2.1')
-depends=('lib32-celt' 'lib32-gcc-libs' 'lib32-opus' 'jack2')
-makedepends=('celt' 'doxygen' 'gcc-multilib' 'lib32-celt' 'lib32-gcc-libs' 
'lib32-opus' 'libffado' 'libsamplerate' 'opus' 'waf')
+depends=('lib32-db' 'lib32-celt' 'lib32-gcc-libs' 'lib32-glibc' 'lib32-opus' 
'jack2')
+makedepends=('db' 'celt' 'lib32-dbus' 'lib32-expat' 'lib32-libsamplerate' 
'libsamplerate' 'opus' 'waf')
 provides=('lib32-jack')
 conflicts=('lib32-jack')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jackaudio/${pkgname#lib32-}/archive/v${pkgver}.tar.gz;)
-sha512sums=('f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa')
+sha512sums=('8c578df723f2c0c91e854abf73a35249784c833264c42c340f0e56744bf931bda75ebd941532c80cecc67e2d469becc27498e546b73cc4581379b8ceee1f49c1')
 
 prepare() {
   cd "${pkgname#lib32-}-${pkgver}"
@@ -30,22 +30,27 @@
 
 build() {
   cd "${pkgname#lib32-}-${pkgver}"
-
+  # mixed mode is broken: https://github.com/jackaudio/jack2/issues/508
+  export PYTHONPATH="${PWD}:${PYTHONPATH}"
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export CXXFLAGS+=' -m32'
+  export CFLAGS+=' -m32'
   waf configure --prefix=/usr \
---libdir=/usr/lib \
---libdir32=/usr/lib32 \
---freebob=no \
+--libdir=/usr/lib32 \
 --classic \
---dbus \
---mixed
+--dbus
   waf build
 }
 
 package() {
   cd "${pkgname#lib32-}-${pkgver}"
-
+  export PYTHONPATH="${PWD}:${PYTHONPATH}"
   waf install --destdir="${pkgdir}"
   # remove all non-32bit and those provided by jack2
   rm -rf "${pkgdir}"/usr/{bin,lib,include,share}
+  rm -rf "${pkgdir}/usr/lib32/jack/"
+  rm -rf "${pkgdir}/usr/lib32/libjack"{net,server}*
 }
 # vim:set ts=2 sw=2 et:


[arch-commits] Commit in lib32-jack2/trunk (PKGBUILD)

2019-08-28 Thread David Runge via arch-commits
Date: Wednesday, August 28, 2019 @ 15:13:49
  Author: dvzrv
Revision: 504257

upgpkg: lib32-jack2 1.9.12-3

Switching to waf in makedepends. Switching to correct licenses (GPL2 and 
LGPL2.1). Removing completely outdated conflicts/replaces. Moving required 
custom waf scripts, so they can be found by system waf.

Modified:
  lib32-jack2/trunk/PKGBUILD

--+
 PKGBUILD |   40 +++-
 1 file changed, 27 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-28 15:13:02 UTC (rev 504256)
+++ PKGBUILD2019-08-28 15:13:49 UTC (rev 504257)
@@ -3,35 +3,49 @@
 
 pkgname=lib32-jack2
 pkgver=1.9.12
-pkgrel=2
+pkgrel=3
 pkgdesc="The next-generation JACK with SMP support (32 bit)"
 arch=('x86_64')
 url="http://jackaudio.org/;
-license=('GPL')
+license=('GPL2' 'LGPL2.1')
 depends=('lib32-celt' 'lib32-gcc-libs' 'lib32-opus' 'jack2')
-makedepends=('celt' 'doxygen' 'gcc-multilib' 'lib32-celt' 'lib32-gcc-libs' 
'lib32-opus' 'libffado' 'libsamplerate' 'opus' 'python2')
+makedepends=('celt' 'doxygen' 'gcc-multilib' 'lib32-celt' 'lib32-gcc-libs' 
'lib32-opus' 'libffado' 'libsamplerate' 'opus' 'waf')
 provides=('lib32-jack')
-conflicts=('lib32-jack' 'jack2-multilib' 'jack2-dbus-multilib')
-replaces=('jack2-multilib' 'jack2-dbus-multilib')
+conflicts=('lib32-jack')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jackaudio/${pkgname#lib32-}/archive/v${pkgver}.tar.gz;)
 
sha512sums=('f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa')
 
+prepare() {
+  cd "${pkgname#lib32-}-${pkgver}"
+  # copying relevant custom waf scripts and loading them specifically using
+  # wscript
+  touch __init__.py
+  mkdir -vp tools
+  cp -v waflib/extras/xcode*.py tools
+  rm -rv waflib
+  sed -e "s/load('xcode'/load('xcode', tooldir='tools'/g" \
+  -e "s/load('xcode6'/load('xcode6', tooldir='tools'/g" \
+  -i wscript
+}
+
 build() {
   cd "${pkgname#lib32-}-${pkgver}"
 
-  python2 waf configure --prefix=/usr \
---libdir=/usr/lib \
---libdir32=/usr/lib32 \
---mixed
-  python2 waf build
+  waf configure --prefix=/usr \
+--libdir=/usr/lib \
+--libdir32=/usr/lib32 \
+--freebob=no \
+--classic \
+--dbus \
+--mixed
+  waf build
 }
 
 package() {
   cd "${pkgname#lib32-}-${pkgver}"
 
-  python2 waf install --destdir="${pkgdir}"
-  # remove all non-32bit and those provided by jack2{,-dbus}
+  waf install --destdir="${pkgdir}"
+  # remove all non-32bit and those provided by jack2
   rm -rf "${pkgdir}"/usr/{bin,lib,include,share}
 }
-
 # vim:set ts=2 sw=2 et:


[arch-commits] Commit in lib32-jack2/trunk (PKGBUILD)

2019-01-26 Thread David Runge via arch-commits
Date: Saturday, January 26, 2019 @ 10:14:34
  Author: dvzrv
Revision: 428062

Switching to python2 for the waf build system. It's broken with python in 
1.9.12, but will work with it again in 1.9.13.

Modified:
  lib32-jack2/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-26 10:14:34 UTC (rev 428061)
+++ PKGBUILD2019-01-26 10:14:34 UTC (rev 428062)
@@ -9,7 +9,7 @@
 url="http://jackaudio.org/;
 license=('GPL')
 depends=('lib32-celt' 'lib32-gcc-libs' 'lib32-opus' 'jack2')
-makedepends=('celt' 'doxygen' 'gcc-multilib' 'lib32-celt' 'lib32-gcc-libs' 
'lib32-opus' 'libffado' 'libsamplerate' 'opus' 'python')
+makedepends=('celt' 'doxygen' 'gcc-multilib' 'lib32-celt' 'lib32-gcc-libs' 
'lib32-opus' 'libffado' 'libsamplerate' 'opus' 'python2')
 provides=('lib32-jack')
 conflicts=('lib32-jack' 'jack2-multilib' 'jack2-dbus-multilib')
 replaces=('jack2-multilib' 'jack2-dbus-multilib')
@@ -19,17 +19,17 @@
 build() {
   cd "${pkgname#lib32-}-${pkgver}"
 
-  python waf configure --prefix=/usr \
+  python2 waf configure --prefix=/usr \
 --libdir=/usr/lib \
 --libdir32=/usr/lib32 \
 --mixed
-  python waf build
+  python2 waf build
 }
 
 package() {
   cd "${pkgname#lib32-}-${pkgver}"
 
-  python waf install --destdir="${pkgdir}"
+  python2 waf install --destdir="${pkgdir}"
   # remove all non-32bit and those provided by jack2{,-dbus}
   rm -rf "${pkgdir}"/usr/{bin,lib,include,share}
 }


[arch-commits] Commit in lib32-jack2/trunk (PKGBUILD)

2018-07-29 Thread David Runge via arch-commits
Date: Sunday, July 29, 2018 @ 18:23:36
  Author: dvzrv
Revision: 364877

upgpkg: lib32-jack2 1.9.12-2

Fixing source array.

Modified:
  lib32-jack2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-29 17:21:48 UTC (rev 364876)
+++ PKGBUILD2018-07-29 18:23:36 UTC (rev 364877)
@@ -4,7 +4,7 @@
 
 pkgname=lib32-jack2
 pkgver=1.9.12
-pkgrel=1
+pkgrel=2
 pkgdesc="The next-generation JACK with SMP support (32 bit)"
 arch=('x86_64')
 url="http://jackaudio.org/;
@@ -14,7 +14,7 @@
 provides=('lib32-jack')
 conflicts=('lib32-jack' 'jack2-multilib' 'jack2-dbus-multilib')
 replaces=('jack2-multilib' 'jack2-dbus-multilib')
-source=("https://github.com/jackaudio/${pkgname#lib32-}/archive/v${pkgver}.tar.gz;)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jackaudio/${pkgname#lib32-}/archive/v${pkgver}.tar.gz;)
 
sha512sums=('f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa')
 
 build() {


[arch-commits] Commit in lib32-jack2/trunk (PKGBUILD)

2015-12-06 Thread Antonio Rojas
Date: Monday, December 7, 2015 @ 03:03:50
  Author: arojas
Revision: 149511

C++11 ABI rebuild

Modified:
  lib32-jack2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 01:59:37 UTC (rev 149510)
+++ PKGBUILD2015-12-07 02:03:50 UTC (rev 149511)
@@ -3,7 +3,7 @@
 
 pkgname=lib32-jack2
 pkgver=1.9.10
-pkgrel=2
+pkgrel=3
 pkgdesc="The next-generation JACK with SMP support (32 bit)"
 arch=('x86_64')
 url="http://jackaudio.org/;


[arch-commits] Commit in lib32-jack2/trunk (PKGBUILD)

2014-09-09 Thread Laurent Carlier
Date: Tuesday, September 9, 2014 @ 23:16:04
  Author: lcarlier
Revision: 118724

upgpkg: lib32-jack2 1.9.10-2

fix FS#41788

Modified:
  lib32-jack2/trunk/PKGBUILD

--+
 PKGBUILD |   48 +---
 1 file changed, 13 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-09 21:13:09 UTC (rev 118723)
+++ PKGBUILD2014-09-09 21:16:04 UTC (rev 118724)
@@ -1,24 +1,14 @@
 # $Id$
 # Maintainer : speps speps at aur dot archlinux dot org
 
-## Replaces jack2-multilib, which had its own rationale:
-# 
http://mailman.archlinux.org/pipermail/arch-multilib/2011-December/000251.html
-
-## New lib32-jack2 package description (replaces jack2{-dbus,}-multilib
-#
-# The vanilla mixed mode build is broken since a long time, so we build
-# and provide just the 32 bit jack client library using some dynamic
-# patching that seems stable enough to last on future build system changes.
-
 pkgname=lib32-jack2
 pkgver=1.9.10
-pkgrel=1
+pkgrel=2
 pkgdesc=The next-generation JACK with SMP support (32 bit)
-arch=('x86_64' 'i686')
+arch=('x86_64')
 url=http://jackaudio.org/;
 license=('GPL')
-depends=('lib32-gcc-libs' 'jack2')
-makedepends=('python2' 'gcc-multilib')
+makedepends=('python2' 'lib32-gcc-libs' 'gcc-multilib' 'libsamplerate')
 provides=('lib32-jack')
 conflicts=('lib32-jack' 'jack2-multilib' 'jack2-dbus-multilib')
 replaces=('jack2-multilib' 'jack2-dbus-multilib')
@@ -25,36 +15,24 @@
 source=(https://dl.dropboxusercontent.com/u/28869550/jack-$pkgver.tar.bz2;)
 md5sums=('4aeb91d7ae0cabce98355436ed4f217a')
 
-prepare() {
+build() {
   cd $srcdir/jack-$pkgver
 
-  # ugly dynamic patch to build just the 32 bit jack client lib
-  # (compatible with previous releases and hoping with the next)
-  sed -e '/serverlib/,/clientlib/{/clientlib/!d}' \
-  -e '/clientlib32bit/i\\tclientlib.posted = True' \
-  -e '1,/clientlib32bit/!d' \
-  -i common/wscript
-
-  # celt and opus are not required to build
-  sed -i 's/, CELT, OPUS//' common/wscript
-}
-
-build() {
-  cd $srcdir/jack-$pkgver
   python2 waf configure --prefix=/usr \
---libdir=/usr/lib32 \
+--libdir=/usr/lib \
+--libdir32=/usr/lib32 \
 --mixed
-  cd common
-  python2 ../waf build $MAKEFLAGS
+  python2 waf build $MAKEFLAGS
 }
 
 package() {
-  cd $srcdir/jack-$pkgver/build/common
+  depends=('lib32-gcc-libs' 'jack2')
+  cd $srcdir/jack-$pkgver
 
-  # jack client 32 bit lib
-  install -Dm755 libjack.so $pkgdir/usr/lib32/libjack.so.0.1.0
-  ln -s libjack.so.0.1.0 $pkgdir/usr/lib32/libjack.so.0
-  ln -s libjack.so.0.1.0 $pkgdir/usr/lib32/libjack.so
+  python2 waf install --destdir=$pkgdir
+
+  rm -rf $pkgdir/usr/{bin,lib,include,share}
+
 }
 
 # vim:set ts=2 sw=2 et:



[arch-commits] Commit in lib32-jack2/trunk (PKGBUILD)

2014-09-03 Thread Eric BĂ©langer
Date: Thursday, September 4, 2014 @ 01:20:01
  Author: eric
Revision: 118229

Fix source url

Modified:
  lib32-jack2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-03 19:43:33 UTC (rev 118228)
+++ PKGBUILD2014-09-03 23:20:01 UTC (rev 118229)
@@ -22,7 +22,7 @@
 provides=('lib32-jack')
 conflicts=('lib32-jack' 'jack2-multilib' 'jack2-dbus-multilib')
 replaces=('jack2-multilib' 'jack2-dbus-multilib')
-source=(http://jackaudio.org/downloads/jack-$pkgver.tar.bz2;)
+source=(https://dl.dropboxusercontent.com/u/28869550/jack-$pkgver.tar.bz2;)
 md5sums=('4aeb91d7ae0cabce98355436ed4f217a')
 
 prepare() {



[arch-commits] Commit in lib32-jack2/trunk (PKGBUILD)

2014-08-24 Thread Ray Rashif
Date: Sunday, August 24, 2014 @ 16:51:46
  Author: schiv
Revision: 117839

upgpkg: lib32-jack2 1.9.10-1

sync w/ jack2

Modified:
  lib32-jack2/trunk/PKGBUILD

--+
 PKGBUILD |   19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-24 14:26:34 UTC (rev 117838)
+++ PKGBUILD2014-08-24 14:51:46 UTC (rev 117839)
@@ -1,15 +1,8 @@
 # $Id$
 # Maintainer : speps speps at aur dot archlinux dot org
 
-## Legacy jack2-multilib package description (now replaced by lib32-jack2)
-#
-# This one is in response to a need for an equivalent to lib32-jack for
-# jack2. A lib32-jack2 would require much patching and invading the pure
-# jack2 package, and what's more, the buildsystem provides a flag just to
-# build a hybrid jack2 in full. As such, we have opted to provide multilib
-# users with a replacement package instead of the usual lib32 add-on.
-#
-# See 
http://mailman.archlinux.org/pipermail/arch-multilib/2011-December/000251.html
+## Replaces jack2-multilib, which had its own rationale:
+# 
http://mailman.archlinux.org/pipermail/arch-multilib/2011-December/000251.html
 
 ## New lib32-jack2 package description (replaces jack2{-dbus,}-multilib
 #
@@ -18,10 +11,10 @@
 # patching that seems stable enough to last on future build system changes.
 
 pkgname=lib32-jack2
-pkgver=1.9.9.5
+pkgver=1.9.10
 pkgrel=1
 pkgdesc=The next-generation JACK with SMP support (32 bit)
-arch=('x86_64')
+arch=('x86_64' 'i686')
 url=http://jackaudio.org/;
 license=('GPL')
 depends=('lib32-gcc-libs' 'jack2')
@@ -29,8 +22,8 @@
 provides=('lib32-jack')
 conflicts=('lib32-jack' 'jack2-multilib' 'jack2-dbus-multilib')
 replaces=('jack2-multilib' 'jack2-dbus-multilib')
-source=(http://jackaudio.org/downloads/jack-1.9.9.5.tar.bz2;)
-md5sums=('6c9de6b89db9d7076fa2ce222816cf4c')
+source=(http://jackaudio.org/downloads/jack-$pkgver.tar.bz2;)
+md5sums=('4aeb91d7ae0cabce98355436ed4f217a')
 
 prepare() {
   cd $srcdir/jack-$pkgver