From 542020ebaf580708d21b95d5b1ab8a0a1c51d637 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 2 Sep 2014 18:03:30 +0000 Subject: [PATCH] a52dec: enable x86 and x86_64 * don't include tools for secondary architectures. --- media-libs/a52dec/a52dec-0.7.4.recipe | 29 +++++++++++++++------------ 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/media-libs/a52dec/a52dec-0.7.4.recipe b/media-libs/a52dec/a52dec-0.7.4.recipe index 2eb73a740..831ae872d 100644 --- a/media-libs/a52dec/a52dec-0.7.4.recipe +++ b/media-libs/a52dec/a52dec-0.7.4.recipe @@ -8,17 +8,21 @@ CHECKSUM_SHA256="a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec3 REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="Copyright (C) 1999-2002 Aaron Holtzman and Michel Lespinasse" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="a52dec-$portVersion.patch" PROVIDES=" a52dec$secondaryArchSuffix = $portVersion - lib:liba52$secondaryArchSuffix - cmd:a52dec$secondaryArchSuffix - cmd:extract_a52$secondaryArchSuffix + lib:liba52$secondaryArchSuffix = 0.0.0 compat >= 0 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:a52dec$secondaryArchSuffix + cmd:extract_a52$secondaryArchSuffix + " +fi REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion @@ -35,17 +39,12 @@ BUILD_PREREQUIRES=" cmd:libtoolize cmd:aclocal cmd:autoconf + cmd:autoreconf " - -SOURCE_DIR="a52dec-0.7.4" BUILD() { - libtoolize --force --copy --install - aclocal - autoconf - automake --add-missing - + autoreconf -fi runConfigure ./configure --enable-shared make $jobArgs } @@ -53,6 +52,10 @@ BUILD() INSTALL() { make install + + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + fi # prepare develop/lib prepareInstalledDevelLibs liba52 @@ -66,7 +69,7 @@ INSTALL() PROVIDES_devel=" a52dec${secondaryArchSuffix}_devel = $portVersion - devel:liba52$secondaryArchSuffix = $portVersion + devel:liba52$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES_devel=" a52dec$secondaryArchSuffix == $portVersion base