diff --git a/mingw-w64-vamp-plugin-sdk/01-mingw-shared.patch b/mingw-w64-vamp-plugin-sdk/01-mingw-shared.patch index 287352e0fd..a37ad854ab 100644 --- a/mingw-w64-vamp-plugin-sdk/01-mingw-shared.patch +++ b/mingw-w64-vamp-plugin-sdk/01-mingw-shared.patch @@ -34,9 +34,10 @@ @@ -95,8 +93,8 @@ # Flags required to tell the compiler to create a dynamically loadable object # - DYNAMIC_LDFLAGS = -static-libgcc -shared -Wl,-Bsymbolic +-DYNAMIC_LDFLAGS = -static-libgcc -shared -Wl,-Bsymbolic -SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_SDK_LINK_ABI) -HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_HOSTSDK_LINK_ABI) ++DYNAMIC_LDFLAGS = -static-libgcc -shared +SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--out-implib,$(INSTALL_SDK_LINK_ABI) +HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--out-implib,$(INSTALL_HOSTSDK_LINK_ABI) diff --git a/mingw-w64-vamp-plugin-sdk/02-clang.patch b/mingw-w64-vamp-plugin-sdk/02-clang.patch new file mode 100644 index 0000000000..0625095463 --- /dev/null +++ b/mingw-w64-vamp-plugin-sdk/02-clang.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -99,7 +99,7 @@ + # Additional flags for making a plugin. This version script tells the + # GNU linker to make all symbols in the library hidden except for the + # public entry point. It's not essential, but makes a tidier library. +-PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--version-script=build/vamp-plugin.map ++PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) + + + # Adapt install details when found to be running on OSX (thanks to David O) diff --git a/mingw-w64-vamp-plugin-sdk/PKGBUILD b/mingw-w64-vamp-plugin-sdk/PKGBUILD index 751038f915..1a780711d2 100644 --- a/mingw-w64-vamp-plugin-sdk/PKGBUILD +++ b/mingw-w64-vamp-plugin-sdk/PKGBUILD @@ -4,31 +4,31 @@ _realname=vamp-plugin-sdk pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="Vamp plugins extract descriptive information from audio data (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url="https://www.vamp-plugins.org/" license=("BSD") options=('!buildflags') -makedepends=("${MINGW_PACKAGE_PREFIX}-aria2" - "${MINGW_PACKAGE_PREFIX}-gcc" +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-autotools") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libsndfile") -# "https://code.soundsoftware.ac.uk/attachments/download/2691/${_realname}-${pkgver}.tar.gz" -source=(01-mingw-shared.patch) -sha256sums=('aa338dc97b454f800ed63d2e44f178f1d1e8fdaca16c19639e3773a968e5518c') +source=("https://code.soundsoftware.ac.uk/attachments/download/2691/${_realname}-${pkgver}.tar.gz" + "01-mingw-shared.patch" + "02-clang.patch") +sha256sums=('aeaf3762a44b148cebb10cde82f577317ffc9df2720e5445c3df85f3739ff75f' + 'b3525265a6104403baadf2239a06a73da556eb894d956274d863bf6e434c8e83' + '30a92217663b9a7755a1c9af5db7f00309f1d0dc4d3abb38712c46e8bbcb4c5c') prepare() { - # curl fails to download with certificate error - cd "${srcdir}" - aria2c --check-certificate=false \ - "https://code.soundsoftware.ac.uk/attachments/download/2691/${_realname}-${pkgver}.tar.gz" - tar -xf "${_realname}-${pkgver}.tar.gz" - cd "${srcdir}/${_realname}-${pkgver}" patch -p1 -i ${srcdir}/01-mingw-shared.patch + + if [[ $MINGW_PACKAGE_PREFIX == *-clang-* ]]; then + patch -p1 -i ${srcdir}/02-clang.patch + fi } build() {