public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2017-07-27 18:51 Sebastien Fabbro
  0 siblings, 0 replies; 15+ messages in thread
From: Sebastien Fabbro @ 2017-07-27 18:51 UTC (permalink / raw
  To: gentoo-commits

commit:     f957a4700c88e595c6ccf055417fff747ada0bdb
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 18:07:54 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 18:50:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f957a470

sci-libs/dlib: fixed more cuda stuff

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sci-libs/dlib/dlib-19.4.ebuild | 10 ++++++----
 sci-libs/dlib/metadata.xml     |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sci-libs/dlib/dlib-19.4.ebuild b/sci-libs/dlib/dlib-19.4.ebuild
index 9d44e7177a7..c6116343a93 100644
--- a/sci-libs/dlib/dlib-19.4.ebuild
+++ b/sci-libs/dlib/dlib-19.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils cuda
 
 DESCRIPTION="Numerical and networking C++ library"
 HOMEPAGE="http://dlib.net/"
@@ -19,20 +19,22 @@ IUSE="cblas debug cuda examples gif jpeg lapack mkl png
 
 RDEPEND="
 	cblas? ( virtual/cblas:= )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-7 )
+	cuda? ( dev-libs/cudnn:= )
 	jpeg? ( virtual/jpeg:0= )
 	lapack? ( virtual/lapack:= )
-	mkl? ( sci-libs/mkl )
+	mkl? ( sci-libs/mkl:= )
 	png? ( media-libs/libpng:0= )
 	sqlite? ( dev-db/sqlite:3= )
-	X? ( x11-libs/libX11 )
+	X? ( x11-libs/libX11:= )
 "
 DEPEND="test? ( ${RDEPEND} )"
 
 src_prepare() {
+	use cuda && cuda_src_prepare
 	cmake-utils_src_prepare
 	sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
 }
+
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="$(get_libdir)"

diff --git a/sci-libs/dlib/metadata.xml b/sci-libs/dlib/metadata.xml
index 3d2eccafb59..422f29c52e5 100644
--- a/sci-libs/dlib/metadata.xml
+++ b/sci-libs/dlib/metadata.xml
@@ -13,7 +13,7 @@
   </longdescription>
   <use>
     <flag name="cblas">Build with CBLAS <pkg>virtual/cblas</pkg></flag>
-    <flag name="cuda">Enable support for CUDA for GPU (cuDNN)</flag>
+    <flag name="cuda">Enable support for CUDA for Deep Neural Networks (cuDNN) on GPU (experimental)</flag>
     <flag name="mkl">Enable support for Intel FFT <pkg>sci-libs/mkl</pkg></flag>
   </use>
   <upstream>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2017-11-06  7:03 Amy Liffey
  0 siblings, 0 replies; 15+ messages in thread
