Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/, sci-libs/indilib/files/
Date: Wed, 14 Jul 2021 13:44:15
Message-Id: 1626270219.31f57fcf95df722dbe0263d5e41863cd3ad48d3b.asturm@gentoo
1 commit: 31f57fcf95df722dbe0263d5e41863cd3ad48d3b
2 Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
3 AuthorDate: Mon Jul 5 16:00:39 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 14 13:43:39 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31f57fcf
7
8 sci-libs/indilib: fix include
9
10 Closes: https://bugs.gentoo.org/800614
11 Package-Manager: Portage-3.0.20, Repoman-3.0.2
12 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
13 Closes: https://github.com/gentoo/gentoo/pull/21538
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 .../indilib/files/indilib-1.9.1-fix-include.patch | 26 +++++++++
17 sci-libs/indilib/indilib-1.9.1-r1.ebuild | 61 ++++++++++++++++++++++
18 2 files changed, 87 insertions(+)
19
20 diff --git a/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch b/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch
21 new file mode 100644
22 index 00000000000..7e3e24880d4
23 --- /dev/null
24 +++ b/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch
25 @@ -0,0 +1,26 @@
26 +From 907b3d81f27593e709af9e3f2cdc6dab05d6d80a Mon Sep 17 00:00:00 2001
27 +From: Paolo Stivanin <paolostivanin@××××××××××××××××××××.com>
28 +Date: Tue, 29 Jun 2021 08:52:04 +0200
29 +Subject: [PATCH] Fix indimacros include path on baseclient.h (#1503)
30 +
31 +---
32 + libs/indibase/baseclient.h | 2 +-
33 + 1 file changed, 1 insertion(+), 1 deletion(-)
34 +
35 +diff --git a/libs/indibase/baseclient.h b/libs/indibase/baseclient.h
36 +index 6d5e49b9a..2656d7486 100644
37 +--- a/libs/indibase/baseclient.h
38 ++++ b/libs/indibase/baseclient.h
39 +@@ -20,11 +20,11 @@
40 +
41 + #include "indiapi.h"
42 + #include "indibase.h"
43 ++#include "indimacros.h"
44 +
45 + #include <string>
46 + #include <vector>
47 +
48 +-#include <indimacros.h>
49 + #include <memory>
50 +
51 + // #define MAXRBUF 2048 // #PS: defined in indibase.h
52
53 diff --git a/sci-libs/indilib/indilib-1.9.1-r1.ebuild b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
54 new file mode 100644
55 index 00000000000..eb8784d3454
56 --- /dev/null
57 +++ b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
58 @@ -0,0 +1,61 @@
59 +# Copyright 1999-2021 Gentoo Authors
60 +# Distributed under the terms of the GNU General Public License v2
61 +
62 +EAPI=7
63 +
64 +inherit cmake udev
65 +
66 +DESCRIPTION="INDI Astronomical Control Protocol library"
67 +HOMEPAGE="https://www.indilib.org/"
68 +SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
69 +S="${WORKDIR}/${P/lib/}"
70 +
71 +LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
72 +SLOT="0/1"
73 +KEYWORDS="~amd64 ~x86"
74 +IUSE="ogg rtlsdr test websocket"
75 +
76 +RESTRICT="!test? ( test )"
77 +
78 +RDEPEND="
79 + net-misc/curl
80 + sci-libs/cfitsio:=
81 + sci-libs/fftw:3.0=
82 + sci-libs/gsl:=
83 + sci-libs/libnova:=
84 + sys-libs/zlib
85 + virtual/jpeg:0
86 + virtual/libusb:0
87 + ogg? (
88 + media-libs/libogg
89 + media-libs/libtheora
90 + )
91 + rtlsdr? ( net-wireless/rtl-sdr )
92 + websocket? ( dev-libs/boost:= )
93 +"
94 +DEPEND="${RDEPEND}
95 + kernel_linux? ( sys-kernel/linux-headers )
96 + test? ( >=dev-cpp/gtest-1.8.0 )
97 + websocket? ( dev-cpp/websocketpp )
98 +"
99 +
100 +PATCHES=(
101 + "${FILESDIR}"/indilib-1.9.1-fix-include.patch
102 +)
103 +
104 +src_configure() {
105 + local mycmakeargs=(
106 + -DINDI_BUILD_QT5_CLIENT=OFF
107 + -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
108 + $(cmake_use_find_package ogg OggTheora)
109 + $(cmake_use_find_package rtlsdr RTLSDR)
110 + -DINDI_BUILD_UNITTESTS=$(usex test)
111 + -DINDI_BUILD_WEBSOCKET=$(usex websocket)
112 + )
113 +
114 + cmake_src_configure
115 +}
116 +
117 +src_test() {
118 + BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
119 +}