[arch-commits] Commit in x42-plugins/trunk (2 files)

David Runge dvzrv at archlinux.org
Tue Jul 14 21:50:31 UTC 2020


    Date: Tuesday, July 14, 2020 @ 21:50:31
  Author: dvzrv
Revision: 663801

upgpkg: x42-plugins 20200714-1: Upgrading to 20200714.

Adding moony.lv2 as it defines kxstudio-lv2-extensions required for linting meters.lv2.
Adding calls to lv2lint in check() to lint all plugins.
Adding upstream patch to make meters.lv2#surround8 pass lv2lint.

Added:
  x42-plugins/trunk/x42-plugins-20200714-meters_surround8.patch
Modified:
  x42-plugins/trunk/PKGBUILD

---------------------------------------------+
 PKGBUILD                                    |  112 +++++++++++++++++++++++++-
 x42-plugins-20200714-meters_surround8.patch |   58 +++++++++++++
 2 files changed, 168 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-14 21:34:57 UTC (rev 663800)
+++ PKGBUILD	2020-07-14 21:50:31 UTC (rev 663801)
@@ -2,7 +2,7 @@
 # Contributor: Lieven Moors <lievenmoors at gmail.com>
 
 pkgname=x42-plugins
-pkgver=20200411
+pkgver=20200714
 pkgrel=1
 pkgdesc="Collection of LV2 plugins"
 arch=('x86_64')
@@ -13,21 +13,40 @@
 'libx11')
 makedepends=('fftw' 'gendesk' 'glib2' 'help2man' 'jack' 'liblo' 'libltc'
 'libsamplerate' 'libsndfile' 'lv2' 'pango' 'ttf-dejavu' 'zita-convolver')
+# NOTE: adding moony.lv2 as a stop-gap solution until kxstudio-lv2-extensions
+# can be packaged to provide the required extensions for the meters plugin
+# during check()
+checkdepends=('lv2lint' 'moony.lv2')
 optdepends=('jack: for standalone applications'
             'liblo: for standalone applications')
 source=("http://gareus.org/misc/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+        "${pkgname}-20200714-meters_surround8.patch"
         "${pkgname}.png::https://x42-plugins.com/x42/static/img/x42.png"
         "${pkgname}.directory"
         "${pkgname}.menu")
