* [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/files/, sci-libs/indilib/
@ 2023-08-25 10:03 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-08-25 10:03 UTC (permalink / raw
To: gentoo-commits
commit: 3ad52ffd7f54fe44be6639222b76bfe334b612f1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 09:59:06 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 10:03:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad52ffd
sci-libs/indilib: drop 1.9.8, 2.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/indilib/Manifest | 2 -
sci-libs/indilib/files/indilib-2.0.2-musl.patch | 37 ------------
sci-libs/indilib/indilib-1.9.8.ebuild | 73 -----------------------
sci-libs/indilib/indilib-2.0.2.ebuild | 78 -------------------------
4 files changed, 190 deletions(-)
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 8c295f3aba1f..ce0c8c2c2354 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,3 +1 @@
-DIST indilib-1.9.8.tar.gz 2633085 BLAKE2B 045d38fc565546528fddfa83cfd78650d30e41769923d7ec8f462a617fdd298228913a075a9f0b511867aa9174143da010bbb4c015d8b5a1d51f2b80090e50d5 SHA512 b9551547de277fe311e4779e65915351850a25fb049ddcfad634ef385014b521416f2366cf50cda80cdfa4a754c18face21cfd59f7f45c4018ca733ddf981ab2
-DIST indilib-2.0.2.tar.gz 2708561 BLAKE2B 57fc3ec79656644380e4e35ebd78cb276afba072894e44a9e30f6c82abf969d79499682821ddaa06fc9698bc8b9f09c98f764c60fab6f5df6ab00de321f5ecd3 SHA512 6cfb00669da71310811fd1668afc2f3b68060b5ca6addaaf3834fe574dc5da1a07c7f799bed3e1b7fe9e6df2367dfc835895cf9e58a65a1fbd8a7c10b7db39bc
DIST indilib-2.0.3.tar.gz 2713456 BLAKE2B b74f3319c744227b533616ec369cb6f379253928c1d73ef8336d122152fcb866403efe8c7aa6f65c99ba10149b0b2b43c4a86a87f82353ce045602b261b75618 SHA512 323e694f90d71cf26da8b05d60d136f2422dc12e31ec88012250faf795e67bb95da2fd729cacc5bfa7cb74cc8fe1e12a0512cb57e694c87f362a4828228db0b7
diff --git a/sci-libs/indilib/files/indilib-2.0.2-musl.patch b/sci-libs/indilib/files/indilib-2.0.2-musl.patch
deleted file mode 100644
index 5e906bdef748..000000000000
--- a/sci-libs/indilib/files/indilib-2.0.2-musl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2e95bc3a8487912c3edc5d83e00557d20335ba3e Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 26 Jul 2023 05:30:00 +0100
-Subject: [PATCH] drivers: auxiliary: use stdint.h types (fix musl build)
- (#1914)
-
----
- drivers/auxiliary/pegasus_upb.cpp | 2 +-
- drivers/auxiliary/pegasus_upb.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/auxiliary/pegasus_upb.cpp b/drivers/auxiliary/pegasus_upb.cpp
-index 6aa290a2d8..437d3e19cc 100644
---- a/drivers/auxiliary/pegasus_upb.cpp
-+++ b/drivers/auxiliary/pegasus_upb.cpp
-@@ -1356,7 +1356,7 @@ bool PegasusUPB::sensorUpdated(const std::vector<std::string> &result, uint8_t s
- //////////////////////////////////////////////////////////////////////
- ///
- //////////////////////////////////////////////////////////////////////
--bool PegasusUPB::stepperUpdated(const std::vector<std::string> &result, u_int8_t index)
-+bool PegasusUPB::stepperUpdated(const std::vector<std::string> &result, uint8_t index)
- {
- if (lastStepperData.empty())
- return true;
-diff --git a/drivers/auxiliary/pegasus_upb.h b/drivers/auxiliary/pegasus_upb.h
-index 47546f7453..7b6cae6de9 100644
---- a/drivers/auxiliary/pegasus_upb.h
-+++ b/drivers/auxiliary/pegasus_upb.h
-@@ -141,7 +141,7 @@ class PegasusUPB : public INDI::DefaultDevice, public INDI::FocuserInterface, pu
- * If the previous stepper data is empty then this will always
- * return true.
- */
-- bool stepperUpdated(const std::vector<std::string> &result, u_int8_t index);
-+ bool stepperUpdated(const std::vector<std::string> &result, uint8_t index);
-
- int PortFD { -1 };
- bool setupComplete { false };
diff --git a/sci-libs/indilib/indilib-1.9.8.ebuild b/sci-libs/indilib/indilib-1.9.8.ebuild
deleted file mode 100644
index 07de9ea058ec..000000000000
--- a/sci-libs/indilib/indilib-1.9.8.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/lib/}"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86"
-IUSE="ogg rtlsdr test websocket"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/libev
- media-libs/libjpeg-turbo:=
- net-misc/curl
- sci-libs/cfitsio:=
- sci-libs/fftw:3.0=
- sci-libs/gsl:=
- sci-libs/libnova:=
- sys-libs/zlib
- virtual/libusb:1
- ogg? (
- media-libs/libogg
- media-libs/libtheora
- )
- rtlsdr? ( net-wireless/rtl-sdr )
- websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
- kernel_linux? ( sys-kernel/linux-headers )
- test? ( >=dev-cpp/gtest-1.8.0 )
- websocket? ( dev-cpp/websocketpp )
-"
-
-src_configure() {
- local mycmakeargs=(
- -DINDI_BUILD_QT5_CLIENT=OFF
- -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
- $(cmake_use_find_package ogg OggTheora)
- $(cmake_use_find_package rtlsdr RTLSDR)
- -DINDI_BUILD_UNITTESTS=$(usex test)
- -DINDI_BUILD_INTEGTESTS=$(usex test)
- -DINDI_BUILD_WEBSOCKET=$(usex websocket)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- # Unit tests
- BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-
- # Integration tests
- # They fail in parallel because they try to bind to the same port more
- # than once.
- BUILD_DIR="${BUILD_DIR}"/integs cmake_src_test -j1
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/sci-libs/indilib/indilib-2.0.2.ebuild b/sci-libs/indilib/indilib-2.0.2.ebuild
deleted file mode 100644
index 64fd177a06a1..000000000000
--- a/sci-libs/indilib/indilib-2.0.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/lib/}"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="ogg rtlsdr test websocket"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/libev
- media-libs/libjpeg-turbo:=
- net-misc/curl
- sci-libs/cfitsio:=
- sci-libs/fftw:3.0=
- sci-libs/gsl:=
- sci-libs/libnova:=
- sys-libs/zlib
- virtual/libusb:1
- ogg? (
- media-libs/libogg
- media-libs/libtheora
- )
- rtlsdr? ( net-wireless/rtl-sdr )
- websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
- kernel_linux? ( sys-kernel/linux-headers )
- test? ( >=dev-cpp/gtest-1.8.0 )
- websocket? ( dev-cpp/websocketpp )
-"
-
-PATCHES=( "${FILESDIR}/${P}-musl.patch" ) # git master, bug 873403
-
-src_configure() {
- local mycmakeargs=(
- -DINDI_BUILD_QT5_CLIENT=OFF
- -DINDI_BUILD_SHARED=ON
- -DINDI_BUILD_STATIC=OFF
- -DINDI_BUILD_XISF=OFF # not packaged
- -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
- $(cmake_use_find_package ogg OggTheora)
- $(cmake_use_find_package rtlsdr RTLSDR)
- -DINDI_BUILD_UNITTESTS=$(usex test)
- -DINDI_BUILD_INTEGTESTS=$(usex test)
- -DINDI_BUILD_WEBSOCKET=$(usex websocket)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- # Unit tests
- BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-
- # Integration tests
- # They fail in parallel because they try to bind to the same port more
- # than once.
- BUILD_DIR="${BUILD_DIR}"/integs cmake_src_test -j1
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/files/, sci-libs/indilib/
@ 2024-07-13 16:28 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2024-07-13 16:28 UTC (permalink / raw
To: gentoo-commits
commit: a796b07b936ac44bcf82b6ea2370946e8215a988
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 16:24:38 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 16:28:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a796b07b
sci-libs/indilib: drop 2.0.7
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/indilib/Manifest | 1 -
.../files/indilib-2.0.7-fix-system-httplib.patch | 32 --------
sci-libs/indilib/indilib-2.0.7.ebuild | 87 ----------------------
3 files changed, 120 deletions(-)
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index faf6a9284aaf..80d24a500f49 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,2 +1 @@
-DIST indilib-2.0.7.tar.gz 2843758 BLAKE2B dee94a40d4b3c5c4d994d945a3608a41765af14c4937d475bdf80dca5d5847b814e0d9a1060f39b15b109916dee45f1876ce8edd29588e209276e3b1bf6f3dd7 SHA512 292c0a5b8f07b24c42ea9424be19012c97317206b837d8601ec4d771fa35c314bf00712509f8199ee3da193ea12f0c3e90036a49deece304dc256cdeba60810d
DIST indilib-2.0.8.tar.gz 2851129 BLAKE2B 061ed06bbb122e5579d881ff76d84e6629045eb9972da68fb0c66554f453e7a0660c0017858b8626af70a114bf099c3f7397c6789f41ed99335bde0de767fb95 SHA512 a9b4c5efe9841c024a7ccc271b2de6626ee442d3543f621822522950cc7549def9de111e66e6d183e0a63bead6d1e211fa6025463f9ca4bad30b7a457c5f66b9
diff --git a/sci-libs/indilib/files/indilib-2.0.7-fix-system-httplib.patch b/sci-libs/indilib/files/indilib-2.0.7-fix-system-httplib.patch
deleted file mode 100644
index 81876a468fa2..000000000000
--- a/sci-libs/indilib/files/indilib-2.0.7-fix-system-httplib.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1d9e7a4645aa9d1c8534a0e69c3fb212382ac1ed Mon Sep 17 00:00:00 2001
-From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Fri, 12 Apr 2024 11:31:01 +0200
-Subject: [PATCH] Link against httplib if using system libraries (#2039)
-
----
- drivers/auxiliary/CMakeLists.txt | 2 +-
- drivers/dome/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/auxiliary/CMakeLists.txt b/drivers/auxiliary/CMakeLists.txt
-index 66f7e3a615..41279d0a9d 100644
---- a/drivers/auxiliary/CMakeLists.txt
-+++ b/drivers/auxiliary/CMakeLists.txt
-@@ -313,5 +313,5 @@ SET(dragonlight_SRC
- dragonlight.cpp)
-
- add_executable(indi_dragon_light ${dragonlight_SRC})
--target_link_libraries(indi_dragon_light indidriver)
-+target_link_libraries(indi_dragon_light indidriver ${HTTPLIB_LIBRARY})
- install(TARGETS indi_dragon_light RUNTIME DESTINATION bin)
-diff --git a/drivers/dome/CMakeLists.txt b/drivers/dome/CMakeLists.txt
-index 9dfdc812b8..377af11d2f 100644
---- a/drivers/dome/CMakeLists.txt
-+++ b/drivers/dome/CMakeLists.txt
-@@ -80,5 +80,5 @@ SET(dragonlair_SRC
- dragonlair.cpp)
-
- add_executable(indi_dragonlair_dome ${dragonlair_SRC})
--target_link_libraries(indi_dragonlair_dome indidriver)
-+target_link_libraries(indi_dragonlair_dome indidriver ${HTTPLIB_LIBRARY})
- install(TARGETS indi_dragonlair_dome RUNTIME DESTINATION bin)
diff --git a/sci-libs/indilib/indilib-2.0.7.ebuild b/sci-libs/indilib/indilib-2.0.7.ebuild
deleted file mode 100644
index 982a14057620..000000000000
--- a/sci-libs/indilib/indilib-2.0.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/lib/}"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="ogg rtlsdr test websocket"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-cpp/cpp-httplib:=
- dev-cpp/nlohmann_json
- dev-libs/libev
- media-libs/libjpeg-turbo:=
- net-misc/curl
- sci-libs/cfitsio:=
- sci-libs/fftw:3.0=
- sci-libs/gsl:=
- sci-libs/libnova:=
- sys-libs/zlib
- virtual/libusb:1
- ogg? (
- media-libs/libogg
- media-libs/libtheora
- )
- rtlsdr? ( net-wireless/rtl-sdr )
- websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
- kernel_linux? ( sys-kernel/linux-headers )
- test? ( >=dev-cpp/gtest-1.8.0 )
- websocket? ( dev-cpp/websocketpp )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-system-httplib.patch" )
-
-src_configure() {
- # -Werror=odr
- # https://bugs.gentoo.org/878525
- # https://github.com/indilib/indi/issues/2023
- filter-lto
-
- local mycmakeargs=(
- -DINDI_SYSTEM_HTTPLIB=ON
- -DINDI_SYSTEM_JSONLIB=ON
- -DINDI_BUILD_QT5_CLIENT=OFF
- -DINDI_BUILD_SHARED=ON
- -DINDI_BUILD_STATIC=OFF
- -DINDI_BUILD_XISF=OFF # not packaged
- -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
- $(cmake_use_find_package ogg OggTheora)
- $(cmake_use_find_package rtlsdr RTLSDR)
- -DINDI_BUILD_UNITTESTS=$(usex test)
- -DINDI_BUILD_INTEGTESTS=$(usex test)
- -DINDI_BUILD_WEBSOCKET=$(usex websocket)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- # Unit tests
- BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-
- # Integration tests
- # They fail in parallel because they try to bind to the same port more
- # than once.
- BUILD_DIR="${BUILD_DIR}"/integs cmake_src_test -j1
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/files/, sci-libs/indilib/
@ 2024-04-22 17:52 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2024-04-22 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 10a790584061b62559cf5b864a43c1d5c668ab73
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 17:25:04 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 17:51:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a79058
sci-libs/indilib: add 2.0.7
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/indilib/Manifest | 1 +
.../files/indilib-2.0.7-fix-system-httplib.patch | 32 ++++++++
sci-libs/indilib/indilib-2.0.7.ebuild | 87 ++++++++++++++++++++++
3 files changed, 120 insertions(+)
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 2b5df8d200b3..258a72594337 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1 +1,2 @@
DIST indilib-2.0.6.tar.gz 2793169 BLAKE2B ebbbc40074df8ea77b781d09d802506003e3f71ee9450730b145ff9d190d9a0d41bcb7db4449fb05f138d536b811d7fcbfd095516b2f73a163bd110335d3d14d SHA512 e00ca31f4bc2298529586e5c1cc35389e9dcc72f9b93a1c5a4594c4c3d11f72a63e02d228a582f4ee08b7986a8eed6ebe53cb19b25fa05ebe53243708d2a8ff5
+DIST indilib-2.0.7.tar.gz 2843758 BLAKE2B dee94a40d4b3c5c4d994d945a3608a41765af14c4937d475bdf80dca5d5847b814e0d9a1060f39b15b109916dee45f1876ce8edd29588e209276e3b1bf6f3dd7 SHA512 292c0a5b8f07b24c42ea9424be19012c97317206b837d8601ec4d771fa35c314bf00712509f8199ee3da193ea12f0c3e90036a49deece304dc256cdeba60810d
diff --git a/sci-libs/indilib/files/indilib-2.0.7-fix-system-httplib.patch b/sci-libs/indilib/files/indilib-2.0.7-fix-system-httplib.patch
new file mode 100644
index 000000000000..81876a468fa2
--- /dev/null
+++ b/sci-libs/indilib/files/indilib-2.0.7-fix-system-httplib.patch
@@ -0,0 +1,32 @@
+From 1d9e7a4645aa9d1c8534a0e69c3fb212382ac1ed Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Fri, 12 Apr 2024 11:31:01 +0200
+Subject: [PATCH] Link against httplib if using system libraries (#2039)
+
+---
+ drivers/auxiliary/CMakeLists.txt | 2 +-
+ drivers/dome/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/auxiliary/CMakeLists.txt b/drivers/auxiliary/CMakeLists.txt
+index 66f7e3a615..41279d0a9d 100644
+--- a/drivers/auxiliary/CMakeLists.txt
++++ b/drivers/auxiliary/CMakeLists.txt
+@@ -313,5 +313,5 @@ SET(dragonlight_SRC
+ dragonlight.cpp)
+
+ add_executable(indi_dragon_light ${dragonlight_SRC})
+-target_link_libraries(indi_dragon_light indidriver)
++target_link_libraries(indi_dragon_light indidriver ${HTTPLIB_LIBRARY})
+ install(TARGETS indi_dragon_light RUNTIME DESTINATION bin)
+diff --git a/drivers/dome/CMakeLists.txt b/drivers/dome/CMakeLists.txt
+index 9dfdc812b8..377af11d2f 100644
+--- a/drivers/dome/CMakeLists.txt
++++ b/drivers/dome/CMakeLists.txt
+@@ -80,5 +80,5 @@ SET(dragonlair_SRC
+ dragonlair.cpp)
+
+ add_executable(indi_dragonlair_dome ${dragonlair_SRC})
+-target_link_libraries(indi_dragonlair_dome indidriver)
++target_link_libraries(indi_dragonlair_dome indidriver ${HTTPLIB_LIBRARY})
+ install(TARGETS indi_dragonlair_dome RUNTIME DESTINATION bin)
diff --git a/sci-libs/indilib/indilib-2.0.7.ebuild b/sci-libs/indilib/indilib-2.0.7.ebuild
new file mode 100644
index 000000000000..97825f10c559
--- /dev/null
+++ b/sci-libs/indilib/indilib-2.0.7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic udev
+
+DESCRIPTION="INDI Astronomical Control Protocol library"
+HOMEPAGE="https://www.indilib.org/"
+SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/lib/}"
+
+LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="ogg rtlsdr test websocket"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-cpp/cpp-httplib:=
+ dev-cpp/nlohmann_json
+ dev-libs/libev
+ media-libs/libjpeg-turbo:=
+ net-misc/curl
+ sci-libs/cfitsio:=
+ sci-libs/fftw:3.0=
+ sci-libs/gsl:=
+ sci-libs/libnova:=
+ sys-libs/zlib
+ virtual/libusb:1
+ ogg? (
+ media-libs/libogg
+ media-libs/libtheora
+ )
+ rtlsdr? ( net-wireless/rtl-sdr )
+ websocket? ( dev-libs/boost:= )
+"
+DEPEND="${RDEPEND}
+ kernel_linux? ( sys-kernel/linux-headers )
+ test? ( >=dev-cpp/gtest-1.8.0 )
+ websocket? ( dev-cpp/websocketpp )
+"
+
+PATCHES=( ${FILESDIR}/${P}-fix-system-httplib.patch )
+
+src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/878525
+ # https://github.com/indilib/indi/issues/2023
+ filter-lto
+
+ local mycmakeargs=(
+ -DINDI_SYSTEM_HTTPLIB=ON
+ -DINDI_SYSTEM_JSONLIB=ON
+ -DINDI_BUILD_QT5_CLIENT=OFF
+ -DINDI_BUILD_SHARED=ON
+ -DINDI_BUILD_STATIC=OFF
+ -DINDI_BUILD_XISF=OFF # not packaged
+ -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
+ $(cmake_use_find_package ogg OggTheora)
+ $(cmake_use_find_package rtlsdr RTLSDR)
+ -DINDI_BUILD_UNITTESTS=$(usex test)
+ -DINDI_BUILD_INTEGTESTS=$(usex test)
+ -DINDI_BUILD_WEBSOCKET=$(usex websocket)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ # Unit tests
+ BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
+
+ # Integration tests
+ # They fail in parallel because they try to bind to the same port more
+ # than once.
+ BUILD_DIR="${BUILD_DIR}"/integs cmake_src_test -j1
+}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/files/, sci-libs/indilib/
@ 2021-11-29 14:26 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-11-29 14:26 UTC (permalink / raw
To: gentoo-commits
commit: 83b096ef1df3e1b6eb57b17bbe2aa0dfa484b494
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 14:26:28 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 14:26:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83b096ef
sci-libs/indilib: Drop 1.9.1-r1
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/indilib/Manifest | 1 -
.../indilib/files/indilib-1.9.1-fix-include.patch | 26 ---------
sci-libs/indilib/indilib-1.9.1-r1.ebuild | 61 ----------------------
3 files changed, 88 deletions(-)
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 93773d6bb5db..fbcacbbd6fb3 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,3 +1,2 @@
-DIST indilib-1.9.1.tar.gz 2322783 BLAKE2B 801071bf9190e4c27b4f3bf9fa2d9a44c4e297f7ee879061636f041d138a02db23525ee411782f3303a0d82bb2fc4d9d6489e2bda18f8e011bfa0d1b33595343 SHA512 d87c341efdaa8109059741738c69b9d6fb4b5dc68c774453eab378aa3784af29e8ed8469dba968a41c584fec1556fdbf0bd65cbb8aa65c2d9e1784d82e7bcc67
DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44
DIST indilib-1.9.3.tar.gz 2350168 BLAKE2B 4e61f79a08d32ee829bb420c2f316f9f0168d21d6d2f11905142efd390e989571a3120ea5d123df4af05d0c6c7a4a7323f8c9fc95bc652afef3fd57bc9728c88 SHA512 d0c1b17f75a25e546261cabe644420dca155672d9223eaf48fad7ed5bbc3fcf80784df1ff21c5edded0f80e0c5ef61303892afa597b611dfd3f57a1a113be5f7
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
deleted file mode 100644
index 7e3e24880d43..000000000000
--- a/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 907b3d81f27593e709af9e3f2cdc6dab05d6d80a Mon Sep 17 00:00:00 2001
-From: Paolo Stivanin <paolostivanin@users.noreply.github.com>
-Date: Tue, 29 Jun 2021 08:52:04 +0200
-Subject: [PATCH] Fix indimacros include path on baseclient.h (#1503)
-
----
- libs/indibase/baseclient.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/indibase/baseclient.h b/libs/indibase/baseclient.h
-index 6d5e49b9a..2656d7486 100644
---- a/libs/indibase/baseclient.h
-+++ b/libs/indibase/baseclient.h
-@@ -20,11 +20,11 @@
-
- #include "indiapi.h"
- #include "indibase.h"
-+#include "indimacros.h"
-
- #include <string>
- #include <vector>
-
--#include <indimacros.h>
- #include <memory>
-
- // #define MAXRBUF 2048 // #PS: defined in indibase.h
diff --git a/sci-libs/indilib/indilib-1.9.1-r1.ebuild b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
deleted file mode 100644
index 15d77f70204d..000000000000
--- a/sci-libs/indilib/indilib-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/lib/}"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ogg rtlsdr test websocket"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- net-misc/curl
- sci-libs/cfitsio:=
- sci-libs/fftw:3.0=
- sci-libs/gsl:=
- sci-libs/libnova:=
- sys-libs/zlib
- virtual/jpeg:0
- virtual/libusb:0
- ogg? (
- media-libs/libogg
- media-libs/libtheora
- )
- rtlsdr? ( net-wireless/rtl-sdr )
- websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
- kernel_linux? ( sys-kernel/linux-headers )
- test? ( >=dev-cpp/gtest-1.8.0 )
- websocket? ( dev-cpp/websocketpp )
-"
-
-PATCHES=(
- "${FILESDIR}"/indilib-1.9.1-fix-include.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DINDI_BUILD_QT5_CLIENT=OFF
- -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
- $(cmake_use_find_package ogg OggTheora)
- $(cmake_use_find_package rtlsdr RTLSDR)
- -DINDI_BUILD_UNITTESTS=$(usex test)
- -DINDI_BUILD_WEBSOCKET=$(usex websocket)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/files/, sci-libs/indilib/
@ 2016-07-25 21:30 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-07-25 21:30 UTC (permalink / raw
To: gentoo-commits
commit: c8cfdbf910a2f93eb7ded8d3666a09079113c23a
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 21:29:43 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 21:29:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8cfdbf9
sci-libs/indilib: remove old
Package-Manager: portage-2.3.0
sci-libs/indilib/Manifest | 1 -
.../indilib/files/indilib-0.9.8.1-symlinks.patch | 22 -----------
sci-libs/indilib/indilib-0.9.9.ebuild | 46 ----------------------
3 files changed, 69 deletions(-)
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index b64e740..c8064ed 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,3 +1,2 @@
-DIST libindi_0.9.9.tar.gz 1275689 SHA256 720b9096baef1489fd7d7d4a236177863a7f7cec86809f21d291b0d9758e4039 SHA512 b905f59252b09cfb79d7b882ce7af8f4bd14d0b22cbff090962cfdd031c78454e5b63e930fc95a2356de5a60355afa3f83b4fa1298db9e7507778d3287df48cd WHIRLPOOL 691b17e6e0a85383b7a34db7e188150ff304579850b2e9389f9ef7c1534a0610b833aa79d12eebc4294d073c3eb3322fb9a3584f9e23a182c8ab7bdf03461b9a
DIST libindi_1.1.0.tar.gz 1374132 SHA256 1ca093b551580e238ac605f156535feebc6c0f9b18d7911ed44a9186f9a446af SHA512 c97767f3919d7ca9b7a3b35cda13127ecbbc6c03cf863755bad6f7f03b934b40bf857523ea7bbc22f0dcb2304d837161c295e4f769a3724240ad9539ac4158a7 WHIRLPOOL 82d8c5562b2cf31a78344d691db13b053fc966f4ce54968035da69e28a3c36ba11c759fb2c1d8695368dfb4eff5d71bb080847bf927d12b055e13fbe53a94800
DIST libindi_1.2.0.tar.gz 1425804 SHA256 a1cf17a4f0a0ca30afd4c131b82e181aeb42a68cda176d5b4c6945436ced2321 SHA512 4d7b67e3ff6000132c2971e58942c5f95822d156c6f9587697b6179137cd40997527d62886d0f5fe053980d1a404b61191d1c54194e9a7154bd10b0e3a7c05d6 WHIRLPOOL fe710841e63acc806b17414df231cd178680da8ed8e7c719c32e34cae9d2203362a9cce0cb7e0593d46dda98f9bb8e9b2cc7d28442e491fb11e1786b3145feca
diff --git a/sci-libs/indilib/files/indilib-0.9.8.1-symlinks.patch b/sci-libs/indilib/files/indilib-0.9.8.1-symlinks.patch
deleted file mode 100644
index 51d3223..0000000
--- a/sci-libs/indilib/files/indilib-0.9.8.1-symlinks.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -242,14 +242,11 @@
-
- install(TARGETS indi_lx200generic RUNTIME DESTINATION bin )
-
--file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake
--"exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200classic)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200autostar)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200_16)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200gps)\n
--exec_program(\"${CMAKE_COMMAND}\" ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200ap)\n
--")
--set_target_properties(indi_lx200generic PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake)
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200classic\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200autostar\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200_16\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx20gps\" )" )
-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${BIN_INSTALL_DIR}/indi_lx200generic\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200ap\" )" )
- #################################################################################
-
- ########### LX200 Generic Legacy ###########
diff --git a/sci-libs/indilib/indilib-0.9.9.ebuild b/sci-libs/indilib/indilib-0.9.9.ebuild
deleted file mode 100644
index 059a10b..0000000
--- a/sci-libs/indilib/indilib-0.9.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="lib${PN/lib/}"
-
-inherit cmake-utils udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="http://www.indilib.org/"
-SRC_URI="mirror://sourceforge/${PN/lib/}/${MY_PN}_${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
- sci-libs/cfitsio
- sci-libs/libnova
- sci-libs/gsl
- sys-libs/zlib
- virtual/jpeg:0
- virtual/libusb:0
-"
-DEPEND="${RDEPEND}
- sys-kernel/linux-headers
-"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.9.8.1-symlinks.patch"
-)
-
-S=${WORKDIR}/${MY_PN}_${PV}
-
-src_configure() {
- local mycmakeargs=(
- -DUDEVRULES_INSTALL_DIR=$(get_udevdir)
- )
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-07-13 16:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-25 10:03 [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/files/, sci-libs/indilib/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-07-13 16:28 Andreas Sturmlechner
2024-04-22 17:52 Andreas Sturmlechner
2021-11-29 14:26 Andreas Sturmlechner
2016-07-25 21:30 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox