ports/contrib
3
3
Fork 2
Code Issues Pull Requests Activity

vamp-plugin-sdk: added a few patches

Browse Source
This commit is contained in:
Tim Biermann 2023-09-24 09:43:27 +02:00
parent b32a15a852
commit 5c2e8a397c
Signed by: tb
GPG Key ID: 42F8B4E30B673606
7 changed files with 219 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vamp-plugin-sdk/.footprint
View File

@ -28,13 +28,9 @@ drwxr-xr-x root/root usr/include/vamp-sdk/
drwxr-xr-x root/root usr/include/vamp/
-rw-r--r-- root/root usr/include/vamp/vamp.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libvamp-hostsdk.a
-rw-r--r-- root/root usr/lib/libvamp-hostsdk.la
lrwxrwxrwx root/root usr/lib/libvamp-hostsdk.so -> libvamp-hostsdk.so.3.10.0
lrwxrwxrwx root/root usr/lib/libvamp-hostsdk.so.3 -> libvamp-hostsdk.so.3.10.0
-rwxr-xr-x root/root usr/lib/libvamp-hostsdk.so.3.10.0
-rw-r--r-- root/root usr/lib/libvamp-sdk.a
-rw-r--r-- root/root usr/lib/libvamp-sdk.la
lrwxrwxrwx root/root usr/lib/libvamp-sdk.so -> libvamp-sdk.so.2.10.0
lrwxrwxrwx root/root usr/lib/libvamp-sdk.so.2 -> libvamp-sdk.so.2.10.0
-rwxr-xr-x root/root usr/lib/libvamp-sdk.so.2.10.0

10
vamp-plugin-sdk/.signature
View File

@ -1,5 +1,9 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF387C1ac7V0/9iShTTm+MyhD7ZesMQn3xJzd9lhUU7jZ4gGnEimC6OK/UoCdv9+3RcLmDVGW90utm/gU4pWcoUwQ=
SHA256 (Pkgfile) = 69e9716f6d553cddd545296830edf8fa33423602fe9773b9f5346932b1e19d80
SHA256 (.footprint) = ae7179d14889b97145fa2d75ec58529276445c6cddd3ae522b0a20895220d38e
RWSagIOpLGJF38fyY14pgPj4RjTDvmp/WCoE00E9sOvEt1V9OPRKJ8lq2NJi9i7xPAfeePiRIkxaZl9KBUAsEnKS8iXAaP7zEg0=
SHA256 (Pkgfile) = cb7a6588fa169a8aa792374289f4fa48d0d946d31d57fc34aac4380adf0294f9
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

21
vamp-plugin-sdk/0003-Link-with-dl.patch Normal file
View File

@ -0,0 +1,21 @@
From: Sebastian Ramacher <sramacher@debian.org>
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)

33
vamp-plugin-sdk/0004-do-not-run-test-always.patch Normal file
View File

@ -0,0 +1,33 @@
--- 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!

33
vamp-plugin-sdk/01-fix_multiarch.patch Normal file
View File

@ -0,0 +1,33 @@
Description: Patch fixing multiarch build
Author: Jaromír Mikeš <mira.mikes@seznam.cz>
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
#

96
vamp-plugin-sdk/02-fix_pkg-config.patch Normal file
View File

@ -0,0 +1,96 @@
Description: Patch fixing pkg-config.
Author: Jaromír Mikeš <mira.mikes@seznam.cz>
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
+])

34
vamp-plugin-sdk/Pkgfile
View File

@ -1,17 +1,41 @@
# Description: The Vamp audio analysis plug-in system.
# Description: The Vamp audio analysis plug-in system
# URL: https://www.vamp-plugins.org/
# Maintainer: Tim Biermann, tbier at posteo dot de
# Packager: Danny Rawlins, crux at romster dot me
# Depends on: libsndfile
name=vamp-plugin-sdk
version=2.10.0
release=1
source=(https://code.soundsoftware.ac.uk/attachments/download/2691/$name-$version.tar.gz)
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)
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
make \
AR=/usr/bin/ar \
RANLIB=/usr/bin/ranlib
make DESTDIR=$PKG install
find $PKG/usr/lib \(\
-name '*.a' -o \
-name '*.la' \
\) -print -delete
}