Date: Saturday, January 16, 2021 @ 17:21:02 Author: dvzrv Revision: 821167
upgpkg: avldrums.lv2 0.4.2-1: Upgrade to 0.4.2. Add lv2-host to depends (as this plugin is only useful in a host). Add all available sodeps in package() and the respective packages in makedepends. Rebase patch to devendor fluidsynth on 0.4.2. Added: avldrums.lv2/trunk/avldrums.lv2-0.4.2-use-system-fluidsynth.patch Modified: avldrums.lv2/trunk/PKGBUILD Deleted: avldrums.lv2/trunk/avldrums.lv2-0.4.1-use-system-fluidsynth.patch ------------------------------------------------+ PKGBUILD | 25 ++++++---- avldrums.lv2-0.4.1-use-system-fluidsynth.patch | 54 ----------------------- avldrums.lv2-0.4.2-use-system-fluidsynth.patch | 54 +++++++++++++++++++++++ 3 files changed, 69 insertions(+), 64 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-01-16 17:01:30 UTC (rev 821166) +++ PKGBUILD 2021-01-16 17:21:02 UTC (rev 821167) @@ -1,6 +1,7 @@ # Maintainer: David Runge <dv...@archlinux.org> + pkgname=avldrums.lv2 -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="A simple Drum Sample Player Plugin, dedicated to the AVLinux Drumkits" arch=('x86_64') @@ -7,30 +8,34 @@ url="https://x42-plugins.com/x42/x42-avldrums" license=('GPL2') groups=('pro-audio' 'lv2-plugins') -depends=('cairo' 'glib2' 'glibc' 'libfluidsynth.so' 'libglvnd' 'libx11' 'pango') -makedepends=('git' 'glu' 'lv2') -source=("$pkgname-$pkgver::git+https://github.com/x42/${pkgname}.git#tag=v${pkgver}" +depends=('cairo' 'glibc' 'libglvnd' 'libx11' 'lv2-host') +makedepends=('fluidsynth' 'git' 'glib2' 'glu' 'lv2' 'pango') +source=("git+https://github.com/x42/${pkgname}.git#tag=v${pkgver}" "git+https://github.com/x42/robtk" - "${pkgname}-${pkgver}-use-system-fluidsynth.patch") + "${pkgname}-0.4.2-use-system-fluidsynth.patch") sha512sums=('SKIP' 'SKIP' - '849123389ea7373251ae02fd5fdac0483a0cd000360f324af11e29269df720a0ec5501911cb92ed41a3211dabd0c868c6b626923b8a648a7fc5ff308fe3c18e5') + 'a47ac0c731e843000bd0b05e58ed2f1159df596ac2303583ebecd3010cb381506cd704fcd7c187ba45961cffb0c5b73ea01b19fc4c75a2bf376e6d7596d17d33') +b2sums=('SKIP' + 'SKIP' + 'aeff7bd322e9e1fa36c36096cdbfc8f3db9a0a726eda27f9f38375c6b887acddaca4ab907ccf59c633d8813c4d992ffdc23524e5beb4209f851cacef9750c577') prepare() { - cd "${pkgname}-${pkgver}" + cd "${pkgname}" git submodule init git config submodule.robtk.url "${srcdir}/robtk" git submodule update # build against system fluidsynth - patch -Np1 -i "../${pkgname}-${pkgver}-use-system-fluidsynth.patch" + patch -Np1 -i "../${pkgname}-0.4.2-use-system-fluidsynth.patch" } build() { - cd "$pkgname-$pkgver" + cd "${pkgname}" make } package() { - cd "$pkgname-$pkgver" + depends+=('libfluidsynth.so' 'libgobject-2.0.so' 'libpango-1.0.so' 'libpangocairo-1.0.so') + cd "${pkgname}" make DESTDIR="$pkgdir/" PREFIX='/usr' install } Deleted: avldrums.lv2-0.4.1-use-system-fluidsynth.patch =================================================================== --- avldrums.lv2-0.4.1-use-system-fluidsynth.patch 2021-01-16 17:01:30 UTC (rev 821166) +++ avldrums.lv2-0.4.1-use-system-fluidsynth.patch 2021-01-16 17:21:02 UTC (rev 821167) @@ -1,54 +0,0 @@ -diff --git c/Makefile w/Makefile -index 1adc235..97847cb 100644 ---- c/Makefile -+++ w/Makefile -@@ -155,7 +155,7 @@ override CFLAGS += -fPIC -fvisibility=hidden - else - override CFLAGS += -DPTW32_STATIC_LIB - endif --override LOADLIBES += `pkg-config $(PKG_UI_FLAGS) --libs glib-2.0` -+override LOADLIBES += `pkg-config $(PKG_UI_FLAGS) --libs glib-2.0 fluidsynth` - - - GLUICFLAGS+=`pkg-config --cflags cairo pango` $(CFLAGS) -@@ -231,38 +231,8 @@ endif - $(BUILDDIR)%.sf2: - cp -v sf2/$(*F).sf2 $@ - --FLUID_SRC = \ -- fluidsynth/src/fluid_adsr_env.c \ -- fluidsynth/src/fluid_chan.c \ -- fluidsynth/src/fluid_chorus.c \ -- fluidsynth/src/fluid_conv.c \ -- fluidsynth/src/fluid_defsfont.c \ -- fluidsynth/src/fluid_event.c \ -- fluidsynth/src/fluid_gen.c \ -- fluidsynth/src/fluid_hash.c \ -- fluidsynth/src/fluid_iir_filter.c \ -- fluidsynth/src/fluid_lfo.c \ -- fluidsynth/src/fluid_list.c \ -- fluidsynth/src/fluid_midi.c \ -- fluidsynth/src/fluid_mod.c \ -- fluidsynth/src/fluid_rev.c \ -- fluidsynth/src/fluid_ringbuffer.c \ -- fluidsynth/src/fluid_rvoice.c \ -- fluidsynth/src/fluid_rvoice_dsp.c \ -- fluidsynth/src/fluid_rvoice_event.c \ -- fluidsynth/src/fluid_rvoice_mixer.c \ -- fluidsynth/src/fluid_samplecache.c \ -- fluidsynth/src/fluid_settings.c \ -- fluidsynth/src/fluid_sffile.c \ -- fluidsynth/src/fluid_sfont.c \ -- fluidsynth/src/fluid_synth.c \ -- fluidsynth/src/fluid_synth_monopoly.c \ -- fluidsynth/src/fluid_sys.c \ -- fluidsynth/src/fluid_tuning.c \ -- fluidsynth/src/fluid_voice.c -- --CPPFLAGS += -Ifluidsynth -I fluidsynth/fluidsynth -DHAVE_CONFIG_H -D DEFAULT_SOUNDFONT=\"\" --DSP_SRC = src/$(LV2NAME).c $(FLUID_SRC) -+CPPFLAGS += -DHAVE_CONFIG_H -D DEFAULT_SOUNDFONT=\"\" -+DSP_SRC = src/$(LV2NAME).c - DSP_DEPS = $(DSP_SRC) src/$(LV2NAME).h src/midnam.h - GUI_DEPS = gui/$(LV2NAME).c src/$(LV2NAME).h - Added: avldrums.lv2-0.4.2-use-system-fluidsynth.patch =================================================================== --- avldrums.lv2-0.4.2-use-system-fluidsynth.patch (rev 0) +++ avldrums.lv2-0.4.2-use-system-fluidsynth.patch 2021-01-16 17:21:02 UTC (rev 821167) @@ -0,0 +1,54 @@ +diff --git i/Makefile w/Makefile +index c5191cc..2c6b26d 100644 +--- i/Makefile ++++ w/Makefile +@@ -156,7 +156,7 @@ override CFLAGS += -fPIC -fvisibility=hidden + else + override CFLAGS += -DPTW32_STATIC_LIB + endif +-override LOADLIBES += `$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs glib-2.0` ++override LOADLIBES += `$(PKG_CONFIG) $(PKG_UI_FLAGS) --libs glib-2.0 fluidsynth` + + + GLUICFLAGS+=`$(PKG_CONFIG) --cflags cairo pango` $(CFLAGS) +@@ -232,38 +232,8 @@ endif + $(BUILDDIR)%.sf2: + cp -v sf2/$(*F).sf2 $@ + +-FLUID_SRC = \ +- fluidsynth/src/fluid_adsr_env.c \ +- fluidsynth/src/fluid_chan.c \ +- fluidsynth/src/fluid_chorus.c \ +- fluidsynth/src/fluid_conv.c \ +- fluidsynth/src/fluid_defsfont.c \ +- fluidsynth/src/fluid_event.c \ +- fluidsynth/src/fluid_gen.c \ +- fluidsynth/src/fluid_hash.c \ +- fluidsynth/src/fluid_iir_filter.c \ +- fluidsynth/src/fluid_lfo.c \ +- fluidsynth/src/fluid_list.c \ +- fluidsynth/src/fluid_midi.c \ +- fluidsynth/src/fluid_mod.c \ +- fluidsynth/src/fluid_rev.c \ +- fluidsynth/src/fluid_ringbuffer.c \ +- fluidsynth/src/fluid_rvoice.c \ +- fluidsynth/src/fluid_rvoice_dsp.c \ +- fluidsynth/src/fluid_rvoice_event.c \ +- fluidsynth/src/fluid_rvoice_mixer.c \ +- fluidsynth/src/fluid_samplecache.c \ +- fluidsynth/src/fluid_settings.c \ +- fluidsynth/src/fluid_sffile.c \ +- fluidsynth/src/fluid_sfont.c \ +- fluidsynth/src/fluid_synth.c \ +- fluidsynth/src/fluid_synth_monopoly.c \ +- fluidsynth/src/fluid_sys.c \ +- fluidsynth/src/fluid_tuning.c \ +- fluidsynth/src/fluid_voice.c +- +-CPPFLAGS += -Ifluidsynth -I fluidsynth/fluidsynth -DHAVE_CONFIG_H -D DEFAULT_SOUNDFONT=\"\" +-DSP_SRC = src/$(LV2NAME).c $(FLUID_SRC) ++CPPFLAGS += -DHAVE_CONFIG_H -D DEFAULT_SOUNDFONT=\"\" ++DSP_SRC = src/$(LV2NAME).c + DSP_DEPS = $(DSP_SRC) src/$(LV2NAME).h src/midnam.h + GUI_DEPS = gui/$(LV2NAME).c src/$(LV2NAME).h +