From e8aa09f74c8ba0c9e1c5ae3ab49f93b6a0820330 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Sep 2024 12:32:28 +0100 Subject: gentoo auto-resync : 14:09:2024 - 12:32:27 --- media-libs/Manifest.gz | Bin 69580 -> 69581 bytes media-libs/clutter-gtk/Manifest | 1 + media-libs/clutter-gtk/clutter-gtk-1.8.4-r2.ebuild | 50 +++++++++ media-libs/giblib/Manifest | 1 - media-libs/giblib/giblib-1.2.4-r1.ebuild | 40 ------- media-libs/glycin-loaders/Manifest | 2 + .../glycin-loaders/glycin-loaders-1.1.0.ebuild | 88 +++++++++++++++ media-libs/libiptcdata/Manifest | 1 - media-libs/libiptcdata/libiptcdata-1.0.5.ebuild | 52 --------- media-libs/libjxl/Manifest | 2 + media-libs/libjxl/libjxl-0.11.0.ebuild | 115 ++++++++++++++++++++ media-libs/libwmf/Manifest | 11 +- ...ibwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch | 118 --------------------- .../files/libwmf-0.2.8.4-CVE-2015-4695.patch | 56 ---------- .../files/libwmf-0.2.8.4-CVE-2015-4696.patch | 23 ---- .../libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch | 25 ----- .../libwmf/files/libwmf-0.2.8.4-intoverflow.patch | 27 ----- .../libwmf-0.2.8.4-use-freetype2-pkg-config.patch | 67 ------------ .../files/libwmf-0.2.8.4-use-system-fonts.patch | 39 ------- media-libs/libwmf/libwmf-0.2.13-r1.ebuild | 5 +- media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild | 101 ------------------ media-libs/vigra/Manifest | 1 - .../files/vigra-1.11.2-python3.12-remove-imp.patch | 30 ------ 23 files changed, 263 insertions(+), 592 deletions(-) create mode 100644 media-libs/clutter-gtk/clutter-gtk-1.8.4-r2.ebuild delete mode 100644 media-libs/giblib/giblib-1.2.4-r1.ebuild create mode 100644 media-libs/glycin-loaders/glycin-loaders-1.1.0.ebuild delete mode 100644 media-libs/libiptcdata/libiptcdata-1.0.5.ebuild create mode 100644 media-libs/libjxl/libjxl-0.11.0.ebuild delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch delete mode 100644 media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch delete mode 100644 media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild delete mode 100644 media-libs/vigra/files/vigra-1.11.2-python3.12-remove-imp.patch (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 9e7630dcbd71..68ed617bf804 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/clutter-gtk/Manifest b/media-libs/clutter-gtk/Manifest index d897873a6f6e..464717cd41ba 100644 --- a/media-libs/clutter-gtk/Manifest +++ b/media-libs/clutter-gtk/Manifest @@ -1,3 +1,4 @@ DIST clutter-gtk-1.8.4.tar.xz 331508 BLAKE2B 4e21b361fb0ebf8e322601e3a9f148125cb489cb6e14a963ee6e7fbf845556dd37fc1fedc89e8288d24bca559afe079cb7efe65c7be5c59c59b21461cf38834a SHA512 810f879a56cd71f1e9c4678ef704a997ee652d052cfea56b3ed9478f7a813a35dd2fdcded028ce17411ae02da52fa31e0fb8d1f4130c7b9f6d25eeb774b51ada EBUILD clutter-gtk-1.8.4-r1.ebuild 1100 BLAKE2B 1206c3d03ac8a9fb35a2f5cd92c1e5f906c4d64fc7379206f6110e592b8239980f5c74bdb6d022d06070ddef678d669059726dbfa0d02bf03faa2e039072094e SHA512 102d35055c4b5c9561f53efeef8007a7bd9c992698c380a082995e643022e893a54b2bf50379969c2a541ab226090d309054d46fdb7d80f337df5e733a955fab +EBUILD clutter-gtk-1.8.4-r2.ebuild 1259 BLAKE2B 0c15d542fafe0f9fd9fede9b89ce5c22b8cb639315e803338b0400416dba7e76a6e386717d02bace17abfe3aa2f9e498c28a5d34a94520d90d6a84c4d6a92f6e SHA512 f39c2239587fdbefd4d4c177ee6130f9b567f6d8078eff93c24274365f749a59f1bd649953860f6e8aca4243f2fe39f3f2571178a4b60c0caf06e7695ad1a893 MISC metadata.xml 354 BLAKE2B c6d44a19a31c7c978dab70d00f8160f3f0400275523b7bf591daa86530213fae3fd38b82788700beb3ad79e921bccd32f93dc412371eaec56d1c911aa41f203a SHA512 22ec82a8742c26c8da4a4912c04bf7457f1df0e3993e0bd65c49fa770608888aa3aab9d6ba6405e9227f27c1a6f94e15088b8cd9122c38a5005cc78da0f05006 diff --git a/media-libs/clutter-gtk/clutter-gtk-1.8.4-r2.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.8.4-r2.ebuild new file mode 100644 index 000000000000..d8655c294ab9 --- /dev/null +++ b/media-libs/clutter-gtk/clutter-gtk-1.8.4-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GNOME2_LA_PUNT="yes" +inherit flag-o-matic gnome2 + +DESCRIPTION="Library for embedding a Clutter canvas (stage) in GTK+" +HOMEPAGE="https://wiki.gnome.org/Projects/Clutter" + +LICENSE="LGPL-2.1+" +SLOT="1.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="X debug examples gtk +introspection wayland" + +RDEPEND=" + >=x11-libs/gtk+-3.24.41-r1:3[X?,introspection?,wayland?] + >=media-libs/clutter-1.23.7:1.0[X=,gtk=,introspection?,wayland=] + media-libs/cogl:1.0=[introspection?] + introspection? ( >=dev-libs/gobject-introspection-1.32:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-build/gtk-doc-am-1.24 + >=sys-devel/gettext-0.18 + virtual/pkgconfig +" + +src_configure() { + # defang automagic dependencies. + use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cflags -DGENTOO_GTK_HIDE_X11 + + gnome2_src_configure \ + --disable-maintainer-flags \ + --enable-deprecated \ + $(usev debug --enable-debug=yes) \ + $(use_enable introspection) +} + +src_install() { + gnome2_src_install + + if use examples; then + docinto examples + dodoc examples/{*.c,redhand.png} + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/media-libs/giblib/Manifest b/media-libs/giblib/Manifest index 93edd2cb7797..0739e0702abd 100644 --- a/media-libs/giblib/Manifest +++ b/media-libs/giblib/Manifest @@ -1,6 +1,5 @@ AUX giblib-1.2.4-fix-build-system.patch 792 BLAKE2B 4e59d03acceb1ff6ea013660e2c6ce1435c47bfcd040800de7deda37346ec7b5687d4b7809222b2331c6b9f52e54c53524d30ca03fe4096b0134fcd5e1a11a7d SHA512 8dc2de904f9c0082b5be16d21d366e84f6912cf891e80b8c32681e4f589c911775fb5227f0ef3d4790920512b279b02b451f3afcbbada329d004c2eac494fe8f AUX giblib-1.2.4-use-pkg-config-imlib2.patch 656 BLAKE2B 01bfa778adc8f2a80c750ccc82455ac1548c123789855ad1f1b1b62e0d91f03330fc6228078300566b411f3b3e814a462241c6deab627ed25475dc2352ec216a SHA512 bdf26ce8aec00b5d84b4903602d1be6322f86c9658b02756ea623c24d824d41e7843f4bf618496eed5a04d816f2dd27545ae54dabdbde5f7f3fb2a4ed7272bbd DIST giblib-1.2.4.tar.gz 287653 BLAKE2B 0b936fe3b56b933a5038751428ec56a872911d3c4ae972e9670cb1ce2496de6a8e21cb4718e7bab4eb1d547eb67ca71b25d77405ff04ebcb1ca0dc03fafea7ef SHA512 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd -EBUILD giblib-1.2.4-r1.ebuild 821 BLAKE2B b3ddd1f969e3725f62abb1e115787a28a9d3f21fc659c76045dfbbeb029dd76703b2692ba64d56d57dd7068479ca9fe945b7f4dfcf82fcb2b0678ef931fd637d SHA512 8d997f409cb9952d19c4825a265e2ee9ab4ed1e8131318ea049f578646c04168b181a6bede4bb99d996dbd9a26a421180991fb329646b3c8af22247868f58ce4 EBUILD giblib-1.2.4-r2.ebuild 858 BLAKE2B 46b49a5f9aabb59db7b5e9f1157dea30aa2c721ac096facf80db375b9d84f4e82a6815dbd59845a1f12e2bdac27ad4faf2f6500f6ce06b8d1801be0461f13c76 SHA512 b20f00b0a09dc93f8fc9fa8e0503f7f22d9a74dd3010d574bc364d6d0b30704022e64ade9b5b868a1efbbf1ad93c6d068e0126c88f4b2242effdc4d2b9d3010e MISC metadata.xml 588 BLAKE2B 12100b3075cd4b28dd2a6e4903d4ae9bd012106138fa0f0a4cbde1282ae76a5905bbad1262be7fd0313ab8dd7e0d7a0180a558d9e010b7dfcae682007ab44cf1 SHA512 dd6e1afccf19602de52482f3308b69ebf578244eb3dee089351125cf0c9616cd2ea27f6271fca1ed5237c36e56ddfe6ec38d4d988612d01d0d3ddbdcc16fbd3f diff --git a/media-libs/giblib/giblib-1.2.4-r1.ebuild b/media-libs/giblib/giblib-1.2.4-r1.ebuild deleted file mode 100644 index b81e9185bd62..000000000000 --- a/media-libs/giblib/giblib-1.2.4-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="a graphics library built on top of imlib2" -HOMEPAGE="http://freshmeat.sourceforge.net/projects/giblib http://www.linuxbrit.co.uk/giblib/" -SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz" - -LICENSE="feh" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" - -RDEPEND=" - media-libs/freetype - media-libs/imlib2:=[X] - x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-1.2.4-fix-build-system.patch ) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - - # no static archives - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/glycin-loaders/Manifest b/media-libs/glycin-loaders/Manifest index a37e93024962..24c57a3cba31 100644 --- a/media-libs/glycin-loaders/Manifest +++ b/media-libs/glycin-loaders/Manifest @@ -1,3 +1,5 @@ +DIST glycin-1.1.0.tar.xz 28570152 BLAKE2B 762c8208c5cc8bf6be93a8daa70cd22b1cbd93c60075ccf38225a10c303b2c503bdc1ec2e6efeb85f36f3787b45a6061926e314f44841a583e0e3cb3debc3d48 SHA512 6e4b84dceb8957f0ab6e840dbc60f6c9bb8179fde841075c614a9742282ea578a51a966eb8e7a2482daf631932e8ce5af2f1f41523f376f4d1a0a2069af94631 DIST glycin-1.1.beta.tar.xz 28597076 BLAKE2B 94e0172de27ce1a1cbbaba6ee5d3792b8a05a2f192598a03f61dc7cdacbdb2927ad3b19158ae30c63fe73916edab0c24a3d547ec4d8c7adbf63b7cce8cc81704 SHA512 a5534546f58508a033b00ad798536e0342c0d3f2108464f3c58bc0c7e23aeebf9687e6b2717c0edf35e3f88177c8bd281ab8f5e82377adec096396ce8c4e8eb2 +EBUILD glycin-loaders-1.1.0.ebuild 1785 BLAKE2B ac9579cfa8d2241ad9a2c1b083877ef492a6fcfca67dc8c6250648758591a93363645c0943f0bd93bc2a3b3d6b11b85be985cbf092e35b53eca07b9f4aedf5da SHA512 eeed10c6a22241eb7779ebbe806bd33a8caaded237b60d8a6410e7fd92853c713013db8f7bad94398465f52762def1af22d62beac0b559ddffa48b3f9111b7cc EBUILD glycin-loaders-1.1_beta-r1.ebuild 1785 BLAKE2B ac9579cfa8d2241ad9a2c1b083877ef492a6fcfca67dc8c6250648758591a93363645c0943f0bd93bc2a3b3d6b11b85be985cbf092e35b53eca07b9f4aedf5da SHA512 eeed10c6a22241eb7779ebbe806bd33a8caaded237b60d8a6410e7fd92853c713013db8f7bad94398465f52762def1af22d62beac0b559ddffa48b3f9111b7cc MISC metadata.xml 334 BLAKE2B 40a37360358b501628e64a2278652edb17a57432f8dc36dd6c585761f59cbdaaa284760e27d9a33b8e7aa27e916df3112601b0b6141940a6b4aae4138af64883 SHA512 06b70f17068f327d4412a798b938e65ced583ab6e63e2dfc66135d8fa7f7e32316f53c1c2dc65a9482222a64fe8398929705bb16579cfd3ee5b2aa677db7dc1a diff --git a/media-libs/glycin-loaders/glycin-loaders-1.1.0.ebuild b/media-libs/glycin-loaders/glycin-loaders-1.1.0.ebuild new file mode 100644 index 000000000000..0775282f7108 --- /dev/null +++ b/media-libs/glycin-loaders/glycin-loaders-1.1.0.ebuild @@ -0,0 +1,88 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cargo meson + +MY_P=glycin-${PV/_/.} +DESCRIPTION="Loaders for glycin clients (glycin crate or libglycin)" +HOMEPAGE="https://gitlab.gnome.org/sophie-h/glycin/" +SRC_URI=" + https://download.gnome.org/sources/glycin/$(ver_cut 1-2)/${MY_P}.tar.xz +" +S=${WORKDIR}/${MY_P} + +LICENSE="|| ( LGPL-2.1+ MPL-2.0 )" +# Dependent crate licenses +LICENSE+=" + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD GPL-3+ ISC MIT + Unicode-DFS-2016 + || ( LGPL-2.1+ MPL-2.0 ) +" +SLOT="0" +KEYWORDS="~amd64" +IUSE="heif jpegxl svg test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.60:2 + >=sys-libs/libseccomp-2.5.0 + heif? ( >=media-libs/libheif-1.17.0:= ) + jpegxl? ( >=media-libs/libjxl-0.10.0:= ) + svg? ( + >=gnome-base/librsvg-2.52.0:2 + >=x11-libs/cairo-1.17.0 + ) +" +DEPEND=" + ${RDEPEND} + test? ( + >=gui-libs/gtk-4.12.0:4 + >=media-libs/lcms-2.14:2 + ) +" +BDEPEND=" + test? ( + sys-apps/bubblewrap + sys-apps/dbus + ) +" + +ECARGO_VENDOR=${S}/vendor + +QA_FLAGS_IGNORED="usr/libexec/glycin-loaders/.*" + +src_prepare() { + default + + # https://gitlab.gnome.org/sophie-h/glycin/-/issues/81 + sed -i -e '\|/fonts|d' tests/tests.rs || die +} + +src_configure() { + local formats=( + $(usev heif glycin-heif) + $(usev jpegxl glycin-jxl) + $(usev svg glycin-svg) + glycin-image-rs + ) + local formats_s=${formats[*]} + local emesonargs=( + -Dprofile=$(usex debug dev release) + -Dglycin-loaders=true + -Dloaders="${formats_s// /,}" + -Dtests=$(usex test true false) + -Dlibglycin=false + ) + + meson_src_configure + ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die +} + +src_test() { + # tests write to /proc/*/uid_map + # apparently, "addpredict /" in Portage breaks it + local -x SANDBOX_ON=0 + meson_src_test +} diff --git a/media-libs/libiptcdata/Manifest b/media-libs/libiptcdata/Manifest index b7ec991e2dca..c66b247b4ce3 100644 --- a/media-libs/libiptcdata/Manifest +++ b/media-libs/libiptcdata/Manifest @@ -1,4 +1,3 @@ DIST libiptcdata-1.0.5.tar.gz 593779 BLAKE2B 7e5226a289fed5c2f4b662efaa693a8b38e95ac34bc1365af05d1af649be876d3e5b58fecea4818255879bd7518aa482cb623540601fb3c8065acd428439a29c SHA512 64ef44b1e639890004f31d5d42844ba25ed558f0a118f1dad9bc3f4dcad2457e51b825a13df849659b0e15afc78f528f330b03be94cdf156bd95b62dc419494a EBUILD libiptcdata-1.0.5-r1.ebuild 1622 BLAKE2B 0a9773eb10ddb5880c59933dfa8fd7e89804c94e284aa0258f60c967627361ebf7e4cb97ef477122cd39a4c24696c1ade6a230c4987fe05462553222501e041f SHA512 70a9668d945772196559242c003644ff0e8512d5ec32be2f152f3f6fd50a898b012479f30e3dfcb19c23ee9b2e082118ec21926a0a8d40894b25270ca6da0a73 -EBUILD libiptcdata-1.0.5.ebuild 1154 BLAKE2B 8d63c60a8f17b5efde8268f05f6a9c6fdb2e216e680fc236557c9194b35a56c0267779f4aedb229e914e3342de2f13309ddec0ea0aaf73d9eff95846cf7b37b6 SHA512 41efcd9d277e65e7caa9ee33ea8e6504388bbf98830b5e9da14a79ba52edb78447c0e4be84c6f1b7843580cbe903f480a663adbeac911e35d23390a2f6951f02 MISC metadata.xml 948 BLAKE2B 2eb9fc81cf1795cfc57e9b89e5880a3f34b21937bc41e802ab09d3fd508ad9e9c67a6c621558e2cf56683a4641b8160a3cfac3ff6ea578ee12e7543f73e1d9e1 SHA512 8dbf6854415f937c99f88fd1c1159acbc94a40b992c8eeaf5edb855a7830d4d11ea8ae9929e2af3e3d11c8ce5c7163e723110fad5f15259d5a21b7451fbaa9ac diff --git a/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild deleted file mode 100644 index 32b30bcceb03..000000000000 --- a/media-libs/libiptcdata/libiptcdata-1.0.5.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-single-r1 - -DESCRIPTION="Library for International Press Telecommunications Council (IPTC) metadata" -HOMEPAGE="https://github.com/ianw/libiptcdata http://libiptcdata.sourceforge.net" -SRC_URI="https://github.com/ianw/${PN}/releases/download/release_1_0_5/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc ppc64 ~riscv sparc x86" -IUSE="doc examples nls python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - nls? ( virtual/libintl ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( >=dev-util/gtk-doc-1 ) - nls? ( >=sys-devel/gettext-0.13.1 ) -" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure () { - local myeconfargs=( - $(use_enable nls) - $(use_enable python) - $(use_enable doc gtk-doc) - ) - econf "${myeconfargs[@]}" -} - -src_install () { - default - - if use examples; then - dodoc python/README - dodoc -r python/examples - fi - - find "${D}" -name '*.la' -delete || die "failed to remove *.la files" -} diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest index 4e6ded08a5d8..0ff030e2176a 100644 --- a/media-libs/libjxl/Manifest +++ b/media-libs/libjxl/Manifest @@ -2,11 +2,13 @@ AUX libjxl-0.8.2-backport-pr2596.patch 2017 BLAKE2B 3155febe7e02fc34dfdf69282102 AUX libjxl-0.8.2-backport-pr2617.patch 2853 BLAKE2B edeafa5bfa85f9868d98f4ee38be2dd4a5d747517e6aec59688d5314f1b6ede74bc3d20a11d08e3e2e2e87e8da987730a8a8cafcecce69369fdfa7bcb8ef2828 SHA512 ad8ddbe50d23895a3127d11bf36832ad1a1762e9b54bacc5f4d881accb5c81801618254b9b56afc4b145a7fb19bab8ca739974ff3bcb498e7db812d3a6cf004d AUX libjxl-0.9.1-backport-pr3143.patch 1065 BLAKE2B acc6ab904994f42cffe19296966587dbbf316289277d91e1a17cd635161b51eed770ab95fc682d93b8693d50def9bb205290c3eb534effdfdc2cd057db36647c SHA512 d5eeca764e13175eb64ba5ee47a9bf03080d0830395ba9b626b7144674a5ce8fbb694705a4d2c55f3b52507a59c5793e21e9c99dded65803857a0859a1f9f466 DIST libjxl-0.10.3.tar.gz 1912351 BLAKE2B 4432ecf34ac03d9ce8fc814835c7ee31fcc1e516b95e347dcb201a6996e1ffaadbd2e78a6a235ee1c4ff5121af495b8bc621e6738e2d03a8eb1639fb397e5246 SHA512 5ece482f4c5f0312e87e020f921525622a6d3f1a3834f3cd8666638fc8d0fba8cd072ef58f7b153dc17ca19071ebae2fbad7b08e6d440c2669f4f1b35888a7d4 +DIST libjxl-0.11.0.tar.gz 1873614 BLAKE2B 60f038c35f921e1d6cfaab62ec92c15fa8b0bb9369724bdbaf25fb72559670de6f2e86bf1fb7d37158e1d046d46d20610b574e2288f86d4bae52fdc2c51e3b76 SHA512 a3648a5f046cae36b3272c46525d002d490f781f44647d4d8318f0b773dd9b7902582ced5636af3489f1d6a44e3baf8ad2e5ab47d26869d16b01607d90e14053 DIST libjxl-0.8.3.tar.gz 1612441 BLAKE2B d1c3b108c67d0a3a63ce50cdc7305b6853b182ec6c210d499e15120fbb858dada23997a4a0eb545f936e02230ed773506b066f24e19cce1f99aedaafd2bd7803 SHA512 f7fb4b2b0fd2459bec86918371369e80de59549c8dc24ff5c83546f564e54c81ea6a72720af151e3f9b64ef326f3ec8a5a6e0023b7fe2de14b056e501af579ef DIST libjxl-0.9.3.tar.gz 1873236 BLAKE2B eb3811ef4fc64bb5df2e06b6b86cbc1b5dbe6eb9728e5ad5a8b791be57359eb63442722cdf629b006be518bf575409b93758d7ec0376a596de4405fb7686b7f2 SHA512 8aace2d8c0ece9db64a1620a10581ddc5a450543db64d44f864eaa5d3b8b3f0466c501fed5d58abdbf6eb5f90af25f6370c33718847bd070e851a02b560f541e DIST libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz 67553075 BLAKE2B 779fee87386e617edd93bca7a523fa1ab223ae88114c3cc5484987a7c92cca2d0bb3d668fa3c8064b2a0255c17a06447c009f4fbf9ef379692ddfa37dee1be97 SHA512 a48d74a1ccff404eb7675225b59965e056dc3fc09930572785d83bae03fa1c38e105336dbf5ecfc3f0995e8b8bfb1097b451ae661f2933590b2b152192c8aa2f DIST libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz 69105882 BLAKE2B a80fce437b810e7b99b4c7bd106ec7eba01a1eeddc90e1b82cb8d75f3ca194c357ef8e7b7e1e9da65aa39dc2cd11d32cb6de8558188c5258c7446d58787603ff SHA512 0d237e706fd8d001a9cb245b685e8e39085416daedec019c348ccc64cf15a34cecdb0c245f94f57507f5934e487ee5157f51f59bb6a000f5899862c582336384 EBUILD libjxl-0.10.3.ebuild 2934 BLAKE2B 9588ef46515e1f5103be1bdc7c68fb985abd57a8b306ca1662e4d24dafcfd2b055318a74758047388d34b24ee9b0fbd09101900d425723901ef5ab6a935a2d0c SHA512 c20972786f697752c3d4cc414409e29c5d67169f3f10bc6b719a1614d8ff7323d3c52b9bb3297d3300ede30b98ce525fb5cab9c36fcce9fb0e717e780a1ecb24 +EBUILD libjxl-0.11.0.ebuild 2939 BLAKE2B 34f7e780c1617fc617cc84740d41a95a6929ae4f80f53d45bd192a7b17ff8e79f22856671f24314a0857565d42700386082d219941d9b1dc8d973d9908d461a0 SHA512 b1f1774022ed70673b16d4d82ece9e7125aa57de8324d1d755b616f9ab1a75ae492cd22f2d74c8d5076c5b4f30510318a50af2dfb5832ee1fa643b2dbeab31ee EBUILD libjxl-0.8.3.ebuild 2560 BLAKE2B d08dfc2ad15d2b1a8bd72dc392d297d4a45411b582616c30f3ee8ab5611281b9873c9839e0e7d953fef2598300cd97e8bfad98197355176964a2a73ab88c7f88 SHA512 1f248077a8e03b0aa94afc75fd9ce28007d04e6237a0d3fa92e14faa6acd764f98e45282657bedd73e16fec3f343f979df352a428c6bc9c4683a39f570ab151a EBUILD libjxl-0.9.3.ebuild 2996 BLAKE2B a6aef6912df3ec3ddca870b15296b3ae356a1617b6b7cf26a5525108d6aaeee10793d99d84f058b27ea59b0c7c0283fc4ead75780b7db60af674ad4722bdbcb8 SHA512 6bfa8dd8c1add61bfe13c3793713e98bfc5bf8f2ed43c3289424357e8a16a7475ca3081694fa5c6ca279594fd353a2561aabb46ffb2336eb7b10cdca2c7717f2 EBUILD libjxl-9999.ebuild 2608 BLAKE2B e4247be931c67d10fa9e200bc113731a940678547be3743a282087dc09b1afe1bee0063ec0d090f60c3860d4542d210f50fdc762263f2609f6fedcb10df058f3 SHA512 63b91932054fd351b091daa652b0f000ad7675e48cb489e4b52da4d99991066dc501d8814b02c2b005e5211f032fe7f6dee1b53944fc239b7bbadd46ee143339 diff --git a/media-libs/libjxl/libjxl-0.11.0.ebuild b/media-libs/libjxl/libjxl-0.11.0.ebuild new file mode 100644 index 000000000000..3c160e17d651 --- /dev/null +++ b/media-libs/libjxl/libjxl-0.11.0.ebuild @@ -0,0 +1,115 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib gnome2-utils + +# This changes frequently. Please check the testdata submodule when bumping. +TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc" +DESCRIPTION="JPEG XL image format reference implementation" +HOMEPAGE="https://github.com/libjxl/libjxl/" +SRC_URI=" + https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + test? ( + https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz + -> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz + ) +" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="+gdk-pixbuf gif jpeg openexr +png test" +REQUIRED_USE="test? ( png )" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/brotli:=[${MULTILIB_USEDEP}] + >=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}] + >=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}] + gdk-pixbuf? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + ) + gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + openexr? ( media-libs/openexr:= ) + png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${DEPEND} + >=x11-misc/shared-mime-info-2.2 +" +DEPEND+=" + test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) +" + +multilib_src_configure() { + local mycmakeargs=( + -DJPEGXL_ENABLE_BENCHMARK=OFF + -DJPEGXL_ENABLE_COVERAGE=OFF + -DJPEGXL_ENABLE_FUZZERS=OFF + -DJPEGXL_ENABLE_SJPEG=OFF + -DJPEGXL_WARNINGS_AS_ERRORS=OFF + + -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif) + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) + -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png) + + -DJPEGXL_ENABLE_SKCMS=OFF + -DJPEGXL_ENABLE_VIEWERS=OFF + -DJPEGXL_FORCE_SYSTEM_BROTLI=ON + -DJPEGXL_FORCE_SYSTEM_GTEST=ON + -DJPEGXL_FORCE_SYSTEM_HWY=ON + -DJPEGXL_FORCE_SYSTEM_LCMS2=ON + -DJPEGXL_ENABLE_DOXYGEN=OFF + -DJPEGXL_ENABLE_MANPAGES=OFF + -DJPEGXL_ENABLE_JNI=OFF + -DJPEGXL_ENABLE_JPEGLI=OFF + -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF + -DJPEGXL_ENABLE_TCMALLOC=OFF + -DJPEGXL_ENABLE_EXAMPLES=OFF + -DBUILD_TESTING=$(usex test ON OFF) + ) + + if use test; then + mycmakeargs+=( + -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" + ) + fi + + if multilib_is_native_abi; then + mycmakeargs+=( + -DJPEGXL_ENABLE_TOOLS=ON + -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) + -DJPEGXL_ENABLE_PLUGINS=ON + -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf) + -DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF + -DJPEGXL_ENABLE_PLUGIN_MIME=OFF + ) + else + mycmakeargs+=( + -DJPEGXL_ENABLE_TOOLS=OFF + -DJPEGXL_ENABLE_OPENEXR=OFF + -DJPEGXL_ENABLE_PLUGINS=OFF + ) + fi + + cmake_src_configure +} + +multilib_src_install() { + cmake_src_install + + find "${ED}" -name '*.a' -delete || die +} + +pkg_postinst() { + use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update +} + +pkg_postrm() { + use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update +} diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest index 1e22e20b343d..5549b95b9c18 100644 --- a/media-libs/libwmf/Manifest +++ b/media-libs/libwmf/Manifest @@ -1,15 +1,6 @@ -AUX libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch 3240 BLAKE2B e890a9ce2bf98f550b1586d9edcae461822cc3ad1ced3a114730c417048f9bd06724234b61826ca471ba5eb3be6086b7882fd6bc2012e0dca4cbc9fa323f60e8 SHA512 49216f9d0f499ce8923fafc8da8fa9ac1d1ce284ba36fa8131be48b23f0885c3f20ec358f0e9a47b6856239aeff2dbe9311df6594a7e797bfef92e092365821f -AUX libwmf-0.2.8.4-CVE-2015-4695.patch 1813 BLAKE2B fba497022327c65d7f00848b1494489bc92e2824ffc30ab7a6df2e5d94f83a5a8ba1baa1beaac7b9b86d90bc9d3d9b43af2057acbbeb462fc9e85e2d40b50cb0 SHA512 43c3b73df7317eec2d0ef5ce818949977d7f634487279afc692a79b78f6418bf6d9c854765fdd85a2647061ae647d2291ac9504dfbf1e6c5c5caf58712e6446e -AUX libwmf-0.2.8.4-CVE-2015-4696.patch 483 BLAKE2B 4cb2ea28fd5a895395492b566b7599d234e7786d72cbddf2be4e2e78a5b4adac6e36b7eeb7d6d885a5d2fbbc08bcb1aea69eafa0d48295b1cce52309a879d552 SHA512 8f89d01822bfe598c410a22385207f5782164974d796c3839c27562531017452ac1f3da3111e8580168963d45fd797b1fbb9487d8593286ff8bbd446cb383dd2 AUX libwmf-0.2.8.4-build.patch 1340 BLAKE2B 166ea2f767a52e96127a1dbfcd91a4e6e95b744c53303db9f093d56b0ac9aed4b2bd75aa1503e02a4e2d5fe599a09274c57e36179d588f71407f5e2bdd729c9d SHA512 de48cf695e0c1a3d9b97e2dbd4db9ccc2c633269de88be8799e5cf37dbd6a5bb70cae36b203ed2bc22f22a38970faa4feeb0b7aa11aa290f68dadd2b3a5dd2f6 -AUX libwmf-0.2.8.4-gdk-pixbuf.patch 1037 BLAKE2B 5dfb05fd737d18cd3a355c2b8ba19c74ea7f41284a64893c0f4412b6d6a51d43c61356baa236901f2318cccab28aa100ceeb2b026ca8b70e36848e50eb549037 SHA512 2a03dffdcf2f8e6181f4468b69dc6dce4b01d9258f7596ffce83a555bed14e429e60848ba26fe7bece309430f9c2a90eec84802221d136f15058207b183382a0 -AUX libwmf-0.2.8.4-intoverflow.patch 971 BLAKE2B f10b1b268144d790e8be24c94ece3a1d02961ed8436be22e26d742812ac3d1b4ff207bc978e2b6aba72e92aea8191f65b91dc8cfae5c5ca405b78f5b41c8b43e SHA512 939b729d2ca9c1204e623d50151d2a736904455e716ce917da83e454dc99165b77c2039413174bd9e219dc7453ef3c92348cc7bf1e3a1ade1d5040a81eb7cdee AUX libwmf-0.2.8.4-libpng-1.5.patch 478 BLAKE2B 355d3cd673a6ce5c09a13aac3b0badb7f1dfff112c4526b6be9b8a76cb1db4a0702bdcccbb5df20aa04976a4c54bfeba0fe11f66f2154c64f3ff2c3409491672 SHA512 acfa95c22d3d352b270d41cd814c1c876536da9a08a19eb40acb9770913fbd824654c90223413507d714248321cd6be9190187d3b00a75ed4a0a001a0800617c AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae2e4bd96eccb7bf12f8ba138a00cb5fb36725dad2a00ba4be71c8a61649f1e723204f59741e86da4517f802ce2743 SHA512 02170d7ec2cd0e987567becd995416c52b85d3f55d6e0e236ea8eeacdb3218edc1a1647d96f24b3dbe904ea3bcc6cacef1a6d82a0fbfa9d808dc061e11a154f7 -AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058 -AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c DIST libwmf-0.2.13.tar.gz 3044235 BLAKE2B 0cfbc94d6e7d52c5ecf09b277cf536f56ec54d3b53845e80afdfe4aa3b397562bffd198fb51726d210f21e3e9e16650f85e9188f4e5303b5c4c8b917ef882040 SHA512 f45a936c9bc98fc1a5f2b0808b497119e4dcd3c132615fdddb7583e5719c7d1d7f85c16ebf313cad453e5b7ae3508bf6b80c4ed2b42322b7dec295d8f4eb86ce -DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5 -EBUILD libwmf-0.2.13-r1.ebuild 2081 BLAKE2B 191d2c1e057590d4bc7e04afa00fcbab29831942db49299b02767e1aa866fee907701a163ee3d4b61bfbc6ecf392762f66fc5689d319f3c63d11449b2c844fcc SHA512 4d932aac098da631e50ad6be984d3272e02e175ccce84170adb40d954005915ec01105d36b4339153988735f954870cf75e45f3e06af4595581405d8652d7345 -EBUILD libwmf-0.2.8.4-r9.ebuild 2572 BLAKE2B d2246a5329e907c7bf23a2ef8350ad4f55f46e80b3839b12d44fa68cdcf8cd56debf4b88bfa6708b064ae333653bebaa383052435fca223eef81cb5001df6341 SHA512 63bbbcdd2b63544bb57d7cbe98fbb84ffa9673df1bf2c906929985c14d5b780936fd0f19207d6d3f8999747f6df459e9bee3a0fe0bbc1876ac6ad0d371280019 +EBUILD libwmf-0.2.13-r1.ebuild 2086 BLAKE2B f35f6816975b25042c4d55833da145de35e596ae406750ccd954411e07099273556e02e0edb8e92784120c329b9c462fa8944ed81d4a4b41820be8a90c38d3ff SHA512 b1197e31e36dda6dc63c20583ec04cee2a1b592159c9c26bbc6000d7067af88e9155bd95ff0dfab8a984b4a8f8ed2c64fb7383785b04df8ebfa81df6d9f6ff3b MISC metadata.xml 358 BLAKE2B 2ea3f9baafa3e335d52668945db020bfef6188bd6fd4daf19dd99714de595f57ae98b1e9c88fe25dbf0647d241a5c24ec84c7e334b36cb17d37a8e545f824b9b SHA512 b4a8da2bb4723d4b3470dfb2c5dc3b745bd44032d627188198979400ec639e8ea01b199f844ce80b99e581e1ab93aac8301b7a05b0ea35ea81e3ff8ab1948706 diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch deleted file mode 100644 index e8ba8db1e843..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2015-06-08 14:46:24.591876404 +0100 -+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2015-06-08 14:46:35.345993247 +0100 -@@ -859,7 +859,7 @@ - % - % - */ --static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels) -+static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels) - { int byte; - int count; - int i; -@@ -870,12 +870,14 @@ - U32 u; - - unsigned char* q; -+ unsigned char* end; - - for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] = 0; - - byte = 0; - x = 0; - q = pixels; -+ end = pixels + bmp->width * bmp->height; - - for (y = 0; y < bmp->height; ) - { count = ReadBlobByte (src); -@@ -884,7 +886,10 @@ - { /* Encoded mode. */ - byte = ReadBlobByte (src); - for (i = 0; i < count; i++) -- { if (compression == 1) -+ { -+ if (q == end) -+ return 0; -+ if (compression == 1) - { (*(q++)) = (unsigned char) byte; - } - else -@@ -896,13 +901,15 @@ - else - { /* Escape mode. */ - count = ReadBlobByte (src); -- if (count == 0x01) return; -+ if (count == 0x01) return 1; - switch (count) - { - case 0x00: - { /* End of line. */ - x = 0; - y++; -+ if (y >= bmp->height) -+ return 0; - q = pixels + y * bmp->width; - break; - } -@@ -910,13 +917,20 @@ - { /* Delta mode. */ - x += ReadBlobByte (src); - y += ReadBlobByte (src); -+ if (y >= bmp->height) -+ return 0; -+ if (x >= bmp->width) -+ return 0; - q = pixels + y * bmp->width + x; - break; - } - default: - { /* Absolute mode. */ - for (i = 0; i < count; i++) -- { if (compression == 1) -+ { -+ if (q == end) -+ return 0; -+ if (compression == 1) - { (*(q++)) = ReadBlobByte (src); - } - else -@@ -943,7 +957,7 @@ - byte = ReadBlobByte (src); /* end of line */ - byte = ReadBlobByte (src); - -- return; -+ return 1; - } - - /* -@@ -1143,8 +1157,18 @@ - } - } - else -- { /* Convert run-length encoded raster pixels. */ -- DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image); -+ { -+ if (bmp_info.bits_per_pixel == 8) /* Convert run-length encoded raster pixels. */ -+ { -+ if (!DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image)) -+ { WMF_ERROR (API,"corrupt bmp"); -+ API->err = wmf_E_BadFormat; -+ } -+ } -+ else -+ { WMF_ERROR (API,"Unexpected pixel depth"); -+ API->err = wmf_E_BadFormat; -+ } - } - - if (ERR (API)) ---- libwmf-0.2.8.4/src/ipa/ipa.h 2015-06-08 14:46:24.590876393 +0100 -+++ libwmf-0.2.8.4/src/ipa/ipa.h 2015-06-08 14:46:35.345993247 +0100 -@@ -48,7 +48,7 @@ - static unsigned short ReadBlobLSBShort (BMPSource*); - static unsigned long ReadBlobLSBLong (BMPSource*); - static long TellBlob (BMPSource*); --static void DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*); -+static int DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*); - static void ReadBMPImage (wmfAPI*,wmfBMP*,BMPSource*); - static int ExtractColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned int,unsigned int); - static void SetColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned char,unsigned int,unsigned int); diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch deleted file mode 100644 index b6d499da98e1..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- libwmf-0.2.8.4/src/player/meta.h -+++ libwmf-0.2.8.4/src/player/meta.h -@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API, - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3067,7 +3067,7 @@ static int meta_pen_create (wmfAPI* API, - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3181,7 +3181,7 @@ static int meta_brush_create (wmfAPI* AP - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3288,7 +3288,7 @@ static int meta_font_create (wmfAPI* API - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); -@@ -3396,7 +3396,7 @@ static int meta_palette_create (wmfAPI* - objects = P->objects; - - i = 0; -- while (objects[i].type && (i < NUM_OBJECTS (API))) i++; -+ while ((i < NUM_OBJECTS (API)) && objects[i].type) i++; - - if (i == NUM_OBJECTS (API)) - { WMF_ERROR (API,"Object out of range!"); diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch deleted file mode 100644 index 3312841258b0..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- libwmf-0.2.8.4/src/player/meta.h -+++ libwmf-0.2.8.4/src/player/meta.h -@@ -2585,6 +2585,8 @@ - polyrect.BR[i] = clip->rects[i].BR; - } - -+ if (FR->region_clip) FR->region_clip (API,&polyrect); -+ - wmf_free (API,polyrect.TL); - wmf_free (API,polyrect.BR); - } -@@ -2593,9 +2595,10 @@ - polyrect.BR = 0; - - polyrect.count = 0; -+ -+ if (FR->region_clip) FR->region_clip (API,&polyrect); - } - -- if (FR->region_clip) FR->region_clip (API,&polyrect); - - return (changed); - } diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch deleted file mode 100644 index 83a9ce7f3635..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -urN libwmf-0.2.8.4.old/configure.ac libwmf-0.2.8.4/configure.ac ---- libwmf-0.2.8.4.old/configure.ac 2011-07-01 22:37:57.000000000 +0200 -+++ libwmf-0.2.8.4/configure.ac 2011-07-01 22:41:38.000000000 +0200 -@@ -744,8 +744,7 @@ - - if test $LIBWMF_BUILDSTYLE != lite; then - PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[ -- GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` -- GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders" -+ GDK_PIXBUF_DIR=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0` - wmf_gdk_pixbuf=yes - ],[ wmf_gdk_pixbuf=no - ]) -diff -urN libwmf-0.2.8.4.old/src/Makefile.am libwmf-0.2.8.4/src/Makefile.am ---- libwmf-0.2.8.4.old/src/Makefile.am 2011-07-01 22:37:57.000000000 +0200 -+++ libwmf-0.2.8.4/src/Makefile.am 2011-07-01 22:40:41.000000000 +0200 -@@ -63,7 +63,7 @@ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -export-dynamic - --loaderdir = $(libdir)/$(GDK_PIXBUF_DIR) -+loaderdir = $(GDK_PIXBUF_DIR) - - loader_LTLIBRARIES = $(GDK_PIXBUF_PLUGIN) - diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch deleted file mode 100644 index 507fe66223ce..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- libwmf-0.2.8.4.orig/src/player.c 2002-12-10 19:30:26.000000000 +0000 -+++ libwmf-0.2.8.4/src/player.c 2006-07-12 15:12:52.000000000 +0100 -@@ -42,6 +42,7 @@ - #include "player/defaults.h" /* Provides: default settings */ - #include "player/record.h" /* Provides: parameter mechanism */ - #include "player/meta.h" /* Provides: record interpreters */ -+#include - - /** - * @internal -@@ -132,8 +134,14 @@ - } - } - --/* P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char)); -- */ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); -+ if (MAX_REC_SIZE(API) > UINT32_MAX / 2) -+ { -+ API->err = wmf_E_InsMem; -+ WMF_DEBUG (API,"bailing..."); -+ return (API->err); -+ } -+ -+ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); - - if (ERR (API)) - { WMF_DEBUG (API,"bailing..."); diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch deleted file mode 100644 index 0f133e2e75e2..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-use-freetype2-pkg-config.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 61655f82224cadb261e81f8bae111eaaa7bdf531 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Wed, 6 Aug 2014 14:53:03 +0200 -Subject: [PATCH] configure: use pkg-config for freetype - -Upstream-status: Pending -Signed-off-by: Koen Kooi ---- - configure.ac | 37 ++++++++----------------------------- - 1 file changed, 8 insertions(+), 29 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3cfe974..0055a8c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -399,40 +399,19 @@ AC_ARG_WITH(freetype,[ --with-freetype=DIR use freetype2 in DIR],[ - fi - ]) - --if [ test -n "$FREETYPE_DIR" ]; then -- AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, ,[$FREETYPE_DIR/bin:$PATH]) --else -- AC_PATH_PROG(FREETYPE_CONFIG,freetype-config) --fi -- --if [ test -n "$FREETYPE_CONFIG" ]; then -- if [ test -n "$FREETYPE_DIR" ]; then -- freetype_cflags="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include" -- freetype_libs=`$FREETYPE_CONFIG --libs` -- else -- freetype_cflags=`$FREETYPE_CONFIG --cflags` -- freetype_libs=`$FREETYPE_CONFIG --libs` -- fi --else -- if [ test -n "$FREETYPE_DIR" ]; then -- freetype_cflags="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include" -- freetype_libs="-L$FREETYPE_DIR/lib -lfreetype" -- else -- freetype_cflags="" -- freetype_libs="-lfreetype" -- fi --fi -- --CPPFLAGS="$freetype_cflags $CPPFLAGS" --LDFLAGS="$LDFLAGS $freetype_libs" -+PKG_CHECK_MODULES(FREETYPE2, freetype2, -+ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" -+ LDFLAGS="$LDFLAGS $FREETYPE2_LIBS", -+ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) -+) - - AC_CHECK_LIB(freetype,FT_Init_FreeType,[ -- WMF_FT_LDFLAGS="$freetype_libs" -+ WMF_FT_LDFLAGS="$FREETYPE2_LIBS" - ],[ AC_MSG_ERROR([* * * freetype(2) is required * * *]) - ]) - AC_CHECK_HEADER(ft2build.h,[ -- WMF_FT_CFLAGS="$freetype_cflags" -- WMF_FT_CONFIG_CFLAGS="$freetype_cflags" -+ WMF_FT_CFLAGS="$FREETYPE2_CFLAGS" -+ WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS" - ],[ AC_MSG_ERROR([* * * freetype(2) is required * * *]) - ]) - --- -1.9.0 - diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch deleted file mode 100644 index 2f7465c33cd0..000000000000 --- a/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN libwmf-0.2.8.4.old/fonts/Makefile.am libwmf-0.2.8.4/fonts/Makefile.am ---- libwmf-0.2.8.4.old/fonts/Makefile.am 2011-07-01 22:37:57.000000000 +0200 -+++ libwmf-0.2.8.4/fonts/Makefile.am 2011-07-01 22:38:37.000000000 +0200 -@@ -1,35 +1,3 @@ - fontdir = @WMF_FONTDIR@ - - bin_SCRIPTS = libwmf-fontmap -- --FONTS = \ -- n019003l.afm \ -- n019003l.pfb \ -- n019004l.afm \ -- n019004l.pfb \ -- n019023l.afm \ -- n019023l.pfb \ -- n019024l.afm \ -- n019024l.pfb \ -- n021003l.afm \ -- n021003l.pfb \ -- n021004l.afm \ -- n021004l.pfb \ -- n021023l.afm \ -- n021023l.pfb \ -- n021024l.afm \ -- n021024l.pfb \ -- n022003l.afm \ -- n022003l.pfb \ -- n022004l.afm \ -- n022004l.pfb \ -- n022023l.afm \ -- n022023l.pfb \ -- n022024l.afm \ -- n022024l.pfb \ -- s050000l.afm \ -- s050000l.pfb -- --font_DATA = $(FONTS) fontmap -- --EXTRA_DIST = libwmf-fontmap.in LICENSE $(FONTS) diff --git a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild index 34d9e1951968..5962fe96d395 100644 --- a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild +++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild @@ -6,7 +6,10 @@ EAPI=8 inherit autotools gnome2-utils DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile Format (WMF)" -HOMEPAGE="https://github.com/caolanm/libwmf http://wvware.sourceforge.net/" +HOMEPAGE=" + https://github.com/caolanm/libwmf + https://wvware.sourceforge.net/ +" SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2" diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild deleted file mode 100644 index 6d328c94189e..000000000000 --- a/media-libs/libwmf/libwmf-0.2.8.4-r9.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools gnome2-utils - -DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile Format (WMF)" -HOMEPAGE="http://wvware.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/project/wvware/${PN}/${PV}/${P}.tar.gz" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc expat X" - -RDEPEND="app-text/ghostscript-gpl - media-fonts/urw-fonts - media-libs/freetype:2= - media-libs/libpng:0= - sys-libs/zlib:= - x11-libs/gdk-pixbuf:2 - virtual/jpeg:0= - expat? ( dev-libs/expat ) - !expat? ( dev-libs/libxml2:2= ) - X? ( x11-libs/libX11 - x11-libs/libXt - x11-libs/libXpm )" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( "AUTHORS" "BUILDING" "ChangeLog" "CREDITS" "INSTALL" "NEWS" "README" "TODO" ) - -PATCHES=( - "${FILESDIR}"/${P}-build.patch - "${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch - "${FILESDIR}"/${P}-CVE-2015-4695.patch - "${FILESDIR}"/${P}-CVE-2015-4696.patch - "${FILESDIR}"/${P}-gdk-pixbuf.patch - "${FILESDIR}"/${P}-intoverflow.patch - "${FILESDIR}"/${P}-libpng-1.5.patch - "${FILESDIR}"/${P}-pngfix.patch - "${FILESDIR}"/${P}-use-freetype2-pkg-config.patch - "${FILESDIR}"/${P}-use-system-fonts.patch - ) - -src_prepare() { - default - - # Fixes QA warning "This package has a configure.in file which has long been deprecated" - # Since there is already a configure.ac, we don't need the deprecated configure.in - rm configure.in || die - - if ! use doc ; then - sed -i -e 's:doc::' Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - # Support for GD is disabled, since it's never linked, even, when enabled - # See https://bugs.gentoo.org/268161 - local myeconfargs=( - --disable-gd - --disable-static - $(use_enable debug) - $(use_with expat) - $(use_with !expat libxml2) - $(use_with X x) - --with-docdir="${EPREFIX}"/usr/share/doc/${PF} - --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-freetype - --with-gsfontdir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-gsfontmap="${EPREFIX}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap - --with-jpeg - --with-layers - --with-png - --with-sys-gd - --with-zlib - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - # address parallel build issue, bug 677566 - MAKEOPTS=-j1 - - default - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - gnome2_gdk_pixbuf_update -} diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest index 6bd364e53b80..2516f9e7adb2 100644 --- a/media-libs/vigra/Manifest +++ b/media-libs/vigra/Manifest @@ -1,6 +1,5 @@ AUX vigra-1.11.1-cmake-module-dir.patch 673 BLAKE2B 9dcd11f5754c59bee64d4a4ead62da0e0cb5cde74923871a377ca06a0f639be3a63d6b1769258d09da474e4110ad499a5402660912d8bb07ac0d5bbe199bc36c SHA512 9ab597ea7413d276b22d3cc46ac4179748b98bbaaa44234f71145d69e987b5162d38f87c3317d9bb863cabbcef7c1f3d77f727d19576df7892b2df7272055ce4 AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca791f58efe85eb205bb5f4e638ddc18d171bb7f4a9487670bb1a276c998f0e5096e2efa4fee0f167907d3d02df01bcb42 SHA512 c1cb242eb2ebdf398c81e16acc5a493312b310836caa7f25717dd20d23e885800beeef9ca0589c75ec3a0bd1ba2d879b1e999094cfef3956134e0d6d13f25d0f -AUX vigra-1.11.2-python3.12-remove-imp.patch 979 BLAKE2B 987cc4515ae9fefd75c242dbdb143da64bf7fea042b6c45ece621728171bed026df7db03696fb841789c8b306f5997405751e8d298bd37074c1390171b109429 SHA512 6cd347faa9d76b0cfd8e0854f8a229b86684af69a986e2502a6b5b3de879e09706073a38e1f47ff71276f886fcafa166bf6edb938d2f21551996ac29e2549ec5 DIST vigra-1.11.2_p20240505.tar.gz 34219390 BLAKE2B ad92dc6d21acb52c1aa587a4fbe051fb8416ab8f0b5a7560a6d720f38e73d467c9cebb3940cede83827e7657e30438e4d0d52207cffaf208be76f4ff8cdebca9 SHA512 fa51fc456046989e8bf1225d8ae4bac9ef77b24b9343e657c327f817f3a1b622c645ef22772a6c14c30f7e86ec5ab08df8592ec7b21727146d0f775c010cc9d5 EBUILD vigra-1.11.2_p20240505.ebuild 2907 BLAKE2B 60b6fd7c1741508a88a9487b3c76b6c4730f9510908eafa52a58d74b32aa407381f46bd0920d60b54b296db2c86fecbd6330aa7edf2f1599b8b34068735b96d9 SHA512 cbf6736b795e61e850d678ef0cbff4e549a70ebd7cfff79a587ec8bc00ea78ae8d1b13b19ea69140700eecb75d7786fb78109f3f31ea7ad268487f1efec91ef1 EBUILD vigra-9999.ebuild 2910 BLAKE2B 170448e8f5fcfa9f22a6835482f1914c9a540253ffc928d0c04a88a45709654b6104a6daa5eab9533d2d0faa83521de7ae7f3132893dda00f1d94817c19be196 SHA512 1259a6730057cd09eaa1bd4b415f15785b207fb48bfcca32a738221b42f7c266967cb065c6861d79f5eb8725216bce938c5559ded5d7f952f09292526eae373b diff --git a/media-libs/vigra/files/vigra-1.11.2-python3.12-remove-imp.patch b/media-libs/vigra/files/vigra-1.11.2-python3.12-remove-imp.patch deleted file mode 100644 index a8094c6e7e7d..000000000000 --- a/media-libs/vigra/files/vigra-1.11.2-python3.12-remove-imp.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4f81ef7ed5128453c049958e496f9638d28bdf76 Mon Sep 17 00:00:00 2001 -From: David Runge -Date: Wed, 13 Mar 2024 16:24:02 +0100 -Subject: [PATCH] Use importlib.reload instead of imp.reload - -The imp module has been deprecated since Python 3.4 and is removed in -Python 3.12. -Replace its use with its replacement in the importlib module. - -Signed-off-by: David Runge ---- - vigranumpy/lib/axistags.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vigranumpy/lib/axistags.py b/vigranumpy/lib/axistags.py -index 5c564ea9..cb5dd193 100644 ---- a/vigranumpy/lib/axistags.py -+++ b/vigranumpy/lib/axistags.py -@@ -241,7 +241,7 @@ def benchmark(expression): - when getitem returns a value, the slowdown is about 3 (due to Python calls) - ''' - import timeit, axistags -- from imp import reload -+ from importlib import reload - reload(axistags) - repetitions = 100000 - t1 = timeit.Timer(expression, --- -2.44.0 - -- cgit v1.2.3