[arch-commits] Commit in giada/repos/community-x86_64 (4 files)

David Runge dvzrv at gemini.archlinux.org
Mon Jul 26 20:30:08 UTC 2021


    Date: Monday, July 26, 2021 @ 20:30:08
  Author: dvzrv
Revision: 985889

archrelease: copy trunk to community-x86_64

Added:
  giada/repos/community-x86_64/PKGBUILD
    (from rev 985888, giada/trunk/PKGBUILD)
  giada/repos/community-x86_64/giada-0.17.2-devendor_nlohmann_json.patch
    (from rev 985888, giada/trunk/giada-0.17.2-devendor_nlohmann_json.patch)
Deleted:
  giada/repos/community-x86_64/PKGBUILD
  giada/repos/community-x86_64/giada-0.17.2-devendor_nlohmann_json.patch

-------------------------------------------+
 PKGBUILD                                  |  149 +++++++++++++---------------
 giada-0.17.2-devendor_nlohmann_json.patch |  110 ++++++++++----------
 2 files changed, 127 insertions(+), 132 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-26 20:29:58 UTC (rev 985888)
+++ PKGBUILD	2021-07-26 20:30:08 UTC (rev 985889)
@@ -1,77 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-
-pkgname=giada
-pkgver=0.18.0.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=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libx11' 'libxcursor' 'libxft'
-'libxinerama' 'libxpm')
-# upstream vendors a hacked rtaudio :(
-makedepends=('alsa-lib' 'catch2' 'cmake' 'fltk' 'gendesk' 'imagemagick' 'jack'
-'libpulse' 'libsamplerate' 'libsndfile' 'libxrandr' 'nlohmann-json' 'rtmidi')
-checkdepends=('xorg-server-xvfb')
-provides=('vst3-host')
-source=("https://www.giadamusic.com/data/${pkgname}-${pkgver}-src.tar.gz"
-        "$pkgname-0.17.2-devendor_nlohmann_json.patch")
-sha512sums=('2bd4bc9fdc605ffbe182f35a9d165d891d64aba9ac22689b6b4ac275db619b96f02ed6523e26b7f5aa441e9cb4446804c50327fd8c8e813d4cfe7746c61f1666'
-            'b9d952c0816dd2b81dadff24521b19f305ca5ddeb1964dd81ce93e6f63b25dbf291c07e528cc2836f268a095bf9920786331a615230416f44a9014ff581a0bce')
-b2sums=('260ffbe64944f4b2eaafc9df9106248e68138f4535f29d16d81b3b9370532beaeb894d36b4e2b2cf8059611a6c1b5cf193bbdd0c18c55c0d518b548b991c009f'
-        'a482f356969c5d184a1eb0945477040cc7c5d1447fee0159cc5d2da05faea0bd696123b0559bdced148b301181f93726a515df24a814dbd08d207e2959f31305')
-
-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.17.2-devendor_nlohmann_json.patch"
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE='None' \
-        -DWITH_VST3=ON \
-        -W no-dev \
-        -B build \
-        -S .
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE='None' \
-        -DWITH_VST3=ON \
-        -DWITH_TESTS=ON \
-        -W no-dev \
-        -B build-test \
-        -S .
-  make VERBOSE=1 -C build
-  make VERBOSE=1 -C build-test
-}
-
-# unclear how to run tests: https://github.com/monocasual/giada/issues/463
-check(){
-  cd "$pkgname-$pkgver"
-  xvfb-run ./build-test/giada --run-tests
-}
-
-package() {
-  depends+=('libasound.so' 'libfltk.so' 'libfreetype.so' 'libjack.so'
-  'libpulse.so' 'libpulse-simple.so' 'librtmidi.so' 'libsamplerate.so'
-  'libsndfile.so')
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install -C build
-  # XDG integration
-  install -vDm 644 "${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-  install -vDm 644 "extras/${pkgname}-logo.svg" \
-    "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
-  # docs
-  install -vDm 644 {ChangeLog,README.md} \
-    -t "${pkgdir}/usr/share/doc/${pkgname}"
-}

Copied: giada/repos/community-x86_64/PKGBUILD (from rev 985888, giada/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-07-26 20:30:08 UTC (rev 985889)
@@ -0,0 +1,72 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+pkgname=giada
+pkgver=0.18.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=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'libx11' 'libxcursor' 'libxft'
+'libxinerama' 'libxpm')
+# upstream vendors a hacked rtaudio :(
+makedepends=('alsa-lib' 'catch2' 'cmake' 'fltk' 'gendesk' 'imagemagick' 'jack'
+'libpulse' 'libsamplerate' 'libsndfile' 'libxrandr' 'nlohmann-json' 'rtmidi')
+checkdepends=('xorg-server-xvfb')
+provides=('vst3-host')
+source=("https://www.giadamusic.com/data/${pkgname}-${pkgver}-src.tar.gz"
+        "$pkgname-0.17.2-devendor_nlohmann_json.patch")
+sha512sums=('2213babe015537754ef02575f2c67162baa4e12dfded784675377c3a5f4de3815656257feae2797c6a22ebbb4c2c9f83a551c6d0a149d3ce291c6c696b9b00e7'
+            'b9d952c0816dd2b81dadff24521b19f305ca5ddeb1964dd81ce93e6f63b25dbf291c07e528cc2836f268a095bf9920786331a615230416f44a9014ff581a0bce')
+b2sums=('e6137270c89ac5bbf239c74a73f31a95e175d0fc69be01c880f27c1ccf4c39cdd74375b35ca77a4100643ca049cdb3ff9fa983d566e3350a620f450e865a15bb'
+        'a482f356969c5d184a1eb0945477040cc7c5d1447fee0159cc5d2da05faea0bd696123b0559bdced148b301181f93726a515df24a814dbd08d207e2959f31305')
+
+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.17.2-devendor_nlohmann_json.patch"
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE='None' \
+        -DWITH_VST3=ON \
+        -W no-dev \
+        -B build \
+        -S .
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE='None' \
+        -DWITH_VST3=ON \
+        -DWITH_TESTS=ON \
+        -W no-dev \
+        -B build-test \
+        -S .
+  make VERBOSE=1 -C build
+  make VERBOSE=1 -C build-test
+}
+
+check(){
+  cd "$pkgname-$pkgver"
+  xvfb-run ./build-test/giada --run-tests
+}
+
+package() {
+  depends+=('libasound.so' 'libfltk.so' 'libfreetype.so' 'libjack.so'
+  'libpulse.so' 'libpulse-simple.so' 'librtmidi.so' 'libsamplerate.so'
+  'libsndfile.so')
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install -C build
+  # docs
+  install -vDm 644 {ChangeLog,README.md} \
+    -t "${pkgdir}/usr/share/doc/${pkgname}"
+}

Deleted: giada-0.17.2-devendor_nlohmann_json.patch
===================================================================
--- giada-0.17.2-devendor_nlohmann_json.patch	2021-07-26 20:29:58 UTC (rev 985888)
+++ giada-0.17.2-devendor_nlohmann_json.patch	2021-07-26 20:30:08 UTC (rev 985889)
@@ -1,55 +0,0 @@
-diff -ruN a/src/core/conf.cpp b/src/core/conf.cpp
---- a/src/core/conf.cpp	2021-03-31 18:44:48.000000000 +0200
-+++ b/src/core/conf.cpp	2021-04-24 16:18:22.530287443 +0200
-@@ -27,7 +27,7 @@
- #include "conf.h"
- #include "core/const.h"
- #include "core/types.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include <nlohmann/json.hpp>
- #include "utils/fs.h"
- #include "utils/log.h"
- #include <FL/Fl.H>
-@@ -315,4 +315,4 @@
- 	ofs << j;
- 	return true;
- }
--} // namespace giada::m::conf
-\ No newline at end of file
-+} // namespace giada::m::conf
-diff -ruN a/src/core/init.cpp b/src/core/init.cpp
---- a/src/core/init.cpp	2021-03-31 18:44:48.000000000 +0200
-+++ b/src/core/init.cpp	2021-04-24 16:19:01.257069455 +0200
-@@ -54,7 +54,7 @@
- #include "core/sequencer.h"
- #include "core/wave.h"
- #include "core/waveManager.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include <nlohmann/json.hpp>
- #include "glue/main.h"
- #include "gui/dialogs/mainWindow.h"
- #include "gui/dialogs/warnings.h"
-diff -ruN a/src/core/midiMapConf.cpp b/src/core/midiMapConf.cpp
---- a/src/core/midiMapConf.cpp	2021-03-31 18:44:48.000000000 +0200
-+++ b/src/core/midiMapConf.cpp	2021-04-24 16:17:56.890211073 +0200
-@@ -26,7 +26,7 @@
- 
- #include "midiMapConf.h"
- #include "const.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include <nlohmann/json.hpp>
- #include "utils/fs.h"
- #include "utils/log.h"
- #include "utils/string.h"
-diff -ruN a/src/core/patch.cpp b/src/core/patch.cpp
---- a/src/core/patch.cpp	2021-03-31 18:44:48.000000000 +0200
-+++ b/src/core/patch.cpp	2021-04-24 16:19:23.867136797 +0200
-@@ -26,7 +26,7 @@
- 
- #include "patch.h"
- #include "core/mixer.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include <nlohmann/json.hpp>
- #include "utils/log.h"
- #include "utils/math.h"
- #include <fstream>

