This commit is contained in:
Ertuğrul Erata
2016-02-25 15:08:15 +02:00
parent 055130ed39
commit 6b551b5bff
20 changed files with 1068 additions and 13 deletions
+13 -3
View File
@@ -11,8 +11,8 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import perlmodules
def setup():
autotools.autoreconf("-vfi")
autotools.aclocal()
# autotools.autoreconf("-vfi")
# autotools.aclocal()
pisitools.cflags.add("-fno-strict-aliasing")
autotools.configure("--disable-static \
@@ -63,9 +63,16 @@ def setup():
--without-epsilon \
--without-idb \
--without-sde \
--mandir=/usr/share/man \
--without-ruby")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
#for bug 13646
#pisitools.dosed("GDALmake.opt", "PY_HAVE_SETUPTOOLS=1 ", "PY_HAVE_SETUPTOOLS= ")
#pisitools.dosed("apps/GNUmakefile", "EXE_DEP_LIBS ", "KILL_EXE_DEP_LIBS ")
def build():
autotools.make()
@@ -73,6 +80,9 @@ def build():
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
#remove egg
pisitools.removeDir("/usr/lib/python2.7/site-packages/GDAL-*")
# pisitools.removeDir("/usr/lib/python2.7/site-packages/GDAL-*")
pisitools.domove("/usr/man/man3/*", "/usr/share/man/man3")
pisitools.removeDir("/usr/man/")
perlmodules.removePodfiles()
@@ -0,0 +1,10 @@
--- swig/python/GNUmakefile.orig 2015-06-14 21:06:33.000000000 +0200
+++ swig/python/GNUmakefile 2015-06-27 22:02:07.805035411 +0200
@@ -70,5 +70,5 @@
ifeq ($(PY_HAVE_SETUPTOOLS),1)
- $(PYTHON) setup.py install
+ $(PYTHON) setup.py install --root=$(DESTDIR)
else
- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
endif
+44 -9
View File
@@ -18,27 +18,30 @@
<!--Dependency>perl-ExtUtils-MakeMaker</Dependency-->
<Dependency>geos-devel</Dependency>
<Dependency>hdf5-devel</Dependency>
<!--Dependency>ogdi-devel</Dependency-->
<Dependency>ogdi-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>giflib-devel</Dependency>
<Dependency>jasper-devel</Dependency>
<!--Dependency>netcdf-devel</Dependency-->
<Dependency>netcdf-devel</Dependency>
<Dependency>podofo-devel</Dependency>
<Dependency>cfitsio-devel</Dependency>
<Dependency>unixODBC-devel</Dependency>
<Dependency>xerces-c-devel</Dependency>
<!--Dependency>libfreexl-devel</Dependency>
<Dependency>libgeotiff-devel</Dependency-->
<Dependency>libfreexl-devel</Dependency>
<Dependency>libgeotiff-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>postgresql-lib</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>expat-devel</Dependency>
<Dependency>curl-devel</Dependency>
<Dependency>sqlite-devel</Dependency>
<Dependency>libpcre-devel</Dependency>
<!--Dependency>poppler-devel</Dependency-->
<Dependency>libxml2-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>gdal-1.5.1-python-install.patch</Patch>
<Patch>gdal-1.6.0-swig-fix.patch</Patch>
<Patch>gdal-sqlite-3.8.7.patch</Patch>
<!--<Patch>libtool.patch</Patch>
<Patch>fix-extra-libs.patch</Patch>-->
<Patch>gdal-python-install.patch</Patch>
</Patches>
</Source>
@@ -61,6 +64,14 @@
<Dependency>libgeotiff</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>postgresql-lib</Dependency>
<Dependency>curl</Dependency>
<Dependency>zlib</Dependency>
<Dependency>expat</Dependency>
<Dependency>libpcre</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libpng</Dependency>
<Dependency>sqlite</Dependency>
<Dependency>libxml2</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -75,6 +86,8 @@
<RuntimeDependencies>
<Dependency release="current">gdal</Dependency>
<Dependency>python-numpy</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>python</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/lib/python2.7</Path>
@@ -86,6 +99,28 @@
<Summary>Development files for gdal</Summary>
<RuntimeDependencies>
<Dependency release="current">gdal</Dependency>
<Dependency>geos-devel</Dependency>
<Dependency>hdf5-devel</Dependency>
<Dependency>ogdi-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>giflib-devel</Dependency>
<Dependency>jasper-devel</Dependency>
<Dependency>netcdf-devel</Dependency>
<Dependency>podofo-devel</Dependency>
<Dependency>cfitsio-devel</Dependency>
<Dependency>unixODBC-devel</Dependency>
<Dependency>xerces-c-devel</Dependency>
<Dependency>libfreexl-devel</Dependency>
<Dependency>libgeotiff-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>postgresql-lib</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>expat-devel</Dependency>
<Dependency>curl-devel</Dependency>
<Dependency>sqlite-devel</Dependency>
<Dependency>libpcre-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
+2 -1
View File
@@ -27,7 +27,6 @@
<Package>
<Name>geos</Name>
<RuntimeDependencies>
<Dependency>ruby</Dependency>
<Dependency>python</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
@@ -43,6 +42,8 @@
<Summary>Development files for geos</Summary>
<RuntimeDependencies>
<Dependency release="current">geos</Dependency>
<Dependency>ruby-devel</Dependency>
<Dependency>python-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
+23
View File
@@ -0,0 +1,23 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import get
from pisi.actionsapi import pisitools
def setup():
pisitools.ldflags.add("-lm")
autotools.autoreconf("-vif")
autotools.configure("--enable-gcov=no \
--disable-static")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README")
+76
View File
@@ -0,0 +1,76 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libfreexl</Name>
<Homepage>https://www.gaia-gis.it/fossil/freexl/index</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<PartOf>science.gis</PartOf>
<IsA>library</IsA>
<Summary>Library to extract valid data from within an Excel (.xls) spreadsheet</Summary>
<Description>FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet.</Description>
<Archive sha1sum="9878a2dfb23ba00be34605557ac454539411071d" type="targz">http://www.gaia-gis.it/gaia-sins/freexl-1.0.2.tar.gz</Archive>
</Source>
<Package>
<Name>libfreexl</Name>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc/*</Path>
</Files>
</Package>
<Package>
<Name>libfreexl-devel</Name>
<Summary>Development files for libfreexl</Summary>
<Files>
<Path fileType="header">/usr/include/*</Path>
<Path fileType="library">/usr/lib/pkgconfig/freexl.pc</Path>
<Path fileType="library">/usr/lib/libfreexl.so</Path>
</Files>
<RuntimeDependencies>
<Dependency release="current">libfreexl</Dependency>
</RuntimeDependencies>
</Package>
<History>
<Update release="5">
<Date>2016-02-25</Date>
<Version>1.0.2</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2015-01-29</Date>
<Version>1.0.0h</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2014-05-31</Date>
<Version>1.0.0g</Version>
<Comment>Version bump.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-10-08</Date>
<Version>1.0.0f</Version>
<Comment>Version bump</Comment>
<Name>Richard de Bruin</Name>
<Email>richdb@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2013-03-11</Date>
<Version>1.0.0d</Version>
<Comment>First release</Comment>
<Name>Richard de Bruin</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
+25
View File
@@ -0,0 +1,25 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
autotools.configure("--disable-static \
--with-jpeg \
--with-libtiff=/usr/include \
--with-proj \
--with-zip")
def build():
autotools.make("-j1")
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("README", "LICENSE")
+87
View File
@@ -0,0 +1,87 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libgeotiff</Name>
<Homepage>http://geotiff.osgeo.org</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>as-is</License>
<IsA>library</IsA>
<Summary>Library for reading TIFF files with embedded tags</Summary>
<Description>Library for reading TIFF files with embedded tags for geographic (cartographic) information.</Description>
<Archive sha1sum="bc9e2bb43f3877b795b4b191e7aec6267f4a1c7e" type="targz">http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>proj-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>doxygen</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>libgeotiff</Name>
<RuntimeDependencies>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>proj</Dependency>
<Dependency>tiff</Dependency>
<Dependency>zlib</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share/epsg_csv</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<Package>
<Name>libgeotiff-devel</Name>
<Summary>Development files for libgeotiff</Summary>
<RuntimeDependencies>
<Dependency release="current">libgeotiff</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>proj-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>zlib-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
</Files>
</Package>
<History>
<Update release="4">
<Date>2015-01-29</Date>
<Version>1.4.1</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2014-05-31</Date>
<Version>1.4.0</Version>
<Comment>Rebuild.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2014-01-30</Date>
<Version>1.4.0</Version>
<Comment>Rebuild</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-11-10</Date>
<Version>1.4.0</Version>
<Comment>First release</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
</History>
</PISI>
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>libgeotiff</Name>
<Summary xml:lan="tr">Gömülü etiket içeren TIFF dosyalarını okumak için kütüphane</Summary>
<Summary xml:lan="pl">Biblioteka GeoTIFF</Summary>
<Description xml:lang="tr">Coğrafik bilgi için gömülü etikletler içeren TIFF dosyalarını okumaya yarayan bir kütüphane.</Description>
<Description xml:lang="pl">Ta biblioteka pozwala na odczytywanie i analizowanie znaczników „GeoTIFF”, a także definiowanie i zapisywanie znaczników w nowych plikach.</Description>
</Source>
<Package>
<Name>libgeotiff-devel</Name>
<Summary xml:lang="tr">libgeotiff için geliştirme dosyaları</Summary>
<Summary xml:lang="pl">Pliki naglowkowe do libgeotiff</Summary>
</Package>
</PISI>
+23
View File
@@ -0,0 +1,23 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import get
from pisi.actionsapi import pisitools
def setup():
autotools.configure("--disable-static \
--disable-geosadvanced")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("AUTHORS", "COPYING", "README", "README.coverage")
# By PiSiDo 2.0.0
+106
View File
@@ -0,0 +1,106 @@
?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libspatialite</Name>
<Homepage>https://www.gaia-gis.it/fossil/libspatialite/index</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>MPL-1.0</License>
<PartOf>science.gis</PartOf>
<IsA>library</IsA>
<Summary>SQLite extension to support spatial data types and operations</Summary>
<Description>SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.</Description>
<Archive sha1sum="698bf70bec669ddcbf1b0cc48f40c2e03776bffc" type="targz">http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.2.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>geos-devel</Dependency>
<Dependency>libfreexl-devel</Dependency>
<Dependency>proj-devel</Dependency>
<Dependency>sqlite-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>libspatialite</Name>
<RuntimeDependencies>
<Dependency>geos</Dependency>
<Dependency>libfreexl</Dependency>
<Dependency>proj</Dependency>
<Dependency>sqlite</Dependency>
<Dependency>zlib</Dependency>
<Dependency>libxml2</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc/*</Path>
</Files>
</Package>
<Package>
<Name>libspatialite-devel</Name>
<Summary>Development files for libspatialite</Summary>
<RuntimeDependencies>
<Dependency release="current">libspatialite</Dependency>
<Dependency>geos-devel</Dependency>
<Dependency>libfreexl-devel</Dependency>
<Dependency>proj-devel</Dependency>
<Dependency>sqlite-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/*</Path>
<Path fileType="library">/usr/lib/pkgconfig/*</Path>
<Path fileType="library">/usr/lib/libspatialite.so</Path>
</Files>
</Package>
<History>
<Update release="6">
<Date>2015-01-29</Date>
<Version>4.2.0</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2014-06-14</Date>
<Version>4.1.1</Version>
<Comment>Rebuild for gcc</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2014-02-20</Date>
<Version>4.1.1</Version>
<Comment>Rebuild Unused</Comment>
<Name>Varol Maksutoğlu</Name>
<Email>waroi@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-10-08</Date>
<Version>4.1.1</Version>
<Comment>Version Bump</Comment>
<Name>Richard de Bruin</Name>
<Email>richdb@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-06-08</Date>
<Version>4.1.0</Version>
<Comment>V.Bump</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2013-03-10</Date>
<Version>4.0.0</Version>
<Comment>First release</Comment>
<Name>Richard de Bruin</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>libspatialite</Name>
<Summary xml:lang="en">SQLite extension to support spatial data types and operations</Summary>
<Description xml:lang="en">SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.</Description>
</Source>
<Package>
<Name>libspatialite-devel</Name>
<Summary xml:lang="tr">libspatialite için geliştirme dosyaları</Summary>
</Package>
</PISI>
+39
View File
@@ -0,0 +1,39 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import shelltools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
WorkDir = "ogdi-3.2.0.beta2"
shelltools.export("TOPDIR", "%s/%s" % (get.workDIR(), WorkDir))
def setup():
autotools.configure('--with-zlib \
--with-projlib="-L/usr/lib -lproj" \
--with-expat \
--with-binconfigs')
def build():
shelltools.export("TARGET", "Linux")
shelltools.export("CFG", "release")
autotools.make("-j1")
def install():
pisitools.dolib_so("bin/Linux/*.so")
pisitools.dosym("/usr/lib/libogdi.so", "/usr/lib/libogdi.so.3")
for i in ["gltpd", "ogdi_import", "ogdi_info"]:
pisitools.dobin("bin/Linux/%s" % i)
pisitools.dobin("ogdi-config")
pisitools.insinto("/usr/lib/pkgconfig", "ogdi.pc")
pisitools.insinto("/usr/include", "ogdi/include/*.h")
pisitools.dodoc("ChangeLog", "NEWS", "README")
@@ -0,0 +1,38 @@
diff --git a/config/generic.mak.in b/config/generic.mak.in
index 1cb74f5..2e9cabe 100644
--- a/config/generic.mak.in
+++ b/config/generic.mak.in
@@ -35,16 +35,16 @@ AR = ar cr
# Compilation and linking flags
#
SHLIB_CFLAGS = @C_PIC@
-COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1
+COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@
-SHLIB_LDFLAGS = -shared
-COMMON_LDFLAGS = $(OPTIMIZATION)
+SHLIB_LDFLAGS = -shared -Wl,-soname,$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR)
+COMMON_LDFLAGS = $(OPTIMIZATION) $(LDFLAGS)
RPC_INCLUDES = @RPC_INCLUDES@
UCB_STATICLIB =
-TCL_INCLUDE = -I/usr/include/tcl8.3
+TCL_INCLUDE = -I${prefix}/include
TCL_LINKLIB =
#
diff --git a/config/unix.mak b/config/unix.mak
index e3af578..927b0fc 100644
--- a/config/unix.mak
+++ b/config/unix.mak
@@ -55,7 +55,7 @@ LINK_SW = -L
ifeq ($(CFG),debug)
OPTIMIZATION = -g
else
-OPTIMIZATION = -O
+OPTIMIZATION =
endif
#
@@ -0,0 +1,298 @@
Index: ogdi-dfsg/configure
===================================================================
--- ogdi-dfsg.orig/configure
+++ ogdi-dfsg/configure
@@ -3939,7 +3939,7 @@
fi
-for ac_header in projects.h
+for ac_header in proj_api.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -4085,8 +4085,8 @@
{ (exit 1); exit 1; }; }
fi
if test "$ac_cv_header_projects_h" = no ; then
- { { echo "$as_me:$LINENO: error: Unable to find external PROJ.4 projects.h file, give path or use default internal library." >&5
-echo "$as_me: error: Unable to find external PROJ.4 projects.h file, give path or use default internal library." >&2;}
+ { { echo "$as_me:$LINENO: error: Unable to find external PROJ.4 proj_api.h file, give path or use default internal library." >&5
+echo "$as_me: error: Unable to find external PROJ.4 proj_api.h file, give path or use default internal library." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4095,12 +4095,12 @@
elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
- if test -r $with_proj/include/projects.h ; then
- echo "checking for $with_proj/include/projects.h ... found"
+ if test -r $with_proj/include/proj_api.h ; then
+ echo "checking for $with_proj/include/proj_api.h ... found"
PROJ_INCLUDE=-I$with_proj/include
else
- { { echo "$as_me:$LINENO: error: Unable to find $with_proj/include/projects.h" >&5
-echo "$as_me: error: Unable to find $with_proj/include/projects.h" >&2;}
+ { { echo "$as_me:$LINENO: error: Unable to find $with_proj/include/proj_api.h" >&5
+echo "$as_me: error: Unable to find $with_proj/include/proj_api.h" >&2;}
{ (exit 1); exit 1; }; }
fi
Index: ogdi-dfsg/configure.in
===================================================================
--- ogdi-dfsg.orig/configure.in
+++ ogdi-dfsg/configure.in
@@ -81,13 +81,13 @@
if test "$with_proj" = "yes" ; then
AC_CHECK_LIB(proj,pj_init,PROJ_SETTING=external,PROJ_SETTING=missing,)
- AC_CHECK_HEADERS(projects.h)
+ AC_CHECK_HEADERS(proj_api.h)
if test $PROJ_SETTING = missing ; then
AC_MSG_ERROR([Unable to find external PROJ.4 library, give path or use default internal library.])
fi
if test "$ac_cv_header_projects_h" = no ; then
- AC_MSG_ERROR([Unable to find external PROJ.4 projects.h file, give path or use default internal library.])
+ AC_MSG_ERROR([Unable to find external PROJ.4 proj_api.h file, give path or use default internal library.])
fi
PROJ_SETTING=external
@@ -95,11 +95,11 @@
elif test "$with_proj" != "no" -a "$with_proj" != "" ; then
- if test -r $with_proj/include/projects.h ; then
- echo "checking for $with_proj/include/projects.h ... found"
+ if test -r $with_proj/include/projapi.h ; then
+ echo "checking for $with_proj/include/proj_api.h ... found"
PROJ_INCLUDE=-I$with_proj/include
else
- AC_MSG_ERROR([Unable to find $with_proj/include/projects.h])
+ AC_MSG_ERROR([Unable to find $with_proj/include/proj_api.h])
fi
if test -r $with_proj/lib/libproj.so ; then
Index: ogdi-dfsg/ogdi/c-api/client.c
===================================================================
--- ogdi-dfsg.orig/ogdi/c-api/client.c
+++ ogdi-dfsg/ogdi/c-api/client.c
@@ -1576,7 +1576,7 @@
char *error_message;
ecs_CtlPoints *cpts;
ecs_Result *res;
- PJ *tempproj;
+ projPJ tempproj;
if (multiblock != 0) {
res = &cln_dummy_result;
@@ -1598,7 +1598,7 @@
/* Check if the projection is valid */
if (strncmp(projection,PROJ_LONGLAT,13) != 0) {
- tempproj = (PJ *) cln_ProjInit(projection);
+ tempproj = (projPJ) cln_ProjInit(projection);
if(tempproj == NULL) {
res = &cln_dummy_result;
ecs_SetError(res,1,"This projection string is invalid");
@@ -1775,7 +1775,7 @@
ecs_Result *res;
register ecs_Client *cln;
char *server_proj;
- PJ *oldtarget,*oldsource;
+ projPJ oldtarget,oldsource;
ecs_Region oldreg;
int oldisprojequal;
int oldisTargetLL;
@@ -1874,7 +1874,7 @@
if (strncmp(projection,PROJ_LONGLAT,13) != 0) {
cln->isTargetLL = FALSE;
- cln->target = (PJ *) cln_ProjInit(projection);
+ cln->target = (projPJ) cln_ProjInit(projection);
if(cln->target == NULL) {
goto setprojerror;
}
@@ -1920,7 +1920,7 @@
if (strncmp(server_proj,PROJ_LONGLAT,13) != 0) {
cln->isSourceLL = FALSE;
- cln->source = (PJ *) cln_ProjInit(server_proj);
+ cln->source = (projPJ) cln_ProjInit(server_proj);
if(cln->source == NULL) {
goto setprojerror;
}
@@ -2328,13 +2328,13 @@
* char *d: Projection name
*
* OUT
- * return PJ *: New projection structure. If NULL, the operation
+ * return projPJ: New projection structure. If NULL, the operation
* is a failure.
*
*----------------------------------------------------------------------
*/
-PJ *cln_ProjInit(d)
+projPJ cln_ProjInit(d)
char *d;
{
int i,n;
@@ -2343,7 +2343,7 @@
char *l;
int longueur;
char *c;
- PJ *retour;
+ projPJ retour;
if ((c = (char *) malloc(strlen(d)+3)) == NULL) {
return NULL;
@@ -2378,7 +2378,7 @@
n++;
}
- retour = (PJ *) pj_init(n, (char **) tableau);
+ retour = (projPJ) pj_init(n, (char **) tableau);
free(c);
free(tableau);
Index: ogdi-dfsg/ogdi/c-api/ecsgeo.c
===================================================================
--- ogdi-dfsg.orig/ogdi/c-api/ecsgeo.c
+++ ogdi-dfsg/ogdi/c-api/ecsgeo.c
@@ -310,7 +310,7 @@
char *projection;
double X1,Y1,X2,Y2;
{
- PJ *proj;
+ projPJ proj;
char **argv;
int argc;
double lon1,lat1,lon2,lat2;
Index: ogdi-dfsg/ogdi/datum_driver/usa/dtusa.c
===================================================================
--- ogdi-dfsg.orig/ogdi/datum_driver/usa/dtusa.c
+++ ogdi-dfsg/ogdi/datum_driver/usa/dtusa.c
@@ -26,7 +26,12 @@
********************************************************************/
#include "ecs.h"
-#include "projects.h"
+#include "proj_api.h"
+
+/* Definition from Proj.4 */
+projUV nad_cvt(projUV, int, struct CTABLE *);
+struct CTABLE *nad_init(projCtx ctx, char *);
+void nad_free(struct CTABLE *);
typedef struct {
struct CTABLE *dtptr;
@@ -124,7 +129,7 @@
strcat(pathfile,"/");
strcat(pathfile,table);
- ptr->dtptr = nad_init(pathfile);
+ ptr->dtptr = nad_init(pj_get_default_ctx(), pathfile);
if (ptr->dtptr == NULL) {
ptr->count--;
return FALSE;
Index: ogdi-dfsg/ogdi/include/ecs_util.h
===================================================================
--- ogdi-dfsg.orig/ogdi/include/ecs_util.h
+++ ogdi-dfsg/ogdi/include/ecs_util.h
@@ -105,12 +105,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "projects.h"
-
-/* Ensure we are compatible with PROJ.4.4.x and PROJ.4.3.x */
-#ifndef USE_PROJUV
-# define projUV UV
-#endif
+#include "proj_api.h"
#include "ecs.h"
@@ -1054,8 +1049,8 @@
ecs_Family currentSelectionFamily: Current layer selection type
char *tclprocname: attribute callback procedure for tcl
char *target_proj: Projection descriptor
- PJ *target: target (c interface) projection descriptors
- PJ *source: source (driver) projection descriptors
+ projPJ target: target (c interface) projection descriptors
+ projPJ source: source (driver) projection descriptors
ecs_Datum targetdatum: target datum information
ecs_Datum sourcedatum: source datum information
void *dthandle: Handle to the datum driver
@@ -1092,8 +1088,8 @@
ecs_Family currentSelectionFamily; /* Current layer selection type */
char *tclprocname; /* attribute callback procedure for tcl */
char *target_proj;
- PJ *target; /* source and target projection descriptors */
- PJ *source;
+ projPJ target; /* source and target projection descriptors */
+ projPJ source;
int isSourceLL; /* flags to avoid unnecessary computation */
int isTargetLL;
int isProjEqual;
@@ -1165,7 +1161,7 @@
/* Projection conversion functions */
-PJ *cln_ProjInit _ANSI_ARGS_((char *d));
+projPJ cln_ProjInit _ANSI_ARGS_((char *d));
int cln_CompareProjections _ANSI_ARGS_((int ClientID));
int cln_UpdateMaxRegion _ANSI_ARGS_((int ClientID, double x, double y, ecs_Region *gr, int sens, int first));
int cln_ConvRegion _ANSI_ARGS_((int ClientID, ecs_Region *gr, int sens));
Index: ogdi-dfsg/contrib/ogdi_import/ogdi_import.c
===================================================================
--- ogdi-dfsg.orig/contrib/ogdi_import/ogdi_import.c
+++ ogdi-dfsg/contrib/ogdi_import/ogdi_import.c
@@ -63,12 +63,7 @@
#include "ecs.h"
#include "shapefil.h"
#include <assert.h>
-#include "projects.h"
-
-#ifndef PJ_VERSION
-#define projPJ PJ*
-#define projUV UV
-#endif
+#include "proj_api.h"
static int ClientID = -1;
static int bNoDict = FALSE;
Index: ogdi-dfsg/contrib/ogdi_info/ogdi_info.c
===================================================================
--- ogdi-dfsg.orig/contrib/ogdi_info/ogdi_info.c
+++ ogdi-dfsg/contrib/ogdi_info/ogdi_info.c
@@ -63,7 +63,7 @@
*/
#include "ecs.h"
-#include "projects.h"
+#include "proj_api.h"
static int ClientID = -1;
static int bNoDict = FALSE;
@@ -214,7 +214,7 @@
/* DumpGlobalRegion() */
/************************************************************************/
-static int DumpGlobalRegion( ecs_Region * region, PJ * proj_defn )
+static int DumpGlobalRegion( ecs_Region * region, projPJ proj_defn )
{
ecs_Result *result;
@@ -398,7 +398,7 @@
{
ecs_Result *result;
- PJ *proj_defn = NULL;
+ projPJ proj_defn = NULL;
/* -------------------------------------------------------------------- */
/* Close old client if there is one active. */
+86
View File
@@ -0,0 +1,86 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>ogdi</Name>
<Homepage>http://ogdi.sourceforge.net</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>as-is</License>
<IsA>library</IsA>
<Summary>Open Geographical Datastore Interface, a GIS support library</Summary>
<Description>OGDI is an application programming interface (API) that uses a standardized access methods to work in conjunction with GIS software packages (the application) and various geospatial data products.</Description>
<Archive sha1sum="e3fd0c8b3fb02ef5da2cc1e76bb5c2d3cb0b51b4" type="targz">mirrors://sourceforge/ogdi/ogdi-3.2.0.beta2.tar.gz</Archive>
<BuildDependencies>
<Dependency>proj-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>expat-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">ogdi-3.1.6-fpic.patch</Patch>
<Patch level="1">patch_for_proj48_redhat.patch</Patch>
</Patches>
</Source>
<Package>
<Name>ogdi</Name>
<RuntimeDependencies>
<Dependency>proj</Dependency>
<Dependency>zlib</Dependency>
<Dependency>expat</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>ogdi-devel</Name>
<Summary>Development files for ogdi</Summary>
<RuntimeDependencies>
<Dependency release="current">ogdi</Dependency>
<Dependency>proj-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>expat-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="4">
<Date>2014-05-31</Date>
<Version>3.2.0_beta2</Version>
<Comment>Rebuild.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2014-03-09</Date>
<Version>3.2.0_beta2</Version>
<Comment>Rebuild</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-07-28</Date>
<Version>3.2.0_beta2</Version>
<Comment>Move pc files to devel pack, rebuild</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-10-13</Date>
<Version>3.2.0_beta2</Version>
<Comment>First release</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
</History>
</PISI>
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>ogdi</Name>
<Summary xml:lan="tr">Açık coğrafik veri kayıt arayüzü, GIS destek kütüphanesi</Summary>
<Description xml:lang="tr">OGDI, GIS yazılım paketleri ve çeşitli mekansal/coğrafik veri ürünleriyle çalışabilecek standart erişim metodları içeren açık bir uygulama geliştirme arayüzüdür.</Description>
</Source>
<Package>
<Name>ogdi-devel</Name>
<Summary xml:lang="tr">ogdi için geliştirme dosyaları</Summary>
</Package>
</PISI>
+37
View File
@@ -0,0 +1,37 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
shelltools.export("CPPFLAGS", "-DNDEBUG -fPIC")
shelltools.export("FC", "gfortran")
shelltools.export("F90", "gfortran")
shelltools.export("FFLAGS", "-fPIC %s" % get.CFLAGS())
shelltools.export("FCFLAGS", "-fPIC %s" % get.CFLAGS())
shelltools.export("F90FLAGS", "-fPIC %s" % get.CFLAGS())
autotools.configure("--enable-shared \
--enable-netcdf-4 \
--enable-dap-netcdf \
--disable-static \
")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build():
autotools.make()
def check():
autotools.make("-j1 check")
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
#pisitools.dodoc("README")
+101
View File
@@ -0,0 +1,101 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>netcdf</Name>
<Homepage>http://my.unidata.ucar.edu/content/software/netcdf/index.html</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>UCAR-Unidata</License>
<IsA>library</IsA>
<Summary>Scientific library and interface for array oriented data access</Summary>
<Description>netcdf (network common data form) is a set of software libraries and machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.</Description>
<Archive sha1sum="cb7de8f14ddeef5e66cbc688e0a127a405d580af" type="targz">ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.4.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>hdf5-devel</Dependency>
<Dependency>curl-devel</Dependency>
<Dependency>libgfortran</Dependency>
</BuildDependencies>
<Patches>
<!--<Patch level="1">link-with-hdf5.patch</Patch>-->
</Patches>
</Source>
<Package>
<Name>netcdf</Name>
<RuntimeDependencies>
<Dependency>hdf5</Dependency>
<Dependency>curl</Dependency>
<Dependency>libgfortran</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="info">/usr/share/info</Path>
</Files>
</Package>
<Package>
<Name>netcdf-devel</Name>
<Summary>Development files for netcdf</Summary>
<RuntimeDependencies>
<Dependency release="current">netcdf</Dependency>
<Dependency>hdf5-devel</Dependency>
<Dependency>curl-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="man">/usr/share/man/man3</Path>
</Files>
</Package>
<History>
<Update release="6">
<Date>2016-02-25</Date>
<Version>4.4.0</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="5">
<Date>2015-02-12</Date>
<Version>4.3.2</Version>
<Comment>Version bump.</Comment>
<Name>Hakan Yıldız</Name>
<Email>hknyldz93@gmail.com</Email>
</Update>
<Update release="4">
<Date>2014-05-31</Date>
<Version>4.3.1</Version>
<Comment>Rebuild.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2014-01-23</Date>
<Version>4.3.1</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-08-04</Date>
<Version>4.3.0</Version>
<Comment>Version bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-11-11</Date>
<Version>4.2.1</Version>
<Comment>First release</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,18 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>netcdf</Name>
<Summary xml:lang="tr">Dizi (array) odaklı veri erişimi için arayüz ve bilimsel kütüphane</Summary>
<Summary xml:lang="fr">Librairie scientifique et interface pour l'accès aux données orientées tableaux.</Summary>
</Source>
<Package>
<Name>netcdf-devel</Name>
<Summary xml:lang="tr">netcdf için geliştirme dosyaları</Summary>
</Package>
<Package>
<Name>netcdf-devel</Name>
<Summary xml:lang="tr">netcdf için geliştirme dosyaları</Summary>
</Package>
</PISI>