| 1 |
commit: 4b3fb0086b61528086d4b4bde2fca8261b813e35 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 17 07:35:13 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 17 07:35:55 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3fb008 |
| 7 |
|
| 8 |
sci-libs/gdal: force JPEG support on for 3.5.0 |
| 9 |
|
| 10 |
Upstream recommend it, the build is broken without it, and while we |
| 11 |
could fix the build issue, I don't see much point for an extremely |
| 12 |
common dependency (especially given we're the first ones |
| 13 |
to notice the build is broken w/o it). |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/844751 |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
sci-libs/gdal/gdal-3.5.0-r2.ebuild | 6 +++--- |
| 19 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sci-libs/gdal/gdal-3.5.0-r2.ebuild b/sci-libs/gdal/gdal-3.5.0-r2.ebuild |
| 22 |
index 42e368935481..93225abeab64 100644 |
| 23 |
--- a/sci-libs/gdal/gdal-3.5.0-r2.ebuild |
| 24 |
+++ b/sci-libs/gdal/gdal-3.5.0-r2.ebuild |
| 25 |
@@ -15,7 +15,7 @@ SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.ta |
| 26 |
LICENSE="BSD Info-ZIP MIT" |
| 27 |
SLOT="0/31" # subslot is libgdal.so.<SONAME> |
| 28 |
KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
| 29 |
-IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd" |
| 30 |
+IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd" |
| 31 |
# Tests fail to build in 3.5.0, let's not worry too much yet given |
| 32 |
# we're only just porting to CMake. Revisit later. |
| 33 |
RESTRICT="!test? ( test ) test" |
| 34 |
@@ -42,6 +42,7 @@ DEPEND="dev-libs/expat |
| 35 |
dev-libs/libxml2:2 |
| 36 |
dev-libs/openssl:= |
| 37 |
media-libs/tiff |
| 38 |
+ media-libs/libjpeg-turbo:= |
| 39 |
>=sci-libs/libgeotiff-1.5.1-r1:= |
| 40 |
>=sci-libs/proj-6.0.0:= |
| 41 |
sys-libs/zlib[minizip(+)] |
| 42 |
@@ -53,7 +54,6 @@ DEPEND="dev-libs/expat |
| 43 |
gml? ( >=dev-libs/xerces-c-3.1 ) |
| 44 |
heif? ( media-libs/libheif:= ) |
| 45 |
hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) |
| 46 |
- jpeg? ( media-libs/libjpeg-turbo:= ) |
| 47 |
jpeg2k? ( media-libs/openjpeg:2= ) |
| 48 |
lzma? ( || ( |
| 49 |
app-arch/xz-utils |
| 50 |
@@ -134,7 +134,7 @@ src_configure() { |
| 51 |
-DGDAL_USE_HDFS=OFF |
| 52 |
-DGDAL_USE_ICONV=ON # TODO dep |
| 53 |
-DGDAL_USE_IDB=OFF |
| 54 |
- -DGDAL_USE_JPEG=$(usex jpeg) |
| 55 |
+ -DGDAL_USE_JPEG=ON |
| 56 |
|
| 57 |
# https://gdal.org/build_hints.html#jpeg12 |
| 58 |
# Independent of whether using system libjpeg |
Archives