1 |
commit: 0319666d48dfe5a424e75a1f497dee7033785c68 |
2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 7 11:03:34 2018 +0000 |
4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 16 16:17:25 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0319666d |
7 |
|
8 |
sci-libs/gdal: fix build with ogdi |
9 |
|
10 |
- Fix subslot to 3.3 |
11 |
Closes: https://bugs.gentoo.org/658640 |
12 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
13 |
|
14 |
.../{gdal-2.3.0.ebuild => gdal-2.3.0-r1.ebuild} | 183 ++++++++++++--------- |
15 |
1 file changed, 103 insertions(+), 80 deletions(-) |
16 |
|
17 |
diff --git a/sci-libs/gdal/gdal-2.3.0.ebuild b/sci-libs/gdal/gdal-2.3.0-r1.ebuild |
18 |
similarity index 67% |
19 |
rename from sci-libs/gdal/gdal-2.3.0.ebuild |
20 |
rename to sci-libs/gdal/gdal-2.3.0-r1.ebuild |
21 |
index 24f395f1b09..8aacbcb83c7 100644 |
22 |
--- a/sci-libs/gdal/gdal-2.3.0.ebuild |
23 |
+++ b/sci-libs/gdal/gdal-2.3.0-r1.ebuild |
24 |
@@ -13,10 +13,10 @@ DESCRIPTION="Translator library for raster geospatial data formats (includes OGR |
25 |
HOMEPAGE="http://www.gdal.org/" |
26 |
SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz" |
27 |
|
28 |
-SLOT="0/2.2" |
29 |
+SLOT="0/2.3" |
30 |
LICENSE="BSD Info-ZIP MIT" |
31 |
KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
32 |
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls" |
33 |
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls" |
34 |
|
35 |
COMMON_DEPEND=" |
36 |
dev-libs/expat |
37 |
@@ -33,8 +33,12 @@ COMMON_DEPEND=" |
38 |
gif? ( media-libs/giflib:= ) |
39 |
gml? ( >=dev-libs/xerces-c-3.1 ) |
40 |
hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) |
41 |
- jpeg? ( virtual/jpeg:0 ) |
42 |
+ jpeg? ( virtual/jpeg:0= ) |
43 |
jpeg2k? ( media-libs/openjpeg:2= ) |
44 |
+ lzma? ( || ( |
45 |
+ app-arch/xz-utils |
46 |
+ app-arch/lzma |
47 |
+ ) ) |
48 |
mdb? ( dev-java/jackcess:1 ) |
49 |
mysql? ( virtual/mysql ) |
50 |
netcdf? ( sci-libs/netcdf:= ) |
51 |
@@ -112,6 +116,7 @@ src_prepare() { |
52 |
-i swig/python/setup.cfg || die "sed python setup.cfg failed" |
53 |
|
54 |
default |
55 |
+ |
56 |
eautoreconf |
57 |
} |
58 |
|
59 |
@@ -119,97 +124,115 @@ src_configure() { |
60 |
# bug 619148 |
61 |
append-cxxflags -std=c++14 |
62 |
|
63 |
+ local myconf=( |
64 |
+ # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore |
65 |
+ # bsb - legal issues |
66 |
+ # ingres - same story as oracle oci |
67 |
+ # jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead |
68 |
+ # podofo - we use poppler instead they are exclusive for each other |
69 |
+ # tiff is a hard dep |
70 |
+ --includedir="${EPREFIX}/usr/include/${PN}" |
71 |
+ --disable-pdf-plugin |
72 |
+ --disable-static |
73 |
+ --enable-shared |
74 |
+ --with-expat |
75 |
+ --with-cryptopp=no |
76 |
+ --with-geotiff |
77 |
+ --with-grib |
78 |
+ --with-hide-internal-symbols |
79 |
+ --with-libjson-c="${EPREFIX}/usr/" |
80 |
+ --with-libtiff |
81 |
+ --with-libtool |
82 |
+ --with-libz="${EPREFIX}/usr/" |
83 |
+ --with-gnm |
84 |
+ --without-bsb |
85 |
+ --without-dods-root |
86 |
+ --without-ecw |
87 |
+ --without-epsilon |
88 |
+ --without-fgdb |
89 |
+ --without-fme |
90 |
+ --without-gta |
91 |
+ --without-grass |
92 |
+ --without-hdf4 |
93 |
+ --without-idb |
94 |
+ --without-ingres |
95 |
+ --without-jasper |
96 |
+ --without-jp2lura |
97 |
+ --without-jp2mrsid |
98 |
+ --without-kakadu |
99 |
+ --without-kea |
100 |
+ --without-libkml |
101 |
+ --without-mongocxx |
102 |
+ --without-mrsid |
103 |
+ --without-mrsid_lidar |
104 |
+ --without-msg |
105 |
+ --without-mrf |
106 |
+ --without-rasdaman |
107 |
+ --without-rasterlite2 |
108 |
+ --without-pcraster |
109 |
+ --without-pdfium |
110 |
+ --without-php |
111 |
+ --without-podofo |
112 |
+ --without-qhull |
113 |
+ --without-sde |
114 |
+ --without-sfcgal |
115 |
+ --without-sosi |
116 |
+ --without-teigha |
117 |
+ --disable-lto |
118 |
+ $(use_enable debug) |
119 |
+ $(use_with armadillo) |
120 |
+ $(use_with aux_xml pam) |
121 |
+ $(use_with curl) |
122 |
+ $(use_with fits cfitsio) |
123 |
+ $(use_with geos) |
124 |
+ $(use_with gif) |
125 |
+ $(use_with gml xerces) |
126 |
+ $(use_with hdf5) |
127 |
+ $(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library yreleased developer by gdal |
128 |
+ $(use_with jpeg) |
129 |
+ $(use_with jpeg2k openjpeg) |
130 |
+ $(use_with lzma liblzma) |
131 |
+ $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) |
132 |
+ $(use_with netcdf) |
133 |
+ $(use_with oracle oci) |
134 |
+ $(use_with odbc) |
135 |
+ $(use_with ogdi ogdi "${EPREFIX}"/usr) |
136 |
+ $(use_with opencl) |
137 |
+ $(use_with pdf poppler) |
138 |
+ $(use_with perl) |
139 |
+ $(use_with png) |
140 |
+ $(use_with postgres pg) |
141 |
+ $(use_with python) |
142 |
+ $(use_with spatialite) |
143 |
+ $(use_with sqlite sqlite3 "${EPREFIX}"/usr) |
144 |
+ $(use_with threads) |
145 |
+ $(use_with webp) |
146 |
+ $(use_with xls freexl) ) |
147 |
+ |
148 |
tc-export AR RANLIB |
149 |
- local myopts=() |
150 |
|
151 |
if use java; then |
152 |
- myopts+=( |
153 |
+ myconf+=( |
154 |
--with-java=$(java-config --jdk-home 2>/dev/null) |
155 |
--with-jvm-lib=dlopen |
156 |
$(use_with mdb) |
157 |
) |
158 |
else |
159 |
- myopts+=( --without-java --without-mdb ) |
160 |
+ myconf+=( --without-java --without-mdb ) |
161 |
fi |
162 |
|
163 |
if use sqlite; then |
164 |
append-libs -lsqlite3 |
165 |
fi |
166 |
|
167 |
- # pcidsk is internal, because there is no such library yet released |
168 |
- # also that thing is developed by the gdal people |
169 |
- # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore |
170 |
- # bsb - legal issues |
171 |
- # ingres - same story as oracle oci |
172 |
- # jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead |
173 |
- # podofo - we use poppler instead they are exclusive for each other |
174 |
- # tiff is a hard dep |
175 |
- ECONF_SOURCE="${S}" econf \ |
176 |
- --includedir="${EPREFIX}/usr/include/${PN}" \ |
177 |
- --disable-pdf-plugin \ |
178 |
- --disable-static \ |
179 |
- --enable-shared \ |
180 |
- --with-expat \ |
181 |
- --with-geotiff \ |
182 |
- --with-grib \ |
183 |
- --with-hide-internal-symbols \ |
184 |
- --with-libjson-c="${EPREFIX}/usr/" \ |
185 |
- --with-libtiff \ |
186 |
- --with-libtool \ |
187 |
- --with-libz="${EPREFIX}/usr/" \ |
188 |
- --with-gnm \ |
189 |
- --with-cryptopp=no \ |
190 |
- --without-bsb \ |
191 |
- --without-dods-root \ |
192 |
- --without-ecw \ |
193 |
- --without-epsilon \ |
194 |
- --without-fme \ |
195 |
- --without-grass \ |
196 |
- --without-hdf4 \ |
197 |
- --without-idb \ |
198 |
- --without-ingres \ |
199 |
- --without-jasper \ |
200 |
- --without-jp2mrsid \ |
201 |
- --without-kakadu \ |
202 |
- --without-mrsid \ |
203 |
- --without-msg \ |
204 |
- --without-mrf \ |
205 |
- --without-pcraster \ |
206 |
- --without-pdfium \ |
207 |
- --without-sde \ |
208 |
- --without-sosi \ |
209 |
- --without-mongocxx \ |
210 |
- --without-podofo \ |
211 |
- --disable-lto \ |
212 |
- $(use_enable debug) \ |
213 |
- $(use_with armadillo) \ |
214 |
- $(use_with aux_xml pam) \ |
215 |
- $(use_with curl) \ |
216 |
- $(use_with fits cfitsio) \ |
217 |
- $(use_with geos) \ |
218 |
- $(use_with gif) \ |
219 |
- $(use_with gml xerces) \ |
220 |
- $(use_with hdf5) \ |
221 |
- $(use_with jpeg pcidsk) \ |
222 |
- $(use_with jpeg) \ |
223 |
- $(use_with jpeg2k openjpeg) \ |
224 |
- $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \ |
225 |
- $(use_with netcdf) \ |
226 |
- $(use_with oracle oci) \ |
227 |
- $(use_with odbc) \ |
228 |
- $(use_with ogdi ogdi "${EPREFIX}"/usr) \ |
229 |
- $(use_with opencl) \ |
230 |
- $(use_with perl) \ |
231 |
- $(use_with png) \ |
232 |
- $(use_with pdf poppler) \ |
233 |
- $(use_with postgres pg) \ |
234 |
- $(use_with python) \ |
235 |
- $(use_with spatialite) \ |
236 |
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \ |
237 |
- $(use_with threads) \ |
238 |
- $(use_with webp) \ |
239 |
- $(use_with xls freexl) \ |
240 |
- ${myopts} |
241 |
+ # bug #632660 |
242 |
+ if use ogdi; then |
243 |
+ tc-export PKG_CONFIG |
244 |
+ append-cflags $(${PKG_CONFIG} --cflags libtirpc) |
245 |
+ append-cxxflags $(${PKG_CONFIG} --cflags libtirpc) |
246 |
+ fi |
247 |
+ |
248 |
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" |
249 |
|
250 |
# mysql-config puts this in (and boy is it a PITA to get it out) |
251 |
if use mysql; then |