diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest index 973ed155e611c..dbd9aee18f9b1 100644 --- a/sci-libs/dlib/Manifest +++ b/sci-libs/dlib/Manifest @@ -1,5 +1,3 @@ -DIST dlib-19.24.2.tar.gz 22252165 BLAKE2B cd6a911e16d9ff6cf94a4334e84983a9c48da42e3f696de20fb28a5bba9720507ec19ddc984bb753288f86359a1c19cdf15ed29f18c43769a1c17d3177d8dedf SHA512 a38a3079c169b16d81d7aca9fc294bcd63bd2dc1a21573f9141ca310542da3629b6523fa6f348be8b41bf5b478c0846a13a4c3fee77f1ac38dfbfc4a01effb57 -DIST dlib-19.24.8.tar.gz 18965261 BLAKE2B 3dbcfcd4d1a98737a21f3618994a96b3932cfc3c12ef26411ef919d8843227418460208911aa687d5a94552588e8e1eb4c99646afc86f4b43afc6972d22c65b8 SHA512 9092768628246b682e29322b101cfb8c0cd1d5a2af850510403cc7f912aa43370db1d4b5b07ff6ce6a575b3bd8cfe666b6b8f78f5e7c2ec751ae23569edcb517 DIST dlib-20.0-FindCUDAToolkit.patch 30558 BLAKE2B 95f969cea3e2d0944dab13a6dc7bb3ca741b6d3b36786e7b1a26b17c9e8be391f7787c4362e3714f75a05963cf080e8f88cf739e6fe6d29af111284927dcb6c3 SHA512 d38136f19f7501891bd27a85358a218a74cf4f86b5c5b5f0bd51ec9bd6a9e41edc891332ba48315c56cec32a27adfc275ce90a4d5409174556f8e79b9d442657 DIST dlib-20.0-Wcast-user-defined.patch 1453 BLAKE2B 39d3592f961ef518eb12523afd8b62650b6509f8ff47a56777e7f253ac8649be446e5e98152e34f7bde665445d93ff72a31caeba87d7ddd1e4ceea7281d2b8db SHA512 42826df16472b482e30ca1dfc8ca5bfcf525fbe83bc51fc551c27e3519772e351fcf1d0c7bb9c0f6e6aa118a8e982db266c6e43b1b392bec2b91353867d073e8 DIST dlib-20.0-c++23-update.patch 1347 BLAKE2B 371130b1292bab2f19692dd308778e1d9f8ed7d0c0793536131ef93b21838769eaa8ecb9868103332b838584bfe78d625cfd7e90f70f4018b4945403b646a634 SHA512 0aef41f78d0dc3d2187a28247ad52ccfad527c46311770555b5aa5798f891cf91e3a0e5014430e93c7843757d2543ba316991dbcd89650222dbe2c04d757b800 diff --git a/sci-libs/dlib/dlib-19.24.2.ebuild b/sci-libs/dlib/dlib-19.24.2.ebuild deleted file mode 100644 index 805e3f37f1324..0000000000000 --- a/sci-libs/dlib/dlib-19.24.2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_EXT=1 -DISTUTILS_OPTIONAL=1 -inherit cmake cuda distutils-r1 - -DESCRIPTION="Numerical and networking C++ library" -HOMEPAGE="http://dlib.net/" -SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Boost-1.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1" -REQUIRED_USE="python? ( png ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -# doc needs a bunch of deps not in portage -RDEPEND=" - cblas? ( virtual/cblas ) - cuda? ( dev-libs/cudnn:= ) - gif? ( media-libs/giflib:= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - lapack? ( virtual/lapack ) - mkl? ( sci-libs/mkl ) - png? ( media-libs/libpng:0= ) - python? ( ${PYTHON_DEPS} ) - sqlite? ( dev-db/sqlite:3 ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND}" -BDEPEND=" - python? ( - ${DISTUTILS_DEPS} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - ) - ) -" - -DOCS=( docs/README.txt ) - -PATCHES=( - # Bug 939094 - "${FILESDIR}/${PN}-missing-include.patch" -) - -src_prepare() { - use cuda && cuda_src_prepare - cmake_src_prepare - use python && distutils-r1_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DDLIB_ENABLE_ASSERTS=$(usex debug) - -DDLIB_ENABLE_STACK_TRACE=$(usex debug) - -DDLIB_GIF_SUPPORT=$(usex gif) - -DDLIB_JPEG_SUPPORT=$(usex jpeg) - -DDLIB_PNG_SUPPORT=$(usex png) - -DDLIB_LINK_WITH_SQLITE3=$(usex sqlite) - -DDLIB_NO_GUI_SUPPORT=$(usex X OFF ON) - -DDLIB_USE_BLAS=$(usex cblas) - -DDLIB_USE_CUDA=$(usex cuda) - -DDLIB_USE_LAPACK=$(usex lapack) - -DUSE_AVX_INSTRUCTIONS=$(usex cpu_flags_x86_avx) - -DUSE_SSE2_INSTRUCTIONS=$(usex cpu_flags_x86_sse2) - -DUSE_SSE4_INSTRUCTIONS=$(usex cpu_flags_x86_sse4_1) - ) - cmake_src_configure - use python && distutils-r1_src_configure -} - -src_compile() { - cmake_src_compile - use python && distutils-r1_src_compile -} - -src_test() { - ( - local BUILD_DIR="${BUILD_DIR}"/dlib/test - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" >/dev/null || die - - local CMAKE_USE_DIR="${S}"/dlib/test - cmake_src_configure - cmake_build - - ./dtest --runall || die "Tests failed" - ) - - use python && distutils-r1_src_test -} - -python_test() { - epytest -} - -src_install() { - cmake_src_install - use python && distutils-r1_src_install - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF} - fi -} diff --git a/sci-libs/dlib/dlib-19.24.8.ebuild b/sci-libs/dlib/dlib-19.24.8.ebuild deleted file mode 100644 index 61bda8bb8ab84..0000000000000 --- a/sci-libs/dlib/dlib-19.24.8.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_EXT=1 -DISTUTILS_OPTIONAL=1 -inherit cmake cuda distutils-r1 - -DESCRIPTION="Numerical and networking C++ library" -HOMEPAGE="https://dlib.net/" -SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Boost-1.0" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="cblas cuda debug examples ffmpeg gif jpeg lapack mkl png python sqlite test webp X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1" -REQUIRED_USE="python? ( png ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -# doc needs a bunch of deps not in portage -RDEPEND=" - cblas? ( virtual/cblas ) - cuda? ( dev-libs/cudnn:= ) - ffmpeg? ( media-video/ffmpeg:=[X?] ) - gif? ( media-libs/giflib:= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - lapack? ( virtual/lapack ) - mkl? ( sci-libs/mkl ) - png? ( media-libs/libpng:0= ) - python? ( ${PYTHON_DEPS} ) - sqlite? ( dev-db/sqlite:3 ) - webp? ( media-libs/libwebp:= ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND}" -BDEPEND=" - python? ( - ${DISTUTILS_DEPS} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - ) - ) -" - -DOCS=( docs/README.txt ) - -PATCHES=( - "${FILESDIR}/${P}"-disable-upstream-flags.patch -) - -src_prepare() { - use cuda && cuda_src_prepare - cmake_src_prepare - use python && distutils-r1_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DDLIB_ENABLE_ASSERTS=$(usex debug) - -DDLIB_ENABLE_STACK_TRACE=$(usex debug) - -DDLIB_USE_FFMPEG=$(usex ffmpeg) - -DDLIB_GIF_SUPPORT=$(usex gif) - -DDLIB_JPEG_SUPPORT=$(usex jpeg) - -DDLIB_PNG_SUPPORT=$(usex png) - -DDLIB_LINK_WITH_SQLITE3=$(usex sqlite) - -DDLIB_NO_GUI_SUPPORT=$(usex X OFF ON) - -DDLIB_USE_BLAS=$(usex cblas) - -DDLIB_USE_CUDA=$(usex cuda) - -DDLIB_USE_LAPACK=$(usex lapack) - -DDLIB_WEBP_SUPPORT=$(usex webp) - -DUSE_AVX_INSTRUCTIONS=$(usex cpu_flags_x86_avx) - -DUSE_SSE2_INSTRUCTIONS=$(usex cpu_flags_x86_sse2) - -DUSE_SSE4_INSTRUCTIONS=$(usex cpu_flags_x86_sse4_1) - ) - cmake_src_configure - use python && distutils-r1_src_configure -} - -src_compile() { - cmake_src_compile - use python && distutils-r1_src_compile -} - -src_test() { - ( - local BUILD_DIR="${BUILD_DIR}"/dlib/test - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" >/dev/null || die - - local CMAKE_USE_DIR="${S}"/dlib/test - cmake_src_configure - cmake_build - - ./dtest --runall || die "Tests failed" - ) - - use python && distutils-r1_src_test -} - -python_test() { - epytest -} - -src_install() { - cmake_src_install - use python && distutils-r1_src_install - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF} - fi -} diff --git a/sci-libs/dlib/files/dlib-missing-include.patch b/sci-libs/dlib/files/dlib-missing-include.patch deleted file mode 100644 index 41b556d09d486..0000000000000 --- a/sci-libs/dlib/files/dlib-missing-include.patch +++ /dev/null @@ -1,22 +0,0 @@ -From dab9aa1fa5ae245c2f8becf1396205f7655b1c01 Mon Sep 17 00:00:00 2001 -From: pfeatherstone <45853521+pfeatherstone@users.noreply.github.com> -Date: Thu, 18 May 2023 13:03:15 +0100 -Subject: [PATCH] missing include (#2798) - -Co-authored-by: pf ---- - dlib/type_traits.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dlib/type_traits.h b/dlib/type_traits.h -index 8391050699..a5bb863278 100644 ---- a/dlib/type_traits.h -+++ b/dlib/type_traits.h -@@ -10,6 +10,7 @@ - */ - - #include -+#include - - namespace dlib - {