pool/gdal
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 623395 from home:Le_Docteur

Browse Source 
- Add patch to fix ECW5 detection in configure:
  * gdal-fix_ecw5_detection.patch

OBS-URL: https://build.opensuse.org/request/show/623395
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=71
This commit is contained in:
Martin Pluskal 2018-07-17 13:05:37 +00:00 committed by Git OBS Bridge
parent b0df8cec72
commit cd14aa3fe5
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gdal-fix_ecw5_detection.patch Normal file
View File

@ -0,0 +1,12 @@
diff -purN gdal-2.3.1.orig/configure.ac gdal-2.3.1/configure.ac
--- gdal-2.3.1.orig/configure.ac 2018-07-17 14:10:15.236559853 +0200
+++ gdal-2.3.1/configure.ac 2018-07-17 14:21:49.213424507 +0200
@@ -2879,7 +2879,7 @@ else
echo "#include <string>" > testnewabi.cpp
echo "namespace NCS { class CString { public: static std::wstring Utf8Decode (const std::string &sUtf8); }; }" >> testnewabi.cpp
echo "int main() { return static_cast<int>(NCS::CString::Utf8Decode(std::string()).size()); }" >> testnewabi.cpp
- if test -z "`$${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then
+ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testnewabi.cpp -L$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF -lNCSEcw -o testnewabi 2>&1`" ; then
ECW_LIBDIR=$with_ecw/$ecw_license_type/lib/newabi/$ECW_ARCH/$ECW_CONF
ECW_LIBS="-L$ECW_LIBDIR -lNCSEcw $ECW_FRAMEWORK_COCOA"
with_ecw=$with_ecw/$ecw_license_type

6
gdal.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 17 12:12:35 UTC 2018 - guillaume.gardet@opensuse.org
- Add patch to fix ECW5 detection in configure:
* gdal-fix_ecw5_detection.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 10 07:52:21 UTC 2018 - guillaume@opensuse.org Tue Jul 10 07:52:21 UTC 2018 - guillaume@opensuse.org

3
gdal.spec
View File

@ -37,6 +37,8 @@ Patch1: GDALmake.opt.in.patch
# Fix hard coded name of libproj library # Fix hard coded name of libproj library
# But libproj.so is valid if libproj-devel is installed ? # But libproj.so is valid if libproj-devel is installed ?
Patch2: gdal-libproj.patch Patch2: gdal-libproj.patch
# PATCH-FIX-UPSTREAM - gdal-fix_ecw5_detection.patch: fix ECW5 detection in configure
Patch3: gdal-fix_ecw5_detection.patch
BuildRequires: blas-devel BuildRequires: blas-devel
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: curl-devel BuildRequires: curl-devel
@ -172,6 +174,7 @@ The GDAL python modules provide support to handle multiple GIS file formats.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# Fix mandir # Fix mandir
sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure