From c18e6c7e527ea28110d8f89c0bfe5a3c32729dcb Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 02:00:53 +0200 Subject: [PATCH] speex: support building for secondary architecture --- media-libs/speex/speex-1.2~rc1.recipe | 47 +++++++++++++++++---------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc1.recipe index 1b185fec9..acc6ae59a 100644 --- a/media-libs/speex/speex-1.2~rc1.recipe +++ b/media-libs/speex/speex-1.2~rc1.recipe @@ -13,32 +13,38 @@ COPYRIGHT=" " SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz" CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="speex-1.2~rc1.patchset" PROVIDES=" - speex = $portVersion - cmd:speexdec = $portVersion - cmd:speexenc = $portVersion - lib:libspeex = 1.5.0 compat >= 1 - lib:libspeexdsp = 1.5.0 compat >= 1 + speex$secondaryArchSuffix = $portVersion + lib:libspeex$secondaryArchSuffix = 1.5.0 compat >= 1 + lib:libspeexdsp$secondaryArchSuffix = 1.5.0 compat >= 1 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:speexdec = $portVersion + cmd:speexenc = $portVersion + " +fi + REQUIRES=" - haiku >= $haikuVersion - lib:libogg + haiku$secondaryArchSuffix >= $haikuVersion + lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libogg + devel:libogg$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make cmd:pkg_config @@ -67,16 +73,21 @@ INSTALL() packageEntries devel \ $dataDir/aclocal \ $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi } # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The speex development files" PROVIDES_devel=" - speex_devel = $portVersion - devel:libspeex = 1.5.0 compat >= 1 - devel:libspeexdsp = 1.5.0 compat >= 1 + speex${secondaryArchSuffix}_devel = $portVersion + devel:libspeex$secondaryArchSuffix = 1.5.0 compat >= 1 + devel:libspeexdsp$secondaryArchSuffix = 1.5.0 compat >= 1 " REQUIRES_devel=" - speex == $portVersion + speex$secondaryArchSuffix == $portVersion "