dev-games/simgear: Build against sci-libs/gdal:3, bug 688130

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Maciej Mrozowski <reavertm@gentoo.org>

diff --git a/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch b/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch
new file mode 100644 (file)
index 0000000..6d48994
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a2f59f..5916c4c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -308,6 +308,7 @@ endif(ENABLE_RTI)
+ if(ENABLE_GDAL)
+     find_package(GDAL 2.0.0 REQUIRED)
+     if (GDAL_FOUND)
++        add_compile_definitions(USE_DEPRECATED_SRS_WKT_WGS84)
+         include_directories(${GDAL_INCLUDE_DIR})
+     endif(GDAL_FOUND)
+ endif(ENABLE_GDAL)

diff --git a/dev-games/simgear/simgear-2019.1.1.ebuild b/dev-games/simgear/simgear-2019.1.1.ebuild
index 61da9b322ade45f6ebc93b2b6428eae38b9324a7..be0ff64162676b1bc06bc1a8cd12881ec03d066d 100644 (file)
--- a/dev-games/simgear/simgear-2019.1.1.ebuild
+++ b/dev-games/simgear/simgear-2019.1.1.ebuild
@@ -33,6 +33,10 @@ RDEPEND="${COMMON_DEPEND}
        subversion? ( dev-vcs/subversion )
 "
 
+PATCHES=(
+       "${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+)
+
 pkg_pretend() {
        [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }

diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index a06b4dfb3dee1ea88c1d690a972efcd7891ea3e3..d5d560554829e0735d0ff8424b68eba57f94b972 100644 (file)
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -35,6 +35,10 @@ RDEPEND="${COMMON_DEPEND}
        subversion? ( dev-vcs/subversion )
 "
 
+PATCHES=(
+       "${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+)
+
 pkg_pretend() {
        [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }