diff --git a/sci-libs/libgeotiff/libgeotiff-1.6.0.recipe b/sci-libs/libgeotiff/libgeotiff-1.7.1.recipe similarity index 65% rename from sci-libs/libgeotiff/libgeotiff-1.6.0.recipe rename to sci-libs/libgeotiff/libgeotiff-1.7.1.recipe index 81f78d5cf..b3f7f3f22 100644 --- a/sci-libs/libgeotiff/libgeotiff-1.6.0.recipe +++ b/sci-libs/libgeotiff/libgeotiff-1.7.1.recipe @@ -4,15 +4,15 @@ cartographic projections." HOMEPAGE="https://trac.osgeo.org/geotiff/" COPYRIGHT="1999-2012 Frank Warmerdam" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.osgeo.org/geotiff/libgeotiff/libgeotiff-$portVersion.tar.gz" -CHECKSUM_SHA256="9311017e5284cffb86f2c7b7a9df1fb5ebcdc61c30468fb2e6bca36e4272ebca" +CHECKSUM_SHA256="05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" portVersionCompat="$portVersion compat >= ${portVersion%%.*}" -libVersion="5.1.0" +libVersion="5.2.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" if [ "$targetArchitecture" != x86_gcc2 ]; then @@ -26,9 +26,6 @@ fi PROVIDES=" libgeotiff$secondaryArchSuffix = $portVersionCompat lib:libgeotiff$secondaryArchSuffix = $libVersionCompat - cmd:applygeo$commandSuffix = $portVersionCompat - cmd:geotifcp$commandSuffix = $portVersionCompat - cmd:listgeo$commandSuffix = $portVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -46,6 +43,21 @@ REQUIRES_devel=" libgeotiff$secondaryArchSuffix == $portVersion base " +PROVIDES_tools=" + libgeotiff${secondaryArchSuffix}_tools + cmd:applygeo$commandSuffix = $portVersionCompat + cmd:geotifcp$commandSuffix = $portVersionCompat + cmd:listgeo$commandSuffix = $portVersionCompat + " +REQUIRES_tools=" + libgeotiff$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libproj$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libjpeg$secondaryArchSuffix @@ -62,15 +74,15 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage libgeotiff$secondaryArchSuffix \ + $libDir/libgeotiff.so.$libVersion + BUILD() { - jpegDir=$portPackageLinksDir/lib~libjpeg - zlibDir=$portPackageLinksDir/lib~libz - runConfigure --omit-dirs binDir ./configure \ --bindir=$commandBinDir \ - --with-zlib=$zlibDir \ - --with-jpeg=$jpegDir + --with-jpeg \ + --with-zlib make $jobArgs } @@ -80,15 +92,38 @@ INSTALL() rm -f "$libDir"/*.la "$libDir"/libgeotiff.a +# install pkgconfig file +mkdir -p $developLibDir/pkgconfig/ +cat > $developLibDir/pkgconfig/libgeotiff.pc <