From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EF05F1581C1 for ; Sat, 13 Jul 2024 16:28:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F319E2BC017; Sat, 13 Jul 2024 16:28:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D58092BC017 for ; Sat, 13 Jul 2024 16:28:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6ECB34301D for ; Sat, 13 Jul 2024 16:28:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 522031B89 for ; Sat, 13 Jul 2024 16:28:30 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1720888099.a796b07b936ac44bcf82b6ea2370946e8215a988.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/files/, sci-libs/indilib/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/indilib/Manifest sci-libs/indilib/files/indilib-2.0.7-fix-system-httplib.patch sci-libs/indilib/indilib-2.0.7.ebuild X-VCS-Directories: sci-libs/indilib/files/ sci-libs/indilib/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a796b07b936ac44bcf82b6ea2370946e8215a988 X-VCS-Branch: master Date: Sat, 13 Jul 2024 16:28:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 606a4d71-4eaa-404d-b259-8a1c8d4fcc30 X-Archives-Hash: 241141fd92e84e58691fc9d23f290546 commit: a796b07b936ac44bcf82b6ea2370946e8215a988 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 13 16:24:38 2024 +0000 Commit: Andreas Sturmlechner gentoo 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 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 -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 -}