diff --git a/media-libs/vamp-plugin-sdk/patches/vamp_plugin_sdk-2.10.0.patchset b/media-libs/vamp-plugin-sdk/patches/vamp_plugin_sdk-2.10.0.patchset new file mode 100644 index 000000000..5302e8a12 --- /dev/null +++ b/media-libs/vamp-plugin-sdk/patches/vamp_plugin_sdk-2.10.0.patchset @@ -0,0 +1,41 @@ +From 286aa2c8eec90b59e3444150a4b928f100da8677 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sat, 27 Nov 2021 18:17:01 +0000 +Subject: vamp-plugin-sdk, fix install paths + + +diff --git a/Makefile.in b/Makefile.in +index 96089c8..27ff538 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -71,12 +71,12 @@ RDFGEN_LIBS = ./libvamp-hostsdk.a @LIBS@ + # have to use "make install". + # + 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_BINARIES = $(INSTALL_PREFIX)/bin ++INSTALL_API_HEADERS = @includedir@/vamp ++INSTALL_SDK_HEADERS = @includedir@/vamp-sdk ++INSTALL_HOSTSDK_HEADERS = @includedir@/vamp-hostsdk ++INSTALL_SDK_LIBS = @libdir@ ++INSTALL_PLUGINS = @libdir@/vamp ++INSTALL_BINARIES = @bindir@ + + INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.10.0 + INSTALL_SDK_LINK_ABI = libvamp-sdk.so.2 +@@ -90,7 +90,7 @@ INSTALL_HOSTSDK_LINK_DEV = libvamp-hostsdk.so + INSTALL_HOSTSDK_STATIC = libvamp-hostsdk.a + INSTALL_HOSTSDK_LA = libvamp-hostsdk.la + +-INSTALL_PKGCONFIG = $(INSTALL_PREFIX)/lib/pkgconfig ++INSTALL_PKGCONFIG = @libdir@/pkgconfig + + # Flags required to tell the compiler to create a dynamically loadable object + # +-- +2.30.2 + diff --git a/media-libs/vamp-plugin-sdk/vamp_plugin_sdk-2.6.recipe b/media-libs/vamp-plugin-sdk/vamp_plugin_sdk-2.10.0.recipe similarity index 51% rename from media-libs/vamp-plugin-sdk/vamp_plugin_sdk-2.6.recipe rename to media-libs/vamp-plugin-sdk/vamp_plugin_sdk-2.10.0.recipe index 8fd3e6e84..60a4a118d 100644 --- a/media-libs/vamp-plugin-sdk/vamp_plugin_sdk-2.6.recipe +++ b/media-libs/vamp-plugin-sdk/vamp_plugin_sdk-2.10.0.recipe @@ -2,23 +2,35 @@ SUMMARY="An API for audio analysis and feature extraction plugins" DESCRIPTION="Vamp is an API for C and C++ plugins that process sampled audio \ data to produce descriptive output (measurements or semantic observations)." HOMEPAGE="https://www.vamp-plugins.org/" -COPYRIGHT="2005-2006 Chris Cannam +COPYRIGHT="2003-2010 Mark Borgerding + 2005-2006 Chris Cannam 2006-2012 Queen Mary, University of London" LICENSE="MIT" -REVISION="3" -SOURCE_URI="http://code.soundsoftware.ac.uk/attachments/download/1520/vamp-plugin-sdk-$portVersion.tar.gz" -CHECKSUM_SHA256="d0d3578137ac0c1e63f31561081a8d61da526a81152bc1dc9383b629bc07f85f" +REVISION="1" +SOURCE_URI="http://code.soundsoftware.ac.uk/attachments/download/2691/vamp-plugin-sdk-$portVersion.tar.gz" +CHECKSUM_SHA256="aeaf3762a44b148cebb10cde82f577317ffc9df2720e5445c3df85f3739ff75f" SOURCE_DIR="vamp-plugin-sdk-$portVersion" +PATCHES="vamp_plugin_sdk-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +commandBinDir=$binDir +commandSuffix=$secondaryArchSuffix +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" +libVersion_hostsdk="3.10.0" +libVersionCompat_hostsdk="$libVersion_hostsdk compat >= ${libVersion_hostsdk%%.*}" + PROVIDES=" vamp_plugin_sdk$secondaryArchSuffix = $portVersion - cmd:vamp_rdf_template_generator - cmd:vamp_simple_host - lib:libvamp_hostsdk$secondaryArchSuffix = 3.6.0 compat >= 3 - lib:libvamp_sdk$secondaryArchSuffix = 2.6.0 compat >= 2 + lib:libvamp_hostsdk$secondaryArchSuffix = $libVersionCompat_hostsdk + lib:libvamp_sdk$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -27,13 +39,24 @@ REQUIRES=" PROVIDES_devel=" vamp_plugin_sdk${secondaryArchSuffix}_devel = $portVersion - devel:libvamp_hostsdk$secondaryArchSuffix = 3.6.0 compat >= 3 - devel:libvamp_sdk$secondaryArchSuffix = 2.6.0 compat >= 2 + devel:libvamp_hostsdk$secondaryArchSuffix = $libVersionCompat_hostsdk + devel:libvamp_sdk$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" vamp_plugin_sdk$secondaryArchSuffix == $portVersion base " +PROVIDES_tools=" + vamp_plugin_sdk${secondaryArchSuffix}_tools + cmd:vamp_rdf_template_generator$commandSuffix + cmd:vamp_simple_host$commandSuffix + " +REQUIRES_tools=" + vamp_plugin_sdk$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix + lib:libsndfile$secondaryArchSuffix + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libsndfile$secondaryArchSuffix @@ -52,7 +75,8 @@ BUILD_PREREQUIRES=" BUILD() { autoreconf -fi - runConfigure ./configure + runConfigure --omit-dirs binDir ./configure \ + --bindir=$commandBinDir make $jobArgs } @@ -60,11 +84,6 @@ INSTALL() { make install - mv $prefix/lib $prefix/lib2 - mkdir -p $(dirname $libDir) $(dirname $includeDir) - mv $prefix/lib2 $libDir - mv $prefix/include $includeDir - rm $libDir/libvamp*.la prepareInstalledDevelLibs libvamp-sdk libvamp-hostsdk @@ -73,9 +92,11 @@ INSTALL() # devel package packageEntries devel \ $developDir + packageEntries tools \ + $commandBinDir } TEST() { - make check + make test }