Date: Saturday, June 20, 2020 @ 21:36:31
Author: dvzrv
Revision: 648662
upgpkg: giada 0.16.3-1: Upgrading to 0.16.3.
Adding patches to fix tests and missing includes for std::string.
Removing linking against Xinerama, Xcursor, Xft, Xrender which seems unneeded.
Adding libfltk.so to sodeps in package().
Modified:
giada/trunk/PKGBUILD
----------+
PKGBUILD | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-20 21:36:30 UTC (rev 648661)
+++ PKGBUILD 2020-06-20 21:36:31 UTC (rev 648662)
@@ -1,7 +1,7 @@
# Maintainer: David Runge <dv...@archlinux.org>
pkgname=giada
-pkgver=0.16.2.2
+pkgver=0.16.3
pkgrel=1
pkgdesc="A free, minimal, hardcore audio tool for DJs, live performers and
electronic musicians"
arch=('x86_64')
@@ -8,20 +8,23 @@
url="https://www.giadamusic.com/";
license=('GPL3')
groups=('pro-audio')
-depends=('fltk' 'gcc-libs' 'glibc' 'libx11' 'libxpm')
+depends=('gcc-libs' 'glibc' 'libx11' 'libxpm')
# upstream vendors a hacked rtaudio :(
-makedepends=('alsa-lib' 'gendesk' 'imagemagick' 'jack' 'libpulse'
+makedepends=('alsa-lib' 'fltk' 'gendesk' 'imagemagick' 'jack' 'libpulse'
'libsamplerate' 'libsndfile' 'nlohmann-json' 'rtmidi')
checkdepends=('catch2' 'xorg-server-xvfb')
source=("https://www.giadamusic.com/data/${pkgname}-${pkgver}-src.tar.gz";
+
"${pkgname}-0.16.3-fix_tests.patch::https://github.com/monocasual/giada/commit/15cbe99dd12cec5bfce8029d9768755b1dcbbc9e.patch";
+
"${pkgname}-0.16.3-fix_string_include.patch::https://github.com/monocasual/giada/commit/149d7b4b6c42e53cdd96890e4c635701521f52e7.patch";
"$pkgname-0.16.2.2-devendor_nlohmann-json.patch")
-sha512sums=('5b642ea557bf27923c99548af2c21cb106d75c515214cf105910897eb1654416303e2b77854220562a6fa16515c6ded219dac470626d96ea6d92fd9cd27757bf'
+sha512sums=('b2dab7a9263ce31dfa64bec2fb504ec26d762c3692a571ba25e11663dd3b3000ba6378044d8155458c969dfa38c8b23d9d135409fefec6a0943ed6137d73f0bf'
+
'10d05fba9ffdf3836ccbec0bb7d381e9dd386a5959af784b36a3fba35d0e104db923998c99f2830053d5a8ed178ddb6501971e6f042a3461a4d08c0557325677'
+
'bb553634619f3870b69d6e545352dd693db5e389f879769a70360a1aec6a627f97a0344648993083617d7cc64e812a81f717f0a2d33d47d2beecbb40fd302111'
'31cf5b2b1bba29e8c97109c04c6456a98b778017ef5d48a0f020d326d8a11a5e76c8613fc232a2492d16aa48bc2faaae4aae7316252d6b887bd2187032fb83f9')
prepare() {
mv -v "$pkgname-$pkgver-src" "$pkgname-$pkgver"
cd "$pkgname-$pkgver"
- autoreconf -vfi
# XDG desktop file
gendesk -n \
--pkgname ${pkgname} \
@@ -28,10 +31,21 @@
--pkgdesc "${pkgdesc}" \
--name Giada \
--categories "AudioVideo;Audio;Midi;Sequencer"
- # fixing catch2 include for system library
- sed -e 's|catch\.hpp|catch2/catch\.hpp|g' -i tests/*.cpp
# devendor nlohmann-json
patch -Np1 -i ../"$pkgname-0.16.2.2-devendor_nlohmann-json.patch"
+ # fix tests and build: https://github.com/monocasual/giada/issues/351
+ patch -Np1 -i "../${pkgname}-0.16.3-fix_tests.patch"
+ patch -Np1 -i "../${pkgname}-0.16.3-fix_string_include.patch"
+ # fixing test includes to use system catch2
+ sed -e 's|catch\.hpp|catch2/catch\.hpp|g' -i tests/*.cpp
+ # remove unused linking against X libs:
+ # https://github.com/monocasual/giada/issues/352
+ sed -e 's/-lXinerama//g' \
+ -e 's/-lXcursor//g' \
+ -e 's/-lXft//g' \
+ -e 's/-lXrender//g' \
+ -i Makefile.am
+ autoreconf -vfi
}
build() {
@@ -50,8 +64,8 @@
}
package() {
- depends+=('libasound.so' 'libjack.so' 'libpulse.so' 'libpulse-simple.so'
- 'librtmidi.so' 'libsamplerate.so' 'libsndfile.so')
+ depends+=('libasound.so' 'libfltk.so' 'libjack.so' 'libpulse.so'
+ 'libpulse-simple.so' 'librtmidi.so' 'libsamplerate.so' 'libsndfile.so')
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir/" install
# XDG integration
