1 |
commit: 986763a2cdc65d3e2f2741f119a450c840d811b8 |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 27 17:22:49 2017 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 27 18:50:41 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986763a2 |
7 |
|
8 |
sci-libs/dlib: version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
11 |
|
12 |
sci-libs/dlib/Manifest | 3 +- |
13 |
sci-libs/dlib/dlib-18.15.ebuild | 44 -------------- |
14 |
sci-libs/dlib/dlib-18.7.ebuild | 44 -------------- |
15 |
sci-libs/dlib/dlib-19.4.ebuild | 69 ++++++++++++++++++++++ |
16 |
sci-libs/dlib/files/dlib-17.48-makefile-test.patch | 35 ----------- |
17 |
sci-libs/dlib/metadata.xml | 9 ++- |
18 |
6 files changed, 77 insertions(+), 127 deletions(-) |
19 |
|
20 |
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest |
21 |
index a3a80ea6ce4..3754a6afb31 100644 |
22 |
--- a/sci-libs/dlib/Manifest |
23 |
+++ b/sci-libs/dlib/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST dlib-18.15.tar.bz2 7088379 SHA256 e2b790222d625c863d43b3b7dec86a826b504fc10b4b69b242f59a82e9dda16c SHA512 16f42fcdc63214b72328204fca2f7e3d36e18a67fd0f4b97acd9fa5046d7bf41f56ab4209a7a92c54896746b72f6f925ae07ca57ea89982c7e26c0a4ee4b693c WHIRLPOOL a15e181de3e43b800932ce338312ed875788c561bb7ed0ad689882b892f72da891b2a8547763472101e835b652322ab6ab301c6cbf117e2442156320f8603716 |
26 |
-DIST dlib-18.7.tar.bz2 5676950 SHA256 e3d801905288683eee245ff205081343eb79d31d5bb50e42f0293fe5b4a3697e SHA512 20f746a430bd3327f6329d9b198da67d66880f63185b5cd000bcd61a203fad6d775b77c923c92186c122ecd4d4e84f5463e4f81da86b4158d9cc24697cb54365 WHIRLPOOL f7c11fd295f791ce9e2b40c5121a20b3d14ced4d574dc1401a3eb4b2e646fae0f5b01b5a4b4ed6532dea9bcf1c0657147ae32f1e4e9c367fe357ec28287cbec3 |
27 |
+DIST dlib-19.4.tar.gz 7226923 SHA256 2bed9669f1a5c436579498d0806b27a9b60c42a975a9b6e67b594b40f58b1a88 SHA512 23bf80353f9b6ce07b6a3a7df05016705645c18bcf2b3ead567935008ea12c9f6dc0722d9bbacc009bd26f78eb43c1cbecf776bfed5a3445c1f2e8e208f201e2 WHIRLPOOL 300670d12b306e224fce6d7f22d79690f543876f78d30064ab2f9782a3a79a031a6b048863a5a2b21f27eb2538b9ab42f9d00dc88f144129fa591b4b1387c367 |
28 |
|
29 |
diff --git a/sci-libs/dlib/dlib-18.15.ebuild b/sci-libs/dlib/dlib-18.15.ebuild |
30 |
deleted file mode 100644 |
31 |
index 23ef281fa00..00000000000 |
32 |
--- a/sci-libs/dlib/dlib-18.15.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,44 +0,0 @@ |
35 |
-# Copyright 1999-2015 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=5 |
39 |
- |
40 |
-inherit eutils toolchain-funcs |
41 |
- |
42 |
-DESCRIPTION="Numerical and networking C++ library" |
43 |
-HOMEPAGE="http://dlib.net/" |
44 |
-SRC_URI="mirror://sourceforge/dclib/${P}.tar.bz2" |
45 |
- |
46 |
-LICENSE="Boost-1.0" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
49 |
-IUSE="blas doc examples jpeg lapack png test X" |
50 |
- |
51 |
-RDEPEND=" |
52 |
- blas? ( virtual/blas ) |
53 |
- jpeg? ( virtual/jpeg:0= ) |
54 |
- lapack? ( virtual/lapack ) |
55 |
- png? ( media-libs/libpng:0= ) |
56 |
- X? ( x11-libs/libX11 )" |
57 |
-DEPEND="test? ( ${RDEPEND} )" |
58 |
- |
59 |
-src_prepare() { |
60 |
- epatch "${FILESDIR}"/${PN}-17.48-makefile-test.patch |
61 |
-} |
62 |
- |
63 |
-src_test() { |
64 |
- cd dlib/test || die |
65 |
- emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" |
66 |
- ./dtest --runall || die |
67 |
-} |
68 |
- |
69 |
-src_install() { |
70 |
- dodoc dlib/README.txt |
71 |
- rm -r dlib/{README,LICENSE}.txt dlib/test || die |
72 |
- doheader -r dlib |
73 |
- use doc && dohtml -r docs/* |
74 |
- if use examples; then |
75 |
- insinto /usr/share/doc/${PF} |
76 |
- doins -r examples |
77 |
- fi |
78 |
-} |
79 |
|
80 |
diff --git a/sci-libs/dlib/dlib-18.7.ebuild b/sci-libs/dlib/dlib-18.7.ebuild |
81 |
deleted file mode 100644 |
82 |
index 2e1697899c5..00000000000 |
83 |
--- a/sci-libs/dlib/dlib-18.7.ebuild |
84 |
+++ /dev/null |
85 |
@@ -1,44 +0,0 @@ |
86 |
-# Copyright 1999-2015 Gentoo Foundation |
87 |
-# Distributed under the terms of the GNU General Public License v2 |
88 |
- |
89 |
-EAPI=5 |
90 |
- |
91 |
-inherit eutils toolchain-funcs |
92 |
- |
93 |
-DESCRIPTION="Numerical and networking C++ library" |
94 |
-HOMEPAGE="http://dlib.net/" |
95 |
-SRC_URI="mirror://sourceforge/dclib/${P}.tar.bz2" |
96 |
- |
97 |
-LICENSE="Boost-1.0" |
98 |
-SLOT="0" |
99 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
100 |
-IUSE="blas doc examples jpeg lapack png test X" |
101 |
- |
102 |
-RDEPEND=" |
103 |
- blas? ( virtual/blas ) |
104 |
- jpeg? ( virtual/jpeg:0= ) |
105 |
- lapack? ( virtual/lapack ) |
106 |
- png? ( media-libs/libpng:0= ) |
107 |
- X? ( x11-libs/libX11 )" |
108 |
-DEPEND="test? ( ${RDEPEND} )" |
109 |
- |
110 |
-src_prepare() { |
111 |
- epatch "${FILESDIR}"/${PN}-17.48-makefile-test.patch |
112 |
-} |
113 |
- |
114 |
-src_test() { |
115 |
- cd dlib/test || die |
116 |
- emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" |
117 |
- ./test --runall || die |
118 |
-} |
119 |
- |
120 |
-src_install() { |
121 |
- dodoc dlib/README.txt |
122 |
- rm -r dlib/{README,LICENSE}.txt dlib/test || die |
123 |
- doheader -r dlib |
124 |
- use doc && dohtml -r docs/* |
125 |
- if use examples; then |
126 |
- insinto /usr/share/doc/${PF} |
127 |
- doins -r examples |
128 |
- fi |
129 |
-} |
130 |
|
131 |
diff --git a/sci-libs/dlib/dlib-19.4.ebuild b/sci-libs/dlib/dlib-19.4.ebuild |
132 |
new file mode 100644 |
133 |
index 00000000000..9d44e7177a7 |
134 |
--- /dev/null |
135 |
+++ b/sci-libs/dlib/dlib-19.4.ebuild |
136 |
@@ -0,0 +1,69 @@ |
137 |
+# Copyright 1999-2017 Gentoo Foundation |
138 |
+# Distributed under the terms of the GNU General Public License v2 |
139 |
+ |
140 |
+EAPI=6 |
141 |
+ |
142 |
+inherit cmake-utils |
143 |
+ |
144 |
+DESCRIPTION="Numerical and networking C++ library" |
145 |
+HOMEPAGE="http://dlib.net/" |
146 |
+SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
147 |
+ |
148 |
+LICENSE="Boost-1.0" |
149 |
+SLOT="0/${PV}" |
150 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
151 |
+IUSE="cblas debug cuda examples gif jpeg lapack mkl png |
152 |
+ sqlite static-libs test X" |
153 |
+ |
154 |
+# doc needs a bunch of deps not in portage |
155 |
+ |
156 |
+RDEPEND=" |
157 |
+ cblas? ( virtual/cblas:= ) |
158 |
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-7 ) |
159 |
+ jpeg? ( virtual/jpeg:0= ) |
160 |
+ lapack? ( virtual/lapack:= ) |
161 |
+ mkl? ( sci-libs/mkl ) |
162 |
+ png? ( media-libs/libpng:0= ) |
163 |
+ sqlite? ( dev-db/sqlite:3= ) |
164 |
+ X? ( x11-libs/libX11 ) |
165 |
+" |
166 |
+DEPEND="test? ( ${RDEPEND} )" |
167 |
+ |
168 |
+src_prepare() { |
169 |
+ cmake-utils_src_prepare |
170 |
+ sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die |
171 |
+} |
172 |
+src_configure() { |
173 |
+ local mycmakeargs=( |
174 |
+ -DLIB_INSTALL_DIR="$(get_libdir)" |
175 |
+ -DDLIB_ENABLE_ASSERTS="$(usex debug)" |
176 |
+ -DDLIB_ENABLE_STACK_TRACE="$(usex debug)" |
177 |
+ -DDLIB_GIF_SUPPORT="$(usex gif)" |
178 |
+ -DDLIB_JPEG_SUPPORT="$(usex jpeg)" |
179 |
+ -DDLIB_PNG_SUPPORT="$(usex png)" |
180 |
+ -DDLIB_LINK_WITH_SQLITE3="$(usex sqlite)" |
181 |
+ -DDLIB_NO_GUI_SUPPORT="$(usex X OFF ON)" |
182 |
+ -DDLIB_USE_BLAS="$(usex cblas)" |
183 |
+ -DDLIB_USE_CUDA="$(usex cuda)" |
184 |
+ -DDLIB_USE_LAPACK="$(usex lapack)" |
185 |
+ ) |
186 |
+ cmake-utils_src_configure |
187 |
+} |
188 |
+ |
189 |
+src_test() { |
190 |
+ mkdir "${BUILD_DIR}"/dlib/test || die |
191 |
+ pushd "${BUILD_DIR}"/dlib/test > /dev/null || die |
192 |
+ cmake "${S}"/dlib/test && emake |
193 |
+ ./dtest --runall || die |
194 |
+ popd > /dev/null || die |
195 |
+} |
196 |
+ |
197 |
+src_install() { |
198 |
+ cmake-utils_src_install |
199 |
+ dodoc docs/README.txt |
200 |
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a |
201 |
+ if use examples; then |
202 |
+ dodoc -r examples |
203 |
+ docompress -x /usr/share/doc/${PF} |
204 |
+ fi |
205 |
+} |
206 |
|
207 |
diff --git a/sci-libs/dlib/files/dlib-17.48-makefile-test.patch b/sci-libs/dlib/files/dlib-17.48-makefile-test.patch |
208 |
deleted file mode 100644 |
209 |
index 81aed443195..00000000000 |
210 |
--- a/sci-libs/dlib/files/dlib-17.48-makefile-test.patch |
211 |
+++ /dev/null |
212 |
@@ -1,35 +0,0 @@ |
213 |
---- dlib/test/makefile.orig 2012-12-10 23:56:00.000000000 +0000 |
214 |
-+++ dlib/test/makefile 2012-12-10 23:59:07.000000000 +0000 |
215 |
-@@ -5,14 +5,15 @@ |
216 |
- TARGET = test |
217 |
- |
218 |
- # these are the compile time flags passed to gcc |
219 |
--CFLAGS = -ggdb -DDEBUG -DDLIB_NO_GUI_SUPPORT -I ../.. -Wall |
220 |
-+CPPFLAGS := -DDEBUG -DDLIB_NO_GUI_SUPPORT -I../.. |
221 |
-+CXXFLAGS := -ggdb -Wall |
222 |
- |
223 |
- # These are the link time flags passed to gcc |
224 |
- LFLAGS = -lpthread -lnsl |
225 |
- |
226 |
- # The name of the compiler. If you only have one version of |
227 |
- # gcc installed then you probably want to change this to just g++ |
228 |
--CC = nice g++ |
229 |
-+CXX := nice g++ |
230 |
- |
231 |
- #################################################### |
232 |
- #################################################### |
233 |
-@@ -146,13 +147,9 @@ |
234 |
- |
235 |
- $(TARGET): $(OBJ) |
236 |
- @echo Linking $@ |
237 |
-- @$(CC) $(OBJ) $(LFLAGS) -o $@ |
238 |
-+ @$(CXX) $(LDFLAGS) $(OBJ) $(LFLAGS) -o $@ |
239 |
- @echo Build Complete |
240 |
- |
241 |
--.cpp.o: $< |
242 |
-- @echo Compiling $< |
243 |
-- @$(CC) -c $(CFLAGS) $< -o $@ |
244 |
-- |
245 |
- clean: |
246 |
- @rm -f $(OBJ) $(TARGET) |
247 |
- @echo All object files and binaries removed |
248 |
|
249 |
diff --git a/sci-libs/dlib/metadata.xml b/sci-libs/dlib/metadata.xml |
250 |
index 0ac2080f0f1..3d2eccafb59 100644 |
251 |
--- a/sci-libs/dlib/metadata.xml |
252 |
+++ b/sci-libs/dlib/metadata.xml |
253 |
@@ -10,8 +10,13 @@ |
254 |
networking, threads, graphical interfaces, data structures, linear |
255 |
algebra, machine learning, XML and text parsing, numerical |
256 |
optimization, Bayesian nets, and numerous other tasks. |
257 |
-</longdescription> |
258 |
+ </longdescription> |
259 |
+ <use> |
260 |
+ <flag name="cblas">Build with CBLAS <pkg>virtual/cblas</pkg></flag> |
261 |
+ <flag name="cuda">Enable support for CUDA for GPU (cuDNN)</flag> |
262 |
+ <flag name="mkl">Enable support for Intel FFT <pkg>sci-libs/mkl</pkg></flag> |
263 |
+ </use> |
264 |
<upstream> |
265 |
- <remote-id type="sourceforge">dclib</remote-id> |
266 |
+ <remote-id type="github">davisking/dlib</remote-id> |
267 |
</upstream> |
268 |
</pkgmetadata> |