diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.6.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.7.recipe similarity index 53% rename from media-libs/libsvgtiny/libsvgtiny-0.1.6.recipe rename to media-libs/libsvgtiny/libsvgtiny-0.1.7.recipe index 64ece8052..e7a2ae004 100644 --- a/media-libs/libsvgtiny/libsvgtiny-0.1.6.recipe +++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7.recipe @@ -5,23 +5,32 @@ library does not do the actual rendering." HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny/" COPYRIGHT="2003-2017 The NetSurf Developers" LICENSE="MIT" -REVISION="2" -SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz" -CHECKSUM_SHA256="062ae047608dd04e4c3d8bc423a743c436131f3b06b8f5649e3e887ab2f0f78a" +REVISION="1" +SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz" +CHECKSUM_SHA256="2c0dcf952f1cd882c3e95401ef9459f16dbb53c5d3e4512339b2f9eb769d7781" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" libsvgtiny$secondaryArchSuffix = $portVersion + lib:libsvgtiny$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix + lib:libdom$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libhubbub$secondaryArchSuffix + lib:libparserutils$secondaryArchSuffix + lib:libwapcaplet$secondaryArchSuffix " PROVIDES_devel=" libsvgtiny${secondaryArchSuffix}_devel = $portVersion - devel:libsvgtiny$secondaryArchSuffix = $portVersion + devel:libsvgtiny$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" libsvgtiny$secondaryArchSuffix == $portVersion base @@ -30,12 +39,13 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libdom$secondaryArchSuffix + devel:libexpat$secondaryArchSuffix devel:libhubbub$secondaryArchSuffix devel:libparserutils$secondaryArchSuffix devel:libwapcaplet$secondaryArchSuffix " BUILD_PREREQUIRES=" - netsurf_buildsystem >= 1.6 + netsurf_buildsystem cmd:gcc$secondaryArchSuffix cmd:gperf cmd:make @@ -44,14 +54,20 @@ BUILD_PREREQUIRES=" BUILD() { - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ - INCLUDEDIR=$relativeIncludeDir + for linkage in lib-static lib-shared; do + make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \ + COMPONENT_TYPE=$linkage + done } INSTALL() { - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ - INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir install + for linkage in lib-static lib-shared; do + make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \ + INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir \ + COMPONENT_TYPE=$linkage \ + install + done prepareInstalledDevelLib libsvgtiny fixPkgconfig