[arch-commits] Commit in setbfree/trunk (PKGBUILD setbfree-0.8.11-gl.patch)

David Runge dvzrv at gemini.archlinux.org
Sun Feb 20 08:37:21 UTC 2022


    Date: Sunday, February 20, 2022 @ 08:37:21
  Author: dvzrv
Revision: 1135227

upgpkg: setbfree 0.8.11-3: Rebuild to fix problem with missing lib in LDFLAGS.

Add patch (provided to upstream but not yet merged) to add -lGL to UI LDFLAGS.
https://github.com/pantherb/setBfree/pull/84
Simplify calls to make.
Run lv2lint against the LV2 plugins in check().
Remove unneeded quotes and curly braces.

Added:
  setbfree/trunk/setbfree-0.8.11-gl.patch
Modified:
  setbfree/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   63 +++++++++++++++++++++++++++------------------
 setbfree-0.8.11-gl.patch |   23 ++++++++++++++++
 2 files changed, 61 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-20 08:18:08 UTC (rev 1135226)
+++ PKGBUILD	2022-02-20 08:37:21 UTC (rev 1135227)
@@ -5,24 +5,34 @@
 _name=setBfree
 pkgname=setbfree
 pkgver=0.8.11
-pkgrel=2
+pkgrel=3
 pkgdesc="DSP tonewheel organ"
-arch=('x86_64')
+arch=(x86_64)
 url="http://setbfree.org"
-license=('GPL2')
-groups=('lv2-plugins' 'pro-audio')
-depends=('cairo' 'ftgl' 'glibc' 'libglvnd' 'libx11')
-makedepends=('gendesk' 'glib2' 'jack' 'liblo' 'lv2' 'pango' 'ttf-dejavu')
-optdepends=('jack: for standalone applications'
-            'liblo: for standalone applications'
-            'lv2-host: for LV2 plugin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/pantherb/${_name}/archive/v${pkgver}.tar.gz")
-sha512sums=('1db2ee90032efee3c24ee99071e11c064a2fbc82f1126346ec0667e1e91f09ffab781bcdb8fa766613711779cdfd85b486e0043f99073d8072ac92e214241c88')
-b2sums=('63b89fb4865ef449d3e291c547f2e115b5fcb0e5de280353e58b3b25e9b9c4d7291df09b2c486d8819295e367a1f3128c0fb5a6bf3b144a999e8ae634eda5f4c')
+license=(GPL2)
+groups=(lv2-plugins pro-audio)
+depends=(cairo ftgl glibc libglvnd libx11)
+makedepends=(gendesk glib2 jack liblo lv2 pango ttf-dejavu)
+checkdepends=(lv2lint)
+optdepends=(
+  'jack: for standalone applications'
+  'liblo: for standalone applications'
+  'lv2-host: for LV2 plugin'
+)
+options=(debug)
+source=(
+  "$pkgname-$pkgver.tar.gz::https://github.com/pantherb/${_name}/archive/v${pkgver}.tar.gz"
+  "$pkgname-0.8.11-gl.patch"
+)
+sha512sums=('1db2ee90032efee3c24ee99071e11c064a2fbc82f1126346ec0667e1e91f09ffab781bcdb8fa766613711779cdfd85b486e0043f99073d8072ac92e214241c88'
+            'a381781e1a2e9d71267f156ff0c4879ff7b3c73da1be7a7e437fda5208154330914911e46b16c1e0290ded9ccc339b402dbc0ad32766e13d777afc95ce5c9133')
+b2sums=('63b89fb4865ef449d3e291c547f2e115b5fcb0e5de280353e58b3b25e9b9c4d7291df09b2c486d8819295e367a1f3128c0fb5a6bf3b144a999e8ae634eda5f4c'
+        '796907c3ae4398cfed56c4109325eeeaf853dd467fbbb386f67c8f6e61cd04bb6d341bbe97c16c21ae5ea770f9c6574a35bb4f9ab460b93ba54bf86eab7a24c9')
 
 prepare() {
-  mv -v "${_name}-$pkgver" "$pkgname-$pkgver"
-  # XDG desktop files
+  # add missing library to link against: https://github.com/pantherb/setBfree/pull/84
+  patch -d $_name-$pkgver -p1 -i ../$pkgname-0.8.11-gl.patch
+
   gendesk -n \
           --pkgname "${pkgname}" \
           --name "${_name}" \
@@ -40,23 +50,26 @@
 }
 
 build() {
-  cd "$pkgname-$pkgver"
   export FONTFILE=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-  make PREFIX=/usr
+  make PREFIX=/usr -C $_name-$pkgver
 }
 
+check() {
+  lv2lint -Mpack -I $_name-$pkgver/b_synth "http://gareus.org/oss/lv2/b_synth"
+  lv2lint -Mpack -I $_name-$pkgver/b_whirl "http://gareus.org/oss/lv2/b_whirl#simple"
+  lv2lint -Mpack -I $_name-$pkgver/b_whirl "http://gareus.org/oss/lv2/b_whirl#extended"
+}
+
 package() {
-  depends+=('libgobject-2.0.so' 'libpango-1.0.so' 'libpangocairo-1.0.so')
-  cd "$pkgname-$pkgver"
-  make PREFIX=/usr DESTDIR="$pkgdir/" install
+  depends+=(libgobject-2.0.so libpango-1.0.so libpangocairo-1.0.so)
+
+  make PREFIX=/usr DESTDIR="$pkgdir" install -C $_name-$pkgver
   # xdg desktop files
-  install -vDm 644 ../*.desktop -t "${pkgdir}/usr/share/applications"
+  install -vDm 644 *.desktop -t "$pkgdir/usr/share/applications"
   # icons
-  install -vDm 644 doc/{${_name},x42-whirl}.png \
-    -t "${pkgdir}/usr/share/pixmaps/"
+  install -vDm 644 $_name-$pkgver/doc/{$_name,x42-whirl}.png -t "$pkgdir/usr/share/pixmaps/"
   # man
-  install -vDm 644 doc/*.1 -t "${pkgdir}/usr/share/man/man1/"
+  install -vDm 644 $_name-$pkgver/doc/*.1 -t "$pkgdir/usr/share/man/man1/"
   # docs
-  install -vDm 644 {AUTHORS,ChangeLog,README.md} doc/*.png \
-    -t "${pkgdir}/usr/share/doc/${pkgname}/"
+  install -vDm 644 $_name-$pkgver/{AUTHORS,ChangeLog,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
 }

Added: setbfree-0.8.11-gl.patch
===================================================================
--- setbfree-0.8.11-gl.patch	                        (rev 0)
+++ setbfree-0.8.11-gl.patch	2022-02-20 08:37:21 UTC (rev 1135227)
@@ -0,0 +1,23 @@
+From 8b92940fe6780155fbafb46782f6720fd6822af1 Mon Sep 17 00:00:00 2001
+From: Christopher Arndt <chris at chrisarndt.de>
+Date: Sat, 19 Feb 2022 16:24:20 +0100
+Subject: [PATCH] fix: add -lGL to UILIBS for non-static unix LV2 builds
+
+Signed-off-by: Christopher Arndt <chris at chrisarndt.de>
+---
+ common.mak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common.mak b/common.mak
+index 1c12f32..3ae8c86 100644
+--- a/common.mak
++++ b/common.mak
+@@ -167,7 +167,7 @@ ifeq ($(LV2AVAIL)$(HAVE_UI)$(HAVE_IDLE), yesyesyes)
+         UILIBS+=`pkg-config --variable=libdir ftgl`/libftgl.a `pkg-config --variable=libdir ftgl`/libfreetype.a
+         UILIBS+=`pkg-config --libs zlib`
+       else
+-        UILIBS+=`pkg-config --libs glu ftgl`
++        UILIBS+=`pkg-config --libs glu gl ftgl`
+       endif
+       UICFLAGS+=-DFONTFILE=\"$(FONTFILE)\"
+     endif



More information about the arch-commits mailing list