[arch-commits] Commit in giada/repos/community-x86_64 (4 files)
David Runge
dvzrv at archlinux.org
Sat Jun 20 21:36:38 UTC 2020
Date: Saturday, June 20, 2020 @ 21:36:38
Author: dvzrv
Revision: 648663
archrelease: copy trunk to community-x86_64
Added:
giada/repos/community-x86_64/PKGBUILD
(from rev 648662, giada/trunk/PKGBUILD)
giada/repos/community-x86_64/giada-0.16.2.2-devendor_nlohmann-json.patch
(from rev 648662, giada/trunk/giada-0.16.2.2-devendor_nlohmann-json.patch)
Deleted:
giada/repos/community-x86_64/PKGBUILD
giada/repos/community-x86_64/giada-0.16.2.2-devendor_nlohmann-json.patch
---------------------------------------------+
PKGBUILD | 142 ++++++++++++++------------
giada-0.16.2.2-devendor_nlohmann-json.patch | 110 ++++++++++----------
2 files changed, 133 insertions(+), 119 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-20 21:36:31 UTC (rev 648662)
+++ PKGBUILD 2020-06-20 21:36:38 UTC (rev 648663)
@@ -1,64 +0,0 @@
-# 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/PKGBUILD (from rev 648662, giada/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-20 21:36:38 UTC (rev 648663)
@@ -0,0 +1,78 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+pkgname=giada
+pkgver=0.16.3
+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=('gcc-libs' 'glibc' 'libx11' 'libxpm')
+# upstream vendors a hacked rtaudio :(
+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=('b2dab7a9263ce31dfa64bec2fb504ec26d762c3692a571ba25e11663dd3b3000ba6378044d8155458c969dfa38c8b23d9d135409fefec6a0943ed6137d73f0bf'
+ '10d05fba9ffdf3836ccbec0bb7d381e9dd386a5959af784b36a3fba35d0e104db923998c99f2830053d5a8ed178ddb6501971e6f042a3461a4d08c0557325677'
+ 'bb553634619f3870b69d6e545352dd693db5e389f879769a70360a1aec6a627f97a0344648993083617d7cc64e812a81f717f0a2d33d47d2beecbb40fd302111'
+ '31cf5b2b1bba29e8c97109c04c6456a98b778017ef5d48a0f020d326d8a11a5e76c8613fc232a2492d16aa48bc2faaae4aae7316252d6b887bd2187032fb83f9')
+
+prepare() {
+ mv -v "$pkgname-$pkgver-src" "$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
+ # XDG desktop file
+ gendesk -n \
+ --pkgname ${pkgname} \
+ --pkgdesc "${pkgdesc}" \
+ --name Giada \
+ --categories "AudioVideo;Audio;Midi;Sequencer"
+ # 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() {
+ 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' 'libfltk.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}"
+}
Deleted: giada-0.16.2.2-devendor_nlohmann-json.patch
===================================================================
--- giada-0.16.2.2-devendor_nlohmann-json.patch 2020-06-20 21:36:31 UTC (rev 648662)
+++ giada-0.16.2.2-devendor_nlohmann-json.patch 2020-06-20 21:36:38 UTC (rev 648663)
@@ -1,55 +0,0 @@
-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"
Copied: giada/repos/community-x86_64/giada-0.16.2.2-devendor_nlohmann-json.patch (from rev 648662, 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-06-20 21:36:38 UTC (rev 648663)
@@ -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