From a9d0fdfa9a56d89270c73778f0bbd4bf4d41a333 Mon Sep 17 00:00:00 2001 From: Carl Ganz Date: Tue, 14 Mar 2023 11:24:46 -0700 Subject: [PATCH 01/10] Enable libspeex in ffmpeg --- mingw-w64-ffmpeg/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-w64-ffmpeg/PKGBUILD b/mingw-w64-ffmpeg/PKGBUILD index 88a3c8d40..cb43313b5 100644 --- a/mingw-w64-ffmpeg/PKGBUILD +++ b/mingw-w64-ffmpeg/PKGBUILD @@ -60,6 +60,7 @@ build() { --enable-hardcoded-tables \ --enable-version3 \ --enable-zlib \ + --enable-libspeex --disable-lzma \ --disable-doc \ --extra-libs="$(${PKG_CONFIG:-pkgconfig} --libs-only-l --static vorbis)" From 175af39bc3fd74fda5365b07c87d6f8c7f5142a0 Mon Sep 17 00:00:00 2001 From: Carl Ganz Date: Thu, 16 Mar 2023 12:43:41 -0700 Subject: [PATCH 02/10] fix missing trailing slash --- mingw-w64-ffmpeg/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-ffmpeg/PKGBUILD b/mingw-w64-ffmpeg/PKGBUILD index cb43313b5..ada0f6464 100644 --- a/mingw-w64-ffmpeg/PKGBUILD +++ b/mingw-w64-ffmpeg/PKGBUILD @@ -60,7 +60,7 @@ build() { --enable-hardcoded-tables \ --enable-version3 \ --enable-zlib \ - --enable-libspeex + --enable-libspeex \ --disable-lzma \ --disable-doc \ --extra-libs="$(${PKG_CONFIG:-pkgconfig} --libs-only-l --static vorbis)" From 9b5b0f031ce4f1390123fe89384fdcfd82420012 Mon Sep 17 00:00:00 2001 From: Carl Ganz Date: Fri, 17 Mar 2023 11:09:42 -0700 Subject: [PATCH 03/10] add libspeex to depends --- mingw-w64-ffmpeg/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mingw-w64-ffmpeg/PKGBUILD b/mingw-w64-ffmpeg/PKGBUILD index ada0f6464..7239ecd67 100644 --- a/mingw-w64-ffmpeg/PKGBUILD +++ b/mingw-w64-ffmpeg/PKGBUILD @@ -18,7 +18,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-bzip2" "${MINGW_PACKAGE_PREFIX}-libvpx" "${MINGW_PACKAGE_PREFIX}-x264" "${MINGW_PACKAGE_PREFIX}-xvidcore" - "${MINGW_PACKAGE_PREFIX}-zlib") + "${MINGW_PACKAGE_PREFIX}-zlib" + "${MINGW_PACKAGE_PREFIX}-libspeex") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-nasm") From 530784f55a81bf3db3aaeb2be1c85c12c60c3832 Mon Sep 17 00:00:00 2001 From: Carl Ganz Date: Fri, 17 Mar 2023 11:17:27 -0700 Subject: [PATCH 04/10] seems like library might just be called speex on mingw https://packages.msys2.org/package/mingw-w64-x86_64-speex --- mingw-w64-ffmpeg/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-ffmpeg/PKGBUILD b/mingw-w64-ffmpeg/PKGBUILD index 7239ecd67..484c89781 100644 --- a/mingw-w64-ffmpeg/PKGBUILD +++ b/mingw-w64-ffmpeg/PKGBUILD @@ -19,7 +19,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-bzip2" "${MINGW_PACKAGE_PREFIX}-x264" "${MINGW_PACKAGE_PREFIX}-xvidcore" "${MINGW_PACKAGE_PREFIX}-zlib" - "${MINGW_PACKAGE_PREFIX}-libspeex") + "${MINGW_PACKAGE_PREFIX}-speex") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-nasm") From 1b7112cd6a2ed17265ab3b666116e553c3a0d2be Mon Sep 17 00:00:00 2001 From: carlganz Date: Fri, 17 Mar 2023 11:30:55 -0700 Subject: [PATCH 05/10] add speex library --- mingw-w64-speex/PKGBUILD | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 mingw-w64-speex/PKGBUILD diff --git a/mingw-w64-speex/PKGBUILD b/mingw-w64-speex/PKGBUILD new file mode 100644 index 000000000..3291cdd27 --- /dev/null +++ b/mingw-w64-speex/PKGBUILD @@ -0,0 +1,45 @@ +# Maintainer: Alexey Pavlov + +_realname=speex +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=1.2.1 +pkgrel=1 +pkgdesc="A free codec for free speech (mingw-w64)" +arch=('any') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +license=('BSD') +url="https://speex.org/" +depends=("${MINGW_PACKAGE_PREFIX}-libogg" "${MINGW_PACKAGE_PREFIX}-speexdsp") +options=('strip' '!libtool' 'staticlibs') +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-autotools") +source=("https://gitlab.xiph.org/xiph/speex/-/archive/Speex-${pkgver}/speex-Speex-${pkgver}.tar.gz") +sha256sums=('beaf2642e81a822eaade4d9ebf92e1678f301abfc74a29159c4e721ee70fdce0') + +prepare() { + mv "speex-Speex-${pkgver}" "${_realname}-${pkgver}" + cd ${srcdir}/${_realname}-${pkgver} + + ./autogen.sh +} + +build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" + mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} + ../${_realname}-${pkgver}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --enable-shared \ + --enable-static \ + --disable-shared + + make +} + +package() { + cd ${srcdir}/build-${MINGW_CHOST} + make DESTDIR="${pkgdir}" install + install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" +} From dd7dbb8b08e9fd72dcecabdbaef4422158e79f1d Mon Sep 17 00:00:00 2001 From: carlganz Date: Fri, 17 Mar 2023 11:40:50 -0700 Subject: [PATCH 06/10] add speexdsp --- mingw-w64-speexdsp/PKGBUILD | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 mingw-w64-speexdsp/PKGBUILD diff --git a/mingw-w64-speexdsp/PKGBUILD b/mingw-w64-speexdsp/PKGBUILD new file mode 100644 index 000000000..f9b1ccddc --- /dev/null +++ b/mingw-w64-speexdsp/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Alexey Pavlov + +_realname=speexdsp +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=1.2.1 +pkgrel=1 +pkgdesc="DSP library derived from Speex (mingw-w64)" +arch=('any') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +license=('BSD') +url="https://www.speex.org/" +depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") +options=('strip' '!libtool' 'staticlibs') +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools") +source=("https://gitlab.xiph.org/xiph/speexdsp/-/archive/SpeexDSP-${pkgver}/speexdsp-SpeexDSP-${pkgver}.tar.gz" + "0001-include-stdint-in-resample-neon-h.patch") +sha256sums=('d17ca363654556a4ff1d02cc13d9eb1fc5a8642c90b40bd54ce266c3807b91a7' + 'a61da81d79a1233e9d3636eb738b06314d51c55941e25b0ece9e49cb746e48c3') + +prepare() { + mv "speexdsp-SpeexDSP-${pkgver}" "${_realname}-${pkgver}" + cd ${srcdir}/${_realname}-${pkgver} + + patch -p 1 -i "${srcdir}/0001-include-stdint-in-resample-neon-h.patch" + + ./autogen.sh +} + +build() { + #export lt_cv_deplibs_check_method='pass_all' + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" + mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} + ../${_realname}-${pkgver}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --disable-shared \ + --enable-static + + make +} + +package() { + cd ${srcdir}/build-${MINGW_CHOST} + make DESTDIR="${pkgdir}" install + install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" +} From e14c2dfc0a847ca570d31ddae332189a8c057a8c Mon Sep 17 00:00:00 2001 From: carlganz Date: Fri, 17 Mar 2023 11:50:32 -0700 Subject: [PATCH 07/10] use gcc and comment out patch a la libogg --- mingw-w64-speex/PKGBUILD | 2 +- mingw-w64-speexdsp/PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-speex/PKGBUILD b/mingw-w64-speex/PKGBUILD index 3291cdd27..d8fb0f9bb 100644 --- a/mingw-w64-speex/PKGBUILD +++ b/mingw-w64-speex/PKGBUILD @@ -12,7 +12,7 @@ license=('BSD') url="https://speex.org/" depends=("${MINGW_PACKAGE_PREFIX}-libogg" "${MINGW_PACKAGE_PREFIX}-speexdsp") options=('strip' '!libtool' 'staticlibs') -makedepends=("${MINGW_PACKAGE_PREFIX}-cc" +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-autotools") source=("https://gitlab.xiph.org/xiph/speex/-/archive/Speex-${pkgver}/speex-Speex-${pkgver}.tar.gz") sha256sums=('beaf2642e81a822eaade4d9ebf92e1678f301abfc74a29159c4e721ee70fdce0') diff --git a/mingw-w64-speexdsp/PKGBUILD b/mingw-w64-speexdsp/PKGBUILD index f9b1ccddc..4ff8c1e9b 100644 --- a/mingw-w64-speexdsp/PKGBUILD +++ b/mingw-w64-speexdsp/PKGBUILD @@ -12,7 +12,7 @@ license=('BSD') url="https://www.speex.org/" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('strip' '!libtool' 'staticlibs') -makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-autotools") source=("https://gitlab.xiph.org/xiph/speexdsp/-/archive/SpeexDSP-${pkgver}/speexdsp-SpeexDSP-${pkgver}.tar.gz" "0001-include-stdint-in-resample-neon-h.patch") sha256sums=('d17ca363654556a4ff1d02cc13d9eb1fc5a8642c90b40bd54ce266c3807b91a7' @@ -22,7 +22,7 @@ prepare() { mv "speexdsp-SpeexDSP-${pkgver}" "${_realname}-${pkgver}" cd ${srcdir}/${_realname}-${pkgver} - patch -p 1 -i "${srcdir}/0001-include-stdint-in-resample-neon-h.patch" + #patch -p 1 -i "${srcdir}/0001-include-stdint-in-resample-neon-h.patch" ./autogen.sh } From 013f20f6e57a2fc2d903a14581a39f6ed804d13a Mon Sep 17 00:00:00 2001 From: Carl Ganz Date: Thu, 6 Apr 2023 08:38:16 -0700 Subject: [PATCH 08/10] Comment out gcc-lib depends Copied from https://github.com/r-windows/rtools-packages/blob/669ffa629cfe4979111383197f1ac342294a0ba5/mingw-w64-intel-tbb/PKGBUILD#L10 --- mingw-w64-speexdsp/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-speexdsp/PKGBUILD b/mingw-w64-speexdsp/PKGBUILD index 4ff8c1e9b..153a3be85 100644 --- a/mingw-w64-speexdsp/PKGBUILD +++ b/mingw-w64-speexdsp/PKGBUILD @@ -10,7 +10,7 @@ arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') license=('BSD') url="https://www.speex.org/" -depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") +#depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('strip' '!libtool' 'staticlibs') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-autotools") source=("https://gitlab.xiph.org/xiph/speexdsp/-/archive/SpeexDSP-${pkgver}/speexdsp-SpeexDSP-${pkgver}.tar.gz" From 701553d3dc0afb2f2620d2b5037b2d87be969c2b Mon Sep 17 00:00:00 2001 From: Carl Ganz Date: Thu, 6 Apr 2023 08:48:06 -0700 Subject: [PATCH 09/10] Update PKGBUILD --- mingw-w64-speexdsp/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-speexdsp/PKGBUILD b/mingw-w64-speexdsp/PKGBUILD index 153a3be85..111b0136f 100644 --- a/mingw-w64-speexdsp/PKGBUILD +++ b/mingw-w64-speexdsp/PKGBUILD @@ -12,7 +12,7 @@ license=('BSD') url="https://www.speex.org/" #depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('strip' '!libtool' 'staticlibs') -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-autotools") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") source=("https://gitlab.xiph.org/xiph/speexdsp/-/archive/SpeexDSP-${pkgver}/speexdsp-SpeexDSP-${pkgver}.tar.gz" "0001-include-stdint-in-resample-neon-h.patch") sha256sums=('d17ca363654556a4ff1d02cc13d9eb1fc5a8642c90b40bd54ce266c3807b91a7' From 621b149cdca3faab07a08fdae6c02b6ea99d12da Mon Sep 17 00:00:00 2001 From: Carl Ganz Date: Thu, 6 Apr 2023 08:48:56 -0700 Subject: [PATCH 10/10] Update PKGBUILD --- mingw-w64-speex/PKGBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mingw-w64-speex/PKGBUILD b/mingw-w64-speex/PKGBUILD index d8fb0f9bb..ce89b0530 100644 --- a/mingw-w64-speex/PKGBUILD +++ b/mingw-w64-speex/PKGBUILD @@ -12,8 +12,7 @@ license=('BSD') url="https://speex.org/" depends=("${MINGW_PACKAGE_PREFIX}-libogg" "${MINGW_PACKAGE_PREFIX}-speexdsp") options=('strip' '!libtool' 'staticlibs') -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-autotools") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") source=("https://gitlab.xiph.org/xiph/speex/-/archive/Speex-${pkgver}/speex-Speex-${pkgver}.tar.gz") sha256sums=('beaf2642e81a822eaade4d9ebf92e1678f301abfc74a29159c4e721ee70fdce0')