Accepting request 588645 from home:aaronpuchert
- Remove unused build dependencies. Some of them aren't maintained and don't build anymore. (libLAS, libght) - Google Test is "vendored" and is also not required as dependency. - FindLASzip-cmake.patch: Make sure LASzip is actually detected. - Change license descriptor to BSD-3-Clause matching the license in the repository. - Remove unused CMake variables. - Use standard macros for building and installing. OBS-URL: https://build.opensuse.org/request/show/588645 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/PDAL?expand=0&rev=7
This commit is contained in:
Martin Pluskal
Git OBS Bridge
parent
ff6ebebe96
commit
5b5fd6d674
18
FindLASzip-cmake.patch
Normal file
18
FindLASzip-cmake.patch
Normal file
@ -0,0 +1,18 @@
|
||||
diff -rup a/cmake/modules/FindLASzip.cmake b/cmake/modules/FindLASzip.cmake
|
||||
--- a/cmake/modules/FindLASzip.cmake
|
||||
+++ b/cmake/modules/FindLASzip.cmake
|
||||
@@ -49,11 +49,13 @@ FIND_LIBRARY(LASZIP_LIBRARY
|
||||
NAMES ${LASZIP_NAMES}
|
||||
PATHS
|
||||
/usr/lib
|
||||
+ /usr/lib64
|
||||
/usr/local/lib
|
||||
+ /usr/local/lib64
|
||||
${OSGEO4W_ROOT_DIR}/lib)
|
||||
|
||||
# Comment out laszip.hpp version info
|
||||
-SET(LASZIP_VERSION_H "${LASZIP_INCLUDE_DIR}/laszip/laszip_api_version.h")
|
||||
+SET(LASZIP_VERSION_H "${LASZIP_INCLUDE_DIR}/laszip_api_version.h")
|
||||
IF(LASZIP_INCLUDE_DIR AND EXISTS ${LASZIP_VERSION_H})
|
||||
SET(LASZIP_VERSION 0)
|
||||
|
||||
12
PDAL.changes
12
PDAL.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 17 13:45:07 UTC 2018 - aaronpuchert@alice-dsl.net
|
||||
|
||||
- Remove unused build dependencies. Some of them aren't maintained
|
||||
and don't build anymore. (libLAS, libght)
|
||||
- Google Test is "vendored" and is also not required as dependency.
|
||||
- FindLASzip-cmake.patch: Make sure LASzip is actually detected.
|
||||
- Change license descriptor to BSD-3-Clause matching the license
|
||||
in the repository.
|
||||
- Remove unused CMake variables.
|
||||
- Use standard macros for building and installing.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 15 13:00:20 UTC 2018 - bruno@ioda-net.ch
|
||||
|
||||
|
||||
22
PDAL.spec
22
PDAL.spec
@ -32,8 +32,7 @@ Name: PDAL
|
||||
Version: 1.6.0
|
||||
Release: 0
|
||||
Summary: Point Data Abstraction Library. GDAL for point cloud data
|
||||
#@TODO verify with upstream if not BSD-3
|
||||
License: BSD-2-Clause
|
||||
License: BSD-3-Clause
|
||||
Group: Productivity/Graphics/CAD
|
||||
Url: http://www.pdal.io/
|
||||
Source0: http://download.osgeo.org/pdal/%{name}-%{version}-src.tar.gz
|
||||
@ -41,6 +40,7 @@ Source1: http://download.osgeo.org/pdal/%{name}-%{version}-src.tar.gz.md5
|
||||
# Source2: https://www.pdal.io/PDAL.pdf
|
||||
#Upstream issue#1789 fix for jsoncpp signature
|
||||
Patch0: https://github.com/PDAL/PDAL/commit/f717a4c.patch
|
||||
Patch1: FindLASzip-cmake.patch
|
||||
# Override the problem of libpsl5 in tumbleweed
|
||||
%if 0%{?suse_version} >= 1330
|
||||
BuildRequires: libpsl5
|
||||
@ -62,22 +62,16 @@ BuildRequires: freeglut-devel
|
||||
# Needed for tests
|
||||
BuildRequires: gdal
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: googletest-devel
|
||||
BuildRequires: hdf5-devel
|
||||
BuildRequires: libcgal-devel
|
||||
BuildRequires: libgdal-devel
|
||||
BuildRequires: libgeos-devel
|
||||
BuildRequires: geotiff-devel
|
||||
BuildRequires: libght-devel
|
||||
BuildRequires: jsoncpp-devel
|
||||
# We need 3.1.1+ for 1.6
|
||||
BuildRequires: laszip-devel
|
||||
BuildRequires: liblas-devel
|
||||
BuildRequires: libproj-devel
|
||||
BuildRequires: libspatialindex-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: netcdf-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig(libpq)
|
||||
# We don't have it yet
|
||||
@ -100,8 +94,6 @@ BuildRequires: zlib-devel
|
||||
# For doc but only in TW
|
||||
# BuildRequires: python-sphinxcontrib-breathe
|
||||
# Doesn't exist on obs BuildRequires: python3-breathe
|
||||
BuildRequires: libibumad-devel
|
||||
BuildRequires: libibverbs-devel
|
||||
Requires: lib%{name}%{soname} = %{version}
|
||||
Recommends: bash-completion
|
||||
|
||||
@ -186,6 +178,7 @@ PDAL algorithms.
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}-src
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
# Fix all wrong shebang and move to python3 only
|
||||
find . -type f -iname "*.py" -exec sed 's,^#!/usr/bin/env python,#/usr/bin/python3,' {} \;
|
||||
|
||||
@ -200,14 +193,12 @@ find ./doc/ -type f -iname "*.ai" -delete
|
||||
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \
|
||||
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \
|
||||
-DLIB_INSTALL_DIR=%{_libdir} \
|
||||
-DLIB_NAME=lib%{name} \
|
||||
-DINCLUDE_INSTALL_DIR=%{_includedir} \
|
||||
-DENABLE_CTEST=ON \
|
||||
-DWITH_COMPLETION=ON \
|
||||
-DWITH_TESTS=ON \
|
||||
-DWITH_LASZIP=ON \
|
||||
-DLASZIP_INCLUDE_DIR=%{_includedir} \
|
||||
-DWITH_GEOTIFF=%{_includedir}/libgeotiff \
|
||||
-DGEOTIFF_INCLUDE_DIR=%{_includedir}/libgeotiff \
|
||||
-DBUILD_SHARED_LIBS=ON \
|
||||
-DBUILD_PLUGIN_PYTHON=ON \
|
||||
@ -217,21 +208,18 @@ find ./doc/ -type f -iname "*.ai" -delete
|
||||
-DBUILD_PLUGIN_HEXBIN=OFF \
|
||||
-DBUILD_PLUGIN_ICEBRIDGE=OFF \
|
||||
-DBUILD_PLUGIN_NITF=OFF \
|
||||
-DBUILD_PLUGIN_P2G=OFF \
|
||||
-DBUILD_PLUGIN_PGPOINTCLOUD=ON \
|
||||
-DBUILD_PLUGIN_SQLITE=ON \
|
||||
-DBUILD_PLUGIN_GREYHOUND=OFF \
|
||||
-DBUILD_PLUGIN_PCL=OFF \
|
||||
..
|
||||
|
||||
make VERBOSE=1 %{?_smp_mflags}
|
||||
%make_jobs
|
||||
# Make documentation once fixed upstream
|
||||
# make doxygen html man pdf
|
||||
|
||||
%install
|
||||
pushd build
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
popd
|
||||
%cmake_install
|
||||
|
||||
#No .la lib
|
||||
find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print
|
||||
|
||||
Loading…
Reference in New Issue
Block a user