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 8F91C158176 for ; Sun, 19 Oct 2025 16:36:34 +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 67F59341F91 for ; Sun, 19 Oct 2025 16:36:34 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 47C02110579; Sun, 19 Oct 2025 16:36:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3EEEB110577 for ; Sun, 19 Oct 2025 16:36:23 +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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5D3B341EC8 for ; Sun, 19 Oct 2025 16:36:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 622F33B1D for ; Sun, 19 Oct 2025 16:36:20 +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: <1760891707.a141708f63bd309a1e83c95e0c5535174857179a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gegl/gegl-0.4.64-r1.ebuild media-libs/gegl/gegl-9999.ebuild X-VCS-Directories: media-libs/gegl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a141708f63bd309a1e83c95e0c5535174857179a X-VCS-Branch: master Date: Sun, 19 Oct 2025 16:36:20 +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: 4a075a95-1b5e-4463-8708-49fc16a246b4 X-Archives-Hash: a9ebdd7902d28235d9b64de704e3369a commit: a141708f63bd309a1e83c95e0c5535174857179a Author: Chris Mayo gmail com> AuthorDate: Sat Oct 18 16:20:09 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 19 16:35:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a141708f media-libs/gegl: optionally build and install developer documentation Signed-off-by: Chris Mayo gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42338 Closes: https://github.com/gentoo/gentoo/pull/42338 Signed-off-by: Sam James gentoo.org> .../{gegl-9999.ebuild => gegl-0.4.64-r1.ebuild} | 27 ++++++++++++++++++---- media-libs/gegl/gegl-9999.ebuild | 10 ++++++-- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.64-r1.ebuild similarity index 83% copy from media-libs/gegl/gegl-9999.ebuild copy to media-libs/gegl/gegl-0.4.64-r1.ebuild index 63bbfb1aa91b..b58b2be71da5 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-0.4.64-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" else SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A graph based image processing framework" @@ -23,8 +23,9 @@ HOMEPAGE="https://gegl.org/" LICENSE="|| ( GPL-3+ LGPL-3 )" SLOT="0.4" -IUSE="cairo debug ffmpeg introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp" +IUSE="cairo debug ffmpeg gtk-doc introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp" REQUIRED_USE=" + gtk-doc? ( introspection ) svg? ( cairo ) test? ( introspection ) vala? ( introspection ) @@ -38,7 +39,7 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 - >=media-libs/babl-0.1.112[introspection?,lcms?,vala?] + >=media-libs/babl-0.1.116[introspection?,lcms?,vala?] media-libs/libjpeg-turbo:= >=media-libs/libnsgif-1.0.0:= >=media-libs/libpng-1.6.0:0= @@ -68,12 +69,17 @@ BDEPEND=" dev-lang/perl >=sys-devel/gettext-0.19.8 virtual/pkgconfig + gtk-doc? ( dev-util/gi-docgen ) test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') ) vala? ( $(vala_depend) ) " DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc ) +PATCHES=( + "${FILESDIR}"/gegl-0.4.64-system-libnsgif.patch +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -102,6 +108,18 @@ src_prepare() { if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die fi + + # fix 'build'headers from *.cl on gentoo-hardened, bug 739816 + pushd "${S}/opencl/" || die + for file in *.cl; do + if [[ -f ${file} ]]; then + "${EPYTHON}" cltostring.py "${file}" || die + fi + done + popd || die + + # Fix QA warning, install docs into /usr/share/gtk-doc/html/gegl-0.4 instead of /usr/share/doc/gegl-0.4 + sed -i -e "s#'doc'#'gtk-doc' / 'html'#" docs/reference/meson.build || die } src_configure() { @@ -113,7 +131,7 @@ src_configure() { local emesonargs=( # - Disable documentation as the generating is bit automagic # if anyone wants to work on it just create bug with patch - -Ddocs=false + -Ddocs=false # website -Dgdk-pixbuf=enabled -Djasper=disabled # - libspiro: not in portage main tree @@ -126,6 +144,7 @@ src_configure() { $(meson_feature cairo) $(meson_feature cairo pangocairo) $(meson_feature ffmpeg libav) + $(meson_feature gtk-doc gi-docgen) $(meson_feature lcms) $(meson_feature lensfun) $(meson_feature openexr) diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild index 63bbfb1aa91b..a65c7f90335b 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -23,8 +23,9 @@ HOMEPAGE="https://gegl.org/" LICENSE="|| ( GPL-3+ LGPL-3 )" SLOT="0.4" -IUSE="cairo debug ffmpeg introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp" +IUSE="cairo debug ffmpeg gtk-doc introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp" REQUIRED_USE=" + gtk-doc? ( introspection ) svg? ( cairo ) test? ( introspection ) vala? ( introspection ) @@ -68,6 +69,7 @@ BDEPEND=" dev-lang/perl >=sys-devel/gettext-0.19.8 virtual/pkgconfig + gtk-doc? ( dev-util/gi-docgen ) test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') ) vala? ( $(vala_depend) ) " @@ -102,6 +104,9 @@ src_prepare() { if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die fi + + # Fix QA warning, install docs into /usr/share/gtk-doc/html/gegl-0.4 instead of /usr/share/doc/gegl-0.4 + sed -i -e "s#'doc'#'gtk-doc' / 'html'#" docs/reference/meson.build || die } src_configure() { @@ -113,7 +118,7 @@ src_configure() { local emesonargs=( # - Disable documentation as the generating is bit automagic # if anyone wants to work on it just create bug with patch - -Ddocs=false + -Ddocs=false # website -Dgdk-pixbuf=enabled -Djasper=disabled # - libspiro: not in portage main tree @@ -126,6 +131,7 @@ src_configure() { $(meson_feature cairo) $(meson_feature cairo pangocairo) $(meson_feature ffmpeg libav) + $(meson_feature gtk-doc gi-docgen) $(meson_feature lcms) $(meson_feature lensfun) $(meson_feature openexr)