[arch-commits] Commit in guitarix2/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Sun May 8 11:31:10 UTC 2016
Date: Sunday, May 8, 2016 @ 13:31:09
Author: arojas
Revision: 174308
archrelease: copy trunk to community-i686, community-x86_64
Added:
guitarix2/repos/community-i686/PKGBUILD
(from rev 174307, guitarix2/trunk/PKGBUILD)
guitarix2/repos/community-i686/guitarix-abs.patch
(from rev 174307, guitarix2/trunk/guitarix-abs.patch)
guitarix2/repos/community-x86_64/PKGBUILD
(from rev 174307, guitarix2/trunk/PKGBUILD)
guitarix2/repos/community-x86_64/guitarix-abs.patch
(from rev 174307, guitarix2/trunk/guitarix-abs.patch)
Deleted:
guitarix2/repos/community-i686/PKGBUILD
guitarix2/repos/community-i686/guitarix2.install
guitarix2/repos/community-x86_64/PKGBUILD
guitarix2/repos/community-x86_64/guitarix2.install
-------------------------------------+
/PKGBUILD | 84 ++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 36 --------------
community-i686/guitarix-abs.patch | 12 ++++
community-i686/guitarix2.install | 11 ----
community-x86_64/PKGBUILD | 36 --------------
community-x86_64/guitarix-abs.patch | 12 ++++
community-x86_64/guitarix2.install | 11 ----
7 files changed, 108 insertions(+), 94 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-05-08 11:30:25 UTC (rev 174307)
+++ community-i686/PKGBUILD 2016-05-08 11:31:09 UTC (rev 174308)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: speps <speps at aur dot archlinux dot org>
-
-pkgname=guitarix2
-pkgver=0.34.0
-pkgrel=3
-pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust"
-arch=('i686' 'x86_64')
-url="http://guitarix.sourceforge.net/"
-license=('GPL')
-depends=('gtkmm' 'liblrdf' 'lilv' 'bluez-libs' 'boost-libs' 'webkitgtk2'
- 'zita-convolver' 'zita-resampler' 'desktop-file-utils')
-makedepends=('python' 'python2' 'boost' 'eigen' 'gperf' 'intltool' 'lv2')
-optdepends=('meterbridge: sound meters')
-provides=('guitarix' 'gx_head')
-conflicts=('guitarix' 'gx_head')
-replaces=('guitarix' 'gx_head')
-install="$pkgname.install"
-source=("http://download.sourceforge.net/project/guitarix/guitarix/$pkgname-$pkgver.tar.bz2")
-md5sums=('0ac5f18ee738d535b1551ea68ac2fce9')
-
-build() {
- cd guitarix-$pkgver
- python2 waf configure --prefix=/usr \
- --no-desktop-update \
- --no-ldconfig \
- --no-faust \
- --shared-lib \
- --lib-dev
- python2 waf build
-}
-
-package() {
- cd guitarix-$pkgver
- python2 waf install --destdir="$pkgdir"
-}
Copied: guitarix2/repos/community-i686/PKGBUILD (from rev 174307, guitarix2/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-05-08 11:31:09 UTC (rev 174308)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=guitarix2
+pkgver=0.34.0
+pkgrel=4
+pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust"
+arch=('i686' 'x86_64')
+url="http://guitarix.sourceforge.net/"
+license=('GPL')
+depends=('gtkmm' 'liblrdf' 'lilv' 'bluez-libs' 'boost-libs' 'webkitgtk2'
+ 'zita-convolver' 'zita-resampler' 'desktop-file-utils')
+makedepends=('python' 'python2' 'boost' 'eigen' 'gperf' 'intltool' 'lv2')
+optdepends=('meterbridge: sound meters')
+provides=('guitarix' 'gx_head')
+conflicts=('guitarix' 'gx_head')
+replaces=('guitarix' 'gx_head')
+source=("http://download.sourceforge.net/project/guitarix/guitarix/$pkgname-$pkgver.tar.bz2" guitarix-abs.patch)
+md5sums=('0ac5f18ee738d535b1551ea68ac2fce9'
+ 'a09d63328d248f58c1c605a0071aadda')
+
+prepare() {
+ cd guitarix-$pkgver
+ # Fix build with GCC 6 (Fedora)
+ patch -p1 -i ../guitarix-abs.patch
+}
+
+build() {
+ cd guitarix-$pkgver
+ python2 waf configure --prefix=/usr \
+ --no-desktop-update \
+ --no-ldconfig \
+ --no-faust \
+ --shared-lib \
+ --lib-dev
+ python2 waf build
+}
+
+package() {
+ cd guitarix-$pkgver
+ python2 waf install --destdir="$pkgdir"
+}
Copied: guitarix2/repos/community-i686/guitarix-abs.patch (from rev 174307, guitarix2/trunk/guitarix-abs.patch)
===================================================================
--- community-i686/guitarix-abs.patch (rev 0)
+++ community-i686/guitarix-abs.patch 2016-05-08 11:31:09 UTC (rev 174308)
@@ -0,0 +1,12 @@
+diff -Nurp guitarix-0.35.0.mod/libgxwmm/gxwmm/gainline.h guitarix-0.35.0/libgxwmm/gxwmm/gainline.h
+--- guitarix-0.35.0.mod/libgxwmm/gxwmm/gainline.h 2016-04-24 06:18:37.000000000 +0200
++++ guitarix-0.35.0/libgxwmm/gxwmm/gainline.h 2016-04-24 21:22:44.846076833 +0200
+@@ -22,7 +22,7 @@
+ #include <gxw/gainpoints.h>
+ #include <vector>
+
+-inline bool operator==(const gain_points& p1, const gain_points& p2) { return p1.i == p2.i && abs(p1.g - p2.g) < 1e-4 * (p1.g + p2.g); }
++inline bool operator==(const gain_points& p1, const gain_points& p2) { return p1.i == p2.i && fabs(p1.g - p2.g) < 1e-4 * (p1.g + p2.g); }
+ inline bool operator!=(const gain_points& p1, const gain_points& p2) { return !(p1 == p2); }
+
+ class Gainline: public std::vector<gain_points>
Deleted: community-i686/guitarix2.install
===================================================================
--- community-i686/guitarix2.install 2016-05-08 11:30:25 UTC (rev 174307)
+++ community-i686/guitarix2.install 2016-05-08 11:31:09 UTC (rev 174308)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-05-08 11:30:25 UTC (rev 174307)
+++ community-x86_64/PKGBUILD 2016-05-08 11:31:09 UTC (rev 174308)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: speps <speps at aur dot archlinux dot org>
-
-pkgname=guitarix2
-pkgver=0.34.0
-pkgrel=3
-pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust"
-arch=('i686' 'x86_64')
-url="http://guitarix.sourceforge.net/"
-license=('GPL')
-depends=('gtkmm' 'liblrdf' 'lilv' 'bluez-libs' 'boost-libs' 'webkitgtk2'
- 'zita-convolver' 'zita-resampler' 'desktop-file-utils')
-makedepends=('python' 'python2' 'boost' 'eigen' 'gperf' 'intltool' 'lv2')
-optdepends=('meterbridge: sound meters')
-provides=('guitarix' 'gx_head')
-conflicts=('guitarix' 'gx_head')
-replaces=('guitarix' 'gx_head')
-install="$pkgname.install"
-source=("http://download.sourceforge.net/project/guitarix/guitarix/$pkgname-$pkgver.tar.bz2")
-md5sums=('0ac5f18ee738d535b1551ea68ac2fce9')
-
-build() {
- cd guitarix-$pkgver
- python2 waf configure --prefix=/usr \
- --no-desktop-update \
- --no-ldconfig \
- --no-faust \
- --shared-lib \
- --lib-dev
- python2 waf build
-}
-
-package() {
- cd guitarix-$pkgver
- python2 waf install --destdir="$pkgdir"
-}
Copied: guitarix2/repos/community-x86_64/PKGBUILD (from rev 174307, guitarix2/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-05-08 11:31:09 UTC (rev 174308)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=guitarix2
+pkgver=0.34.0
+pkgrel=4
+pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust"
+arch=('i686' 'x86_64')
+url="http://guitarix.sourceforge.net/"
+license=('GPL')
+depends=('gtkmm' 'liblrdf' 'lilv' 'bluez-libs' 'boost-libs' 'webkitgtk2'
+ 'zita-convolver' 'zita-resampler' 'desktop-file-utils')
+makedepends=('python' 'python2' 'boost' 'eigen' 'gperf' 'intltool' 'lv2')
+optdepends=('meterbridge: sound meters')
+provides=('guitarix' 'gx_head')
+conflicts=('guitarix' 'gx_head')
+replaces=('guitarix' 'gx_head')
+source=("http://download.sourceforge.net/project/guitarix/guitarix/$pkgname-$pkgver.tar.bz2" guitarix-abs.patch)
+md5sums=('0ac5f18ee738d535b1551ea68ac2fce9'
+ 'a09d63328d248f58c1c605a0071aadda')
+
+prepare() {
+ cd guitarix-$pkgver
+ # Fix build with GCC 6 (Fedora)
+ patch -p1 -i ../guitarix-abs.patch
+}
+
+build() {
+ cd guitarix-$pkgver
+ python2 waf configure --prefix=/usr \
+ --no-desktop-update \
+ --no-ldconfig \
+ --no-faust \
+ --shared-lib \
+ --lib-dev
+ python2 waf build
+}
+
+package() {
+ cd guitarix-$pkgver
+ python2 waf install --destdir="$pkgdir"
+}
Copied: guitarix2/repos/community-x86_64/guitarix-abs.patch (from rev 174307, guitarix2/trunk/guitarix-abs.patch)
===================================================================
--- community-x86_64/guitarix-abs.patch (rev 0)
+++ community-x86_64/guitarix-abs.patch 2016-05-08 11:31:09 UTC (rev 174308)
@@ -0,0 +1,12 @@
+diff -Nurp guitarix-0.35.0.mod/libgxwmm/gxwmm/gainline.h guitarix-0.35.0/libgxwmm/gxwmm/gainline.h
+--- guitarix-0.35.0.mod/libgxwmm/gxwmm/gainline.h 2016-04-24 06:18:37.000000000 +0200
++++ guitarix-0.35.0/libgxwmm/gxwmm/gainline.h 2016-04-24 21:22:44.846076833 +0200
+@@ -22,7 +22,7 @@
+ #include <gxw/gainpoints.h>
+ #include <vector>
+
+-inline bool operator==(const gain_points& p1, const gain_points& p2) { return p1.i == p2.i && abs(p1.g - p2.g) < 1e-4 * (p1.g + p2.g); }
++inline bool operator==(const gain_points& p1, const gain_points& p2) { return p1.i == p2.i && fabs(p1.g - p2.g) < 1e-4 * (p1.g + p2.g); }
+ inline bool operator!=(const gain_points& p1, const gain_points& p2) { return !(p1 == p2); }
+
+ class Gainline: public std::vector<gain_points>
Deleted: community-x86_64/guitarix2.install
===================================================================
--- community-x86_64/guitarix2.install 2016-05-08 11:30:25 UTC (rev 174307)
+++ community-x86_64/guitarix2.install 2016-05-08 11:31:09 UTC (rev 174308)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
More information about the arch-commits
mailing list