From: Amy Liffey @ 2017-11-06  7:03 UTC (permalink / raw
  To: gentoo-commits

commit:     73668e19377cffa720941b94ad6c7fe852a4ee91
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  6 07:02:49 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Nov  6 07:02:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73668e19

sci-libs/dlib: version bump 19.7

Acked-by: David Seifert <soap <AT> gentoo.org>
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-libs/dlib/Manifest         |  1 +
 sci-libs/dlib/dlib-19.7.ebuild | 70 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 3754a6afb31..da63b4e98b1 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1 +1,2 @@
 DIST dlib-19.4.tar.gz 7226923 SHA256 2bed9669f1a5c436579498d0806b27a9b60c42a975a9b6e67b594b40f58b1a88 SHA512 23bf80353f9b6ce07b6a3a7df05016705645c18bcf2b3ead567935008ea12c9f6dc0722d9bbacc009bd26f78eb43c1cbecf776bfed5a3445c1f2e8e208f201e2 WHIRLPOOL 300670d12b306e224fce6d7f22d79690f543876f78d30064ab2f9782a3a79a031a6b048863a5a2b21f27eb2538b9ab42f9d00dc88f144129fa591b4b1387c367
+DIST dlib-19.7.tar.gz 7670615 SHA256 bc9f7be1866b9a7dcd2aeea66469cfb6025e25e6659470a4410dae166df1d645 SHA512 a3877066e04a411d96e910f4229c60a86971a9290e840aa4a5b2f0b102e9b8c37bfede259b80b71ba066d21eb0aa2565808e51d0eab6397ff5fd2bac60dcedd5 WHIRLPOOL 24d556021129d112e169352d2a96ad7324568ee0bf70b361f7f50f5c4cdc49f69b7d9f21dbcd7c79b91252abfad29d6e321440b136626151068142d9ee669f8d

diff --git a/sci-libs/dlib/dlib-19.7.ebuild b/sci-libs/dlib/dlib-19.7.ebuild
new file mode 100644
index 00000000000..34db9681490
--- /dev/null
+++ b/sci-libs/dlib/dlib-19.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils cuda
+
+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 ~amd64-linux ~x86-linux"
+IUSE="cblas debug cuda examples gif jpeg lapack mkl png sqlite static-libs test X"
+
+# doc needs a bunch of deps not in portage
+
+RDEPEND="
+	cblas? ( virtual/cblas:= )
+	cuda? ( dev-libs/cudnn:= )
+	jpeg? ( virtual/jpeg:0= )
+	lapack? ( virtual/lapack:= )
+	mkl? ( sci-libs/mkl:= )
+	png? ( media-libs/libpng:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	X? ( x11-libs/libX11:= )
+"
+DEPEND="test? ( ${RDEPEND} )"
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+	cmake-utils_src_prepare
+	sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+		-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)"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	mkdir "${BUILD_DIR}"/dlib/test || die
+	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
+	cmake "${S}"/dlib/test && emake
+	./dtest --runall || die
+	popd > /dev/null || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc docs/README.txt
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2018-07-13 10:33 Tony Vroon
  0 siblings, 0 replies; 15+ messages in thread
From: Tony Vroon @ 2018-07-13 10:33 UTC (permalink / raw
  To: gentoo-commits

commit:     7a461b76c112bf52f928d75ecf7279759b7c9900
Author:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 10:23:09 2018 +0000
Commit:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 10:33:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a461b76

sci-libs/dlib: Version bump to 19.9

From donat-b on GitHub, with thanks.
Apologies for strange commit style, this is due to GitHub tooling issues.
Have had to pull the raw files out as the diff is broken. Somehow.

Closes: https://github.com/gentoo/gentoo/pull/7207
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-libs/dlib/Manifest         |  1 +
 sci-libs/dlib/dlib-19.9.ebuild | 75 ++++++++++++++++++++++++++++++++++++++++++
 sci-libs/dlib/metadata.xml     |  1 +
 3 files changed, 77 insertions(+)

diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 326d98722fb..e29ea272a5f 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,2 +1,3 @@
 DIST dlib-19.4.tar.gz 7226923 BLAKE2B 2d72936fc46d559a80288e7f88a64c372fb5f8dcfc69b57abee8a27519f3084fa0cf4193261dd9758f9eb718e755d46a17655e38cb74aaa0046855f11676e157 SHA512 23bf80353f9b6ce07b6a3a7df05016705645c18bcf2b3ead567935008ea12c9f6dc0722d9bbacc009bd26f78eb43c1cbecf776bfed5a3445c1f2e8e208f201e2
 DIST dlib-19.7.tar.gz 7670615 BLAKE2B 13343f3b99bf5dd7a9c032de09eff47f1675bbc978a93edfbd952196b2347e4a887a8eed805f22985477b10ecfa1df85fc568e32f1a00b17b0292a0a51db9764 SHA512 a3877066e04a411d96e910f4229c60a86971a9290e840aa4a5b2f0b102e9b8c37bfede259b80b71ba066d21eb0aa2565808e51d0eab6397ff5fd2bac60dcedd5
+DIST dlib-19.9.tar.gz 8892457 BLAKE2B d18548e09f8169bbc9d7f339599bd58b940410839b259a8d7be9cb999f82e634ad5cd0539adb45239dab821ea1029493d24ae9990ca32c75c744e2c5d9e218f6 SHA512 1e2123c22e1b13cc84108fa627bfa92eadc9dee63f93a9f45676bbf2b752c8728117d915ac327f5223b0cdbce87dd3bef2f4d8d5ed3f8f5a314ffa9e8962a246

diff --git a/sci-libs/dlib/dlib-19.9.ebuild b/sci-libs/dlib/dlib-19.9.ebuild
new file mode 100644
index 00000000000..82d750cd9a8
--- /dev/null
+++ b/sci-libs/dlib/dlib-19.9.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit python-r1 cmake-utils cuda
+
+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 ~amd64-linux ~x86-linux"
+IUSE="cblas debug cuda examples gif jpeg lapack mkl png python sqlite static-libs test X"
+
+# doc needs a bunch of deps not in portage
+
+RDEPEND="
+	cblas? ( virtual/cblas:= )
+	cuda? ( dev-libs/cudnn:= )
+	jpeg? ( virtual/jpeg: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="test? ( ${RDEPEND} )"
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+	cmake-utils_src_prepare
+	sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+		-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)"
+		-DBOOST_LIBRARYDIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	mkdir "${BUILD_DIR}"/dlib/test || die
+	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
+	cmake "${S}"/dlib/test && emake
+	./dtest --runall || die
+	popd > /dev/null || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use python; then
+		python_foreach_impl python_domodule ${PN}
+	fi
+	dodoc docs/README.txt
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}

diff --git a/sci-libs/dlib/metadata.xml b/sci-libs/dlib/metadata.xml
index 422f29c52e5..97d198eb46b 100644
--- a/sci-libs/dlib/metadata.xml
+++ b/sci-libs/dlib/metadata.xml
@@ -15,6 +15,7 @@
     <flag name="cblas">Build with CBLAS <pkg>virtual/cblas</pkg></flag>
     <flag name="cuda">Enable support for CUDA for Deep Neural Networks (cuDNN) on GPU (experimental)</flag>
     <flag name="mkl">Enable support for Intel FFT <pkg>sci-libs/mkl</pkg></flag>
+    <flag name="python">Enable support for Python API bindings</flag>
   </use>
   <upstream>
     <remote-id type="github">davisking/dlib</remote-id>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2019-03-02 20:11 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2019-03-02 20:11 UTC (permalink / raw
  To: gentoo-commits

commit:     8c8ce92dc34626c4397991b444985f70c3012265
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Mon Jan  7 20:35:48 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 20:10:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c8ce92d

sci-libs/dlib: version bump 19.16 fixing Python install

Bug: https://bugs.gentoo.org/659262
Bug: https://bugs.gentoo.org/664194
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/9655
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/dlib/Manifest          |   1 +
 sci-libs/dlib/dlib-19.16.ebuild | 108 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index e29ea272a5f..f46283f5a80 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,3 +1,4 @@
+DIST dlib-19.16.tar.gz 10411975 BLAKE2B 93047590a4d8f4685970d3db6841cbf9cc90ca8a5e50f0929a106d887e5db1b4fd96bbe14380537a3e28369a8db6d9d8c067e7768000ac3c7d0f225b46369326 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
 DIST dlib-19.4.tar.gz 7226923 BLAKE2B 2d72936fc46d559a80288e7f88a64c372fb5f8dcfc69b57abee8a27519f3084fa0cf4193261dd9758f9eb718e755d46a17655e38cb74aaa0046855f11676e157 SHA512 23bf80353f9b6ce07b6a3a7df05016705645c18bcf2b3ead567935008ea12c9f6dc0722d9bbacc009bd26f78eb43c1cbecf776bfed5a3445c1f2e8e208f201e2
 DIST dlib-19.7.tar.gz 7670615 BLAKE2B 13343f3b99bf5dd7a9c032de09eff47f1675bbc978a93edfbd952196b2347e4a887a8eed805f22985477b10ecfa1df85fc568e32f1a00b17b0292a0a51db9764 SHA512 a3877066e04a411d96e910f4229c60a86971a9290e840aa4a5b2f0b102e9b8c37bfede259b80b71ba066d21eb0aa2565808e51d0eab6397ff5fd2bac60dcedd5
 DIST dlib-19.9.tar.gz 8892457 BLAKE2B d18548e09f8169bbc9d7f339599bd58b940410839b259a8d7be9cb999f82e634ad5cd0539adb45239dab821ea1029493d24ae9990ca32c75c744e2c5d9e218f6 SHA512 1e2123c22e1b13cc84108fa627bfa92eadc9dee63f93a9f45676bbf2b752c8728117d915ac327f5223b0cdbce87dd3bef2f4d8d5ed3f8f5a314ffa9e8962a246

diff --git a/sci-libs/dlib/dlib-19.16.ebuild b/sci-libs/dlib/dlib-19.16.ebuild
new file mode 100644
index 00000000000..bdcf3929b23
--- /dev/null
+++ b/sci-libs/dlib/dlib-19.16.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+DISTUTILS_OPTIONAL=1
+inherit cmake-utils 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 ~amd64-linux ~x86-linux"
+IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite static-libs test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# doc needs a bunch of deps not in portage
+
+RDEPEND="
+	cblas? ( virtual/cblas:= )
+	cuda? ( dev-libs/cudnn:= )
+	gif? ( media-libs/giflib:= )
+	jpeg? ( virtual/jpeg: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}
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	)"
+
+DOCS=( docs/README.txt )
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		--"$(usex gif)" DLIB_GIF_SUPPORT
+		--"$(usex jpeg)" DLIB_JPEG_SUPPORT
+		--"$(usex png)" DLIB_PNG_SUPPORT
+		--"$(usex X no yes)" DLIB_NO_GUI_SUPPORT
+		--"$(usex cblas)" DLIB_USE_BLAS
+		--"$(usex cuda)" DLIB_USE_CUDA
+		--"$(usex lapack)" DLIB_USE_LAPACK
+		--"$(usex cpu_flags_x86_avx)" USE_AVX_INSTRUCTIONS
+		--"$(usex cpu_flags_x86_sse2)" USE_SSE2_INSTRUCTIONS
+		--"$(usex cpu_flags_x86_sse4_1)" USE_SSE4_INSTRUCTIONS
+	)
+}
+
+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-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+src_test() {
+	mkdir "${BUILD_DIR}"/dlib/test || die
+	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
+	cmake "${S}"/dlib/test && emake
+	./dtest --runall || die
+	popd > /dev/null || die
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2019-08-13  7:40 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2019-08-13  7:40 UTC (permalink / raw
  To: gentoo-commits

commit:     ce6299d7b171db80f90f1fd2637142876ab0fcd2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 07:31:56 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug 13 07:31:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce6299d7

sci-libs/dlib: Add missing PYTHON_REQUIRED_USE

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-libs/dlib/dlib-19.9.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/dlib/dlib-19.9.ebuild b/sci-libs/dlib/dlib-19.9.ebuild
index 555dc500ca7..28049b0cd64 100644
--- a/sci-libs/dlib/dlib-19.9.ebuild
+++ b/sci-libs/dlib/dlib-19.9.ebuild
@@ -13,6 +13,7 @@ LICENSE="Boost-1.0"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cblas debug cuda examples gif jpeg lapack mkl png python sqlite static-libs test X"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # doc needs a bunch of deps not in portage
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2019-12-12 14:58 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2019-12-12 14:58 UTC (permalink / raw
  To: gentoo-commits

commit:     a8425c28d7cbc75e31db4c8a923f5161036d318c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 14:55:45 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 14:58:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8425c28

sci-libs/dlib: Fix MissingTestRestrict

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-libs/dlib/dlib-19.4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-libs/dlib/dlib-19.4.ebuild b/sci-libs/dlib/dlib-19.4.ebuild
index c6116343a93..8e755d5722e 100644
--- a/sci-libs/dlib/dlib-19.4.ebuild
+++ b/sci-libs/dlib/dlib-19.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cblas debug cuda examples gif jpeg lapack mkl png
 	 sqlite static-libs test X"
+RESTRICT="!test? ( test )"
 
 # doc needs a bunch of deps not in portage
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2020-06-05 22:36 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-06-05 22:36 UTC (permalink / raw
  To: gentoo-commits

commit:     4b0e1477d69eeafdd9b68bdf758672e518646882
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  5 22:35:41 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 22:36:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0e1477

sci-libs/dlib: Drop 19.4, 19.7 and 19.16 (r0)

Closes: https://bugs.gentoo.org/659262
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/dlib/Manifest          |   2 -
 sci-libs/dlib/dlib-19.16.ebuild | 109 ----------------------------------------
 sci-libs/dlib/dlib-19.4.ebuild  |  72 --------------------------
 sci-libs/dlib/dlib-19.7.ebuild  |  71 --------------------------
 4 files changed, 254 deletions(-)

diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index f46283f5a80..6682430cf3a 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,4 +1,2 @@
 DIST dlib-19.16.tar.gz 10411975 BLAKE2B 93047590a4d8f4685970d3db6841cbf9cc90ca8a5e50f0929a106d887e5db1b4fd96bbe14380537a3e28369a8db6d9d8c067e7768000ac3c7d0f225b46369326 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
-DIST dlib-19.4.tar.gz 7226923 BLAKE2B 2d72936fc46d559a80288e7f88a64c372fb5f8dcfc69b57abee8a27519f3084fa0cf4193261dd9758f9eb718e755d46a17655e38cb74aaa0046855f11676e157 SHA512 23bf80353f9b6ce07b6a3a7df05016705645c18bcf2b3ead567935008ea12c9f6dc0722d9bbacc009bd26f78eb43c1cbecf776bfed5a3445c1f2e8e208f201e2
-DIST dlib-19.7.tar.gz 7670615 BLAKE2B 13343f3b99bf5dd7a9c032de09eff47f1675bbc978a93edfbd952196b2347e4a887a8eed805f22985477b10ecfa1df85fc568e32f1a00b17b0292a0a51db9764 SHA512 a3877066e04a411d96e910f4229c60a86971a9290e840aa4a5b2f0b102e9b8c37bfede259b80b71ba066d21eb0aa2565808e51d0eab6397ff5fd2bac60dcedd5
 DIST dlib-19.9.tar.gz 8892457 BLAKE2B d18548e09f8169bbc9d7f339599bd58b940410839b259a8d7be9cb999f82e634ad5cd0539adb45239dab821ea1029493d24ae9990ca32c75c744e2c5d9e218f6 SHA512 1e2123c22e1b13cc84108fa627bfa92eadc9dee63f93a9f45676bbf2b752c8728117d915ac327f5223b0cdbce87dd3bef2f4d8d5ed3f8f5a314ffa9e8962a246

diff --git a/sci-libs/dlib/dlib-19.16.ebuild b/sci-libs/dlib/dlib-19.16.ebuild
deleted file mode 100644
index cb682127de9..00000000000
--- a/sci-libs/dlib/dlib-19.16.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_OPTIONAL=1
-inherit cmake-utils 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 ~amd64-linux ~x86-linux"
-IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite static-libs test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# doc needs a bunch of deps not in portage
-
-RDEPEND="
-	cblas? ( virtual/cblas:= )
-	cuda? ( dev-libs/cudnn:= )
-	gif? ( media-libs/giflib:= )
-	jpeg? ( virtual/jpeg: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}
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)"
-
-DOCS=( docs/README.txt )
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		--"$(usex gif)" DLIB_GIF_SUPPORT
-		--"$(usex jpeg)" DLIB_JPEG_SUPPORT
-		--"$(usex png)" DLIB_PNG_SUPPORT
-		--"$(usex X no yes)" DLIB_NO_GUI_SUPPORT
-		--"$(usex cblas)" DLIB_USE_BLAS
-		--"$(usex cuda)" DLIB_USE_CUDA
-		--"$(usex lapack)" DLIB_USE_LAPACK
-		--"$(usex cpu_flags_x86_avx)" USE_AVX_INSTRUCTIONS
-		--"$(usex cpu_flags_x86_sse2)" USE_SSE2_INSTRUCTIONS
-		--"$(usex cpu_flags_x86_sse4_1)" USE_SSE4_INSTRUCTIONS
-	)
-}
-
-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-utils_src_configure
-	use python && distutils-r1_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-src_test() {
-	mkdir "${BUILD_DIR}"/dlib/test || die
-	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test && emake
-	./dtest --runall || die
-	popd > /dev/null || die
-	use python && distutils-r1_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && distutils-r1_src_install
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}

diff --git a/sci-libs/dlib/dlib-19.4.ebuild b/sci-libs/dlib/dlib-19.4.ebuild
deleted file mode 100644
index 8e755d5722e..00000000000
--- a/sci-libs/dlib/dlib-19.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda
-
-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 ~amd64-linux ~x86-linux"
-IUSE="cblas debug cuda examples gif jpeg lapack mkl png
-	 sqlite static-libs test X"
-RESTRICT="!test? ( test )"
-
-# doc needs a bunch of deps not in portage
-
-RDEPEND="
-	cblas? ( virtual/cblas:= )
-	cuda? ( dev-libs/cudnn:= )
-	jpeg? ( virtual/jpeg:0= )
-	lapack? ( virtual/lapack:= )
-	mkl? ( sci-libs/mkl:= )
-	png? ( media-libs/libpng:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	X? ( x11-libs/libX11:= )
-"
-DEPEND="test? ( ${RDEPEND} )"
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-	sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-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)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	mkdir "${BUILD_DIR}"/dlib/test || die
-	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test && emake
-	./dtest --runall || die
-	popd > /dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc docs/README.txt
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}

diff --git a/sci-libs/dlib/dlib-19.7.ebuild b/sci-libs/dlib/dlib-19.7.ebuild
deleted file mode 100644
index 470c52a217e..00000000000
--- a/sci-libs/dlib/dlib-19.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda
-
-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 ~amd64-linux ~x86-linux"
-IUSE="cblas debug cuda examples gif jpeg lapack mkl png sqlite static-libs test X"
-RESTRICT="!test? ( test )"
-
-# doc needs a bunch of deps not in portage
-
-RDEPEND="
-	cblas? ( virtual/cblas:= )
-	cuda? ( dev-libs/cudnn:= )
-	jpeg? ( virtual/jpeg:0= )
-	lapack? ( virtual/lapack:= )
-	mkl? ( sci-libs/mkl:= )
-	png? ( media-libs/libpng:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	X? ( x11-libs/libX11:= )
-"
-DEPEND="test? ( ${RDEPEND} )"
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-	sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-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)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	mkdir "${BUILD_DIR}"/dlib/test || die
-	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test && emake
-	./dtest --runall || die
-	popd > /dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc docs/README.txt
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2020-06-05 22:36 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-06-05 22:36 UTC (permalink / raw
  To: gentoo-commits

commit:     3f8826c867bbfbdd73406da1986864e7558a334e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  5 22:03:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 22:36:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f8826c8

sci-libs/dlib: Add REQUIRED_USE="python? ( png )"

Closes: https://bugs.gentoo.org/690718
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/dlib/dlib-19.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/dlib/dlib-19.16-r1.ebuild b/sci-libs/dlib/dlib-19.16-r1.ebuild
index 8baa4aca61b..5b0ca7e80ee 100644
--- a/sci-libs/dlib/dlib-19.16-r1.ebuild
+++ b/sci-libs/dlib/dlib-19.16-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="Boost-1.0"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 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? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( png ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2020-06-05 22:36 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-06-05 22:36 UTC (permalink / raw
  To: gentoo-commits

commit:     11546b57ee1c41f66f6e87a591d78356402f46e8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  5 21:46:17 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 22:36:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11546b57

sci-libs/dlib: EAPI-7 bump, cmake.eclass, drop IUSE="static-libs"

EAPI-7 gives us BUILD_SHARED_LIBS=ON by default.

Closes: https://bugs.gentoo.org/725466
Closes: https://bugs.gentoo.org/708330
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/dlib/dlib-19.16-r1.ebuild | 106 +++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)

diff --git a/sci-libs/dlib/dlib-19.16-r1.ebuild b/sci-libs/dlib/dlib-19.16-r1.ebuild
new file mode 100644
index 00000000000..8baa4aca61b
--- /dev/null
+++ b/sci-libs/dlib/dlib-19.16-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 ~amd64-linux ~x86-linux"
+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? ( ${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? ( virtual/jpeg: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? ( test? ( dev-python/pytest[${PYTHON_USEDEP}] ) )"
+
+DOCS=( docs/README.txt )
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+	cmake_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		--"$(usex gif)" DLIB_GIF_SUPPORT
+		--"$(usex jpeg)" DLIB_JPEG_SUPPORT
+		--"$(usex png)" DLIB_PNG_SUPPORT
+		--"$(usex X no yes)" DLIB_NO_GUI_SUPPORT
+		--"$(usex cblas)" DLIB_USE_BLAS
+		--"$(usex cuda)" DLIB_USE_CUDA
+		--"$(usex lapack)" DLIB_USE_LAPACK
+		--"$(usex cpu_flags_x86_avx)" USE_AVX_INSTRUCTIONS
+		--"$(usex cpu_flags_x86_sse2)" USE_SSE2_INSTRUCTIONS
+		--"$(usex cpu_flags_x86_sse4_1)" USE_SSE4_INSTRUCTIONS
+	)
+}
+
+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
+}
+
+python_test() {
+	esetup.py test
+}
+
+src_test() {
+	mkdir "${BUILD_DIR}"/dlib/test || die
+	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
+	cmake "${S}"/dlib/test || die
+	emake
+	./dtest --runall || die
+	popd > /dev/null || die
+	use python && distutils-r1_src_test
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2021-01-01  1:56 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2021-01-01  1:56 UTC (permalink / raw
  To: gentoo-commits

commit:     57d643449f605608ba7eb3ea82fd46f2512263bd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 01:51:40 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 01:55:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57d64344

sci-libs/dlib: Remove old (py3.6)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-libs/dlib/Manifest         |  1 -
 sci-libs/dlib/dlib-19.9.ebuild | 77 ------------------------------------------
 2 files changed, 78 deletions(-)

diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 6682430cf3a..63c671d911e 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,2 +1 @@
 DIST dlib-19.16.tar.gz 10411975 BLAKE2B 93047590a4d8f4685970d3db6841cbf9cc90ca8a5e50f0929a106d887e5db1b4fd96bbe14380537a3e28369a8db6d9d8c067e7768000ac3c7d0f225b46369326 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
-DIST dlib-19.9.tar.gz 8892457 BLAKE2B d18548e09f8169bbc9d7f339599bd58b940410839b259a8d7be9cb999f82e634ad5cd0539adb45239dab821ea1029493d24ae9990ca32c75c744e2c5d9e218f6 SHA512 1e2123c22e1b13cc84108fa627bfa92eadc9dee63f93a9f45676bbf2b752c8728117d915ac327f5223b0cdbce87dd3bef2f4d8d5ed3f8f5a314ffa9e8962a246

diff --git a/sci-libs/dlib/dlib-19.9.ebuild b/sci-libs/dlib/dlib-19.9.ebuild
deleted file mode 100644
index fcc55d70b0e..00000000000
--- a/sci-libs/dlib/dlib-19.9.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit python-r1 cmake-utils cuda
-
-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 ~amd64-linux ~x86-linux"
-IUSE="cblas debug cuda examples gif jpeg lapack mkl png python sqlite static-libs test X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# doc needs a bunch of deps not in portage
-
-RDEPEND="
-	cblas? ( virtual/cblas:= )
-	cuda? ( dev-libs/cudnn:= )
-	jpeg? ( virtual/jpeg: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="test? ( ${RDEPEND} )"
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-	sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-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)"
-		-DBOOST_LIBRARYDIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	mkdir "${BUILD_DIR}"/dlib/test || die
-	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test && emake
-	./dtest --runall || die
-	popd > /dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use python; then
-		python_foreach_impl python_domodule ${PN}
-	fi
-	dodoc docs/README.txt
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2021-03-31 11:41 David Seifert
  0 siblings, 0 replies; 15+ messages in thread
From: David Seifert @ 2021-03-31 11:41 UTC (permalink / raw
  To: gentoo-commits

commit:     83a445079c6b79e602aa11c6063761f57f074c12
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 31 11:40:54 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Mar 31 11:40:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a44507

sci-libs/dlib: Version bump to 19.22

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/dlib/Manifest          |  1 +
 sci-libs/dlib/dlib-19.22.ebuild | 97 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 63c671d911e..f824015a676 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1 +1,2 @@
 DIST dlib-19.16.tar.gz 10411975 BLAKE2B 93047590a4d8f4685970d3db6841cbf9cc90ca8a5e50f0929a106d887e5db1b4fd96bbe14380537a3e28369a8db6d9d8c067e7768000ac3c7d0f225b46369326 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
+DIST dlib-19.22.tar.gz 10796236 BLAKE2B 5ca840536f61b38557d39ff6c24d9727f7c494e032d5abf912ccf83f724ecad61ce241126478eeed8b14e33b994af4065b1cfaf17a3b29cfa0dafc236e4c2a06 SHA512 49af41460de9aa270e47ee1d158231e87ffdbbf56ca29a3382dd896fcf81ef04729e59bd9c26eac63fb088cefce651149e5cdb0ffed73bfd6b05127887114d94

diff --git a/sci-libs/dlib/dlib-19.22.ebuild b/sci-libs/dlib/dlib-19.22.ebuild
new file mode 100644
index 00000000000..04deb083df0
--- /dev/null
+++ b/sci-libs/dlib/dlib-19.22.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+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 ~amd64-linux ~x86-linux"
+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? ( virtual/jpeg: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? ( test? ( dev-python/pytest[${PYTHON_USEDEP}] ) )"
+
+DOCS=( docs/README.txt )
+
+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
+}
+
+python_test() {
+	esetup.py test
+}
+
+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
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2021-05-27 21:06 David Seifert
  0 siblings, 0 replies; 15+ messages in thread
From: David Seifert @ 2021-05-27 21:06 UTC (permalink / raw
  To: gentoo-commits

commit:     ef1eb6cda412a67d7c695683b3634d7c37b45a47
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu May 27 21:05:32 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu May 27 21:05:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1eb6cd

sci-libs/dlib: Remove old 19.16-r1

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/dlib/Manifest             |   1 -
 sci-libs/dlib/dlib-19.16-r1.ebuild | 106 -------------------------------------
 2 files changed, 107 deletions(-)

diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index f824015a676..21442f52ac6 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,2 +1 @@
-DIST dlib-19.16.tar.gz 10411975 BLAKE2B 93047590a4d8f4685970d3db6841cbf9cc90ca8a5e50f0929a106d887e5db1b4fd96bbe14380537a3e28369a8db6d9d8c067e7768000ac3c7d0f225b46369326 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
 DIST dlib-19.22.tar.gz 10796236 BLAKE2B 5ca840536f61b38557d39ff6c24d9727f7c494e032d5abf912ccf83f724ecad61ce241126478eeed8b14e33b994af4065b1cfaf17a3b29cfa0dafc236e4c2a06 SHA512 49af41460de9aa270e47ee1d158231e87ffdbbf56ca29a3382dd896fcf81ef04729e59bd9c26eac63fb088cefce651149e5cdb0ffed73bfd6b05127887114d94

diff --git a/sci-libs/dlib/dlib-19.16-r1.ebuild b/sci-libs/dlib/dlib-19.16-r1.ebuild
deleted file mode 100644
index b962a0da02e..00000000000
--- a/sci-libs/dlib/dlib-19.16-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-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 ~amd64-linux ~x86-linux"
-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? ( virtual/jpeg: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? ( test? ( dev-python/pytest[${PYTHON_USEDEP}] ) )"
-
-DOCS=( docs/README.txt )
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		--"$(usex gif)" DLIB_GIF_SUPPORT
-		--"$(usex jpeg)" DLIB_JPEG_SUPPORT
-		--"$(usex png)" DLIB_PNG_SUPPORT
-		--"$(usex X no yes)" DLIB_NO_GUI_SUPPORT
-		--"$(usex cblas)" DLIB_USE_BLAS
-		--"$(usex cuda)" DLIB_USE_CUDA
-		--"$(usex lapack)" DLIB_USE_LAPACK
-		--"$(usex cpu_flags_x86_avx)" USE_AVX_INSTRUCTIONS
-		--"$(usex cpu_flags_x86_sse2)" USE_SSE2_INSTRUCTIONS
-		--"$(usex cpu_flags_x86_sse4_1)" USE_SSE4_INSTRUCTIONS
-	)
-}
-
-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
-}
-
-python_test() {
-	esetup.py test
-}
-
-src_test() {
-	mkdir "${BUILD_DIR}"/dlib/test || die
-	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test || die
-	emake
-	./dtest --runall || die
-	popd > /dev/null || die
-	use python && distutils-r1_src_test
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2022-07-06 16:53 Andrew Ammerlaan
  0 siblings, 0 replies; 15+ messages in thread
From: Andrew Ammerlaan @ 2022-07-06 16:53 UTC (permalink / raw
  To: gentoo-commits

commit:     d885daee659f925afca359ae795d8d5f9ea083ad
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 16:50:05 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 16:52:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d885daee

sci-libs/dlib: add 19.24

Fails to compile with python3_11 at the moment

Closes: https://bugs.gentoo.org/846254
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/dlib/Manifest          |   1 +
 sci-libs/dlib/dlib-19.24.ebuild | 101 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+)

diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 21442f52ac6e..dcf90b41e38c 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1 +1,2 @@
 DIST dlib-19.22.tar.gz 10796236 BLAKE2B 5ca840536f61b38557d39ff6c24d9727f7c494e032d5abf912ccf83f724ecad61ce241126478eeed8b14e33b994af4065b1cfaf17a3b29cfa0dafc236e4c2a06 SHA512 49af41460de9aa270e47ee1d158231e87ffdbbf56ca29a3382dd896fcf81ef04729e59bd9c26eac63fb088cefce651149e5cdb0ffed73bfd6b05127887114d94
+DIST dlib-19.24.tar.gz 10863367 BLAKE2B eda85c6ec38fcf212754aae2cdb68539425028735b5148a2f6668ac19f2583129585a7101b74fe202fbfa3d3d2f09e533805a82f8291540919a7eb11483812e8 SHA512 f6ef2fec0977782cdcc15c6340bd91e3471294332de391405f14d86e9fd0cfcc8195fbf5b702f8d269a90b06db23a8134d112ed3fcfb780ff0433d988c41d199

diff --git a/sci-libs/dlib/dlib-19.24.ebuild b/sci-libs/dlib/dlib-19.24.ebuild
new file mode 100644
index 000000000000..961c180ef7c2
--- /dev/null
+++ b/sci-libs/dlib/dlib-19.24.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_PEP517=setuptools
+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 ~amd64-linux ~x86-linux"
+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? ( test? (
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+) )"
+
+DOCS=( docs/README.txt )
+
+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
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2022-08-06  2:55 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2022-08-06  2:55 UTC (permalink / raw
  To: gentoo-commits

commit:     6994a9d44688a2dcde3a0d74ef796937d7120495
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 02:55:12 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 02:55:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6994a9d4

sci-libs/dlib: add missing DISTUTILS_DEPS

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/dlib/dlib-19.24.ebuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/sci-libs/dlib/dlib-19.24.ebuild b/sci-libs/dlib/dlib-19.24.ebuild
index 961c180ef7c2..7390b5b72a3d 100644
--- a/sci-libs/dlib/dlib-19.24.ebuild
+++ b/sci-libs/dlib/dlib-19.24.ebuild
@@ -32,10 +32,15 @@ RDEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	X? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}"
-BDEPEND="python? ( test? (
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-) )"
+BDEPEND="
+	python? (
+		${DISTUTILS_DEPS}
+		test? (
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+		)
+	)
+"
 
 DOCS=( docs/README.txt )
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/
@ 2023-06-08 10:14 Pacho Ramos
  0 siblings, 0 replies; 15+ messages in thread
From: Pacho Ramos @ 2023-06-08 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     004c6d2556c0072e733de93c90ffc41d44bcd689
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  8 10:13:45 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Jun  8 10:13:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=004c6d25

sci-libs/dlib: add 19.24.2

Closes: https://bugs.gentoo.org/897212
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-libs/dlib/Manifest            |   1 +
 sci-libs/dlib/dlib-19.24.2.ebuild | 106 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 56b903522e3d..81b62dedb86c 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1 +1,2 @@
+DIST dlib-19.24.2.tar.gz 22252165 BLAKE2B cd6a911e16d9ff6cf94a4334e84983a9c48da42e3f696de20fb28a5bba9720507ec19ddc984bb753288f86359a1c19cdf15ed29f18c43769a1c17d3177d8dedf SHA512 a38a3079c169b16d81d7aca9fc294bcd63bd2dc1a21573f9141ca310542da3629b6523fa6f348be8b41bf5b478c0846a13a4c3fee77f1ac38dfbfc4a01effb57
 DIST dlib-19.24.tar.gz 10863367 BLAKE2B eda85c6ec38fcf212754aae2cdb68539425028735b5148a2f6668ac19f2583129585a7101b74fe202fbfa3d3d2f09e533805a82f8291540919a7eb11483812e8 SHA512 f6ef2fec0977782cdcc15c6340bd91e3471294332de391405f14d86e9fd0cfcc8195fbf5b702f8d269a90b06db23a8134d112ed3fcfb780ff0433d988c41d199

diff --git a/sci-libs/dlib/dlib-19.24.2.ebuild b/sci-libs/dlib/dlib-19.24.2.ebuild
new file mode 100644
index 000000000000..dd936a0dc155
--- /dev/null
+++ b/sci-libs/dlib/dlib-19.24.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+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 ~amd64-linux ~x86-linux"
+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 )
+
+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
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2023-06-08 10:14 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-08 10:14 [gentoo-commits] repo/gentoo:master commit in: sci-libs/dlib/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2022-08-06  2:55 Sam James
2022-07-06 16:53 Andrew Ammerlaan
2021-05-27 21:06 David Seifert
2021-03-31 11:41 David Seifert
2021-01-01  1:56 Michał Górny
2020-06-05 22:36 Andreas Sturmlechner
2020-06-05 22:36 Andreas Sturmlechner
2020-06-05 22:36 Andreas Sturmlechner
2019-12-12 14:58 Michał Górny
2019-08-13  7:40 Michał Górny
2019-03-02 20:11 Andreas Sturmlechner
2018-07-13 10:33 Tony Vroon
2017-11-06  7:03 Amy Liffey
2017-07-27 18:51 Sebastien Fabbro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox