From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F0737158088 for ; Thu, 30 Oct 2025 13:38:10 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D3E4B3415DF for ; Thu, 30 Oct 2025 13:38:10 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 46C5011056D; Thu, 30 Oct 2025 13:38:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 3ED8111056D for ; Thu, 30 Oct 2025 13:38:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EECC5341051 for ; Thu, 30 Oct 2025 13:38:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F5443B9B for ; Thu, 30 Oct 2025 13:38:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1761831421.0143d0a1d52ea619e17e4dbe5d3ac9fad801b761.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/gdal/gdal-3.11.4-r1.ebuild sci-libs/gdal/gdal-3.11.4.ebuild X-VCS-Directories: sci-libs/gdal/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0143d0a1d52ea619e17e4dbe5d3ac9fad801b761 X-VCS-Branch: master Date: Thu, 30 Oct 2025 13:38:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9c8e9819-abad-4a85-9790-85a03f80edc2 X-Archives-Hash: 603c6e6b6a96da1d9a3daa8ac40de20e commit: 0143d0a1d52ea619e17e4dbe5d3ac9fad801b761 Author: Alfred Wingate protonmail com> AuthorDate: Thu Oct 30 12:10:11 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Oct 30 13:37:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0143d0a1 sci-libs/gdal: make jpeg unconditional + missing tiff[jpeg] dependency Closes: https://bugs.gentoo.org/965329 Signed-off-by: Alfred Wingate protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44385 Signed-off-by: Sam James gentoo.org> sci-libs/gdal/{gdal-3.11.4.ebuild => gdal-3.11.4-r1.ebuild} | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sci-libs/gdal/gdal-3.11.4.ebuild b/sci-libs/gdal/gdal-3.11.4-r1.ebuild similarity index 98% rename from sci-libs/gdal/gdal-3.11.4.ebuild rename to sci-libs/gdal/gdal-3.11.4-r1.ebuild index d347a71a7942..85f960a9e178 100644 --- a/sci-libs/gdal/gdal-3.11.4.ebuild +++ b/sci-libs/gdal/gdal-3.11.4-r1.ebuild @@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~arm64 ~x86" IUSE=" archive armadillo avif blosc cryptopp +curl cpu_flags_arm_neon 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 exprtk fits geos gif gml hdf5 heif java jpeg jpeg2k jpegxl + cpu_flags_x86_ssse3 exprtk fits geos gif gml hdf5 heif java jpeg2k jpegxl lerc libaec libdeflate lz4 lzma mongodb +muparser mysql netcdf odbc openexr oracle parquet pdf png postgres python qhull spatialite sqlite test +tools webp xls zstd @@ -41,8 +41,9 @@ COMMON_DEPEND=" dev-libs/json-c:= dev-libs/libxml2:2= dev-libs/openssl:= - media-libs/tiff:= + media-libs/tiff:=[jpeg] >=sci-libs/libgeotiff-1.5.1-r1:= + media-libs/libjpeg-turbo:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] archive? ( app-arch/libarchive:= ) @@ -60,7 +61,6 @@ COMMON_DEPEND=" java? ( >=virtual/jdk-1.8:* ) - jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) jpegxl? ( media-libs/libjxl:= ) lerc? ( media-libs/lerc:= ) @@ -247,10 +247,7 @@ src_configure() { -DGDAL_USE_HDFS=OFF -DGDAL_USE_ICONV=ON # TODO dep -DGDAL_USE_IDB=OFF - - # Enable internal implementation so that tests pass with the use disabled - -DGDAL_USE_JPEG=$(usex jpeg) - -DGDAL_USE_JPEG_INTERNAL=$(usex !jpeg) + -DGDAL_USE_JPEG=ON # bug #965329 # https://gdal.org/build_hints.html#jpeg12 # Independent of whether using system libjpeg