-sha512sums=('d6dd7c7b80d08ebeeae38708096e8bb8a0c7c3a2fc77381f180728becf2fbddd19d27e681896252ca8128ef8dbc3a08ef55036cdd38caa6e095c8c6c3ef3588e'
+sha512sums=('5ec4ec5f79803b49dda46b209b94eca292e428708a9eead2c8221e2ca7eef5761f229354a44e014e32264816e93d469578e6348ab3e7e5442b931bda3fb13ae7'
+            '78bac02778f357b9c9e8ebcb10740658d8d95e11e3e4b7bbce1f1abda57e40b3fce1010725ab73da4e5299d6b6ed7d4a551c169ea445ef6ceec3f0f7b0b7748b'
             '956fdd8e04c846d06a5267d1748916744418e0ddfce0ac2e9dd3a1c1376aea61499177af80709d9fe78f8c0c2ddcbf9f9e5b2e413adc9a7eca9b648a87ad4860'
             'fef75b22b2c1fed8586af4dfd01ea291a7c1506e80ce384f05f13dc04c4b7e3e934003c20d89ae94f36ad1021b7ad75097da836ca30ee965b4107b559305b496'
             '411015b0feb8a289272cb821afa7e2a284d3e9d994a446baa73b3a6ce0f0ebd1e94c4cb3392a0afb1d741ce6d8b2d14c9bd124a0684b830275b4ba8e14680aa3')
+b2sums=('8979136756ec374e565b023c5a3e6af6c4bb3e00810d6070ee8bb34f1142efdf4e90f820c2fd1ea21fcf1b6035156f5cfe8bbcb8a9724efebcbf2456c000449e'
+        'f0d9c97beea8952c81087e14db45bdc679226dc7e5eafe6899a30c9cd277af3daeb012ab228ed16e200b7e4787a9332e53f82874dc2d8881e1ca2881848ef92a'
+        '35a8cfcdf7f8c57ba655049a6d75b3bf9d253c25702a3f191d3f6cab215887f7de5025d025993861ae88c1b4daae132e9cc1ddf083e5b822f1b53a683c0fcaa3'
+        'fb6557cd2e8b83dae1cb38503f2a72093085ddcc0a4ba2e5e0375f7063b83b3fb4180091ce10524cd336eeb33cffed45ada93055b960c9189f83d664216b33ee'
+        '9c695f58099fcbfdce3e693e491d851ff7894a650ea12e079894176ef054b5f592785467c286bd8feaa340fdcdfb53d930b3a44ea890112e3fc1a4d172beb243')
 
 _names=('darc' 'dpl' 'fat1' 'fil4' 'matrixmixer8x8' 'meter' 'mixtri' 'scope' 'spectr' 'stepseq' 'tuna')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
+
+  (
+    cd meters.lv2
+    # fixing linting issue with surround8 variant of meters plugin
+    # https://github.com/x42/meters.lv2/issues/28
+    patch -Np1 -i "$srcdir/${pkgname}-20200714-meters_surround8.patch"
+  )
+
   declare -A comments=(
     ["darc"]="A general purpose audio signal compressor"
     ["dpl"]="Look-ahead digital peak limiter intended but not limited to the final step of mastering or mixing"
@@ -125,6 +144,95 @@
   make
 }
 
+check() {
+  local _name _version _convolver _controlfilter _default _meter _midifilter _onsettrigger _sisco _tuna
+  local _controlfilters=('exp' 'invert' 'linearscale' 'lowpass' 'nlog')
+  local _convolvers=('Mono' 'MonoToStereo' 'Stereo')
+  local _defaults=('mono' 'stereo')
+  local _meters=('VUmono' 'VUstereo' 'BBCmono' 'BBCstereo' 'BBCM6' 'EBUmono'
+  'EBUstereo' 'DINmono' 'DINstereo' 'NORmono' 'NORstereo' 'COR' 'EBUr128'
+  'goniometer' 'spectr30mono' 'spectr30stereo' 'dBTPmono' 'dBTPstereo'
+  'K12mono' 'K12stereo' 'K14mono' 'K14stereo' 'K20mono' 'K20stereo'
+  'phasewheel' 'stereoscope' 'dr14mono' 'dr14stereo' 'TPnRMSmono'
+  'TPnRMSstereo' 'SigDistHist' 'bitmeter' 'surround8' 'surround5' 'surround4'
+  'surround3')
+  local _midifilters=('cctonote' 'channelfilter' 'channelmap' 'chokefilter'
+  'enforcescale' 'eventblocker' 'keyrange' 'keysplit' 'mapcc' 'mapkeychannel'
+  'mapkeyscale' 'midichord' 'mididelay' 'mididup' 'midistrum' 'miditranspose'
+  'monolegato' 'noactivesensing' 'nodup' 'notetocc' 'notetoggle' 'ntapdelay'
+  'onechannelfilter' 'passthru' 'quantize' 'randvelocity' 'scalecc' 'sostenuto'
+  'velocitygamma' 'velocityrange' 'velocityscale')
+  local _onsettriggers=('bassdrum_mono' 'bassdrum_stereo')
+  local _siscos=('Mono' 'Stereo' '3chan' '4chan')
+  local _tunas=('one' 'two')
+
+  cd "${pkgname}-${pkgver}"
+
+  while IFS=" " read -r _name _version; do
+    echo "lv2lint test for ${_name} ${_version}"
+    case "$_name" in
+      controlfilter.lv2 )
+        for _controlfilter in "${_controlfilters[@]}"; do
+          lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name//.lv2/}#${_controlfilter}"
+        done
+        ;;
+      convoLV2 )
+        for _convolver in "${_convolvers[@]}"; do
+          lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name}#${_convolver}"
+        done
+        ;;
+      darc.lv2|dpl.lv2|fil4.lv2 )
+        for _default in "${_defaults[@]}"; do
+          lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name//.lv2/}#${_default}"
+        done
+        ;;
+      matrixmixer.lv2 )
+        lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name//.lv2/}#i8o8"
+        ;;
+      meters.lv2 )
+        for _meter in "${_meters[@]}"; do
+          lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name//.lv2/}#${_meter}"
+        done
+        ;;
+      midifilter.lv2 )
+        for _midifilter in "${_midifilters[@]}"; do
+          lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name//.lv2/}#${_midifilter}"
+        done
+        ;;
+      mixtri.lv2 )
+        lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name//.lv2/}#lv2"
+        ;;
+      onsettrigger.lv2 )
+        for _onsettrigger in "${_onsettriggers[@]}"; do
+          lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name//.lv2/}#${_onsettrigger}"
+        done
+        ;;
+      sisco.lv2 )
+        for _sisco in "${_siscos[@]}"; do
+          lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name//.lv2/}#${_sisco}"
+        done
+        ;;
+      spectra.lv2 )
+        lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name//.lv2/}#Mono"
+        ;;
+      stepseq.lv2 )
+        lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name//.lv2/}#s8n8"
+        ;;
+      tuna.lv2 )
+        for _tuna in "${_tunas[@]}"; do
+          lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name//.lv2/}#${_tuna}"
+        done
+        ;;
+      robtk )
+        echo "Toolkit. Skipping..."
+        ;;
+      * )
+        lv2lint -Mpack -I "${_name}/build" "http://gareus.org/oss/lv2/${_name//.lv2/}"
+        ;;
+    esac
+  done < plugin.versions
+}
+
 package() {
   depends+=('libfftw3f.so' 'libgobject-2.0.so' 'libltc.so' 'libpango-1.0.so'
   'libpangocairo-1.0.so' 'libsamplerate.so' 'libsndfile.so'

Added: x42-plugins-20200714-meters_surround8.patch
===================================================================
--- x42-plugins-20200714-meters_surround8.patch	                        (rev 0)
+++ x42-plugins-20200714-meters_surround8.patch	2020-07-14 21:50:31 UTC (rev 663801)
@@ -0,0 +1,58 @@
+From 86c35e31c3e8e3e2b8a6ddf38a68e1145715a79c Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin at gareus.org>
+Date: Tue, 14 Jul 2020 22:01:51 +0200
+Subject: [PATCH] Fix surround-meter LV2 port symbol uniqueness
+
+---
+ lv2ttl/meters.lv2.ttl.in | 2 +-
+ lv2ttl/surmeter.h        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lv2ttl/meters.lv2.ttl.in b/lv2ttl/meters.lv2.ttl.in
+index 0afc651..dc5bbd0 100644
+--- a/lv2ttl/meters.lv2.ttl.in
++++ b/lv2ttl/meters.lv2.ttl.in
+@@ -3629,7 +3629,7 @@ mtr:surround8 at URI_SUFFIX@
+ 		a lv2:ControlPort ,
+ 			lv2:OutputPort ;
+ 		lv2:index 24 ;
+-		lv2:symbol "peak4" ;
++		lv2:symbol "peak3" ;
+ 		lv2:name "Peak 4" ;
+ 		lv2:minimum 0.0 ;
+ 		lv2:maximum 1.0 ;
+diff --git a/lv2ttl/surmeter.h b/lv2ttl/surmeter.h
+index f7b0ca8..062468b 100644
+--- a/lv2ttl/surmeter.h
++++ b/lv2ttl/surmeter.h
+@@ -36,7 +36,7 @@ static const RtkLv2Description _plugin_surmeter = {
+ 		{ "in3", AUDIO_IN, nan, nan, nan, "In3"},
+ 		{ "out3", AUDIO_OUT, nan, nan, nan, "Out3"},
+ 		{ "rms3", CONTROL_OUT, nan, 0.000000, 1.000000, "RMS 3"},
+-		{ "peak4", CONTROL_OUT, nan, 0.000000, 1.000000, "Peak 4"},
++		{ "peak3", CONTROL_OUT, nan, 0.000000, 1.000000, "Peak 3"},
+ 		{ "in4", AUDIO_IN, nan, nan, nan, "In4"},
+ 		{ "out4", AUDIO_OUT, nan, nan, nan, "Out4"},
+ 		{ "rms4", CONTROL_OUT, nan, 0.000000, 1.000000, "RMS 4"},
+From f0c35ee97267988b3a38c5851c5fa0761005bfc4 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin at gareus.org>
+Date: Tue, 14 Jul 2020 22:43:57 +0200
+Subject: [PATCH] Amend 86c35e31c3e, update lv2:name to match symbol name
+
+---
+ lv2ttl/meters.lv2.ttl.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lv2ttl/meters.lv2.ttl.in b/lv2ttl/meters.lv2.ttl.in
+index dc5bbd0..7b2c6c6 100644
+--- a/lv2ttl/meters.lv2.ttl.in
++++ b/lv2ttl/meters.lv2.ttl.in
+@@ -3630,7 +3630,7 @@ mtr:surround8 at URI_SUFFIX@
+ 			lv2:OutputPort ;
+ 		lv2:index 24 ;
+ 		lv2:symbol "peak3" ;
+-		lv2:name "Peak 4" ;
++		lv2:name "Peak 3" ;
+ 		lv2:minimum 0.0 ;
+ 		lv2:maximum 1.0 ;
+ 	] , [


More information about the arch-commits mailing list