[gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeotiff/files/, sci-libs/libgeotiff/

2022-03-21 Thread Sam James 
commit: 3af4933852ab0021e667db087ca55911f1f75382
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 22 02:13:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 22 02:13:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af49338

sci-libs/libgeotiff: update CMake patch

Signed-off-by: Sam James  gentoo.org>

 .../files/libgeotiff-1.7.1-gnuinstalldirs.patch| 24 +-
 ...iff-1.7.1.ebuild => libgeotiff-1.7.1-r1.ebuild} |  0
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch 
b/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch
index 47ee7050aa8a..6fdcd9753f95 100644
--- a/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch
+++ b/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch
@@ -1,6 +1,6 @@
 https://github.com/OSGeo/libgeotiff/pull/74
 
-From 8541a109f3aad4756488f730ed8d71060f9b282f Mon Sep 17 00:00:00 2001
+From d18deccb461990c826ceee8fbcc57a44502ace2e Mon Sep 17 00:00:00 2001
 From: Sam James 
 Date: Sun, 20 Mar 2022 02:55:50 +
 Subject: [PATCH] CMake: adopt GNUInstallDirs
@@ -13,7 +13,15 @@ This works cross-platform still but it means libgeotiff uses 
the
 standard options which CMake projects tend to use for such locations
 and therefore no special treatment is needed when packaging it.
 
+Fixes: https://github.com/OSGeo/issues/33
 Signed-off-by: Sam James 
+---
+ CMakeLists.txt | 41 ++-
+ bin/CMakeLists.txt |  6 ++---
+ 2 files changed, 14 insertions(+), 33 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 001df67..1840258 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -7,6 +7,8 @@
@@ -96,3 +104,17 @@ Signed-off-by: Sam James 
  
  # Define grouping of source files in PROJECT file (e.g. Visual Studio)
  SOURCE_GROUP("CMake Files" FILES CMakeLists.txt)
+diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
+index dad465f..c61585c 100644
+--- a/bin/CMakeLists.txt
 b/bin/CMakeLists.txt
+@@ -41,6 +41,6 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build - done: 
${GEOTIFF_UTILITIES}")
+ # Targets installation
+ 
+ INSTALL(TARGETS ${GEOTIFF_UTILITIES}
+-RUNTIME DESTINATION ${GEOTIFF_BIN_DIR}
+-LIBRARY DESTINATION ${GEOTIFF_LIB_DIR}
+-ARCHIVE DESTINATION ${GEOTIFF_LIB_DIR})
++RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.1.ebuild 
b/sci-libs/libgeotiff/libgeotiff-1.7.1-r1.ebuild
similarity index 100%
rename from sci-libs/libgeotiff/libgeotiff-1.7.1.ebuild
rename to sci-libs/libgeotiff/libgeotiff-1.7.1-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeotiff/files/, sci-libs/libgeotiff/

2022-03-19 Thread Sam James 
commit: 3b3e37665feed62856266979950a25d5b08a7fd8
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 20 02:59:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 20 03:23:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b3e3766

sci-libs/libgeotiff: add 1.7.1

Signed-off-by: Sam James  gentoo.org>

 sci-libs/libgeotiff/Manifest   |  1 +
 .../files/libgeotiff-1.7.1-gnuinstalldirs.patch| 98 ++
 sci-libs/libgeotiff/libgeotiff-1.7.1.ebuild| 53 
 3 files changed, 152 insertions(+)

diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 7a85e7ff274f..60dda82bdd42 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,2 +1,3 @@
 DIST libgeotiff-1.6.0.tar.gz 537175 BLAKE2B 
4b1430c9e80cdd4193f474484b295c151ecb9a654248e08527046f1aa35cfab0be59980edad2cc6ae90c1a7b0e03d46fd203affd5b01c83e0fd4435d5e56b2d3
 SHA512 
4c59598140d6c435a25aff6520e07a01a0153cac526df3b3e1366d5edc43cd82b15099da79ee8a2fb916e858f5a5d7421cfbf96bb485c91fac9e19c7209b7418
 DIST libgeotiff-1.7.0.tar.gz 541931 BLAKE2B 
3c0843f8c86d6bbcedf9d07b45d2d676f1ccfaba7b5e40fa7f8d5f290b39da5cfaebe39567eab9e8add1b99042aad51d5104b81c2c05493d18d022d41e5b106b
 SHA512 
8e294b5db89e88dbd4f7eb9d804be788ff3d14a1a14f721e9805b42cc797500596f0473dd8e5be6c1da01b56bdebc872df2b30470a2d96686f308019de10739a
+DIST libgeotiff-1.7.1.tar.gz 542779 BLAKE2B 
e26a14fcb463f4a9e5a3652b978223da6b11dcb4ec6a3b6068460f929a57e9affafdb652f16fad23a2da4612c6ae3c2624bfb4f26c96fc4290a33f1e0629b726
 SHA512 
af119040598f4349124848d9788ea1d0d2019e23fc48eaf4b0445320c51e91afa6c7e25b49738bdaf0aa4467a19104b00838d669da27dee77898c489fe5fe4c1

diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch 
b/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch
new file mode 100644
index ..47ee7050aa8a
--- /dev/null
+++ b/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch
@@ -0,0 +1,98 @@
+https://github.com/OSGeo/libgeotiff/pull/74
+
+From 8541a109f3aad4756488f730ed8d71060f9b282f Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sun, 20 Mar 2022 02:55:50 +
+Subject: [PATCH] CMake: adopt GNUInstallDirs
+
+This makes it a lot easier for packagers (it happens by default
+if we've setup our environment correctly) to have files installed in the right
+places, including libdir, but also documentation, which can vary.
+
+This works cross-platform still but it means libgeotiff uses the
+standard options which CMake projects tend to use for such locations
+and therefore no special treatment is needed when packaging it.
+
+Signed-off-by: Sam James 
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -7,6 +7,8 @@
+ 
###
+ PROJECT(GeoTIFF)
+ 
++include(GNUInstallDirs)
++
+ SET(GEOTIFF_LIB_NAME geotiff)
+ SET(GEOTIFF_LIBRARY_TARGET geotiff_library)
+ 
+@@ -239,38 +241,17 @@ SET(GEOTIFF_MAN_PAGES
+ 
+ #${PROJECT_BINARY_DIR}/geotiff_version.h
+ 
+-SET(DEFAULT_BIN_SUBDIR bin)
+-SET(DEFAULT_LIB_SUBDIR lib)
+-SET(DEFAULT_INCLUDE_SUBDIR include)
+-
+-# Locations are changeable by user to customize layout of GeoTIFF installation
+-# (default values are platform-specIFic)
+-SET(GEOTIFF_BIN_SUBDIR ${DEFAULT_BIN_SUBDIR} CACHE STRING
+-"Subdirectory where executables will be installed")
+-SET(GEOTIFF_LIB_SUBDIR ${DEFAULT_LIB_SUBDIR} CACHE STRING
+-"Subdirectory where libraries will be installed")
+-SET(GEOTIFF_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING
+-"Subdirectory where header files will be installed")
+-
+-# Mark *_SUBDIR variables as advanced and dedicated to use by power-users 
only.
+-MARK_AS_ADVANCED(GEOTIFF_BIN_SUBDIR GEOTIFF_LIB_SUBDIR GEOTIFF_INCLUDE_SUBDIR)
+-
+-# Full paths for the installation
+-SET(GEOTIFF_BIN_DIR ${GEOTIFF_BIN_SUBDIR})
+-SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR})
+-SET(GEOTIFF_INCLUDE_DIR ${GEOTIFF_INCLUDE_SUBDIR})
+-
+ # Install doc files
+ INSTALL(FILES
+ AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN
+-DESTINATION doc)
++DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ 
+ # Install man pages
+-INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1)
++INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ 
+ 
+ # Install header files for development distribution
+-INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${GEOTIFF_INCLUDE_DIR})
++INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ 
###
+ # Build libxtiff library
+@@ -323,7 +304,7 @@ if(UNIX)
+   set_target_properties(
+ ${GEOTIFF_LIBRARY_TARGET}
+ PROPERTIES
+-INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${GEOTIFF_LIB_DIR}")
++INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+endif()
+ endif()
+ 
+@@

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeotiff/files/, sci-libs/libgeotiff/

2021-05-27 Thread David Seifert 
commit: bfa0a8866340aee27f8e72abfa37158f9c2585cf
Author: Jakov Smolic  sartura  hr>
AuthorDate: Thu May 27 21:05:26 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu May 27 21:05:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa0a886

sci-libs/libgeotiff: Remove old 1.5.1

Closes: https://bugs.gentoo.org/716882
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/libgeotiff/Manifest   |  1 -
 .../files/libgeotiff-1.5.1-proj-6.2-tests.patch| 57 
 sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild | 60 --
 3 files changed, 118 deletions(-)

diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 930d7ae0d29..f5d06499c8f 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,2 +1 @@
-DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 
24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893
 SHA512 
6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
 DIST libgeotiff-1.6.0.tar.gz 537175 BLAKE2B 
4b1430c9e80cdd4193f474484b295c151ecb9a654248e08527046f1aa35cfab0be59980edad2cc6ae90c1a7b0e03d46fd203affd5b01c83e0fd4435d5e56b2d3
 SHA512 
4c59598140d6c435a25aff6520e07a01a0153cac526df3b3e1366d5edc43cd82b15099da79ee8a2fb916e858f5a5d7421cfbf96bb485c91fac9e19c7209b7418

diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.5.1-proj-6.2-tests.patch 
b/sci-libs/libgeotiff/files/libgeotiff-1.5.1-proj-6.2-tests.patch
deleted file mode 100644
index 5004aadb981..000
--- a/sci-libs/libgeotiff/files/libgeotiff-1.5.1-proj-6.2-tests.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 678ffd97db2d63cf6856428bea65a93e069f812f Mon Sep 17 00:00:00 2001
-From: Even Rouault 
-Date: Wed, 4 Sep 2019 16:11:37 +0200
-Subject: [PATCH] Adapt test script for PROJ 6.2 EPSG database (fixes #22)
-

- libgeotiff/test/testlistgeo  | 8 +++-
- libgeotiff/test/testlistgeo_out.dist | 4 ++--
- 3 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/test/testlistgeo b/test/testlistgeo
-index 7fb4a2f..571f5d0 100755
 a/test/testlistgeo
-+++ b/test/testlistgeo
-@@ -210,10 +210,15 @@ echo "Testing listgeo equidistant_cylindrical.tif" >> 
${OUT}
- $EXE ${DATA_DIR}/equidistant_cylindrical.tif >>${OUT}
- echo "" >>${OUT}
- 
-+# Normalize for results depending on the exact version of PROJ / EPSG database
-+sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp
-+mv ${OUT}.tmp ${OUT}
-+
-+sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > 
testlistgeo_out.dist.tmp
- 
- # do 'diff' with distribution results
- echo "diff ${OUT} with testlistgeo_out.dist"
--diff -u ${OUT} ${TEST_CLI_DIR}/testlistgeo_out.dist
-+diff -u ${OUT} testlistgeo_out.dist.tmp
- if [ $? -ne 0 ] ; then
- echo  ""
- echo "PROBLEMS HAVE OCCURRED"
-@@ -224,6 +229,7 @@ else
- echo "TEST OK"
- echo "test file ${OUT} removed"
- echo
-+rm testlistgeo_out.dist.tmp
- /bin/rm -f ${OUT}
- exit 0
- fi
-diff --git a/test/testlistgeo_out.dist b/test/testlistgeo_out.dist
-index 68a948c..c157f00 100644
 a/test/testlistgeo_out.dist
-+++ b/test/testlistgeo_out.dist
-@@ -1738,11 +1738,11 @@ Geotiff_Information:
-Keyed_Information:
-   GTModelTypeGeoKey (Short,1): ModelTypeProjected
-   GTRasterTypeGeoKey (Short,1): RasterPixelIsArea
--  ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89 / LAEA Europe)
-+  ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89-extended / LAEA 
Europe)
-   End_Of_Keys.
-End_Of_Geotiff.
- 
--PCS = 3035 (ETRS89 / LAEA Europe)
-+PCS = 3035 (ETRS89-extended / LAEA Europe)
- Projection = 19986 (Europe Equal Area 2001)
- Projection Method: CT_LambertAzimEqualArea
-ProjCenterLatGeoKey: 52.00 ( 52d 0' 0.00"N)

diff --git a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild 
b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
deleted file mode 100644
index 3ffe18121a5..000
--- a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library for reading TIFF files with embedded tags for geographic 
information"
-HOMEPAGE="https://trac.osgeo.org/geotiff/ https://github.com/OSGeo/libgeotiff;
-SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0/5"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
-IUSE="debug doc static-libs"
-
-BDEPEND="
-   doc? ( app-doc/doxygen )
-"
-DEPEND="
-   >=media-libs/tiff-3.9.1:0
-   >=sci-libs/proj-6.0.0:=
-   sys-libs/zlib
-   virtual/jpeg:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-proj-6.2-tests.patch" )

[gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeotiff/files/

2017-02-01 Thread David Seifert 
commit: 44a08dbcb8b70a2d16271d772e3622637e9d0730
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Tue Jan 31 18:14:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Feb  1 22:40:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a08dbc

sci-libs/libgeotiff: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3742

 sci-libs/libgeotiff/files/libgeotiff-1.2.4-soname.patch | 13 -
 1 file changed, 13 deletions(-)

diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.2.4-soname.patch 
b/sci-libs/libgeotiff/files/libgeotiff-1.2.4-soname.patch
deleted file mode 100644
index e23ef6f..
--- a/sci-libs/libgeotiff/files/libgeotiff-1.2.4-soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 configure.in.orig  2008-03-01 14:32:39.0 -0800
-+++ configure.in   2008-03-01 14:37:27.0 -0800
-@@ -36,7 +36,9 @@
- GEOTIFF_DLL=cyggeotiff-1.dll
- GEOTIFF_IMP=libgeotiff.dll.a
-   LD_SHARED="gcc -shared -Wl,--export-all 
-Wl,--out-implib=\$(GEOTIFF_IMP)" ;;
--*) 
GEOTIFF_SO=libgeotiff.${SO_EXT}.$VERSION_MAJOR.$VERSION_MINOR.$VERSION_POINT ;;
-+*) 
GEOTIFF_SO=libgeotiff.${SO_EXT}.$VERSION_MAJOR.$VERSION_MINOR.$VERSION_POINT
-+   GEOTIFF_SONAME=libgeotiff.${SO_EXT}.$VERSION_MAJOR.$VERSION_MINOR
-+   LD_SHARED="gcc -shared -Wl,-soname -Wl,$GEOTIFF_SONAME" ;;
-   esac
- fi
- AC_SUBST(GEOTIFF_SO,$GEOTIFF_SO)