From d927e138fd45647b1b20c0ec59d8560a7550dc7a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Dec 2013 00:36:04 -0800 Subject: [PATCH] Fixed secondaryArchSuffix errors in smpeg --- media-libs/smpeg/smpeg-0.4.5.recipe | 39 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 918b4c4e5..9229a4fb0 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -10,36 +10,36 @@ ARCHITECTURES="x86 x86_gcc2" SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" - smpeg$secondaryArchSupport = 0.4.5 compat >= 0 + smpeg$secondaryArchSuffix = 0.4.5 compat >= 0 cmd:smpeg = 0.4.5 compat >= 0 - cmd:plaympeg = 0.4.5 compat >= 0 - cmd:glmovie = 0.4.5 compat >= 0 - lib:libsmpeg$secondaryArchSupport = 0.4_0.1.4 compat >= 0.4_0 - lib:libsmpeg_0.4$secondaryArchSupport = 0.1.4 compat >= 0 + cmd:plaympeg$secondaryArchSuffix = 0.4.5 compat >= 0 + cmd:glmovie$secondaryArchSuffix = 0.4.5 compat >= 0 + lib:libsmpeg$secondaryArchSuffix = 0.4_0.1.4 compat >= 0.4_0 + lib:libsmpeg_0.4$secondaryArchSuffix = 0.1.4 compat >= 0 " REQUIRES=" - haiku$secondaryArchSupport - lib:libglu$secondaryArchSupport - lib:libsdl$secondaryArchSupport + haiku$secondaryArchSuffix + lib:libglu$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libsdl$secondaryArchSupport - devel:libglu$secondaryArchSupport + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + devel:libglu$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSupport}_devel >= $haikuVersion - cmd:gcc$secondaryArchSupport + cmd:gcc$secondaryArchSuffix cmd:libtoolize cmd:aclocal cmd:autoconf cmd:automake - cmd:ld$secondaryArchSupport + cmd:ld$secondaryArchSuffix cmd:make cmd:pkg_config - lib:libsdl$secondaryArchSupport + lib:libsdl$secondaryArchSuffix " BUILD() @@ -61,6 +61,7 @@ INSTALL() make install prepareInstalledDevelLibs libsmpeg + fixDevelopLibDirReferences $binDir/smpeg-config fixPkgconfig # devel package @@ -73,12 +74,12 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - smpeg${secondaryArchSupport}_devel = $portVersion - cmd:smpeg_config - devel:libsmpeg$secondaryArchSupport = 0.4_0.1.4 compat >= 0.4_0 - devel:libsmpeg_0.4$secondaryArchSupport = 0.4.5 compat >= 0 + smpeg${secondaryArchSuffix}_devel = $portVersion + cmd:smpeg_config$secondaryArchSuffix + devel:libsmpeg$secondaryArchSuffix = 0.4_0.1.4 compat >= 0.4_0 + devel:libsmpeg_0.4$secondaryArchSuffix = 0.4.5 compat >= 0 " REQUIRES_devel=" - smpeg$secondaryArchSupport == $portVersion base + smpeg$secondaryArchSuffix == $portVersion base "