From 20aa368519de59b66af8a61164c3448f3c68f34b Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 3 Sep 2014 20:05:57 +0000 Subject: [PATCH] libmpeg2: fix lib versions * don't include tools on secondary architectures * enable x86_64 --- media-libs/libmpeg2/libmpeg2-0.5.1.recipe | 30 ++++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe index 1fc74b95b..61e2b73d4 100644 --- a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe +++ b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe @@ -8,20 +8,24 @@ COPYRIGHT=" 2000-2003 Michel Lespinasse 1999-2000 Aaron Holtzman " -SRC_URI="http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz" +SRC_URI="http://libmpeg2.sourceforge.net/files/libmpeg2-$portVersion.tar.gz" CHECKSUM_SHA256="dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4" -REVISION="2" -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libmpeg2${secondaryArchSuffix} = $portVersion compat >= 0.5 - lib:libmpeg2${secondaryArchSuffix} = $portVersion compat >= 0.5 - lib:libmpeg2convert${secondaryArchSuffix} = $portVersion compat >= 0.5 - cmd:mpeg2dec${secondaryArchSuffix} = $portVersion - cmd:corrupt_mpeg2${secondaryArchSuffix} = $portVersion - cmd:extract_mpeg2${secondaryArchSuffix} = $portVersion + lib:libmpeg2${secondaryArchSuffix} = 0.1.0 compat >= 0 + lib:libmpeg2convert${secondaryArchSuffix} = 0.0.0 compat >= 0 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:mpeg2dec${secondaryArchSuffix} = $portVersion + cmd:corrupt_mpeg2${secondaryArchSuffix} = $portVersion + cmd:extract_mpeg2${secondaryArchSuffix} = $portVersion + " +fi REQUIRES=" haiku${secondaryArchSuffix} >= $haikuVersion @@ -42,8 +46,6 @@ BUILD_PREREQUIRES=" PATCHES="libmpeg2-${portVersion}.patch" -SOURCE_DIR="libmpeg2-${portVersion}" - BUILD() { ./bootstrap @@ -54,6 +56,10 @@ BUILD() INSTALL() { make install + + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + fi # prepare develop/lib prepareInstalledDevelLibs libmpeg2 libmpeg2convert @@ -67,8 +73,8 @@ INSTALL() PROVIDES_devel=" libmpeg2${secondaryArchSuffix}_devel = $portVersion compat >= 0.5 - devel:libmpeg2${secondaryArchSuffix} = $portVersion compat >= 0.5 - devel:libmpeg2convert${secondaryArchSuffix} = $portVersion compat >= 0.5 + devel:libmpeg2${secondaryArchSuffix} = 0.1.0 compat >= 0 + devel:libmpeg2convert${secondaryArchSuffix} = 0.0.0 compat >= 0 " REQUIRES_devel=" libmpeg2${secondaryArchSuffix} == $portVersion base