[packages/gtatool] - fix pcl detection - rel 2

baggins baggins at pld-linux.org
Sat May 11 14:30:49 CEST 2019


commit 0498f6eb6eb2227ace65f3c51cfd43bf754b79d2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat May 11 14:30:33 2019 +0200

    - fix pcl detection
    - rel 2

 gtatool.spec  | 12 +++++++-----
 pcl-1.9.patch | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/gtatool.spec b/gtatool.spec
index 13d3438..8dfc422 100644
--- a/gtatool.spec
+++ b/gtatool.spec
@@ -25,14 +25,15 @@ Summary:	Tools to manipulate Generic Tagged Array (GTA) files
 Summary(pl.UTF-8):	Narzędzia do obróbki plików GTA (ogólnych tablic etykietowanych)
 Name:		gtatool
 Version:	2.2.3
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		Applications/File
 Source0:	https://marlam.de/gta/releases/%{name}-%{version}.tar.xz
 # Source0-md5:	afa7556b180f69f0b11c08902117e7f5
-Patch1:		%{name}-getopt.patch
-Patch2:		%{name}-bashcomp.patch
-Patch5:		imagemagick7.patch
+Patch0:		%{name}-getopt.patch
+Patch1:		%{name}-bashcomp.patch
+Patch2:		imagemagick7.patch
+Patch3:		pcl-1.9.patch
 URL:		http://gta.nongnu.org/gtatool.html
 %{?with_magick:BuildRequires:	ImageMagick-c++-devel}
 %{?with_openexr:BuildRequires:	OpenEXR-devel}
@@ -296,9 +297,10 @@ Bashowe uzupełnianie parametrów programu gtatool.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch5 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
diff --git a/pcl-1.9.patch b/pcl-1.9.patch
new file mode 100644
index 0000000..e05e379
--- /dev/null
+++ b/pcl-1.9.patch
@@ -0,0 +1,15 @@
+--- gtatool-2.2.3/configure.ac~	2019-05-11 14:26:22.000000000 +0200
++++ gtatool-2.2.3/configure.ac	2019-05-11 14:29:11.905612327 +0200
+@@ -460,10 +460,11 @@
+     PKG_CHECK_MODULES([libpcl_io], [pcl_io >= 1.6], [],
+         [PKG_CHECK_MODULES([libpcl_io], [pcl_io-1.7 >= 1.7], [],
+             [PKG_CHECK_MODULES([libpcl_io], [pcl_io-1.8 >= 1.8], [],
++              [PKG_CHECK_MODULES([libpcl_io], [pcl_io-1.9 >= 1.9], [],
+                 [pcd="no "
+                 AC_MSG_WARN([PCL io library not found:])
+                 AC_MSG_WARN([$libpcl_io_PKG_ERRORS])
+-                AC_MSG_WARN([Disabled the from-pcd and to-pcd commands.])])])])
++                AC_MSG_WARN([Disabled the from-pcd and to-pcd commands.])])])])])
+ fi
+ AC_DEFINE_UNQUOTED([WITH_PCD], [`if test "$pcd" = "yes"; then echo "1"; else echo "0"; fi`], [Use pcd?])
+ AM_CONDITIONAL([WITH_PCD], [test "$pcd" = "yes"])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtatool.git/commitdiff/0498f6eb6eb2227ace65f3c51cfd43bf754b79d2



More information about the pld-cvs-commit mailing list