From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5077F15800F for ; Wed, 25 Jan 2023 17:48:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BDF3E07EF; Wed, 25 Jan 2023 17:48:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 84C91E07EF for ; Wed, 25 Jan 2023 17:48:20 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7778E340C7C for ; Wed, 25 Jan 2023 17:48:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6E0588A for ; Wed, 25 Jan 2023 17:48:16 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1674668762.7bf3457a5c29e257bf1538831644b7b390344328.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/babl/files/, media-libs/babl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/babl/Manifest media-libs/babl/babl-0.1.92-r1.ebuild media-libs/babl/babl-0.1.96-r1.ebuild media-libs/babl/files/babl-0.1.92_universal_nonlinear_rgb_u8_converter_sse2.patch X-VCS-Directories: media-libs/babl/ media-libs/babl/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7bf3457a5c29e257bf1538831644b7b390344328 X-VCS-Branch: master Date: Wed, 25 Jan 2023 17:48:16 +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: 9fd23042-b499-47f5-b3ef-fc0fa4ff88ec X-Archives-Hash: 387aadb79d38d8edf9f5725dc68f0be9 commit: 7bf3457a5c29e257bf1538831644b7b390344328 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 24 21:23:16 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 25 17:46:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf3457a media-libs/babl: drop 0.1.92-r1, 0.1.96-r1 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/babl/Manifest | 2 - media-libs/babl/babl-0.1.92-r1.ebuild | 68 --------------------- media-libs/babl/babl-0.1.96-r1.ebuild | 69 ---------------------- ...universal_nonlinear_rgb_u8_converter_sse2.patch | 18 ------ 4 files changed, 157 deletions(-) diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest index ba4ddf504fa2..d8e6aba17b20 100644 --- a/media-libs/babl/Manifest +++ b/media-libs/babl/Manifest @@ -1,3 +1 @@ -DIST babl-0.1.92.tar.xz 309784 BLAKE2B c3c716ba1b54082743ba6ea33da99fb458dc971ab78ae72170af9840eadbc7f2aeb0a26d3270ede2a6e0d7b55489fc8f700b1c69731a4612ba4106f9672762d0 SHA512 c2baf39f576bf7f57786c59f2de0818257f4d1d62cadf44fdd802c9a534ed94390dd1616e7e72fcc9de1fb85a24a10fbacdbbabbe376a45ae598be46817e3bc0 -DIST babl-0.1.96.tar.xz 312184 BLAKE2B 6ee307054cf4d1e0f434a6070189ed143c60056decb59184f880b26863c8177d0c69294254651923f7dfb897555939602e6f4384e7561a839a3cf80ae9468859 SHA512 771d68b80f1123baa38256e4b1d7946284cd88997b2ab7c7092a74120e91ea5ee7ab4c001686ae4b3e363b6465484f185a64f9c75515a55d3ffb81fecbeaca42 DIST babl-0.1.98.tar.xz 312516 BLAKE2B c12626e4b8127a5b2e17507e20cf6ce324834a58d64fa54b80fbe00ef2468d3d29c870d44a22f08f7e74404cf6f47321084c854a4ba017cf0c8c199d8210849f SHA512 33b2e3f8fbcd6602bb82d6242dd2911bb2232e69350f7a0e70e14b1472052e27b0e2a1fa6a2b6d0449fc9796353336e311c8d4007c532447cd61f95b684a3120 diff --git a/media-libs/babl/babl-0.1.92-r1.ebuild b/media-libs/babl/babl-0.1.92-r1.ebuild deleted file mode 100644 index aaaefb6f1af8..000000000000 --- a/media-libs/babl/babl-0.1.92-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VALA_USE_DEPEND=vapigen - -inherit meson gnome2-utils vala - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git" - SRC_URI="" -else - SRC_URI="https://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A dynamic, any to any, pixel format conversion library" -HOMEPAGE="https://gegl.org/babl/" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1" -REQUIRED_USE="vala? ( introspection )" - -BDEPEND=" - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -RDEPEND=" - introspection? ( >=dev-libs/gobject-introspection-1.32:= ) - lcms? ( >=media-libs/lcms-2.8:2 ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}_universal_nonlinear_rgb_u8_converter_sse2.patch" # Bug 857708 -) - -src_prepare() { - default - gnome2_environment_reset - - sed -i -e 's/Description/description/' meson.build || die # bug 843266 -} - -src_configure() { - use vala && vala_setup - - # Automagic rsvg support is just for website generation we do not call, - # so we don't need to fix it - # w3m is used for dist target thus no issue for us that it is automagically - # detected - local emesonargs=( - -Dwith-docs=false - $(meson_use introspection enable-gir) - $(meson_use lcms with-lcms) - $(meson_use vala enable-vapi) - $(meson_use cpu_flags_x86_avx2 enable-avx2) - $(meson_use cpu_flags_x86_f16c enable-f16c) - $(meson_use cpu_flags_x86_mmx enable-mmx) - $(meson_use cpu_flags_x86_sse enable-sse) - $(meson_use cpu_flags_x86_sse2 enable-sse2) - $(meson_use cpu_flags_x86_sse4_1 enable-sse4_1) - ) - meson_src_configure -} diff --git a/media-libs/babl/babl-0.1.96-r1.ebuild b/media-libs/babl/babl-0.1.96-r1.ebuild deleted file mode 100644 index 6031f275a4be..000000000000 --- a/media-libs/babl/babl-0.1.96-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VALA_USE_DEPEND=vapigen - -inherit meson gnome2-utils vala - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git" - SRC_URI="" -else - SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A dynamic, any to any, pixel format conversion library" -HOMEPAGE="https://gegl.org/babl/" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1" -REQUIRED_USE="vala? ( introspection )" - -BDEPEND=" - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -RDEPEND=" - introspection? ( >=dev-libs/gobject-introspection-1.32:= ) - lcms? ( >=media-libs/lcms-2.8:2 ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - default - gnome2_environment_reset -} - -src_configure() { - use vala && vala_setup - - # Automagic rsvg support is just for website generation we do not call, - # so we don't need to fix it - # w3m is used for dist target thus no issue for us that it is automagically - # detected - local emesonargs=( - -Dwith-docs=false - $(meson_use introspection enable-gir) - $(meson_use lcms with-lcms) - $(meson_use vala enable-vapi) - $(meson_use cpu_flags_x86_avx2 enable-avx2) - $(meson_use cpu_flags_x86_f16c enable-f16c) - $(meson_use cpu_flags_x86_mmx enable-mmx) - $(meson_use cpu_flags_x86_sse enable-sse) - $(meson_use cpu_flags_x86_sse2 enable-sse2) - $(meson_use cpu_flags_x86_sse4_1 enable-sse4_1) - ) - meson_src_configure -} - -src_install() { - meson_src_install - - # Bug 871690 - dosym -r /usr/"$(get_libdir)"/pkgconfig/babl.pc /usr/"$(get_libdir)"/pkgconfig/babl-0.1.pc -} diff --git a/media-libs/babl/files/babl-0.1.92_universal_nonlinear_rgb_u8_converter_sse2.patch b/media-libs/babl/files/babl-0.1.92_universal_nonlinear_rgb_u8_converter_sse2.patch deleted file mode 100644 index 57954b1b9f25..000000000000 --- a/media-libs/babl/files/babl-0.1.92_universal_nonlinear_rgb_u8_converter_sse2.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix alignment of vector of floats in babl-rgb-converter.c -Bug: https://bugs.gentoo.org/857708 -Upstream-Bug: https://gitlab.gnome.org/GNOME/babl/-/issues/76 -Signed-off-by: Alexander Bezrukov - -diff -ur a/babl/base/babl-rgb-converter.c b/babl/base/babl-rgb-converter.c ---- a/babl/base/babl-rgb-converter.c -+++ b/babl/base/babl-rgb-converter.c -@@ -306,7 +306,8 @@ - uint8_t *rgb_in_u8 = (void*)src_char; - uint8_t *rgb_out_u8 = (void*)dst_char; - -- float rgba_out[4*samples]; -+ // The alignment is necessary for SIMD intrinsics in babl_matrix_mul_vectorff_buf4_sse2() -+ float __attribute__ ((aligned (16))) rgba_out[4*samples]; - - for (i = 0; i < samples; i++) - {