diff options
Diffstat (limited to 'sci-libs/indilib')
| -rw-r--r-- | sci-libs/indilib/Manifest | 7 | ||||
| -rw-r--r-- | sci-libs/indilib/files/indilib-2.0.7-fix-system-httplib.patch | 32 | ||||
| -rw-r--r-- | sci-libs/indilib/indilib-2.0.8.ebuild | 7 | ||||
| -rw-r--r-- | sci-libs/indilib/indilib-2.0.9.ebuild (renamed from sci-libs/indilib/indilib-2.0.7.ebuild) | 11 |
4 files changed, 6 insertions, 51 deletions
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index a2e81699ffe5..0c0e55d92266 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1,6 +1,5 @@ -AUX indilib-2.0.7-fix-system-httplib.patch 1359 BLAKE2B d2a8000039bedef796d7e751000320bb3aaa69563fc5ef878d0b4c8b2a274087d30230388cc5b05a9fcb25f4b5369ce501d9b13d7f88dbf213096b9f893b3c62 SHA512 81ed02c6a92a4e2143551f4e2abdaacf44d747bb4c4cb06b18807fc005c4c97b87a4d0830dea6d6f8a473162d5863eee6d0aceab6396c2a3a35b9e951c2b7dc3 -DIST indilib-2.0.7.tar.gz 2843758 BLAKE2B dee94a40d4b3c5c4d994d945a3608a41765af14c4937d475bdf80dca5d5847b814e0d9a1060f39b15b109916dee45f1876ce8edd29588e209276e3b1bf6f3dd7 SHA512 292c0a5b8f07b24c42ea9424be19012c97317206b837d8601ec4d771fa35c314bf00712509f8199ee3da193ea12f0c3e90036a49deece304dc256cdeba60810d DIST indilib-2.0.8.tar.gz 2851129 BLAKE2B 061ed06bbb122e5579d881ff76d84e6629045eb9972da68fb0c66554f453e7a0660c0017858b8626af70a114bf099c3f7397c6789f41ed99335bde0de767fb95 SHA512 a9b4c5efe9841c024a7ccc271b2de6626ee442d3543f621822522950cc7549def9de111e66e6d183e0a63bead6d1e211fa6025463f9ca4bad30b7a457c5f66b9 -EBUILD indilib-2.0.7.ebuild 1954 BLAKE2B 83c4595530644a5211c6dfb415d60ead126b567fbbd42033a79ddecfe54f5ac7876de20a9064b9bba304a2c6dd1ad8d851024e437c81f9c4d59ae55129f741ae SHA512 96373f4b5e6070aa0785eb6a4e53c73c27cb6ccb98f8e2475995a385e56cd4cfe88ee77c6f5ecb43dc0efb170a545768bff3921c71961483fc475a2ba211dd00 -EBUILD indilib-2.0.8.ebuild 1897 BLAKE2B 8a544c9f323b97ebe1d615c585ab38fb832299b0dccbe2b1c1e72b9486328840add58ba72c7efe098e2c62c82441e9c376e47ccce3d33adbb8a73d3b91dfaaef SHA512 7a2ad54c7624ec6dd798d3b54e092b289365b5719d77577362f92801f9a059de00f1360c49b215853321b4c846947a23da879142c596f5f68a2aabb5da28dc21 +DIST indilib-2.0.9.tar.gz 2894181 BLAKE2B 888209ce864ee324c842b1847c4f2c9b279a614b81be66597cc194cd7d67327565a1cd30b2c22b76c467ba513d1d61215bdf91161a634421ed36737b4256340b SHA512 b5e1ef58c2139bd5dd79e72d9d25d5c0730f29dff2db0001db5b1d0eff029f60f714c13e14e820f5ccfa8ab6cba25f4cd16e699f9842fa722ef961d00fc8c4a4 +EBUILD indilib-2.0.8.ebuild 1775 BLAKE2B 301589c8be496391d5dbe326f71246e275383bf1c3beef2cd663621364b256fbbae489dc9bae5286cf3fde301ed74b65e025a52ab98523f235d979fe8c96f297 SHA512 10e2de746c8a61ef3a7ddea8c0c0a03fb368bc12165eb0c1a37f635dc5737e198163f0c415298b8e1f065676ff58fc7ad475db0597293e6e3710db82fd59ae5b +EBUILD indilib-2.0.9.ebuild 1776 BLAKE2B 06fddaa942b71ff3e6aee230a5de2a8427461cbff115a23a5ec5e1fa42112106b9f2c95ceed7cc83b88d3a4b9cb34fe617096379590b85a98f11c7bbd71d7288 SHA512 99543b62d875a26ecfd01bdf8b725cea186be31eb73b847f417c5515ec828cf04aac8677522e82446736f3e403b379dbd3c0e7348fee9a886bfd8e22cde11a3d MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f 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.8.ebuild b/sci-libs/indilib/indilib-2.0.8.ebuild index 77b317737296..0cfc49a84aa4 100644 --- a/sci-libs/indilib/indilib-2.0.8.ebuild +++ b/sci-libs/indilib/indilib-2.0.8.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic udev +inherit cmake udev DESCRIPTION="INDI Astronomical Control Protocol library" HOMEPAGE="https://www.indilib.org/" @@ -43,11 +43,6 @@ DEPEND="${RDEPEND} " 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 diff --git a/sci-libs/indilib/indilib-2.0.7.ebuild b/sci-libs/indilib/indilib-2.0.9.ebuild index 982a14057620..5550e43e5885 100644 --- a/sci-libs/indilib/indilib-2.0.7.ebuild +++ b/sci-libs/indilib/indilib-2.0.9.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic udev +inherit cmake udev DESCRIPTION="INDI Astronomical Control Protocol library" HOMEPAGE="https://www.indilib.org/" @@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}" LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" SLOT="0/1" -KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" IUSE="ogg rtlsdr test websocket" RESTRICT="!test? ( test )" @@ -42,14 +42,7 @@ DEPEND="${RDEPEND} 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 |