commit: f25f741c568cfc24eb9f7c6b66a3c727fdcabe40 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Dec 19 10:58:44 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Dec 19 11:43:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25f741c
media-libs/vips: drop 8.15.0 Keeping 8.14.5 for now as the stable candidate given it does not need newer still-not-stable newer dev-cpp/highway. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-libs/vips/Manifest | 1 - .../vips/files/vips-8.15.0-disabled-jpeg.patch | 18 --- media-libs/vips/vips-8.15.0.ebuild | 168 --------------------- 3 files changed, 187 deletions(-) diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest index b9ed6f8c6d4d..341ac2034302 100644 --- a/media-libs/vips/Manifest +++ b/media-libs/vips/Manifest @@ -1,3 +1,2 @@ DIST vips-8.14.5.tar.xz 18652928 BLAKE2B 033359fcb7e52ec11daf7cf85641789e3c4b858644bce6290742920cbee8a1d8bc2f56ffdcd52ccb6d4da9f8bf24fbab626e121bba063eb97201af28eb440d57 SHA512 ceea6e4d378ac99eb026293e91da530b91febbd5d775b57ab807bcd60f39ca44a088161a713e31b972694d3797d4acaa97028f0e1d3ce4d9db7f8078c005dbe1 -DIST vips-8.15.0.tar.xz 18653932 BLAKE2B 3c5dfbf12de1d2fce5a0d1e11311d20d9f431276c42a72a9cbd4229ad9abbc2af3549c2b12934f1baefce688170346ae4b68f8c5bbbc07be005f44167d81e277 SHA512 2b5ba9529c3bb9c0fb80ef19dc958ba272611599a1e56395b4516c5dc66981b7a2dfea1039437843dc16f22f8d15a5a6233ec673c796d195154717d2d5167f67 DIST vips-8.15.1.tar.xz 18648116 BLAKE2B 734f9d6bba794cf01ef38de0f0ed25fe93d2924579bbe966de94739ff1c7309815924e8926a86f90d9138daeeb6fba255be4be41496c1725e44cb52f22873628 SHA512 41f81c3bcb49e570c548d47494b0b705c5dbf870e16d67a85098a00c3f198a6f04e43899d97f92efe9bfdd5cedde79f51cc112c6953574748e1905d91d083dfa diff --git a/media-libs/vips/files/vips-8.15.0-disabled-jpeg.patch b/media-libs/vips/files/vips-8.15.0-disabled-jpeg.patch deleted file mode 100644 index 47f2a4685aa9..000000000000 --- a/media-libs/vips/files/vips-8.15.0-disabled-jpeg.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://bugs.gentoo.org/918954 -https://github.com/libvips/libvips/pull/3772 -From: Ionen Wolkens <io...@gentoo.org> -Date: Fri, 1 Dec 2023 11:33:13 -0500 -Subject: [PATCH] Sync vips__jpeg_region_write_target definitions - -Prevents a build failure in the off-chance jpeg was disabled. ---- a/libvips/foreign/vips2jpeg.c -+++ b/libvips/foreign/vips2jpeg.c -@@ -1035,7 +1035,7 @@ vips__jpeg_region_write_target(VipsRegion *region, VipsRect *rect, - VipsTarget *target, - int Q, const char *profile, - gboolean optimize_coding, gboolean progressive, -- gboolean strip, gboolean trellis_quant, -+ VipsForeignKeep keep, gboolean trellis_quant, - gboolean overshoot_deringing, gboolean optimize_scans, - int quant_table, VipsForeignSubsample subsample_mode, - int restart_interval) diff --git a/media-libs/vips/vips-8.15.0.ebuild b/media-libs/vips/vips-8.15.0.ebuild deleted file mode 100644 index bbf67050980e..000000000000 --- a/media-libs/vips/vips-8.15.0.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit meson python-single-r1 vala - -DESCRIPTION="VIPS Image Processing Library" -HOMEPAGE="https://libvips.github.io/libvips/"; -SRC_URI="https://github.com/libvips/libvips/releases/download/v${PV}/${P}.tar.xz"; - -LICENSE="LGPL-2.1+ MIT" -SLOT="0/42" # soname -KEYWORDS="~amd64 ~x86" -IUSE=" - archive deprecated doc exif fftw fits fontconfig graphicsmagick - gtk-doc heif +highway imagemagick imagequant +introspection +jpeg - jpeg2k jpegxl lcms matio openexr orc pango pdf +png python svg - test tiff vala webp -" -REQUIRED_USE=" - fontconfig? ( pango ) - graphicsmagick? ( imagemagick ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( jpeg png webp ) - vala? ( introspection ) -" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/expat - virtual/libintl - archive? ( app-arch/libarchive:= ) - exif? ( media-libs/libexif ) - fftw? ( sci-libs/fftw:3.0= ) - fits? ( sci-libs/cfitsio:= ) - fontconfig? ( media-libs/fontconfig ) - heif? ( media-libs/libheif:= ) - highway? ( >=dev-cpp/highway-1.0.5 ) - !highway? ( - orc? ( dev-lang/orc ) - ) - imagemagick? ( - graphicsmagick? ( media-gfx/graphicsmagick:= ) - !graphicsmagick? ( media-gfx/imagemagick:= ) - ) - imagequant? ( media-gfx/libimagequant ) - introspection? ( dev-libs/gobject-introspection ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpeg2k? ( media-libs/openjpeg:= ) - jpegxl? ( media-libs/libjxl ) - lcms? ( media-libs/lcms:2 ) - matio? ( sci-libs/matio:= ) - openexr? ( media-libs/openexr:= ) - pango? ( - x11-libs/cairo - x11-libs/pango - ) - pdf? ( - app-text/poppler[cairo] - x11-libs/cairo - ) - png? ( media-libs/libpng:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]') - ) - svg? ( - gnome-base/librsvg:2 - sys-libs/zlib:= - x11-libs/cairo - ) - tiff? ( media-libs/tiff:= ) - webp? ( media-libs/libwebp:= ) -" -DEPEND=" - ${RDEPEND} - pango? ( x11-base/xorg-proto ) - pdf? ( x11-base/xorg-proto ) - svg? ( x11-base/xorg-proto ) - test? ( - tiff? ( media-libs/tiff[jpeg] ) - ) -" -BDEPEND=" - dev-util/glib-utils - sys-devel/gettext - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - gtk-doc? ( dev-util/gtk-doc ) - python? ( ${PYTHON_DEPS} ) - vala? ( $(vala_depend) ) -" - -PATCHES=( - "${FILESDIR}"/${P}-disabled-jpeg.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - use vala && vala_setup - - sed -i "s/'vips-doc'/'${PF}'/" cplusplus/meson.build || die - - sed -i "/subdir('fuzz')/d" meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_use deprecated) - $(meson_use doc doxygen) - -Dexamples=false - $(meson_use gtk-doc gtk_doc) - $(meson_use vala vapi) - -Dcgif=disabled # not packaged, and not used to view gif (only saving) - $(meson_feature archive) - $(meson_feature exif) - $(meson_feature fftw) - $(meson_feature fits cfitsio) - $(meson_feature fontconfig) - $(meson_feature heif) - $(meson_feature highway) - $(meson_feature imagemagick magick) - -Dmagick-package=$(usex graphicsmagick GraphicsMagick MagickCore) - $(meson_feature imagequant) - $(meson_feature introspection) - $(meson_feature jpeg) - $(meson_feature jpeg2k openjpeg) - $(meson_feature jpegxl jpeg-xl) - $(meson_feature lcms) - $(meson_feature matio) - -Dnifti=disabled # not packaged - $(meson_feature openexr) - -Dopenslide=disabled # not packaged - $(meson_feature orc) # no-op if USE=highway is set - $(meson_feature pango pangocairo) - -Dpdfium=disabled # not packaged, can use poppler instead - $(meson_feature png) - $(meson_feature pdf poppler) - -Dquantizr=disabled # not packaged, can use imagequant instead - -Dspng=disabled # not packaged, can use libpng instead - $(meson_feature svg rsvg) - $(meson_feature tiff) - $(meson_feature webp) - $(meson_feature svg zlib) # zlib is currently only used by svgload.c - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - if use python; then - python_fix_shebang "${ED}"/usr/bin/vipsprofile - else - rm -- "${ED}"/usr/{bin/vipsprofile,share/man/man1/vipsprofile.1} || die - fi -}
