From 852c6aff75a5050a4fc337750d0ef6842765ced8 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 7 Nov 2021 22:56:12 +0000 Subject: media-libs/gd: use libavif subslot operator Closes: https://bugs.gentoo.org/822333 Signed-off-by: Sam James --- media-libs/gd/gd-2.3.2-r1.ebuild | 90 +++++++++++++++++++++++++++++++++++++ media-libs/gd/gd-2.3.2.ebuild | 90 ------------------------------------- media-libs/gd/gd-2.3.3-r1.ebuild | 95 ++++++++++++++++++++++++++++++++++++++++ media-libs/gd/gd-2.3.3.ebuild | 95 ---------------------------------------- 4 files changed, 185 insertions(+), 185 deletions(-) create mode 100644 media-libs/gd/gd-2.3.2-r1.ebuild delete mode 100644 media-libs/gd/gd-2.3.2.ebuild create mode 100644 media-libs/gd/gd-2.3.3-r1.ebuild delete mode 100644 media-libs/gd/gd-2.3.3.ebuild (limited to 'media-libs/gd') diff --git a/media-libs/gd/gd-2.3.2-r1.ebuild b/media-libs/gd/gd-2.3.2-r1.ebuild new file mode 100644 index 000000000000..d145563ca1de --- /dev/null +++ b/media-libs/gd/gd-2.3.2-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic multilib-minimal + +DESCRIPTION="Graphics library for fast image creation" +HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/" +SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz" +S="${WORKDIR}/lib${P}" + +LICENSE="gd IJG HPND BSD" +SLOT="2/3" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm zlib" +RESTRICT="!test? ( test )" + +# fontconfig has prefixed font paths, details see bug #518970 +REQUIRED_USE=" + prefix? ( fontconfig ) + test? ( png ) +" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + avif? ( media-libs/libavif:=[${MULTILIB_USEDEP}] ) + fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) + jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + heif? ( media-libs/libheif:=[${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] ) + webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) + xpm? ( + >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] + ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch" +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + # bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65 + if use cpu_flags_x86_sse ; then + append-cflags -msse -mfpmath=sse + else + append-cflags -ffloat-store + fi + + # bug 632076, https://github.com/libgd/libgd/issues/278 + if use arm64 || use ppc64 || use s390 ; then + append-cflags -ffp-contract=off + fi + + # we aren't actually {en,dis}abling X here ... the configure + # script uses it just to add explicit -I/-L paths which we + # don't care about on Gentoo systems. + local myeconfargs=( + --disable-werror + --without-x + --without-liq + $(use_enable static-libs static) + $(use_with avif) + $(use_with fontconfig) + $(use_with png) + $(use_with tiff) + $(use_with truetype freetype) + $(use_with heif) + $(use_with jpeg) + $(use_with webp) + $(use_with xpm) + $(use_with zlib) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + dodoc README.md + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/gd/gd-2.3.2.ebuild b/media-libs/gd/gd-2.3.2.ebuild deleted file mode 100644 index 9e697c051d80..000000000000 --- a/media-libs/gd/gd-2.3.2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic multilib-minimal - -DESCRIPTION="Graphics library for fast image creation" -HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/" -SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz" -S="${WORKDIR}/lib${P}" - -LICENSE="gd IJG HPND BSD" -SLOT="2/3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm zlib" -RESTRICT="!test? ( test )" - -# fontconfig has prefixed font paths, details see bug #518970 -REQUIRED_USE=" - prefix? ( fontconfig ) - test? ( png ) -" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - avif? ( media-libs/libavif[${MULTILIB_USEDEP}] ) - fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) - jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) - heif? ( media-libs/libheif[${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] ) - webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) - xpm? ( - >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch" -) - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - # bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65 - if use cpu_flags_x86_sse ; then - append-cflags -msse -mfpmath=sse - else - append-cflags -ffloat-store - fi - - # bug 632076, https://github.com/libgd/libgd/issues/278 - if use arm64 || use ppc64 || use s390 ; then - append-cflags -ffp-contract=off - fi - - # we aren't actually {en,dis}abling X here ... the configure - # script uses it just to add explicit -I/-L paths which we - # don't care about on Gentoo systems. - local myeconfargs=( - --disable-werror - --without-x - --without-liq - $(use_enable static-libs static) - $(use_with avif) - $(use_with fontconfig) - $(use_with png) - $(use_with tiff) - $(use_with truetype freetype) - $(use_with heif) - $(use_with jpeg) - $(use_with webp) - $(use_with xpm) - $(use_with zlib) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - dodoc README.md - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/gd/gd-2.3.3-r1.ebuild b/media-libs/gd/gd-2.3.3-r1.ebuild new file mode 100644 index 000000000000..a50c264c6bb7 --- /dev/null +++ b/media-libs/gd/gd-2.3.3-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic multilib-minimal + +DESCRIPTION="Graphics library for fast image creation" +HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/" +SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz" +S="${WORKDIR}/lib${P}" + +LICENSE="gd IJG HPND BSD" +SLOT="2/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm zlib" +RESTRICT="!test? ( test )" + +# fontconfig has prefixed font paths, details see bug #518970 +REQUIRED_USE=" + prefix? ( fontconfig ) + test? ( png ) +" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + avif? ( media-libs/libavif:=[${MULTILIB_USEDEP}] ) + fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) + jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + heif? ( media-libs/libheif:=[${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] ) + webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) + xpm? ( + >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] + ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch" +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + # bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65 + if use cpu_flags_x86_sse ; then + append-cflags -msse -mfpmath=sse + else + append-cflags -ffloat-store + fi + + # bug 632076, https://github.com/libgd/libgd/issues/278 + if use arm64 || use ppc64 || use s390 ; then + append-cflags -ffp-contract=off + fi + + # we aren't actually {en,dis}abling X here ... the configure + # script uses it just to add explicit -I/-L paths which we + # don't care about on Gentoo systems. + local myeconfargs=( + --disable-werror + --without-x + --without-liq + $(use_enable static-libs static) + $(use_with avif) + $(use_with fontconfig) + $(use_with png) + $(use_with tiff) + $(use_with truetype freetype) + $(use_with heif) + $(use_with jpeg) + $(use_with webp) + $(use_with xpm) + $(use_with zlib) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + # See https://github.com/libgd/libgd/issues/763 (although it still passed without it here?) + TMPDIR="${T}" default +} + +multilib_src_install_all() { + dodoc README.md + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/gd/gd-2.3.3.ebuild b/media-libs/gd/gd-2.3.3.ebuild deleted file mode 100644 index e890c90f2dd2..000000000000 --- a/media-libs/gd/gd-2.3.3.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic multilib-minimal - -DESCRIPTION="Graphics library for fast image creation" -HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/" -SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz" -S="${WORKDIR}/lib${P}" - -LICENSE="gd IJG HPND BSD" -SLOT="2/3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm zlib" -RESTRICT="!test? ( test )" - -# fontconfig has prefixed font paths, details see bug #518970 -REQUIRED_USE=" - prefix? ( fontconfig ) - test? ( png ) -" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - avif? ( media-libs/libavif[${MULTILIB_USEDEP}] ) - fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) - jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) - heif? ( media-libs/libheif[${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] ) - webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) - xpm? ( - >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch" -) - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - # bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65 - if use cpu_flags_x86_sse ; then - append-cflags -msse -mfpmath=sse - else - append-cflags -ffloat-store - fi - - # bug 632076, https://github.com/libgd/libgd/issues/278 - if use arm64 || use ppc64 || use s390 ; then - append-cflags -ffp-contract=off - fi - - # we aren't actually {en,dis}abling X here ... the configure - # script uses it just to add explicit -I/-L paths which we - # don't care about on Gentoo systems. - local myeconfargs=( - --disable-werror - --without-x - --without-liq - $(use_enable static-libs static) - $(use_with avif) - $(use_with fontconfig) - $(use_with png) - $(use_with tiff) - $(use_with truetype freetype) - $(use_with heif) - $(use_with jpeg) - $(use_with webp) - $(use_with xpm) - $(use_with zlib) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - # See https://github.com/libgd/libgd/issues/763 (although it still passed without it here?) - TMPDIR="${T}" default -} - -multilib_src_install_all() { - dodoc README.md - find "${ED}" -name '*.la' -delete || die -} -- cgit v1.2.3-65-gdbad