summaryrefslogtreecommitdiff
path: root/sci-libs/ogdi
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/ogdi')
-rw-r--r--sci-libs/ogdi/Manifest8
-rw-r--r--sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch38
-rw-r--r--sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch11
-rw-r--r--sci-libs/ogdi/files/ogdi-3.2.0_beta2-endianess.patch18
-rw-r--r--sci-libs/ogdi/files/ogdi-3.2.0_beta2-proj480.patch297
-rw-r--r--sci-libs/ogdi/ogdi-3.2.0-r1.ebuild (renamed from sci-libs/ogdi/ogdi-3.2.0.ebuild)16
-rw-r--r--sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild66
7 files changed, 11 insertions, 443 deletions
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index 3b8fcfd80a24..a0edb68e45bc 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,4 +1,3 @@
-AUX ogdi-3.1.6-fpic.patch 961 BLAKE2B 6339c06958876010249514fb633186ba08eb749cc16c36ca2279f0685641b0b7a0cc2f4aa70994cfc20cba4107d05e969cb3bc2ae9627a1920557af3d292ce84 SHA512 9d5d89d907043b14f5a18b6e036a1784b657ae6dd824d03067ab3e1e4e777ad55286e9addf15c9499523d7b2fdb743d329660f64a54e5140961c567135b40579
AUX ogdi-3.2.0-acinclude.patch 508 BLAKE2B 97ab24d0f836b3da111f88455734e681f203932c98ec85319e49843575e4ed224d04f319a7fd6069c9ea6b08ece00838c82236a9425e90e9262fbe144c1d5765 SHA512 6782744a2d7ae0e2a11d6b600777e10891c4ff68f2e32d205b8e96b79dcbdde4d863a25ed263705df54e48ed1fedeffcee085ec12fc769fe53a22f7cb863441c
AUX ogdi-3.2.0-aclocal.patch 2048 BLAKE2B 91fe93c2ab1adb8d9561411a3668f093ba6922586f9401d7abbc449fea057ba6315595604eba123fa8149d608358f15d6ff1c4c2b4765c41377c2c91ddb77a57 SHA512 a63e00f5e1706169311d43e00c2baa78d017eee728dd1bafad10aa3d9f7332ecdb5bfea1b24df888dd06d9de1f09339da68ea8ed663e9f1fa97665459b2099f1
AUX ogdi-3.2.0-endianess.patch 1028 BLAKE2B 25ea3bb0991b201bbfae2597ae622e2cd0a18749d274e6553e7dcd31cd2befb15f2bea1dd073f8d6d3bac568aeafbdaac6b04b7fcb0597733a97ea926bbd9a49 SHA512 3a4ee5ee69f27fbad6170f1e3142a70ba529bd81a9b3209d1cb005a2ebf1c04f782194f20e8a046a19ec817c81ee04a9f7ab192321f8dc9590f4f8823c71d38e
@@ -7,12 +6,7 @@ AUX ogdi-3.2.0-ldflags.patch 700 BLAKE2B 6a2b494e35644dfa544ed000c4b3139b03a495e
AUX ogdi-3.2.0-optimisation.patch 247 BLAKE2B 097d0e9615352512f5322b7e11826fe4352728f020b76c4c7dcbb58c6cc9903165ac49ec442c773a97bb575271f37e88a5f22951aae507afa0483c6b512d5488 SHA512 894dd439f0599e68117a82e461e75e5e48efde1bcd165fde727339b3d5855a17fab1f721663154a8d8626e38607237d8136e41a57b6b390f061762dd317b2e3c
AUX ogdi-3.2.0-rpc.patch 11640 BLAKE2B 86809477603e9842e9c80e59b83769ef7a67e05aa5fd8db5795639aa0387a3f7324405bf4ea532a522154f88a4fd29469b7bdbef3285771b4c54c625c33f32a0 SHA512 b16647603aec1a2bc5fdcdf17234d78c62d882777187ba4896d7ea7ef96025c663f585866fa70e432700faa1963c2d2643f6b83791a90f4c38fc1e426b84889a
AUX ogdi-3.2.0-tcl.patch 320 BLAKE2B 4cf742b86210f4b78f9cfd304e6ed928fdeb26aebc541d3de3017939b75f08ec47676e5c91466a9ec667830b7cebacd334878cb30ba4d0937ab9f5408bb1333f SHA512 19f08d16caab2cc456b608f89f100830de6c2b7d13336240a9738c5435fe6065a946c4929dab386889363d392dd701dc5be5c1a1d6b589c31721caa5fddf97b8
-AUX ogdi-3.2.0_beta2-64b.patch 289 BLAKE2B 7b35827d1d06037d25a17a8d9dc4bb288e653847b763a0ea21823fa7e0ead371c8f7fd3431cd840ac8027efb16d736ee562c72fbd45b22b0d4b3a383329501e7 SHA512 fa79643dda054c1dad1e398d429c638eba31e572e265b3eec10408116d68eeafb65b0fedb0c0710beed58c506c810e2ef432b1f998a73cb70421fb8c796e2e91
-AUX ogdi-3.2.0_beta2-endianess.patch 590 BLAKE2B 4af94feb2e6b3345d9e440f48f1ac98f71792a832010f5666c38335b55b0215248ec568a52d61dfbae3e5804122a8fa4d95751108de85125182dcb440417e337 SHA512 7d4508610cc34d2552c4135226e2418d6e634ff6f85a9423534a3f2275392e5097399decc4bb9b8f4f02e7a23b7f7a4507182541c814e73efd5544292469e50e
-AUX ogdi-3.2.0_beta2-proj480.patch 9939 BLAKE2B bcefedd0043c8535adc8d5e3362f38514ec91a220444145b1c27b1a41b45191364f52130a46e91e371571bf4a5f7a4df64f798c7d526fa29a250b67690044989 SHA512 3ac6c554c8f89252b8ff6f8f9ff3824ec1c453b1ac395d41e395ccd1c15c659dfbb77d0a6110edf2cd20a1c738f70e444a566cd6bee7ead2bc563d773c77c737
AUX ogdi-3.2.0_beta2-subdirs.patch 905 BLAKE2B 69db0794449ca68b61ba8723585a2d055836f2bfd031023073b515a326ca04215833c9ab1ef1d73f1bd5392a56d2479ba71d9a24fea42f5a41f239a3ec6c55db SHA512 b6e6f50dafdb6aea991b8ece37953a9910b3fa790dcb68108ba7316c81de3cffae1413afb9d9126457550fa46bded8a7613c8be27fcd9956c8c17b5b64065732
-DIST ogdi-3.2.0.beta2.tar.gz 956839 BLAKE2B d0729d42f3224d9911bb09f8cf2f150204950739547bf8ed5349c8ed63e7ab7a4e17298fe8bbf45fc17f5781e86925ab35d8356d396ffe7f35a4cf20803fce04 SHA512 2159dfd010be9da63cf009beee7f6571cd13c4f08d1a69a5d945dd64878347b28455eb5376f184e2d91fa4a3bd409446ccbd706aa9000d3d7d2ac4b6e30ced93
DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca SHA512 b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0
-EBUILD ogdi-3.2.0.ebuild 1684 BLAKE2B 6a2f19e187d2152b94092746ceb6258edae78837293285f48df6324a38f8a60fea00a32354dcb3de6c04246a39c5b609e7d5d9339826ba13f8d735d252f94b0b SHA512 d20023fdf7b33ade215fbeab8e693deba0f3a233fa6b1b12930639b37f4d45651d8b3e637b174f5ad9a22727fae570b8db8969881f451378bc609cea5828737f
-EBUILD ogdi-3.2.0_beta2.ebuild 1525 BLAKE2B f5d96d0ac178971ecec0f66edef7817dd85220364bc62362c4f2af749749122d93f23851a62aac5f29662e4def9706e951b869b8b2dfb37652e88bb20b06d30d SHA512 2d2a5c8a9959b2fa77fb6395f262f3eae08a713e93700c43b9d746579293b5653f0761f80c23cc32fa3bf823cd31413d48978492e7abc91e5c3a79fc3eb2d318
+EBUILD ogdi-3.2.0-r1.ebuild 1730 BLAKE2B 0414eebbe445021de0a41e17ae77f5b954d025c90c3f4e74708e941793d3bd5cb171a329897b06b0652fa01dc4e036cadb4199ee56a7b6503a8ca38cd74d1b74 SHA512 8602a2c3ed67233f23006739206a471e72fed4a8d370150bbaa7d3f7e9f3a0567eca246d7ec47db96767237538a42962cfc3dbee12ba9cd317d4479590931a93
MISC metadata.xml 337 BLAKE2B 01ea83d967f6073198b6a96775ed63b603dcd4736a3a3faa8d8e5e891d2b4fb25ef436425fe51be91d4d81702f392c7f28274738b7d672a82d681159e28b87dd SHA512 958474862734f915497c1e574254cd2152009f436b59dd57be9bcd5ad0ae2949dba1f6275ad3a68b3a6d60863093df2bf2bcfffdea51b591e9c1864231899221
diff --git a/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch b/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch
deleted file mode 100644
index f6fbc85e5ae9..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-
- #
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
deleted file mode 100644
index 16c40b2ff435..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ogdi.old/ogdi/driver/vrf/feature.c 2007/05/09 20:46:28 1.16
-+++ ogdi/ogdi/driver/vrf/feature.c 2009/05/08 04:15:50 1.17
-@@ -1347,7 +1350,7 @@
- short int temp4;
- int temp5;
- date_type temp6;
-- long count;
-+ int32 count;
-
- if (returnString != NULL) {
- free(returnString);
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-endianess.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-endianess.patch
deleted file mode 100644
index 75c85fbb29b5..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-endianess.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urNad ogdi-dfsg~/vpflib/include/machine.h ogdi-dfsg/vpflib/include/machine.h
---- ogdi-dfsg~/vpflib/include/machine.h 2007-03-27 17:35:24.000000000 +0200
-+++ ogdi-dfsg/vpflib/include/machine.h 2007-03-27 17:41:16.000000000 +0200
-@@ -15,10 +15,11 @@
- long output;
- } xBYTE_ORDER;
-
--#if SYS_BIG_ENDIAN == 1
--#define MACHINE_BYTE_ORDER MOST_SIGNIFICANT
--#else
-+#include <endian.h>
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
- #define MACHINE_BYTE_ORDER LEAST_SIGNIFICANT
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+#define MACHINE_BYTE_ORDER MOST_SIGNIFICANT
- #endif
-
- #ifdef _WINDOWS
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-proj480.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-proj480.patch
deleted file mode 100644
index 9380f91ffd3d..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-proj480.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-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. */
diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild
index 7f42ae15c1e6..7de1803045b3 100644
--- a/sci-libs/ogdi/ogdi-3.2.0.ebuild
+++ b/sci-libs/ogdi/ogdi-3.2.0-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
MY_P=${P/_/.}
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
HOMEPAGE="http://ogdi.sourceforge.net/"
@@ -18,13 +18,16 @@ IUSE="static-libs"
DEPEND="
net-libs/libtirpc
dev-libs/expat
- >=sci-libs/proj-4.9.0
+ >=sci-libs/proj-4.9.0:=
+ <sci-libs/proj-6.0.0:=
sys-libs/zlib
"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
+DOCS=( ChangeLog NEWS README )
+
PATCHES=(
"${FILESDIR}"/${PN}-3.2.0_beta2-subdirs.patch
"${FILESDIR}"/${P}-acinclude.patch
@@ -39,7 +42,7 @@ PATCHES=(
src_prepare() {
default
- rm -rf external
+ rm -r external || die
sed 's:O2:O9:g' -i configure || die
}
@@ -51,7 +54,8 @@ src_configure() {
econf \
--with-projlib="-L${EPREFIX}/usr/$(get_libdir) -lproj" \
- --with-zlib --with-expat
+ --with-expat \
+ --with-zlib
}
src_compile() {
@@ -70,5 +74,5 @@ src_install() {
dolib.so lib/${TARGET}/lib*
use static-libs && dolib.a lib/${TARGET}/static/*.a
# dosym libogdi31.so /usr/$(get_libdir)/libogdi.so
- dodoc ChangeLog NEWS README
+ einstalldocs
}
diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
deleted file mode 100644
index fcd803cbbad7..000000000000
--- a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${P/_/.}
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
-HOMEPAGE="http://ogdi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="
- dev-libs/expat
- >=sci-libs/proj-4.8.0
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- rm -rf external
- epatch \
- "${FILESDIR}"/${P}-subdirs.patch \
- "${FILESDIR}"/${P}-endianess.patch \
- "${FILESDIR}"/${P}-64b.patch \
- "${FILESDIR}"/${P}-proj480.patch \
- "${FILESDIR}"/${PN}-3.1.6-fpic.patch
- sed 's:O2:O9:g' -i configure || die
-}
-
-src_configure() {
- export TOPDIR="${S}"
- export TARGET=$(uname)
- export CFG="release"
- export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
-
- econf \
- --with-projlib="-L${EPREFIX}/usr/$(get_libdir) -lproj" \
- --with-zlib --with-expat
-}
-
-src_compile() {
- # bug #299239
- emake -j1 \
- CC="$(tc-getCC)" \
- LD="$(tc-getCC)" \
- SHLIB_LD="$(tc-getCC)"
-}
-
-src_install() {
- mv "${S}"/bin/${TARGET}/*.so* "${S}"/lib/Linux/. || die "lib move failed"
- dobin "${S}"/bin/${TARGET}/*
- insinto /usr/include
- doins ogdi/include/ecs.h ogdi/include/ecs_util.h
- dolib.so lib/${TARGET}/lib*
- use static-libs && dolib.a lib/${TARGET}/static/*.a
-# dosym libogdi31.so /usr/$(get_libdir)/libogdi.so
- dodoc ChangeLog NEWS README
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-03 13:32:59 +0000