Skip to content

Commit

Permalink
media-gfx/gimp: 2.99.12 version bump
Browse files Browse the repository at this point in the history
In this release of Gimp dev-preview 2.99.12 the porting
from Autotools to Meson build system take place.

The Meson now is preferred by upstream.

Due to diferences of configuration options withon configure.ac
and meson_options.txt the some src_configuration options dropped

1. related to flags:
USE="aqua cpu_flags_ppc_altivec cpu_flags_ppc_mmx cpu_flags_ppc_sse"

2. autotools configure options:
GEGL="${EPREFIX}"/usr/bin/gegl-0.4
GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
--with-pdbgen

Also some patches are dropped in src_prepare() phase:

sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144

sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test

The USE="X" adds conditional support of x11-libs/libXcursor.

The FEATURES="test" now use x11-misc/xvfb-run instead virtualx.eclass to run tests.

In addition USE="doc" now build related to gobject-introspection (g-ir-doc)
plugin documentations. Early it's built was broken for autotools.

Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru>
  • Loading branch information
band-a-prend committed Aug 29, 2022
1 parent 2958c77 commit 302617a
Show file tree
Hide file tree
Showing 3 changed files with 325 additions and 63 deletions.
1 change: 1 addition & 0 deletions media-gfx/gimp/Manifest
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d122cdc6dd3b7637f06cff28310e12d9a79678ac477b56728f4ceb53292001c53f026e94be417db76dd7e14740ab SHA512 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3
DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa90ae06cbcdc7b30914f959c1a15a7e7ea34ba22ce09a973b29acf1277e3a4519d744140c3fcabc59f31dc3ebf43 SHA512 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917
256 changes: 256 additions & 0 deletions media-gfx/gimp/gimp-2.99.12.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,256 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

LUA_COMPAT=( luajit )
PYTHON_COMPAT=( python3_{8..10} )
GNOME2_EAUTORECONF=yes
VALA_MIN_API_VERSION="0.50"
VALA_USE_DEPEND=vapigen

inherit lua-single meson python-single-r1 toolchain-funcs vala xdg

DESCRIPTION="GNU Image Manipulation Program"
HOMEPAGE="https://www.gimp.org/"
SRC_URI="mirror://gimp/v2.99/${P}.tar.xz"
LICENSE="GPL-3 LGPL-3"
SLOT="0/3"

IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python test udev unwind vala vector-icons webp wmf xpm"
REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
python? ( ${PYTHON_REQUIRED_USE} )
"

RESTRICT="!test? ( test )"

# media-libs/{babl,gegl} are required to be built with USE="introspection"
# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
COMMON_DEPEND="
>=app-text/poppler-0.90.1[cairo]
>=app-text/poppler-data-0.4.9
>=dev-libs/appstream-glib-0.7.16
>=dev-libs/atk-2.34.1
>=dev-libs/glib-2.68.0:2
>=dev-libs/json-glib-1.4.4
dev-libs/libxml2:2
dev-libs/libxslt
>=gnome-base/librsvg-2.40.21:2
>=media-gfx/mypaint-brushes-2.0.2:=
>=media-libs/babl-0.1.96[introspection,lcms,vala?]
>=media-libs/fontconfig-2.12.6
>=media-libs/freetype-2.10.2
>=media-libs/gegl-0.4.38:0.4[cairo,introspection,lcms,vala?]
>=media-libs/gexiv2-0.14.0
>=media-libs/harfbuzz-2.6.5:=
>=media-libs/lcms-2.9:2
media-libs/libjpeg-turbo
>=media-libs/libmypaint-1.6.1:=
>=media-libs/libpng-1.6.37:0=
>=media-libs/tiff-4.1.0:0
net-libs/glib-networking[ssl]
sys-libs/zlib
>=x11-libs/cairo-1.16.0
>=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
>=x11-libs/gtk+-3.24.16:3[introspection]
>=x11-libs/pango-1.44.7
aalib? ( media-libs/aalib )
alsa? ( >=media-libs/alsa-lib-1.0.0 )
heif? ( >=media-libs/libheif-1.9.1:= )
javascript? ( dev-libs/gjs )
jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
jpegxl? ( >=media-libs/libjxl-0.6.1:= )
lua? (
${LUA_DEPS}
$(lua_gen_cond_dep '
dev-lua/lgi[${LUA_USEDEP}]
')
)
mng? ( media-libs/libmng:= )
openexr? ( >=media-libs/openexr-2.3.0:= )
postscript? ( app-text/ghostscript-gpl )
python? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
')
)
udev? ( >=dev-libs/libgudev-167:= )
unwind? ( >=sys-libs/libunwind-1.1.0:= )
webp? ( >=media-libs/libwebp-0.6.0:= )
wmf? ( >=media-libs/libwmf-0.2.8 )
X? ( x11-libs/libXcursor )
xpm? ( x11-libs/libXpm )
"

RDEPEND="
${COMMON_DEPEND}
x11-themes/hicolor-icon-theme
gnome? ( gnome-base/gvfs )
"

DEPEND="
${COMMON_DEPEND}
>=dev-lang/perl-5.30.3
dev-util/gdbus-codegen
dev-util/gtk-update-icon-cache
>=dev-util/intltool-0.51.0
>=sys-devel/autoconf-2.54
>=sys-devel/automake-1.11
>=sys-devel/gettext-0.21
>=sys-devel/libtool-2.4.6
doc? (
app-text/yelp-tools
dev-libs/gobject-introspection[doctool]
dev-util/gi-docgen
)
test? ( x11-misc/xvfb-run )
vala? ( $(vala_depend) )
"

# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
BDEPEND="virtual/pkgconfig"

DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" )

pkg_setup() {
use lua && lua-single_pkg_setup

if use python; then
python-single-r1_pkg_setup
fi
}

src_prepare() {
default

sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794

# Fix Gimp and GimpUI devel doc installation paths
sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp/meson.build || die
sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp-ui/meson.build || die

# Fix pygimp.interp python implementation path.
# Meson @PYTHON_PATH@ use sandbox path e.g.:
# '/var/tmp/portage/media-gfx/gimp-2.99.12/temp/python3.10/bin/python3'
sed -i -e 's:@PYTHON_PATH@:'${EPYTHON}':' plug-ins/python/pygimp.interp.in || die

export CC_FOR_BUILD="$(tc-getBUILD_CC)"
}

_adjust_sandbox() {
# Bugs #569738 and #591214
local nv
for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
# We do not check for existence as they may show up later
# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
addwrite "${nv}"
done

addwrite /dev/dri/ # bugs #574038 and #684886
addwrite /dev/ati/ # bug #589198
addwrite /proc/mtrr # bug #589198
}

src_configure() {
_adjust_sandbox

use vala && vala_setup

local emesonargs=(
-Denable-default-bin=true

-Dcheck-update=no
-Denable-multiproc=true
-Dappdata-test=disabled
-Dbug-report-url=https://bugs.gentoo.org/
-Dlibbacktrace=false
-Dwebkit-unmaintained=false
$(meson_feature aalib aa)
$(meson_feature alsa)
$(meson_feature doc gi-docgen)
$(meson_feature heif)
$(meson_feature jpeg2k jpeg2000)
$(meson_feature jpegxl jpeg-xl)
$(meson_feature mng)
$(meson_feature openexr)
$(meson_feature postscript ghostscript)
$(meson_feature test headless-tests)
$(meson_feature udev gudev)
$(meson_feature vala vala-plugins)
$(meson_feature webp)
$(meson_feature wmf)
$(meson_feature X xcursor)
$(meson_feature xpm)
$(meson_use doc g-ir-doc)
$(meson_use javascript)
$(meson_use lua)
$(meson_use python)
$(meson_use unwind libunwind)
$(meson_use vector-icons)
)

meson_src_configure
}

src_compile() {
export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
meson_src_compile
}

# for https://bugs.gentoo.org/664938
_rename_plugins() {
einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
local prename=gimp-org-
(
cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
for plugin_slash in $(ls -d1 */); do
plugin=${plugin_slash%/}
if [[ -f ${plugin}/${plugin} ]]; then
# NOTE: Folder and file name need to match for Gimp to load that plug-in
# so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
mv ${plugin}/{,${prename}}${plugin} || exit 1
mv {,${prename}}${plugin} || exit 1
fi
done
)
}

src_test() {
meson_src_test
}

src_install() {
meson_src_install

if use python; then
python_optimize
fi

# Workaround for bug #321111 to give GIMP the least
# precedence on PDF documents by default
mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die

find "${D}" -name '*.la' -type f -delete || die

# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die

# Create symlinks for Gimp exec in /usr/bin
dosym "${ESYSROOT}"/usr/bin/gimp-2.99 /usr/bin/gimp
dosym "${ESYSROOT}"/usr/bin/gimp-console-2.99 /usr/bin/gimp-console
dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter
dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-2.99 /usr/bin/gimp-test-clipboard
dosym "${ESYSROOT}"/usr/bin/gimptool-2.99 /usr/bin/gimptool

_rename_plugins || die
}

pkg_postinst() {
xdg_desktop_database_update
}

pkg_postrm() {
xdg_desktop_database_update
}

0 comments on commit 302617a

Please sign in to comment.