From c555fefb10e0770d2f73373c61e7f48066c4b6db103322ecfaef31c2c615d105 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 5 Dec 2015 16:30:21 +0000 Subject: [PATCH] Accepting request 347578 from home:pluskalm:branches:Application:Geo - Enable opencl and freexl support - Update dependencies OBS-URL: https://build.opensuse.org/request/show/347578 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=21 --- gdal.changes | 6 ++++++ gdal.spec | 13 +++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gdal.changes b/gdal.changes index 937a9f8..c6a97b0 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 5 16:05:16 UTC 2015 - mpluskal@suse.com + +- Enable opencl and freexl support +- Update dependencies + ------------------------------------------------------------------- Fri Sep 25 11:29:38 UTC 2015 - ecsos@opensuse.org diff --git a/gdal.spec b/gdal.spec index 44a3765..6f4acef 100644 --- a/gdal.spec +++ b/gdal.spec @@ -53,6 +53,7 @@ BuildRequires: libspatialite-devel BuildRequires: libtiff-devel >= 3.6.0 BuildRequires: libtool BuildRequires: libxerces-c-devel +BuildRequires: libxml2-devel BuildRequires: netcdf-devel BuildRequires: openjpeg2-devel BuildRequires: poppler-devel @@ -71,10 +72,14 @@ BuildRequires: libecwj2-devel %if 0%{?suse_version} >= 1310 BuildRequires: autoconf BuildRequires: automake +BuildRequires: freexl-devel BuildRequires: hdf5-devel %endif -%if 0%{?suse_version} > 1310 && 0%{?suse_version} != 1315 +%if 0%{?suse_version} > 1320 +BuildRequires: libjson-c-devel BuildRequires: libwebp-devel +BuildRequires: ocl-icd-devel +BuildRequires: opencl-headers BuildRequires: perl-ExtUtils-MakeMaker %else BuildRequires: hdf-devel >= 4.0 @@ -160,7 +165,7 @@ rm -r man %build # need to regenerate (old one does not accpet CFLAGS) %if 0%{?suse_version} >= 1310 -autoreconf -fi +autoreconf -fiv %endif %configure \ @@ -196,6 +201,7 @@ autoreconf -fi --with-python \ --with-perl \ --with-mysql \ + --with-freexl \ --with-xerces=yes \ --with-xerces-lib="-lxerces-c" \ --with-xerces-inc=%{_includedir}/xercesc \ @@ -203,6 +209,9 @@ autoreconf -fi --with-ecw \ CFLAGS="$CFLAGS -pthread" \ %endif +%if 0%{?suse_version} > 1320 + --with-opencl \ +%endif %if 0%{?suse_version} > 1310 --without-hdf4 \ --with-hdf5 \