* [gentoo-commits] repo/gentoo:master commit in: sci-libs/ogdi/files/, sci-libs/ogdi/
@ 2018-03-03 21:05 Andreas Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2018-03-03 21:05 UTC (permalink / raw
To: gentoo-commits
commit: dac2e018aad56ee395e1a5160bba19e68caa29ea
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 3 21:05:14 2018 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 3 21:05:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dac2e018
sci-libs/ogdi: Version bump, adapted from Dennis Schridde's overlay
Bug: https://bugs.gentoo.org/371389
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sci-libs/ogdi/Manifest | 1 +
sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch | 18 +
sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch | 77 +++++
sci-libs/ogdi/files/ogdi-3.2.0-endianess.patch | 34 ++
sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch | 27 ++
sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch | 25 ++
sci-libs/ogdi/files/ogdi-3.2.0-optimisation.patch | 13 +
sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch | 390 ++++++++++++++++++++++
sci-libs/ogdi/files/ogdi-3.2.0-tcl.patch | 14 +
sci-libs/ogdi/ogdi-3.2.0.ebuild | 74 ++++
10 files changed, 673 insertions(+)
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index ceaa0a96ccd..03fca35e180 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,2 +1,3 @@
DIST ogdi-3.1.5.tar.gz 913902 BLAKE2B ec60b620823b0ac77823b4c41f828d7edb8651d4ddfdb377c98030b0d58b723b7488d27fff80fc35f7b5040e13022bc8d54e266ec0e2ec2271d96a8902237ccc SHA512 fd77106a25b07bbaba23cab2e9e5298d7df62faf50c9ead72c4def683c4097717559b816a476ddfa16823f23d418a474ec49937b961ba06f606880f3338d6cfd
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
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch b/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch
new file mode 100644
index 00000000000..6952e7d349d
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch
@@ -0,0 +1,18 @@
+From 9e56a8be9e228b466d6464f09349a8ea2c3ec637 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 28 Nov 2017 23:23:11 +0100
+Subject: [PATCH 2/6] Rename aclocal.m4 to acinclude.m4 to prevent clash with
+ actual aclocal generated file
+
+---
+ aclocal.m4 => acinclude.m4 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename aclocal.m4 => acinclude.m4 (100%)
+
+diff --git a/aclocal.m4 b/acinclude.m4
+similarity index 100%
+rename from aclocal.m4
+rename to acinclude.m4
+--
+2.15.0
+
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch b/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch
new file mode 100644
index 00000000000..bc39b7753d3
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch
@@ -0,0 +1,77 @@
+From 2f8d760ac4470e22f2f4965aa3282ea21ffa1f17 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 28 Nov 2017 23:21:39 +0100
+Subject: [PATCH 3/6] Apply stricter quoting to macros defined in acinclude.m4
+
+Refer to the automake manual for details on why recent versions of aclocal are
+ more strict:
+ https://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal
+---
+ acinclude.m4 | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 163a446..9d3308e 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1,4 +1,4 @@
+-AC_DEFUN(AC_COMPILER_WFLAGS,
++AC_DEFUN([AC_COMPILER_WFLAGS],
+ [
+ # Remove -g from compile flags, we will add via CFG variable if
+ # we need it.
+@@ -8,17 +8,17 @@ AC_DEFUN(AC_COMPILER_WFLAGS,
+ # check for GNU compiler, and use -Wall
+ if test "$GCC" = "yes"; then
+ C_WFLAGS="-Wall"
+- AC_DEFINE(USE_GNUCC)
++ AC_DEFINE([USE_GNUCC])
+ fi
+ if test "$GXX" = "yes"; then
+ CXX_WFLAGS="-Wall"
+- AC_DEFINE(USE_GNUCC)
++ AC_DEFINE([USE_GNUCC])
+ fi
+- AC_SUBST(CXX_WFLAGS,$CXX_WFLAGS)
+- AC_SUBST(C_WFLAGS,$C_WFLAGS)
++ AC_SUBST([CXX_WFLAGS],$CXX_WFLAGS)
++ AC_SUBST([C_WFLAGS],$C_WFLAGS)
+ ])
+
+-AC_DEFUN(AC_COMPILER_PIC,
++AC_DEFUN([AC_COMPILER_PIC],
+ [
+ echo 'void f(){}' > conftest.c
+ if test -z "`${CC-cc} -fPIC -c conftest.c 2>&1`"; then
+@@ -33,8 +33,8 @@ AC_DEFUN(AC_COMPILER_PIC,
+ fi
+ rm -f conftest*
+
+- AC_SUBST(CXX_PIC,$CXX_PIC)
+- AC_SUBST(C_PIC,$C_PIC)
++ AC_SUBST([CXX_PIC],$CXX_PIC)
++ AC_SUBST([C_PIC],$C_PIC)
+ ])
+
+ dnl
+@@ -42,7 +42,7 @@ dnl Try to find something to link shared libraries with. Use "c++ -shared"
+ dnl in preference to "ld -shared" because it will link in required c++
+ dnl run time support for us.
+ dnl
+-AC_DEFUN(AC_LD_SHARED,
++AC_DEFUN([AC_LD_SHARED],
+ [
+ echo 'void g(); int main(){ g(); return 0; }' > conftest1.c
+
+@@ -88,7 +88,7 @@ AC_DEFUN(AC_LD_SHARED,
+ fi
+ rm -f conftest* libconftest*
+
+- AC_SUBST(LD_SHARED,$LD_SHARED)
++ AC_SUBST([LD_SHARED],$LD_SHARED)
+ ])
+
+
+--
+2.15.0
+
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-endianess.patch b/sci-libs/ogdi/files/ogdi-3.2.0-endianess.patch
new file mode 100644
index 00000000000..c1293fa6652
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-endianess.patch
@@ -0,0 +1,34 @@
+From 0cc56791fa5f43a399adcea438d7254611573f2d Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 28 Nov 2017 21:53:51 +0100
+Subject: [PATCH 1/6] Use endian.h to determine endianness
+
+glibc and others have an endian.h header that contains a __BYTE_ORDER macro,
+ which can be used to determine endianness. The header might also be called
+ sys/endian.h on some systems.
+---
+ vpflib/include/machine.h | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/vpflib/include/machine.h b/vpflib/include/machine.h
+index 808522d..cee8774 100644
+--- a/vpflib/include/machine.h
++++ b/vpflib/include/machine.h
+@@ -15,10 +15,11 @@ typedef struct
+ 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
+--
+2.15.0
+
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch b/sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch
new file mode 100644
index 00000000000..a9cad1ef8a7
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch
@@ -0,0 +1,27 @@
+From a4a7fdb81c7b78159541d1e027275b8b4893cc4a Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 28 Nov 2017 23:03:34 +0100
+Subject: [PATCH 5/6] Compile everything with -fPIC if required
+
+Previously only objects directly compiled for shared objects were compiled
+ with -fPIC, but static objects linked into shared objects also need this flag.
+---
+ config/generic.mak.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/generic.mak.in b/config/generic.mak.in
+index 699166b..3b671d7 100644
+--- a/config/generic.mak.in
++++ b/config/generic.mak.in
+@@ -35,7 +35,7 @@ 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)
+--
+2.15.0
+
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch b/sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch
new file mode 100644
index 00000000000..a21a12d354f
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch
@@ -0,0 +1,25 @@
+From 216529de46898bdeda075f084f4f62c796bfef87 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 28 Nov 2017 23:53:03 +0100
+Subject: [PATCH 4/6] Respect LDFLAGS provided to ./configure
+
+---
+ config/generic.mak.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/generic.mak.in b/config/generic.mak.in
+index 699166b..86b7fa2 100644
+--- a/config/generic.mak.in
++++ b/config/generic.mak.in
+@@ -38,7 +38,7 @@ SHLIB_CFLAGS = @C_PIC@
+ COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1
+
+ SHLIB_LDFLAGS = -shared
+-COMMON_LDFLAGS = $(OPTIMIZATION)
++COMMON_LDFLAGS = $(OPTIMIZATION) @LDFLAGS@
+
+ RPC_INCLUDES = @RPC_INCLUDES@
+
+--
+2.15.0
+
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-optimisation.patch b/sci-libs/ogdi/files/ogdi-3.2.0-optimisation.patch
new file mode 100644
index 00000000000..6dd25fe6d7c
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-optimisation.patch
@@ -0,0 +1,13 @@
+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-rpc.patch b/sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch
new file mode 100644
index 00000000000..1569003d4e4
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch
@@ -0,0 +1,390 @@
+From 52b4a972c164d6900584f147ba4bf73f02e0bbe7 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 28 Nov 2017 23:25:41 +0100
+Subject: [PATCH 6/6] Fall back to libtirpc if libc does not provide rpc/rpc.h
+
+---
+ config/generic.mak.in | 4 +-
+ configure | 245 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ configure.in | 6 ++
+ ogdi-config.in | 4 +-
+ ogdi.pc.in | 4 +-
+ 5 files changed, 255 insertions(+), 8 deletions(-)
+
+diff --git a/config/generic.mak.in b/config/generic.mak.in
+index 3b671d7..6ff7e33 100644
+--- a/config/generic.mak.in
++++ b/config/generic.mak.in
+@@ -35,7 +35,7 @@ AR = ar cr
+ # Compilation and linking flags
+ #
+ SHLIB_CFLAGS = @C_PIC@
+-COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@
++COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@ @RPC_CFLAGS@
+
+ SHLIB_LDFLAGS = -shared
+ COMMON_LDFLAGS = $(OPTIMIZATION)
+@@ -61,7 +61,7 @@ INST_BIN = @bindir@
+ #
+ #RPC_LINKLIB = -lrpcsvc -lnsl -lsocket
+ #RPC_LINKLIB = -ldl -ldbmalloc
+-RPC_LINKLIB = @LIBS@
++RPC_LINKLIB = @LIBS@ @RPC_LIBS@
+
+ #
+ # Endian definition, could be little or big
+diff --git a/configure b/configure
+index d7acc10..c6459e0 100755
+--- a/configure
++++ b/configure
+@@ -634,6 +634,8 @@ PROJ_INCLUDE
+ PROJ_SETTING
+ BIG_ENDIAN
+ RPC_INCLUDES
++RPC_LIBS
++RPC_CFLAGS
+ EGREP
+ GREP
+ CPP
+@@ -643,6 +645,9 @@ CXX_PIC
+ C_WFLAGS
+ CXX_WFLAGS
+ HAVE_ICONV
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
++PKG_CONFIG
+ OBJEXT
+ EXEEXT
+ ac_ct_CC
+@@ -714,7 +719,12 @@ CFLAGS
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP'
++PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
++CPP
++RPC_CFLAGS
++RPC_LIBS'
+
+
+ # Initialize some variables set by options.
+@@ -1343,7 +1353,14 @@ Some influential environment variables:
+ LIBS libraries to pass to the linker, e.g. -l<library>
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
++ PKG_CONFIG path to pkg-config utility
++ PKG_CONFIG_PATH
++ directories to add to pkg-config's search path
++ PKG_CONFIG_LIBDIR
++ path overriding pkg-config's built-in search path
+ CPP C preprocessor
++ RPC_CFLAGS C compiler flags for RPC, overriding pkg-config
++ RPC_LIBS linker flags for RPC, overriding pkg-config
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -2867,6 +2884,126 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
++
++
++
++
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ ac_pt_PKG_CONFIG=$PKG_CONFIG
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $ac_pt_PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
++$as_echo "$ac_pt_PKG_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++ if test "x$ac_pt_PKG_CONFIG" = x; then
++ PKG_CONFIG=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ PKG_CONFIG=$ac_pt_PKG_CONFIG
++ fi
++else
++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++fi
++
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=0.9.0
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ PKG_CONFIG=""
++ fi
++fi
++
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+ if ${ac_cv_lib_dl_dlopen+:} false; then :
+@@ -3045,7 +3182,6 @@ HAVE_ICONV=$HAVE_ICONV
+
+
+
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -3443,6 +3579,111 @@ fi
+ done
+
+
++for ac_header in rpc/rpc.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_rpc_h" "$ac_includes_default"
++if test "x$ac_cv_header_rpc_rpc_h" = xyes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_RPC_RPC_H 1
++_ACEOF
++
++else
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtirpc" >&5
++$as_echo_n "checking for libtirpc... " >&6; }
++
++if test -n "$RPC_CFLAGS"; then
++ pkg_cv_RPC_CFLAGS="$RPC_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_RPC_CFLAGS=`$PKG_CONFIG --cflags "libtirpc" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$RPC_LIBS"; then
++ pkg_cv_RPC_LIBS="$RPC_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_RPC_LIBS=`$PKG_CONFIG --libs "libtirpc" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ RPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtirpc" 2>&1`
++ else
++ RPC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtirpc" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$RPC_PKG_ERRORS" >&5
++
++ as_fn_error $? "Package requirements (libtirpc) were not met:
++
++$RPC_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables RPC_CFLAGS
++and RPC_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details." "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables RPC_CFLAGS
++and RPC_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details" "$LINENO" 5; }
++else
++ RPC_CFLAGS=$pkg_cv_RPC_CFLAGS
++ RPC_LIBS=$pkg_cv_RPC_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++fi
++fi
++
++done
++
++
+ for ac_header in rpc/pmap_clnt.h float.h dlfcn.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+diff --git a/configure.in b/configure.in
+index 68b1c92..d5fe134 100644
+--- a/configure.in
++++ b/configure.in
+@@ -23,6 +23,7 @@ fi
+
+ dnl Checks for programs.
+ AC_PROG_CC
++PKG_PROG_PKG_CONFIG
+
+ dnl We always want to check /usr/local for stuff.
+ dnl LIBS="$LIBS -L/usr/local/lib"
+@@ -38,6 +39,11 @@ AC_COMPILER_WFLAGS
+ AC_COMPILER_PIC
+ AC_LD_SHARED
+
++dnl ---------------------------------------------------------------------------
++dnl Do we have rpc/rpc.h
++dnl ---------------------------------------------------------------------------
++AC_CHECK_HEADERS([rpc/rpc.h],,
++ [PKG_CHECK_MODULES([RPC], [libtirpc])])
+
+ dnl ---------------------------------------------------------------------------
+ dnl Do we have rpc/pmap_clnt.h, float.h, dlfcn.h?
+diff --git a/ogdi-config.in b/ogdi-config.in
+index f3c9a03..c6dfc50 100644
+--- a/ogdi-config.in
++++ b/ogdi-config.in
+@@ -13,8 +13,8 @@ exec_prefix="@exec_prefix@"
+ libdir="@libdir@"
+ includedir="@includedir@/ogdi"
+ libs="-logdi"
+-all_libs="-logdi -lproj -lexpat -lz"
+-I_opts="-I${includedir}"
++all_libs="-logdi -lproj -lexpat -lz @RPC_LIBS@"
++I_opts="-I${includedir} @RPC_CFLAGS@"
+ L_opts=""
+ R_opts=""
+ cppflags=""
+diff --git a/ogdi.pc.in b/ogdi.pc.in
+index 8b919de..1f290d9 100644
+--- a/ogdi.pc.in
++++ b/ogdi.pc.in
+@@ -6,7 +6,7 @@ includedir=@includedir@
+ Name: ogdi
+ Description: Open Geographic Datastore Interface
+ Version: @OGDI_VERSION@
+-Cflags: -I${includedir}/ogdi
++Cflags: -I${includedir}/ogdi @RPC_CFLAGS@
+ Libs: -L${libdir} -logdi
+-Libs.private: -lproj -lexpat -lz
++Libs.private: -lproj -lexpat -lz @RPC_LIBS@
+
+--
+2.15.0
+
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-tcl.patch b/sci-libs/ogdi/files/ogdi-3.2.0-tcl.patch
new file mode 100644
index 00000000000..5d6917b0e01
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-tcl.patch
@@ -0,0 +1,14 @@
+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
+@@ -46,8 +46,8 @@ AR = ar cr
+ RPC_INCLUDES = @RPC_INCLUDES@
+
+ UCB_STATICLIB =
+
+-TCL_INCLUDE = -I/usr/include/tcl8.3
++TCL_INCLUDE = -I${prefix}/include
+ TCL_LINKLIB =
+
+ #
diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0.ebuild
new file mode 100644
index 00000000000..e844f7644e5
--- /dev/null
+++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND="
+ net-libs/libtirpc
+ dev-libs/expat
+ >=sci-libs/proj-4.9.0
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.0_beta2-subdirs.patch
+ "${FILESDIR}"/${P}-acinclude.patch
+ "${FILESDIR}"/${P}-aclocal.patch
+ "${FILESDIR}"/${P}-endianess.patch
+ "${FILESDIR}"/${P}-fpic.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+ "${FILESDIR}"/${P}-optimisation.patch
+ "${FILESDIR}"/${P}-rpc.patch
+ "${FILESDIR}"/${P}-tcl.patch
+)
+
+src_prepare() {
+ default
+ rm -rf external
+ 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 || die "symlink failed"
+ dodoc ChangeLog NEWS README
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/ogdi/files/, sci-libs/ogdi/
@ 2019-12-29 0:20 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-12-29 0:20 UTC (permalink / raw
To: gentoo-commits
commit: 92a6aec7d300f7681223194ea170a71db5ef7258
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 22:34:14 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 00:20:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a6aec7
sci-libs/ogdi: Drop 3.2.0_beta2
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/ogdi/Manifest | 1 -
sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch | 38 ---
sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch | 11 -
.../ogdi/files/ogdi-3.2.0_beta2-endianess.patch | 18 --
sci-libs/ogdi/files/ogdi-3.2.0_beta2-proj480.patch | 297 ---------------------
sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild | 66 -----
6 files changed, 431 deletions(-)
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index d2b94841f4a..e10d38f7e8a 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,2 +1 @@
-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
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 f6fbc85e5ae..00000000000
--- 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 16c40b2ff43..00000000000
--- 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 75c85fbb29b..00000000000
--- 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 9380f91ffd3..00000000000
--- 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_beta2.ebuild b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild
deleted file mode 100644
index fcd803cbbad..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/ogdi/files/, sci-libs/ogdi/
@ 2020-04-10 11:31 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-04-10 11:31 UTC (permalink / raw
To: gentoo-commits
commit: 064fcfbe59e7d0b0519994cc434a597fc3f97d32
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 11:14:33 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 11:30:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=064fcfbe
sci-libs/ogdi: 4.1.0 version bump
Bug: https://bugs.gentoo.org/699838
Closes: https://bugs.gentoo.org/706190
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/ogdi/Manifest | 1 +
sci-libs/ogdi/files/ogdi-4.1.0-subdirs.patch | 24 +++++++++++
sci-libs/ogdi/ogdi-4.1.0.ebuild | 60 ++++++++++++++++++++++++++++
3 files changed, 85 insertions(+)
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index e10d38f7e8a..3e06551d6aa 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1 +1,2 @@
DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca SHA512 b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0
+DIST ogdi-4.1.0.tar.gz 848818 BLAKE2B d037d7a1b97e0db4b714e94a46c04e7126b5ab520e9cf54ffaba5f3e8ffa694690f4863ce257a4f56a3a596ae3ce430eb8f656f700a9287455b9f540299c6b1a SHA512 abfc409bfa5ea2f81a90c16361fe6cdc2b2ee39775c22ceb74b13b171aa04d6d6eaffe398cae0ef91dcde8509e5cc25100eedeffdad358e090b78e118d386859
diff --git a/sci-libs/ogdi/files/ogdi-4.1.0-subdirs.patch b/sci-libs/ogdi/files/ogdi-4.1.0-subdirs.patch
new file mode 100644
index 00000000000..208bfb2bb02
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-4.1.0-subdirs.patch
@@ -0,0 +1,24 @@
+diff -urN a/makefile b/makefile
+--- a/makefile
++++ b/makefile
+@@ -17,7 +17,7 @@
+ #
+ # Sub-directories that need to be built
+ #
+-subdirs = external vpflib ogdi contrib
++subdirs = vpflib ogdi contrib
+
+ #
+ # Default target to build everything in all sub-directories
+diff -urN a/ogdi/makefile b/ogdi/makefile
+--- a/ogdi/makefile
++++ b/ogdi/makefile
+@@ -15,7 +15,7 @@
+ #
+ # Sub-directories that need to be built
+ #
+-subdirs = include c-api glutil attr_driver driver gltpd examples
++subdirs = include c-api glutil attr_driver driver gltpd
+
+ #
+ # Default target to build everything in all sub-directories
diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
new file mode 100644
index 00000000000..b51bd57ebf3
--- /dev/null
+++ b/sci-libs/ogdi/ogdi-4.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
+HOMEPAGE="http://ogdi.sourceforge.net/ https://github.com/libogdi/ogdi"
+SRC_URI="https://github.com/libogdi/ogdi/releases/download/${PN}_${PV//./_}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+ dev-libs/expat
+ net-libs/libtirpc:=
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog NEWS README )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-subdirs.patch
+ "${FILESDIR}"/${PN}-3.2.0-endianess.patch
+ "${FILESDIR}"/${PN}-3.2.0-optimisation.patch
+ "${FILESDIR}"/${PN}-3.2.0-tcl.patch
+)
+
+src_prepare() {
+ default
+ rm -r external || die
+ 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-expat \
+ --with-zlib
+}
+
+src_compile() {
+ # bug #299239
+ emake -j1
+}
+
+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*
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/ogdi/files/, sci-libs/ogdi/
@ 2024-04-05 7:40 Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2024-04-05 7:40 UTC (permalink / raw
To: gentoo-commits
commit: f05911cd1a46ac7b974ddcd9d09fec1a911373ac
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Thu Apr 4 12:12:37 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Apr 5 07:39:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f05911cd
sci-libs/ogdi: Fix C99 errors
Closes: https://bugs.gentoo.org/886460
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/36095
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../ogdi/files/ogdi-4.1.0-c99-conversions.patch | 21 +++++++++++++++++++++
sci-libs/ogdi/ogdi-4.1.0-r1.ebuild | 3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/sci-libs/ogdi/files/ogdi-4.1.0-c99-conversions.patch b/sci-libs/ogdi/files/ogdi-4.1.0-c99-conversions.patch
new file mode 100644
index 000000000000..476f77b938ef
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-4.1.0-c99-conversions.patch
@@ -0,0 +1,21 @@
+--- a/vpflib/vpfprop.c 2024-04-04 12:03:43.682864289 +0000
++++ b/vpflib/vpfprop.c 2024-04-04 12:07:30.498441728 +0000
+@@ -840,7 +840,8 @@
+ #endif
+
+ {
+- int32 ncov,i,j,k,n;
++ char ncov;
++ int32 i,j,k,n;
+ char path[255];
+ char **ptr, **coverages, **subset, **fcnames=(char **)NULL;
+
+@@ -1447,7 +1447,7 @@
+ int32 *nfc )
+ #else
+ char **coverage_feature_class_names (library_path, coverage, nfc)
+- char *library_path, coverage;
++ char *library_path, *coverage;
+ int32 *nfc;
+ #endif
+
diff --git a/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
index e449cbd2f7e3..c0eb8f3c5dff 100644
--- a/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
+++ b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,6 +26,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.2.0-endianess.patch
"${FILESDIR}"/${PN}-3.2.0-optimisation.patch
"${FILESDIR}"/${PN}-3.2.0-tcl.patch
+ "${FILESDIR}"/${P}-c99-conversions.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-05 7:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-05 7:40 [gentoo-commits] repo/gentoo:master commit in: sci-libs/ogdi/files/, sci-libs/ogdi/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2020-04-10 11:31 Andreas Sturmlechner
2019-12-29 0:20 Andreas Sturmlechner
2018-03-03 21:05 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox