From 231da52ef9afcd65dab201e23788ed6750bbab6b Mon Sep 17 00:00:00 2001 From: Alexpux Date: Fri, 13 Feb 2015 22:15:20 +0300 Subject: [PATCH] speex: Fix dependencies. Build static libs. --- mingw-w64-speex/01-mingw-winmm.patch | 33 ++++++++++++++++++++++++++++ mingw-w64-speex/PKGBUILD | 17 +++++++++----- 2 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 mingw-w64-speex/01-mingw-winmm.patch diff --git a/mingw-w64-speex/01-mingw-winmm.patch b/mingw-w64-speex/01-mingw-winmm.patch new file mode 100644 index 0000000000..1ec8741763 --- /dev/null +++ b/mingw-w64-speex/01-mingw-winmm.patch @@ -0,0 +1,33 @@ +--- speex-1.2rc2/configure.ac.orig 2015-02-13 22:00:58.022200000 +0300 ++++ speex-1.2rc2/configure.ac 2015-02-13 22:03:41.947000000 +0300 +@@ -198,6 +198,15 @@ + uclinux) LDFLAGS="-Wl,-elf2flt=-s100000 $LDFLAGS";; + esac + ++case $host_os in ++ mingw*) ++ WINMM_LIBS="-lwinmm" ++ ;; ++ *) WINMM_LIBS= ++ ;; ++esac ++AC_SUBST(WINMM_LIBS) ++ + AC_ARG_ENABLE(fixed-point-debug, [ --enable-fixed-point-debug Debug fixed-point implementation], + [if test "$enableval" = yes; then + AC_DEFINE([FIXED_DEBUG], , [Debug fixed-point implementation]) +--- speex-1.2rc2/src/Makefile.am.orig 2015-02-13 22:04:00.745000000 +0300 ++++ speex-1.2rc2/src/Makefile.am 2015-02-13 22:04:12.367000000 +0300 +@@ -20,9 +20,9 @@ + + speexenc_SOURCES = speexenc.c wav_io.c skeleton.c + speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la \ +- $(OGG_LIBS) @FFT_LIBS@ @SPEEXDSP_LIBS@ ++ $(OGG_LIBS) @FFT_LIBS@ @SPEEXDSP_LIBS@ @WINMM_LIBS@ + + speexdec_SOURCES = speexdec.c wav_io.c + speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \ +- $(OGG_LIBS) @FFT_LIBS@ ++ $(OGG_LIBS) @FFT_LIBS@ @WINMM_LIBS@ + + diff --git a/mingw-w64-speex/PKGBUILD b/mingw-w64-speex/PKGBUILD index a0fce269c4..156247bfaf 100644 --- a/mingw-w64-speex/PKGBUILD +++ b/mingw-w64-speex/PKGBUILD @@ -8,25 +8,30 @@ pkgdesc="A free codec for free speech (mingw-w64)" arch=('any') license=('BSD') url="http://www.speex.org/" -depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libogg") +depends=("${MINGW_PACKAGE_PREFIX}-libogg" "${MINGW_PACKAGE_PREFIX}-speexdsp") options=('strip' '!libtool' 'staticlibs') -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") -source=(http://downloads.us.xiph.org/releases/${_realname}/${_realname}-$pkgver.tar.gz) -md5sums=('6ae7db3bab01e1d4b86bacfa8ca33e81') +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-pkg-config") +source=(http://downloads.us.xiph.org/releases/${_realname}/${_realname}-$pkgver.tar.gz + 01-mingw-winmm.patch) +md5sums=('6ae7db3bab01e1d4b86bacfa8ca33e81' + '8edb0120f01d93e8202a97ebb1f5fc24') prepare() { cd ${srcdir}/${_realname}-${pkgver} + patch -p1 -i ${srcdir}/01-mingw-winmm.patch + + autoreconf -fiv } build() { - export lt_cv_deplibs_check_method='pass_all' mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} ${srcdir}/${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --enable-shared \ - --disable-static + --enable-static make }