diff --git a/sci-libs/gdal/gdal302-3.0.2.recipe b/sci-libs/gdal/gdal302-3.0.2.recipe index 5fa0ce9e8..7d16215e2 100644 --- a/sci-libs/gdal/gdal302-3.0.2.recipe +++ b/sci-libs/gdal/gdal302-3.0.2.recipe @@ -122,6 +122,7 @@ REVISION="6" SOURCE_URI="https://download.osgeo.org/gdal/$portVersion/gdal-$portVersion.tar.xz" CHECKSUM_SHA256="c3765371ce391715c8f28bd6defbc70b57aa43341f6e94605f04fe3c92468983" SOURCE_DIR="gdal-$portVersion" +PATCHES="gdal302-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -137,7 +138,7 @@ libVersion=26.0.2 libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - gdal$secondaryArchSuffix = $portVersion + gdal302$secondaryArchSuffix = $portVersion lib:libgdal$secondaryArchSuffix = $libVersionCompat cmd:gdal_contour cmd:gdal_grid @@ -167,6 +168,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libarmadillo$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libgeotiff$secondaryArchSuffix lib:libgif$secondaryArchSuffix @@ -185,29 +187,32 @@ REQUIRES=" " PROVIDES_devel=" - gdal${secondaryArchSuffix}_devel = $portVersion + gdal302${secondaryArchSuffix}_devel = $portVersion cmd:gdal_config devel:libgdal$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - gdal$secondaryArchSuffix == $portVersion base + gdal302$secondaryArchSuffix == $portVersion base + " +CONFLICTS_devel=" + gdal${secondaryArchSuffix}_devel " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libarmadillo$secondaryArchSuffix devel:libexpat$secondaryArchSuffix - devel:libgeotiff$secondaryArchSuffix >= 5 - devel:libgif$secondaryArchSuffix >= 7.0.0 + devel:libgeotiff$secondaryArchSuffix + devel:libgif$secondaryArchSuffix devel:libhdf5$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libnetcdf$secondaryArchSuffix devel:libpng16$secondaryArchSuffix - devel:libproj$secondaryArchSuffix >= 15 + devel:libproj$secondaryArchSuffix devel:libssl$secondaryArchSuffix - devel:libtiff$secondaryArchSuffix >= 5 - devel:libwebp$secondaryArchSuffix >= 7 + devel:libtiff$secondaryArchSuffix + devel:libwebp$secondaryArchSuffix devel:libxml2$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libzstd$secondaryArchSuffix @@ -223,16 +228,19 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage gdal$secondaryArchSuffix \ +defineDebugInfoPackage gdal302$secondaryArchSuffix \ $libDir/libgdal.so.$libVersion BUILD() { export LDFLAGS="-lnetwork" + touch config.rpath + export CXXFLAGS="-fpermissive" expatDir=$portPackageLinksDir/lib~libexpat autoreconf -fi runConfigure --omit-dirs binDir ./configure \ --bindir=$commandBinDir \ + --disable-static \ --with-expat=$expatDir make $jobArgs } diff --git a/sci-libs/gdal/patches/gdal302-3.0.2.patchset b/sci-libs/gdal/patches/gdal302-3.0.2.patchset new file mode 100644 index 000000000..83e0372ae --- /dev/null +++ b/sci-libs/gdal/patches/gdal302-3.0.2.patchset @@ -0,0 +1,21 @@ +From 983af9e5699e904dde29941818cb3a0b70fe15d7 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Thu, 4 May 2023 08:59:27 +0200 +Subject: build fix + + +diff --git a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp +index 5517c3b..9d9eeb7 100644 +--- a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp ++++ b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include + #include + +-- +2.37.3 +