[arch-commits] Commit in lsp-plugins/trunk (3 files)

[David Runge]

    Date: Monday, April 11, 2022 @ 21:33:22
  Author: dvzrv
Revision: 1185899

upgpkg: lsp-plugins 1.2.0-2: Rebuild to build plugins in release mode.

Do not use test settings when building the plugins: https://github.com/sadko4u/lsp-plugins/issues/237
Use (adapted) upstream patches for installing XDG data and icons correctly:
https://github.com/sadko4u/lsp-plugins/issues/229

Added:
  lsp-plugins/trunk/lsp-plugins-1.2.0-icon_install.patch
  lsp-plugins/trunk/lsp-plugins-1.2.0-xdg_data_install.patch
Modified:
  lsp-plugins/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   38 +++++++++++++++--------------
 lsp-plugins-1.2.0-icon_install.patch     |   23 +++++++++++++++++
 lsp-plugins-1.2.0-xdg_data_install.patch |   13 +++++++++
 3 files changed, 56 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-11 21:31:57 UTC (rev 1185898)
+++ PKGBUILD	2022-04-11 21:33:22 UTC (rev 1185899)
@@ -3,7 +3,7 @@
 pkgbase=lsp-plugins
 pkgname=(lsp-plugins lsp-plugins-docs)
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Collection of free plugins compatible with LADSPA, LV2 and LinuxVST"
 arch=(x86_64)
 url="https://lsp-plug.in"
@@ -11,13 +11,26 @@
 makedepends=(cairo gcc-libs glibc hicolor-icon-theme libglvnd libx11 jack ladspa libsndfile lv2 php)
 checkdepends=(lv2lint)
 options=(debug)
-source=($pkgname-$pkgver.tar.gz::https://github.com/sadko4u/$pkgname/archive/$pkgver/$pkgver.tar.gz)
-source=(https://github.com/sadko4u/$pkgname/releases/download/$pkgver/$pkgname-src-$pkgver.tar.gz)
-sha512sums=('b4aa8ca6512bb01248d39393fb6ac76f4b97a60f36d2f7e18a5dce6600cc77d57c667c96f51940ce7b8ad09b72638e417c9e3802dc7e49f652979d8fe7e40957')
-b2sums=('ffa65105fa05ff8ae845333138c2ccedc5295a524ed45c6633912b342b112f05aecbc3dfa935dbfb7dc6d7efc106cf1b20ed86ddc649729461e7a32a200e473d')
+source=(
+  https://github.com/sadko4u/$pkgname/releases/download/$pkgver/$pkgname-src-$pkgver.tar.gz
+  $pkgbase-1.2.0-xdg_data_install.patch
+  $pkgbase-1.2.0-icon_install.patch
+)
+sha512sums=('b4aa8ca6512bb01248d39393fb6ac76f4b97a60f36d2f7e18a5dce6600cc77d57c667c96f51940ce7b8ad09b72638e417c9e3802dc7e49f652979d8fe7e40957'
+            'ff2f848e117c21dc0cbc1a4c9d7df9de911e66f2cb555192bf567e5414735cd47f8ebf81396344831a665adef1e4616e78560e85b4960bcaa3a45811648d1938'
+            '7eab97335c7e1b80ccb0e6363686c1eb38e5a169c282ee4f090c594477a65f2147cb206e703e0ec3ed6eeeb591ba975a27d3ab8befcf503f9a42280d314c6c8e')
+b2sums=('ffa65105fa05ff8ae845333138c2ccedc5295a524ed45c6633912b342b112f05aecbc3dfa935dbfb7dc6d7efc106cf1b20ed86ddc649729461e7a32a200e473d'
+        '9cb89cc8881f1c274c4ea15174a258059060f0e12928744c264c53e318c04c972e5dcb05ce20a81fe69656b87e7bb39489dc5c8ef29b44630584f2cfeaa69fd5'
+        '722e07a0cce45bc49a7a276e470970ea7fd5764c5f049ec40273f9fff945af147e9fdcdec03a69860b0528e108d15e439489477904ed6024736a73fc74b3abab')
 
+prepare() {
+  # fix installation location of XDG data and icons: https://github.com/sadko4u/lsp-plugins/issues/229
+  patch -Np1 -d $pkgbase/modules/lsp-plugin-fw -i ../../../$pkgbase-1.2.0-xdg_data_install.patch
+  patch -Np1 -d $pkgbase/modules/lsp-plugins-shared -i ../../../$pkgbase-1.2.0-icon_install.patch
+}
+
 build() {
-  make config TEST=1 FEATURES='doc lv2 vst2 jack ladspa xdg' PREFIX=/usr -C $pkgbase
+  make config FEATURES='doc lv2 vst2 jack ladspa xdg' PREFIX=/usr -C $pkgbase
   make -C $pkgbase
 }
 
@@ -57,16 +70,9 @@
   spectrum_analyzer_x8 surge_filter_mono surge_filter_stereo trigger_midi_mono
   trigger_midi_stereo trigger_mono trigger_stereo)
 
-  (
-    cd $pkgbase
-    # NOTE: there are currently no unit tests :(
-    .build/host/lsp-plugin-fw/lsp-plugins-test utest --nofork --debug --verbose
-  )
-
   make FEATURES=lv2 DESTDIR="$PWD/test" install -C $pkgbase
   for _plugin in "${_lv2_plugins[@]}"; do
-    # NOTE: disable errors due to globally visbile Plugin and UI Symbols: https://github.com/sadko4u/lsp-plugins/issues/237
-    lv2lint -Mpack -t "Plugin Symbols" -t "UI Symbols" -I "$PWD/test/usr/lib/lv2/$pkgname.lv2/" $_lv2_uri$_plugin
+    lv2lint -Mpack -I "$PWD/test/usr/lib/lv2/$pkgname.lv2/" $_lv2_uri$_plugin
   done
 }
 
@@ -93,10 +99,6 @@
 
   make PREFIX=/usr DESTDIR="$pkgdir" install -C $pkgbase
 
-  # move XDG integration and icons to correct location: https://github.com/sadko4u/lsp-plugins/issues/235
-  mv -v "$pkgdir/usr/local/share/"* "$pkgdir/usr/share/"
-  rm -rfv "$pkgdir/usr/local"
-
   _pick docs "$pkgdir/usr/share/doc"
 }
 

Added: lsp-plugins-1.2.0-icon_install.patch
===================================================================
--- lsp-plugins-1.2.0-icon_install.patch	                        (rev 0)
+++ lsp-plugins-1.2.0-icon_install.patch	2022-04-11 21:33:22 UTC (rev 1185899)
@@ -0,0 +1,23 @@
+diff --git a/res/main/xdg/Makefile b/res/main/xdg/Makefile
+index dbaa21c..59c160d 100644
+--- a/res/main/xdg/Makefile
++++ b/res/main/xdg/Makefile
+@@ -23,10 +23,14 @@ ifneq ($(VERBOSE),1)
+ .SILENT:
+ endif
+ 
+-DESTDIR        :=
+-ETCDIR         := /etc
+-SHAREDDIR      := /usr/local/share
+-FILES          :=
++MODDIR                  = $(CURDIR)/..
++CONFIG                 := $(MODDIR)/.config.mk
++DESTDIR                :=
++ETCDIR                 := /etc
++SHAREDDIR              := /usr/local/share
++FILES                  :=
++
++include $(CONFIG)
+ 
+ XDG_ICON_PATH   = $(DESTDIR)$(SHAREDDIR)/icons/hicolor
+ XDG_MENU_PATH   = $(DESTDIR)$(ETCDIR)/xdg/menus/applications-merged

Added: lsp-plugins-1.2.0-xdg_data_install.patch
===================================================================
--- lsp-plugins-1.2.0-xdg_data_install.patch	                        (rev 0)
+++ lsp-plugins-1.2.0-xdg_data_install.patch	2022-04-11 21:33:22 UTC (rev 1185899)
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index f40e786..5c2deac 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -918,7 +918,7 @@ $(BIN_INSTALL): $(DEPENDENCIES_BIN)
+ 	$(MAKE) -C "$($(BIN_INST_ARTIFACT_ID)_PATH)" install DESTDIR="$(DESTDIR)"
+ 
+ $(ARTIFACT_XDG_INST): install_xdg_msg
+-	$(MAKE) -C "$($(ARTIFACT_XDG_INST_ID)_PATH)/res/main/xdg" install_xdg DESTDIR="$(DESTDIR)" FILES="$(ARTIFACT_XDG_FILES)"
++	$(MAKE) -C "$($(ARTIFACT_XDG_INST_ID)_PATH)/res/main/xdg" install_xdg DESTDIR="$(DESTDIR)" FILES="$(ARTIFACT_XDG_FILES)" CONFIG=$(ROOTDIR)/.config.mk
+ 
+ install_jack: jack
+ 	echo "Install jack"