From ac282594b43e1b2a1f87cdd1a4cab58f8ac86830 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Wed, 6 Mar 2024 18:58:24 +0100 Subject: [PATCH] vamp-plugin-sdk: -> 2.10.0 --- vamp-plugin-sdk/.signature | 8 +- vamp-plugin-sdk/0003-Link-with-dl.patch | 21 ---- .../0004-do-not-run-test-always.patch | 33 ------- vamp-plugin-sdk/01-fix_multiarch.patch | 33 ------- vamp-plugin-sdk/02-fix_pkg-config.patch | 96 ------------------- vamp-plugin-sdk/Pkgfile | 19 +--- 6 files changed, 5 insertions(+), 205 deletions(-) delete mode 100644 vamp-plugin-sdk/0003-Link-with-dl.patch delete mode 100644 vamp-plugin-sdk/0004-do-not-run-test-always.patch delete mode 100644 vamp-plugin-sdk/01-fix_multiarch.patch delete mode 100644 vamp-plugin-sdk/02-fix_pkg-config.patch diff --git a/vamp-plugin-sdk/.signature b/vamp-plugin-sdk/.signature index 41cb82c0f..db201f65f 100644 --- a/vamp-plugin-sdk/.signature +++ b/vamp-plugin-sdk/.signature @@ -1,9 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38fyY14pgPj4RjTDvmp/WCoE00E9sOvEt1V9OPRKJ8lq2NJi9i7xPAfeePiRIkxaZl9KBUAsEnKS8iXAaP7zEg0= -SHA256 (Pkgfile) = cb7a6588fa169a8aa792374289f4fa48d0d946d31d57fc34aac4380adf0294f9 +RWSagIOpLGJF35HBRmIp+/X4ZMSG6Xkmy8yLXojoKYKjl5qSMAh/tz5jm3Qy0ZK3Pspb9c72zbE5Z3YK5hKV+/edz6WoSkDxRgE= +SHA256 (Pkgfile) = 6baa4a551aae2f44b1bcbbbd062b3e48bd18a755c67590f25cb5eefc52737ba8 SHA256 (.footprint) = ebf988c8e723831c758eb7467f5490166e2d1e1485e9546bde65a2de2bbfa8c9 SHA256 (vamp-plugin-sdk-2.10.0.tar.gz) = aeaf3762a44b148cebb10cde82f577317ffc9df2720e5445c3df85f3739ff75f -SHA256 (01-fix_multiarch.patch) = 2f40eed6a95dd3c22dddc8a9fe793d325492d0646c19227700d5dd4f60dc7d72 -SHA256 (02-fix_pkg-config.patch) = 091a5ed0ab89203633d9560f91bf964615318142f89973ac23414a3b6bdd5a2b -SHA256 (0003-Link-with-dl.patch) = 2e4dc8f4a7b660640eedc3760589f68b93e6de407ee4a32c007fab79f1c3862c -SHA256 (0004-do-not-run-test-always.patch) = b620d6bab9e204760bba7944ac6f3ef6cd514621cc7a57513fe161d9e6a5b71d diff --git a/vamp-plugin-sdk/0003-Link-with-dl.patch b/vamp-plugin-sdk/0003-Link-with-dl.patch deleted file mode 100644 index 612068c93..000000000 --- a/vamp-plugin-sdk/0003-Link-with-dl.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Sebastian Ramacher -Date: Thu, 21 Nov 2019 23:49:47 +0100 -Subject: Link with dl - ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: vamp-plugin-sdk/Makefile.in -=================================================================== ---- vamp-plugin-sdk.orig/Makefile.in -+++ vamp-plugin-sdk/Makefile.in -@@ -260,7 +260,7 @@ $(SDK_DYNAMIC): $(SDK_OBJECTS) $(API_HEA - $(CXX) $(LDFLAGS) $(SDK_DYNAMIC_LDFLAGS) -o $@ $(SDK_OBJECTS) - - $(HOSTSDK_DYNAMIC): $(HOSTSDK_OBJECTS) $(API_HEADERS) $(HOSTSDK_HEADERS) -- $(CXX) $(LDFLAGS) $(HOSTSDK_DYNAMIC_LDFLAGS) -o $@ $(HOSTSDK_OBJECTS) -+ $(CXX) $(LDFLAGS) $(HOSTSDK_DYNAMIC_LDFLAGS) -o $@ $(HOSTSDK_OBJECTS) -ldl - - $(PLUGIN_TARGET): $(PLUGIN_OBJECTS) $(SDK_STATIC) $(PLUGIN_HEADERS) - $(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LIBS) diff --git a/vamp-plugin-sdk/0004-do-not-run-test-always.patch b/vamp-plugin-sdk/0004-do-not-run-test-always.patch deleted file mode 100644 index de2807317..000000000 --- a/vamp-plugin-sdk/0004-do-not-run-test-always.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -248,7 +248,7 @@ - - rdfgen: $(RDFGEN_TARGET) - --all: sdk plugins host rdfgen test -+all: sdk plugins host rdfgen - - $(SDK_STATIC): $(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS) - $(AR) r $@ $(SDK_OBJECTS) ---- a/configure -+++ b/configure -@@ -4076,7 +4076,7 @@ - have_sndfile="yes" - fi - if test "x$have_sndfile" = "xyes" ; then -- TARGETS="sdk plugins host rdfgen test" -+ TARGETS="sdk plugins host rdfgen" - else - as_fn_error $? "libsndfile not found - cannot build example Vamp host! - If you don't want to build the host, configure with --disable-programs." "$LINENO" 5 ---- a/configure.ac -+++ b/configure.ac -@@ -28,7 +28,7 @@ - PKG_CHECK_MODULES([SNDFILE],[sndfile],have_sndfile="yes",have_sndfile="no") - if test "x$have_sndfile" = "xyes" ; then - dnl all good, build everything -- TARGETS="sdk plugins host rdfgen test" -+ TARGETS="sdk plugins host rdfgen" - else - dnl no libsndfile - can't build host! - AC_MSG_ERROR([libsndfile not found - cannot build example Vamp host! diff --git a/vamp-plugin-sdk/01-fix_multiarch.patch b/vamp-plugin-sdk/01-fix_multiarch.patch deleted file mode 100644 index bdbcf21dd..000000000 --- a/vamp-plugin-sdk/01-fix_multiarch.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Patch fixing multiarch build -Author: Jaromír Mikeš -Forwarded: cannam@all-day-breakfast.com - -Index: vamp-plugin-sdk/Makefile.in -=================================================================== ---- vamp-plugin-sdk.orig/Makefile.in -+++ vamp-plugin-sdk/Makefile.in -@@ -70,12 +70,13 @@ RDFGEN_LIBS = ./libvamp-hostsdk.a @LIBS@ - # editing for non-Linux platforms. Of course you don't necessarily - # have to use "make install". - # -+LIBDIR ?= lib - INSTALL_PREFIX = @prefix@ - INSTALL_API_HEADERS = $(INSTALL_PREFIX)/include/vamp - INSTALL_SDK_HEADERS = $(INSTALL_PREFIX)/include/vamp-sdk - INSTALL_HOSTSDK_HEADERS = $(INSTALL_PREFIX)/include/vamp-hostsdk --INSTALL_SDK_LIBS = $(INSTALL_PREFIX)/lib --INSTALL_PLUGINS = $(INSTALL_PREFIX)/lib/vamp -+INSTALL_SDK_LIBS = $(INSTALL_PREFIX)/$(LIBDIR) -+INSTALL_PLUGINS = $(INSTALL_PREFIX)/$(LIBDIR)/vamp - INSTALL_BINARIES = $(INSTALL_PREFIX)/bin - - INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.10.0 -@@ -90,7 +91,7 @@ INSTALL_HOSTSDK_LINK_DEV = libvamp-host - INSTALL_HOSTSDK_STATIC = libvamp-hostsdk.a - INSTALL_HOSTSDK_LA = libvamp-hostsdk.la - --INSTALL_PKGCONFIG = $(INSTALL_PREFIX)/lib/pkgconfig -+INSTALL_PKGCONFIG = $(INSTALL_PREFIX)/$(LIBDIR)/pkgconfig - - # Flags required to tell the compiler to create a dynamically loadable object - # diff --git a/vamp-plugin-sdk/02-fix_pkg-config.patch b/vamp-plugin-sdk/02-fix_pkg-config.patch deleted file mode 100644 index 03905fe33..000000000 --- a/vamp-plugin-sdk/02-fix_pkg-config.patch +++ /dev/null @@ -1,96 +0,0 @@ -Description: Patch fixing pkg-config. -Author: Jaromír Mikeš -Forwarded: cannam@all-day-breakfast.com - -Index: vamp-plugin-sdk/pkgconfig/vamp-hostsdk.pc.in -=================================================================== ---- vamp-plugin-sdk.orig/pkgconfig/vamp-hostsdk.pc.in -+++ vamp-plugin-sdk/pkgconfig/vamp-hostsdk.pc.in -@@ -1,7 +1,7 @@ --prefix=%PREFIX% --exec_prefix=${prefix} --libdir=${exec_prefix}/lib --includedir=${prefix}/include -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ - - Name: vamp-hostsdk - Version: 2.10 -Index: vamp-plugin-sdk/pkgconfig/vamp-sdk.pc.in -=================================================================== ---- vamp-plugin-sdk.orig/pkgconfig/vamp-sdk.pc.in -+++ vamp-plugin-sdk/pkgconfig/vamp-sdk.pc.in -@@ -1,7 +1,7 @@ --prefix=%PREFIX% --exec_prefix=${prefix} --libdir=${exec_prefix}/lib --includedir=${prefix}/include -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ - - Name: vamp-sdk - Version: 2.10 -Index: vamp-plugin-sdk/pkgconfig/vamp.pc.in -=================================================================== ---- vamp-plugin-sdk.orig/pkgconfig/vamp.pc.in -+++ vamp-plugin-sdk/pkgconfig/vamp.pc.in -@@ -1,7 +1,7 @@ --prefix=%PREFIX% --exec_prefix=${prefix} --libdir=${exec_prefix}/lib --includedir=${prefix}/include -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ - - Name: vamp - Version: 2.10 -Index: vamp-plugin-sdk/Makefile.in -=================================================================== ---- vamp-plugin-sdk.orig/Makefile.in -+++ vamp-plugin-sdk/Makefile.in -@@ -280,6 +280,7 @@ clean: - distclean: clean - rm -f $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET) *~ */*~ - rm -f config.log config.status Makefile -+ rm -f $(PCDIR)/vamp.pc $(PCDIR)/vamp-sdk.pc $(PCDIR)/vamp-hostsdk.pc - - install: $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET) - mkdir -p $(DESTDIR)$(INSTALL_API_HEADERS) -@@ -309,12 +310,9 @@ install: $(SDK_STATIC) $(SDK_DYNAMIC) $( - ln -s $(INSTALL_SDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV) - rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV) - ln -s $(INSTALL_HOSTSDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV) -- sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp.pc.in \ -- > $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp.pc -- sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp-sdk.pc.in \ -- > $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-sdk.pc -- sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(PCDIR)/vamp-hostsdk.pc.in \ -- > $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-hostsdk.pc -+ cp $(PCDIR)/vamp.pc $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp.pc -+ cp $(PCDIR)/vamp-sdk.pc $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-sdk.pc -+ cp $(PCDIR)/vamp-hostsdk.pc $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-hostsdk.pc - sed -e "s,%LIBNAME%,$(INSTALL_SDK_LIBNAME),g" \ - -e "s,%LINK_ABI%,$(INSTALL_SDK_LINK_ABI),g" \ - -e "s,%LINK_DEV%,$(INSTALL_SDK_LINK_DEV),g" \ -Index: vamp-plugin-sdk/configure.ac -=================================================================== ---- vamp-plugin-sdk.orig/configure.ac -+++ vamp-plugin-sdk/configure.ac -@@ -59,5 +59,10 @@ changequote([,])dnl - - AC_SUBST(CXXFLAGS) - AC_SUBST(CFLAGS) --AC_OUTPUT([Makefile]) -+AC_OUTPUT([ -+ Makefile -+ pkgconfig/vamp.pc -+ pkgconfig/vamp-hostsdk.pc -+ pkgconfig/vamp-sdk.pc -+]) - diff --git a/vamp-plugin-sdk/Pkgfile b/vamp-plugin-sdk/Pkgfile index 8435ce0d0..89d9288ea 100644 --- a/vamp-plugin-sdk/Pkgfile +++ b/vamp-plugin-sdk/Pkgfile @@ -6,33 +6,20 @@ name=vamp-plugin-sdk version=2.10.0 release=2 -source=(https://code.soundsoftware.ac.uk/attachments/download/2691/$name-$version.tar.gz - 01-fix_multiarch.patch - 02-fix_pkg-config.patch - 0003-Link-with-dl.patch - 0004-do-not-run-test-always.patch) +source=(https://code.soundsoftware.ac.uk/attachments/download/2691/$name-$version.tar.gz) build() { cd $name-$version - patch -Np1 -i $SRC/01-fix_multiarch.patch - patch -Np1 -i $SRC/02-fix_pkg-config.patch - patch -Np1 -i $SRC/0003-Link-with-dl.patch - patch -Np1 -i $SRC/0004-do-not-run-test-always.patch - export LIBDIR=lib export CFLAGS="$CFLAGS -fPIC -Wall" export CXXFLAGS="$CFLAGS -fPIC -Wall" - autoreconf -vfi - ./configure --prefix=/usr - make \ - AR=/usr/bin/ar \ - RANLIB=/usr/bin/ranlib + make -j1 - make DESTDIR=$PKG install + make DESTDIR=$PKG -j1 install find $PKG/usr/lib \(\ -name '*.a' -o \