Copied: giada/repos/community-x86_64/giada-0.17.2-devendor_nlohmann_json.patch (from rev 985888, giada/trunk/giada-0.17.2-devendor_nlohmann_json.patch)
===================================================================
--- giada-0.17.2-devendor_nlohmann_json.patch	                        (rev 0)
+++ giada-0.17.2-devendor_nlohmann_json.patch	2021-07-26 20:30:08 UTC (rev 985889)
@@ -0,0 +1,55 @@
+diff -ruN a/src/core/conf.cpp b/src/core/conf.cpp
+--- a/src/core/conf.cpp	2021-03-31 18:44:48.000000000 +0200
++++ b/src/core/conf.cpp	2021-04-24 16:18:22.530287443 +0200
+@@ -27,7 +27,7 @@
+ #include "conf.h"
+ #include "core/const.h"
+ #include "core/types.h"
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include <nlohmann/json.hpp>
+ #include "utils/fs.h"
+ #include "utils/log.h"
+ #include <FL/Fl.H>
+@@ -315,4 +315,4 @@
+ 	ofs << j;
+ 	return true;
+ }
+-} // namespace giada::m::conf
+\ No newline at end of file
++} // namespace giada::m::conf
+diff -ruN a/src/core/init.cpp b/src/core/init.cpp
+--- a/src/core/init.cpp	2021-03-31 18:44:48.000000000 +0200
++++ b/src/core/init.cpp	2021-04-24 16:19:01.257069455 +0200
+@@ -54,7 +54,7 @@
+ #include "core/sequencer.h"
+ #include "core/wave.h"
+ #include "core/waveManager.h"
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include <nlohmann/json.hpp>
+ #include "glue/main.h"
+ #include "gui/dialogs/mainWindow.h"
+ #include "gui/dialogs/warnings.h"
+diff -ruN a/src/core/midiMapConf.cpp b/src/core/midiMapConf.cpp
+--- a/src/core/midiMapConf.cpp	2021-03-31 18:44:48.000000000 +0200
++++ b/src/core/midiMapConf.cpp	2021-04-24 16:17:56.890211073 +0200
+@@ -26,7 +26,7 @@
+ 
+ #include "midiMapConf.h"
+ #include "const.h"
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include <nlohmann/json.hpp>
+ #include "utils/fs.h"
+ #include "utils/log.h"
+ #include "utils/string.h"
+diff -ruN a/src/core/patch.cpp b/src/core/patch.cpp
+--- a/src/core/patch.cpp	2021-03-31 18:44:48.000000000 +0200
++++ b/src/core/patch.cpp	2021-04-24 16:19:23.867136797 +0200
+@@ -26,7 +26,7 @@
+ 
+ #include "patch.h"
+ #include "core/mixer.h"
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include <nlohmann/json.hpp>
+ #include "utils/log.h"
+ #include "utils/math.h"
+ #include <fstream>



More information about the arch-commits mailing list