[arch-commits] Commit in giada/repos/community-x86_64 (3 files)
David Runge
dvzrv at archlinux.org
Tue Apr 21 09:40:59 UTC 2020
Date: Tuesday, April 21, 2020 @ 09:40:59
Author: dvzrv
Revision: 617321
archrelease: copy trunk to community-x86_64
Added:
giada/repos/community-x86_64/PKGBUILD
(from rev 617320, giada/trunk/PKGBUILD)
giada/repos/community-x86_64/giada-0.16.2.2-devendor_nlohmann-json.patch
(from rev 617320, giada/trunk/giada-0.16.2.2-devendor_nlohmann-json.patch)
Deleted:
giada/repos/community-x86_64/PKGBUILD
---------------------------------------------+
PKGBUILD | 117 ++++++++++++++------------
giada-0.16.2.2-devendor_nlohmann-json.patch | 55 ++++++++++++
2 files changed, 119 insertions(+), 53 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-21 09:40:52 UTC (rev 617320)
+++ PKGBUILD 2020-04-21 09:40:59 UTC (rev 617321)
@@ -1,53 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-pkgname=giada
-pkgver=0.16.1
-pkgrel=1
-pkgdesc="A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"
-arch=('x86_64')
-url="https://www.giadamusic.com/"
-license=('GPL3')
-groups=('pro-audio')
-depends=('alsa-lib' 'fltk' 'gcc-libs' 'glibc' 'jansson' 'libjack.so' 'libpulse'
-'librtmidi.so' 'libsamplerate' 'libsndfile' 'libx11' 'libxpm')
-makedepends=('gendesk' 'imagemagick')
-checkdepends=('catch2' 'xorg-server-xvfb')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/monocasual/${pkgname}/archive/v${pkgver}.tar.gz")
-sha512sums=('12a898d449bea7d189eb320ea1241c0e408eafbf2460ff122b1383aff4209b5af4513ba5a2d4684cbbcaaf5a866d8016f19337497c7cd4faf58b884663543c35')
-
-prepare() {
- cd "$pkgname-$pkgver"
- autoreconf -vfi
- # XDG desktop file
- gendesk -n \
- --pkgname ${pkgname} \
- --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
-}
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure --prefix=/usr \
- --target=linux \
- --enable-system-catch
- make
-}
-
-check(){
- cd "$pkgname-$pkgver"
- xvfb-run -a make -k check
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
- # XDG integration
- install -vDm 644 "${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
- install -vDm 644 "extras/${pkgname}-logo.png" \
- "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
- # docs
- install -vDm 644 {ChangeLog,README.md} \
- -t "${pkgdir}/usr/share/doc/${pkgname}"
-}
Copied: giada/repos/community-x86_64/PKGBUILD (from rev 617320, giada/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-21 09:40:59 UTC (rev 617321)
@@ -0,0 +1,64 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+pkgname=giada
+pkgver=0.16.2.2
+pkgrel=1
+pkgdesc="A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"
+arch=('x86_64')
+url="https://www.giadamusic.com/"
+license=('GPL3')
+groups=('pro-audio')
+depends=('fltk' 'gcc-libs' 'glibc' 'libx11' 'libxpm')
+# upstream vendors a hacked rtaudio :(
+makedepends=('alsa-lib' '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.2.2-devendor_nlohmann-json.patch")
+sha512sums=('5b642ea557bf27923c99548af2c21cb106d75c515214cf105910897eb1654416303e2b77854220562a6fa16515c6ded219dac470626d96ea6d92fd9cd27757bf'
+ '31cf5b2b1bba29e8c97109c04c6456a98b778017ef5d48a0f020d326d8a11a5e76c8613fc232a2492d16aa48bc2faaae4aae7316252d6b887bd2187032fb83f9')
+
+prepare() {
+ mv -v "$pkgname-$pkgver-src" "$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
+ autoreconf -vfi
+ # XDG desktop file
+ gendesk -n \
+ --pkgname ${pkgname} \
+ --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"
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ # TODO: build vst once the included juce is fixed for gcc >= 9.1.0
+ # https://github.com/monocasual/giada/issues/328
+ ./configure --prefix=/usr \
+ --target=linux \
+ --enable-system-catch
+ make
+}
+
+check(){
+ cd "$pkgname-$pkgver"
+ xvfb-run -a make -k check
+}
+
+package() {
+ depends+=('libasound.so' 'libjack.so' 'libpulse.so' 'libpulse-simple.so'
+ 'librtmidi.so' 'libsamplerate.so' 'libsndfile.so')
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+ # XDG integration
+ install -vDm 644 "${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
+ install -vDm 644 "extras/${pkgname}-logo.png" \
+ "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+ # docs
+ install -vDm 644 {ChangeLog,README.md} \
+ -t "${pkgdir}/usr/share/doc/${pkgname}"
+}
Copied: giada/repos/community-x86_64/giada-0.16.2.2-devendor_nlohmann-json.patch (from rev 617320, giada/trunk/giada-0.16.2.2-devendor_nlohmann-json.patch)
===================================================================
--- giada-0.16.2.2-devendor_nlohmann-json.patch (rev 0)
+++ giada-0.16.2.2-devendor_nlohmann-json.patch 2020-04-21 09:40:59 UTC (rev 617321)
@@ -0,0 +1,55 @@
+diff -ruN a/src/core/conf.cpp b/src/core/conf.cpp
+--- a/src/core/conf.cpp 2020-02-18 22:26:06.000000000 +0100
++++ b/src/core/conf.cpp 2020-02-20 20:00:59.845504376 +0100
+@@ -29,7 +29,7 @@
+ #include <cassert>
+ #include <string>
+ #include <FL/Fl.H>
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include <nlohmann/json.hpp>
+ #include "utils/fs.h"
+ #include "utils/log.h"
+ #include "core/const.h"
+@@ -314,4 +314,4 @@
+ ofs << j;
+ return true;
+ }
+-}}}; // giada::m::conf::
+\ No newline at end of file
++}}}; // giada::m::conf::
+diff -ruN a/src/core/init.cpp b/src/core/init.cpp
+--- a/src/core/init.cpp 2020-02-18 22:26:06.000000000 +0100
++++ b/src/core/init.cpp 2020-02-20 19:59:55.206135824 +0100
+@@ -35,7 +35,7 @@
+ #include <X11/Xlib.h> // For XInitThreads
+ #endif
+ #include <FL/Fl.H>
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include <nlohmann/json.hpp>
+ #include "gui/updater.h"
+ #include "utils/log.h"
+ #include "utils/fs.h"
+diff -ruN a/src/core/midiMapConf.cpp b/src/core/midiMapConf.cpp
+--- a/src/core/midiMapConf.cpp 2020-02-18 22:26:06.000000000 +0100
++++ b/src/core/midiMapConf.cpp 2020-02-20 20:01:20.878632255 +0100
+@@ -30,7 +30,7 @@
+ #include <string>
+ #include <cstring>
+ #include <dirent.h>
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include <nlohmann/json.hpp>
+ #include "utils/string.h"
+ #include "utils/log.h"
+ #include "utils/fs.h"
+diff -ruN a/src/core/patch.cpp b/src/core/patch.cpp
+--- a/src/core/patch.cpp 2020-02-18 22:26:06.000000000 +0100
++++ b/src/core/patch.cpp 2020-02-20 20:00:40.602359018 +0100
+@@ -26,7 +26,7 @@
+
+
+ #include <fstream>
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include <nlohmann/json.hpp>
+ #include "utils/math.h"
+ #include "utils/log.h"
+ #include "core/mixer.h"
More information about the arch-commits
mailing list