diff --git a/net-libs/libupnp/libupnp-1.14.12.recipe b/net-libs/libupnp/libupnp-1.14.12.recipe index 0c25ac10c..da62b764e 100644 --- a/net-libs/libupnp/libupnp-1.14.12.recipe +++ b/net-libs/libupnp/libupnp-1.14.12.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2000-2003 Intel Corporation 2005-2006 Rémi Turboult 2006 Michel Pfeiffer and others" LICENSE="BSD (3-clause)" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/pupnp/pupnp/archive/release-$portVersion.tar.gz" CHECKSUM_SHA256="6a7f26818d5aa3949bc2e68739387a261c564430ba612f793c61d31619dde1e4" SOURCE_DIR="pupnp-release-$portVersion" @@ -18,10 +18,15 @@ PATCHES="libupnp-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +libIxmlVersion="11.1.2" +libIxmlVersionCompat="$libIxmlVersion compat >= ${libIxmlVersion%%.*}" +libUpnpVersion="17.1.3" +libUpnpVersionCompat="$libUpnpVersion compat >= ${libUpnpVersion%%.*}" + PROVIDES=" libupnp$secondaryArchSuffix = $portVersion - lib:libixml$secondaryArchSuffix = 11.0.0 compat >= 11 - lib:libupnp$secondaryArchSuffix = 17.0.0 compat >= 17 + lib:libixml$secondaryArchSuffix = $libIxmlVersionCompat + lib:libupnp$secondaryArchSuffix = $libUpnpVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -29,8 +34,8 @@ REQUIRES=" PROVIDES_devel=" libupnp${secondaryArchSuffix}_devel = $portVersion - devel:libixml$secondaryArchSuffix = 11.0.0 compat >= 11 - devel:libupnp$secondaryArchSuffix = 17.0.0 compat >= 17 + devel:libixml$secondaryArchSuffix = $libIxmlVersionCompat + devel:libupnp$secondaryArchSuffix = $libUpnpVersionCompat " REQUIRES_devel=" libupnp$secondaryArchSuffix == $portVersion base @@ -52,7 +57,7 @@ BUILD_PREREQUIRES=" BUILD() { autoreconf -fi - runConfigure ./configure + runConfigure ./configure --disable-static make } diff --git a/net-libs/libupnp/libupnp15-1.10.1.recipe b/net-libs/libupnp/libupnp15-1.10.1.recipe index 7f412ffe3..a2a93b892 100644 --- a/net-libs/libupnp/libupnp15-1.10.1.recipe +++ b/net-libs/libupnp/libupnp15-1.10.1.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2000-2003 Intel Corporation 2005-2006 Rémi Turboult 2006 Michel Pfeiffer and others" LICENSE="BSD (3-clause)" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/pupnp/pupnp/archive/release-$portVersion.tar.gz" CHECKSUM_SHA256="de04f501ccae0f776c5a3b6878ef26b84631bc1c10183822794508d912cd9e53" SOURCE_DIR="pupnp-release-$portVersion" @@ -18,9 +18,12 @@ PATCHES="libupnp-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +libVersion="15.0.1" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" libupnp15$secondaryArchSuffix = $portVersion - lib:libupnp$secondaryArchSuffix = 15.0.1 compat >= 15 + lib:libupnp$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -43,7 +46,7 @@ BUILD_PREREQUIRES=" BUILD() { autoreconf -fi - runConfigure ./configure + runConfigure ./configure --disable-static make } @@ -55,7 +58,7 @@ INSTALL() rm -f $libDir/libixml* # prepare development lib links - prepareInstalledDevelLibs libupnp + prepareInstalledDevelLib libupnp fixPkgconfig # devel package