* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/liblas/files/, sci-geosciences/liblas/
@ 2015-10-23 15:56 Amy Winston
0 siblings, 0 replies; 4+ messages in thread
From: Amy Winston @ 2015-10-23 15:56 UTC (permalink / raw
To: gentoo-commits
commit: 08e80b8aebc0f36a2fd0c07e32bad61fbc6d29eb
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 15:53:34 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 15:54:53 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08e80b8a
sci-geosciences/liblas: new ebuild
New ebuild initially written by SoapZaNet and committed
under proxy-maintainers herd with wraeth as maintainer.
Package-Manager: portage-2.2.20.1
sci-geosciences/liblas/Manifest | 1 +
.../files/liblas-1.8.0_remove-std-c++98.patch | 30 ++++++++++++++++
sci-geosciences/liblas/liblas-1.8.0.ebuild | 40 ++++++++++++++++++++++
sci-geosciences/liblas/metadata.xml | 20 +++++++++++
4 files changed, 91 insertions(+)
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
new file mode 100644
index 0000000..c07d365
--- /dev/null
+++ b/sci-geosciences/liblas/Manifest
@@ -0,0 +1 @@
+DIST libLAS-1.8.0.tar.bz2 3907684 SHA256 17310082845e45e5c4cece78af98ee93aa5d992bf6d4ba9a6e9f477228738d7a SHA512 1804149c7bcf04896a683a1098d372a65c000b7562795911fae697f81f370315aa373f34c12fa740d4607c07cd73e48354e34c9e26b032ffe679ecbfd4496a50 WHIRLPOOL ee2400877fad72b1ab9e5b94e673c1ff858c4c3b129aebd8146aeeb7e01a56d6aad70147a55391e9c0bb02e354036aa27b077430a4aa88b13d182389f11b538d
diff --git a/sci-geosciences/liblas/files/liblas-1.8.0_remove-std-c++98.patch b/sci-geosciences/liblas/files/liblas-1.8.0_remove-std-c++98.patch
new file mode 100644
index 0000000..dc230da
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.0_remove-std-c++98.patch
@@ -0,0 +1,30 @@
+--- libLAS-1.8.0/CMakeLists.txt
++++ libLAS-1.8.0/CMakeLists.txt
+@@ -140,27 +140,6 @@
+
+ set(CMAKE_INCLUDE_PATH c:/osgeo4w64/include;$ENV{CMAKE_INCLUDE_PATH})
+ set(CMAKE_LIBRARY_PATH c:/osgeo4w64/lib;$ENV{CMAKE_LIBRARY_PATH})
+-else()
+-
+- # Recommended C++ compilation flags
+- # -Weffc++
+- #
+- # Remove -pedandic which causes errors from boost (comma at end of
+- # enum) 2012-09-05. Remove -Wcast-qual -Wfloat-equal
+- # -Wredundant-decls to suppress the multitude of warning messages.
+- set(LIBLAS_COMMON_CXX_FLAGS
+- " -Wextra -Wall -Wno-unused-parameter -Wno-unused-variable -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
+-
+- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+-
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBLAS_COMMON_CXX_FLAGS}")
+- if (CMAKE_COMPILER_IS_GNUCXX)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -ansi")
+- endif()
+-
+- elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBLAS_COMMON_CXX_FLAGS}")
+- endif()
+ endif(WIN32)
+
+ if (APPLE)
diff --git a/sci-geosciences/liblas/liblas-1.8.0.ebuild b/sci-geosciences/liblas/liblas-1.8.0.ebuild
new file mode 100644
index 0000000..3c31b09
--- /dev/null
+++ b/sci-geosciences/liblas/liblas-1.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib multilib
+
+DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS"
+HOMEPAGE="http://www.liblas.org"
+SRC_URI="http://download.osgeo.org/${PN}/libLAS-${PV}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdal geotiff"
+REQUIRED_USE="gdal? ( geotiff )"
+
+RDEPEND="
+ dev-libs/boost:=
+ sci-geosciences/laszip
+ gdal? ( sci-libs/gdal )
+ geotiff? ( sci-libs/libgeotiff )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/libLAS-${PV}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}_remove-std-c++98.patch
+)
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package gdal GDAL)
+ $(cmake-utils_use_find_package geotiff GeoTIFF)
+ -DLIBLAS_LIB_SUBDIR=$(get_libdir)
+ )
+ cmake-utils_src_configure
+}
diff --git a/sci-geosciences/liblas/metadata.xml b/sci-geosciences/liblas/metadata.xml
new file mode 100644
index 0000000..96d8999
--- /dev/null
+++ b/sci-geosciences/liblas/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-geosciences</herd>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>wraeth@wraeth.id.au</email>
+ <name>Sam Jorna</name>
+ <description>Proxy maintainer - assign bugs to him</description>
+</maintainer>
+<use>
+ <flag name="gdal">Add support for the <pkg>sci-libs/gdal</pkg> geospatial
+ raster library</flag>
+ <flag name="geotiff">Add support for geo-tagged TIFF files with
+ <pkg>sci-libs/libgeotiff</pkg></flag>
+</use>
+<longdescription lang="en">
+A C/C++ library for reading and writing the very common LAS LiDAR format.
+</longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/liblas/files/, sci-geosciences/liblas/
@ 2018-08-03 11:54 Amy Liffey
0 siblings, 0 replies; 4+ messages in thread
From: Amy Liffey @ 2018-08-03 11:54 UTC (permalink / raw
To: gentoo-commits
commit: fa7139977774c59c7322c941e62b1bce588b0ee5
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 3 11:46:26 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Aug 3 11:53:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa713997
sci-geosciences/liblas: fix overloading calls
- Change SRC_URI and HOMEPAGE to github
- Add patch for overloaded calls
Closes: https://bugs.gentoo.org/661654
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sci-geosciences/liblas/Manifest | 1 +
.../files/liblas-1.8.1-fix-overload-call.patch | 15 +++++++
sci-geosciences/liblas/liblas-1.8.1-r1.ebuild | 49 ++++++++++++++++++++++
3 files changed, 65 insertions(+)
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index 118f37d5fa6..3b20aa193d5 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -1 +1,2 @@
DIST libLAS-1.8.1.tar.bz2 3920203 BLAKE2B 2ef8e822c5d1c07d929e788c59e6e5b942aba637fb764d37e1505d136c75cd4a28efc4702b022bcfee8063b684956b4466c9ec00e737d7024ca2719d7b11f341 SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf
+DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6
diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-fix-overload-call.patch b/sci-geosciences/liblas/files/liblas-1.8.1-fix-overload-call.patch
new file mode 100644
index 00000000000..0b77da12148
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.1-fix-overload-call.patch
@@ -0,0 +1,15 @@
+--- a/src/gt_citation.cpp 2018-08-03 12:16:16.007831564 +0100
++++ b/src/gt_citation.cpp 2018-08-03 12:16:45.224830335 +0100
+@@ -387,10 +387,10 @@
+ osCitation += primemName;
+ bRewriteGeogCitation = TRUE;
+
+- double primemValue = poSRS->GetPrimeMeridian(NULL);
++ double primemValue = poSRS->GetPrimeMeridian();
+ if(angUnitName && !EQUAL(angUnitName, "Degree"))
+ {
+- double aUnit = poSRS->GetAngularUnits(NULL);
++ double aUnit = poSRS->GetAngularUnits();
+ primemValue *= aUnit;
+ }
+ GTIFKeySet( psGTIF, GeogPrimeMeridianLongGeoKey, TYPE_DOUBLE, 1,
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild
new file mode 100644
index 00000000000..8e0dbdea857
--- /dev/null
+++ b/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS"
+HOMEPAGE="https://github.com/libLAS/libLAS/"
+SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+# tests known to fail due to LD_LIBRARY_PATH issue
+RESTRICT="test"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="gdal"
+
+RDEPEND="
+ dev-libs/boost:=
+ sci-geosciences/laszip
+ sci-libs/libgeotiff
+ gdal? ( sci-libs/gdal )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/libLAS-${PV}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch
+ "${FILESDIR}"/${P}-fix-overload-call.patch #bug 661654
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # add missing linkage
+ sed -e 's:${LAS2COL} ${LIBLAS_C_LIB_NAME}:& ${CMAKE_THREAD_LIBS_INIT}:' \
+ -i "${S}/apps/CMakeLists.txt" || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DWITH_GDAL=$(usex gdal)"
+ -DLIBLAS_LIB_SUBDIR=$(get_libdir)
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/liblas/files/, sci-geosciences/liblas/
@ 2020-06-15 9:54 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-06-15 9:54 UTC (permalink / raw
To: gentoo-commits
commit: cdb09fb67044e74063938f4b8091d602da75146c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 09:53:48 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 09:53:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb09fb6
sci-geosciences/liblas: Fix building against boost 1.73
Closes: https://bugs.gentoo.org/722878
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Suggested-by: Attila Tóth <atoth <AT> atoth.sote.hu>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../liblas/files/liblas-1.8.1-boost-1.73.patch | 55 ++++++++++++++++++++++
sci-geosciences/liblas/liblas-1.8.1-r3.ebuild | 1 +
2 files changed, 56 insertions(+)
diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch b/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch
new file mode 100644
index 00000000000..288f207737b
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.1-boost-1.73.patch
@@ -0,0 +1,55 @@
+diff --git a/include/liblas/detail/binary.hpp b/include/liblas/detail/binary.hpp
+index d3116a1..ab20e06 100644
+--- a/include/liblas/detail/binary.hpp
++++ b/include/liblas/detail/binary.hpp
+@@ -17,6 +17,8 @@
+ #ifndef LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+ #define LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+
++#include <liblas/detail/endian.hpp>
++
+ #include <cassert>
+ #include <climits>
+ #include <cstring>
+@@ -25,7 +27,6 @@
+
+ #include <boost/config.hpp>
+ #include <boost/static_assert.hpp>
+-#include <boost/detail/endian.hpp>
+ #include <boost/type_traits/is_signed.hpp>
+
+ #if CHAR_BIT != 8
+@@ -43,7 +44,7 @@ namespace detail { namespace binary {
+ struct big_endian_tag {};
+ struct little_endian_tag {};
+
+-#ifdef BOOST_BIG_ENDIAN
++#ifdef LIBLAS_BIG_ENDIAN
+ typedef big_endian_tag native_endian_tag;
+ #else
+ typedef little_endian_tag native_endian_tag;
+diff --git a/src/c_api.cpp b/src/c_api.cpp
+index a70fe74..e8be785 100644
+--- a/src/c_api.cpp
++++ b/src/c_api.cpp
+@@ -96,6 +96,7 @@ using namespace liblas;
+ #endif
+
+ #include <boost/lambda/lambda.hpp>
++#include <boost/bind.hpp>
+
+ bool IsReprojectionTransform(liblas::TransformPtr const& p)
+ {
+diff --git a/src/header.cpp b/src/header.cpp
+index 9987ce1..a5c8f7d 100644
+--- a/src/header.cpp
++++ b/src/header.cpp
+@@ -54,7 +54,7 @@
+ // boost
+ #include <boost/cstdint.hpp>
+ #include <boost/lambda/lambda.hpp>
+-
++#include <boost/bind.hpp>
+ //std
+ #include <algorithm>
+ #include <fstream>
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
index 46930174cab..cee50e9a545 100644
--- a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}"/${P}-CVE-2018-20540.patch # bug 678482
"${FILESDIR}"/${P}-CVE-2018-20540-fixup.patch # bug 698846
"${FILESDIR}"/${P}-fix-debug.patch # bug 668778
+ "${FILESDIR}"/${P}-boost-1.73.patch # bug 722878
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/liblas/files/, sci-geosciences/liblas/
@ 2021-05-25 11:55 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-05-25 11:55 UTC (permalink / raw
To: gentoo-commits
commit: 3220d7fbcf7eee75e057450836646ee69628c19d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 25 11:50:31 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 25 11:54:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3220d7fb
sci-geosciences/liblas: fix GCC 11 build
Closes: https://bugs.gentoo.org/789732
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../liblas/files/liblas-1.8.1-gcc11.patch | 34 ++++++++++++++++++++++
sci-geosciences/liblas/liblas-1.8.1-r3.ebuild | 1 +
2 files changed, 35 insertions(+)
diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch b/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch
new file mode 100644
index 00000000000..b279eb40f4c
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.1-gcc11.patch
@@ -0,0 +1,34 @@
+https://github.com/libLAS/libLAS/commit/8c4985384453a2df7254f05688b83706723bad7b.patch
+https://bugs.gentoo.org/789732
+
+From 8c4985384453a2df7254f05688b83706723bad7b Mon Sep 17 00:00:00 2001
+From: FX Coudert <fxcoudert@gmail.com>
+Date: Wed, 4 Oct 2017 11:51:23 +0200
+Subject: [PATCH] fix pointer comparison
+
+---
+ src/gt_citation.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gt_citation.cpp b/src/gt_citation.cpp
+index 65fce31a..8d3966bc 100644
+--- a/src/gt_citation.cpp
++++ b/src/gt_citation.cpp
+@@ -155,7 +155,7 @@ char* ImagineCitationTranslation(char* psCitation, geokey_t keyID)
+ if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ')
+ p1 --;
+ p2 = p1 - 1;
+- while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') )
++ while( p2 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') )
+ p2--;
+ if(p2 != p1 - 1)
+ p1 = p2;
+@@ -198,7 +198,7 @@ char* ImagineCitationTranslation(char* psCitation, geokey_t keyID)
+ if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ')
+ p1 --;
+ char* p2 = p1 - 1;
+- while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') )
++ while( p2 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') )
+ p2--;
+ if(p2 != p1 - 1)
+ p1 = p2;
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
index 0714f93b9b9..575896dad15 100644
--- a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
"${FILESDIR}"/${P}-CVE-2018-20540-fixup.patch # bug 698846
"${FILESDIR}"/${P}-fix-debug.patch # bug 668778
"${FILESDIR}"/${P}-boost-1.73.patch # bug 722878
+ "${FILESDIR}"/${P}-gcc11.patch # bug 789732
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-25 11:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-15 9:54 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/liblas/files/, sci-geosciences/liblas/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-05-25 11:55 Sam James
2018-08-03 11:54 Amy Liffey
2015-10-23 15:56 Amy Winston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox