diff options
Diffstat (limited to 'media-gfx')
17 files changed, 577 insertions, 386 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 640bda081665..944503f788ff 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest index 60765b1961b4..c677a47a22c1 100644 --- a/media-gfx/frogr/Manifest +++ b/media-gfx/frogr/Manifest @@ -1,5 +1,5 @@ AUX frogr-1.5-meson-0.61-build.patch 1341 BLAKE2B d1c1cdc5eb3f479ae16cc8e5bc5c164904c63d802e5ae2de5fe29d3209462fc65f2750a80ac95a7a3f83c9edd4ebf9067e80166f3ffa18d8380ae221d1312e11 SHA512 b46c7c8d42a9be4bfd90797d2ac77b7f18c2d7e5c571f3a19830849265915389c9c756199297ba6f8969074064beddeb96e87bb1dbbdcf3f9310240a783a0d30 AUX frogr-1.5-warning-level.patch 752 BLAKE2B b0fd94da39939daa195bd4da03b6701b6336e49a7f60fdfe703853d27a562b8dd29bc923cecf08f13acb3200935dfdb43ff1bcf16cda78d80e6980654da4bde5 SHA512 3aa0522da679eba07f3f32134a19adaa6ffdb25bec46c4202e8caf2c38c93749c565f315d5265fca56a618a60d01fe11ef04f971a6c5168a33a42f0187182fbd -DIST frogr-1.5.tar.xz 2233600 BLAKE2B aeb04db0d5d57f470d377986f2e857ee63b47df85e9c3251cdfac8585efa19491650ecede0bfa95c157c2584298dc02173afec624bc439dcd8b52d101c465d54 SHA512 f4af5ec82ad1771e71387c40467fc697c7e3edff9f76ecd0f762e446d136a293477867cb7b6bc6d10bc0fdd95210b25f515eb56bf2d456f79009884019c44dd4 -EBUILD frogr-1.5-r1.ebuild 935 BLAKE2B de07074b6c7fa5121e6237bb06c70d12132e0562fde8b288ac489764fc9513c346880964452b281687866d81a933ea65a91560cd9e3835a2ed11d586836f1574 SHA512 7b8b5b617e097d9835e8947f5fda6770484f4fc0068f85f5402aab03298d7271b59b803b3aeb9abce50b75aa3e21686cc3ecbc885f1abe29fe76cd72cd3541bc -MISC metadata.xml 387 BLAKE2B b08b71b2565331e07ca5b0c99cd8fcb57f6d0f584eb70798ddf20b6e74bc58f1e3d79f354c4bd0b72d26a85dffda4ca87e44a18345ce497020406ce0958bb092 SHA512 cb8c90665280861d2310256c59783f68126d8a24f994bb011487a3509d3ca418605b5e5c89da520204eb646fb4d920c6e8bc8c868b0faffc764832ff2fcc3d92 +DIST frogr-1.7.tar.xz 2247476 BLAKE2B 16b5c546b61234310390f4dadee0094e671f141121023833123e57de7f90666a38a117dedece0cba53a1500e8bce20e79dd690c598e010327a32aee7b11afe1a SHA512 73531186dbe3fdb4b937d54c02b471b444bac059de4ea02913b5fef255816af0b0ef89bbb449e443ee5b50f0d156960efe190f5988a1a50f8ecfe2eb1e10b89f +EBUILD frogr-1.7.ebuild 885 BLAKE2B a01a8662b054629c5175e4931d14048402de3081c127d8e4679d5e5778bb36c908fe88a7432a543fa73ba3bb548681c96cd01d9f47355b9f1d8e037e519d2b71 SHA512 5c1fe8bd3f4a933fa8c6a432fe8e4ec7f36a85e30744941ec4c2c337486acb9f857e7e31e8325d07fc7ae1ce18f4ac35410cdad78a5a4dee7b7bdd90193fbf33 +MISC metadata.xml 709 BLAKE2B a81cb2f0bfe655765fb3fd3ec14c2d1618bd7ccb4ac4a11d2c9f5692d450303cc05fa43fe9a474d5de16314b8d426fb6d62c2d1fdb56725d0a2d40e3b6cdf325 SHA512 894700cc8301eef0202979ff212edbdcaf1665651a97cfef201f8c92fe7f63dd8205972215e3dbbf6a012c09a8637020503fe2ec2597bcb8816e18f13a7b2149 diff --git a/media-gfx/frogr/frogr-1.5-r1.ebuild b/media-gfx/frogr/frogr-1.7.ebuild index 75bd15003391..dcf134553b9d 100644 --- a/media-gfx/frogr/frogr-1.5-r1.ebuild +++ b/media-gfx/frogr/frogr-1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,33 +15,31 @@ KEYWORDS="~amd64" RDEPEND=" >=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2 - >=x11-libs/gtk+-3.16:3[introspection] - >=media-libs/libexif-0.6.14 + >=dev-libs/libgcrypt-1.5:= >=dev-libs/libxml2-2.6.8:2 media-libs/gstreamer:1.0 + >=media-libs/libexif-0.6.14 >=net-libs/libsoup-2.34:2.4 - >=dev-libs/libgcrypt-1.5:* + >=x11-libs/gtk+-3.16:3[introspection] + x11-libs/gdk-pixbuf:2 " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + x11-base/xorg-proto" BDEPEND=" + dev-util/itstool >=sys-devel/gettext-0.19.7 virtual/pkgconfig " # TODO add a useflag for enable-video or header-bar??? -PATCHES=( - "${FILESDIR}/frogr-1.5-warning-level.patch" - "${FILESDIR}/frogr-1.5-meson-0.61-build.patch" -) - pkg_postinst() { xdg_pkg_postinst - gnome2_icon_cache_update + xdg_icon_cache_update gnome2_schemas_update } pkg_postrm() { xdg_pkg_postrm - gnome2_icon_cache_update + xdg_icon_cache_update gnome2_schemas_update } diff --git a/media-gfx/frogr/metadata.xml b/media-gfx/frogr/metadata.xml index 1e1e3db44283..63a6a3cb5736 100644 --- a/media-gfx/frogr/metadata.xml +++ b/media-gfx/frogr/metadata.xml @@ -1,10 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> <longdescription> Frogr is a small application for the GNOME desktop that allows users to manage their accounts in the Flickr image hosting website. It supports all the basic Flickr features. </longdescription> + <maintainer type="person" proxied="yes"> + <email>cfuga@cfuga.mx</email> + <name>Cristian Othón Martínez Vera</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/frogr</remote-id> + </upstream> </pkgmetadata> diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index 4010c7a50fd5..0f4548835b53 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -1,14 +1,7 @@ AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865 AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a -AUX graphicsmagick-1.3.38-configure-bashism.patch 1203 BLAKE2B 0aa4a6cccd1f7e392446db33446b706df0e5a82b77abba3901ea7e8190ed592a4ce17b0544f08b59900cd48b3e57e029862ef94120ceca75536959fba15b9f7f SHA512 e45bc482381e4c58cd854d9d28b8a3a7bf83bc707f5d3a6290f28b1b333c84778c5e185f0a637348a2fbaac56790d6b9ddee1f2ee660ba67912300039d872330 -DIST GraphicsMagick-1.3.38.tar.xz 5958352 BLAKE2B 132c8b2303690dbe84b0e9ab33db0c0861845ef0260915e33197912dbcae02ae70c27bce634cfe0ab6b739ef6f3e828cbea9043fc90be993fb2c4a5e33e20ee9 SHA512 478f9e2907d4cb1099b0cbd1a73e4ab58aef94edf6cb1636ce48a378084ec1671599fd4f369455e5af898e94d1386f7149f6933b7c668027a6f6952bc763ec3a -DIST GraphicsMagick-1.3.38.tar.xz.sig 119 BLAKE2B 166b7bb6de30af22d1f2317812f76dee43dd69c5557613deea35de3767624466c07001fe029ec9d33d0c61ed2fe5ca3f48bf435853374c722963a1293bfaa7a1 SHA512 c6dfee7e4b63b646460f9045ca5c8f3105d1a761ec3cd3471b53293178ed9a963884539c8026d934ce1915654d517a9b30232d7260a13f6d7dbeb5a592485b09 -DIST GraphicsMagick-1.3.39.tar.xz 5509028 BLAKE2B 774717df5c10664d7f60305bbc0b780bd896c27cf5999fae3835a3b3275068bde626a8efb073f7eb9151671e0c170579b5fa7a36b9773e1a0d96c5cd7d0b73c8 SHA512 4820587a8fbc18864134a243eca68359389d92f2b716c657088e06b6fcf76831d9b3b4644478195ee6c5fb3a4ebdce06c79997f5a5778a28c63f5c8a319419a4 -DIST GraphicsMagick-1.3.39.tar.xz.asc 228 BLAKE2B ea9f9d607a4699e148beab6f43f04897c808db5a19c9b0d62d65218127506549931d9cae002ebed2abc8022fb9707612a298139fd051da6c5a6f2f9d5ac3d2a0 SHA512 f9d83d39e1bda804c1c128f18c9a6539906b21abacfb64501fb65c67a56b46b8591ba32a890ecf49917791ebdf394307136229b5820e16909159f5c42270f7ba DIST GraphicsMagick-1.3.40.tar.xz 5507792 BLAKE2B 2052eb34931f07c902a9c68192ebe4d36137cd23219b1598bae2fa78c5c8bfd1efadf9fd430ed4fee8dc903e50ffabe5a9c76bf55966b85b6f303b2decdca6ee SHA512 e64902aa2a8702d03d188350bd4252a2263e431611f9a70f38cd8beede8a38cc91bb4de3603fedf15420ebbba488f609f218e9b45e356b9f8dc8e4a75f380ee5 DIST GraphicsMagick-1.3.40.tar.xz.asc 228 BLAKE2B 70eaaa0cd30cfe23ac6dc5e8edc026c57eea7b1a608e83da3408f6fa9fc2cceeb8190e4e9015f321ee688f2a32689d244d69bc61764a99ab0f99ada72143a575 SHA512 82c628e4a260a690c7b1941321881a97d54b4c9580dcbfd8ae786a1774dc43c46e8542488ca875346446858e7475847c440cfca572315a5fe123315b187a240a -EBUILD graphicsmagick-1.3.38-r5.ebuild 3888 BLAKE2B 887dae54344fa0d5cf2ce66d4d3c42ec43bdc57af36520dc1203ba4e4b5d2eedaa7508657da8b3c68969318a1ff0ca78ff6c17972113a00ce34bcd03acae3563 SHA512 7b9f180f034b966e271591b76b368d2155afa7e2c7bb74c22bbf4b68c9349990dd3f004c58cda6a17e90476f96541197a54ed740eb6db5b5e38c14d287ca02c8 -EBUILD graphicsmagick-1.3.39.ebuild 3851 BLAKE2B 5364a3e3f0e5f57089443ad1010a75371507d5a2ed6c4c365b722238518acb26dada10c24ea897507069e0ff23af5f8077908f3b922cc37c686bc23ac075e181 SHA512 fb54d82d2deda4e66b823c33281b382b02e6f14209607f91fd51c60a0d27c2cad59be034b5b9a212a3b42a4dd79cd371ae797a6afce52eb1ca9f63250dcc5b79 EBUILD graphicsmagick-1.3.40.ebuild 3851 BLAKE2B 5364a3e3f0e5f57089443ad1010a75371507d5a2ed6c4c365b722238518acb26dada10c24ea897507069e0ff23af5f8077908f3b922cc37c686bc23ac075e181 SHA512 fb54d82d2deda4e66b823c33281b382b02e6f14209607f91fd51c60a0d27c2cad59be034b5b9a212a3b42a4dd79cd371ae797a6afce52eb1ca9f63250dcc5b79 EBUILD graphicsmagick-9999.ebuild 3859 BLAKE2B ecc9180502d00af2bfeb3d96125cfe610a7a1e304720a09bfce47b7a1c702a29a19b600fd5354a15d32588e363d663164efff0966ebeccfbf1e1d330e2f8c20c SHA512 d697391be219a2dbb275cc73d9cee4e7692033d9a65d096f43c772c58f7e572aeee932222d3b2c1c0f3f86503873d8d20fa3a26268be182a275a941d58d4cee5 MISC metadata.xml 1299 BLAKE2B 8b52e6f32fd37011471723ec75a32611ae53f92a092dd2ef5eba48391b7282f00ffd20131dbeb86c30b77e697634e13a72dcc218f547a005ff828cf7d43bf658 SHA512 a96a6ee1fc8b7c2b3162e356be1536bfde975dceb37894eca59c80fb9623fcce309b2fd0cc233da9f572925aad9821623748c871c7e2e2f61733d1831a1ca368 diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch deleted file mode 100644 index 69d5fd50a1bf..000000000000 --- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch +++ /dev/null @@ -1,34 +0,0 @@ -# HG changeset patch -# User Sam James <sam@gentoo.org> -# Date 1659168362 -3600 -# Sat Jul 30 09:06:02 2022 +0100 -# Node ID aa77bc8461ee15501a0298dafd53c97447aa30d0 -# Parent 0a06f497d58839e4100b3be46bbdcd14d8147d75 -configure: fix bashism - -configure scripts need to be runnable with a POSIX-compliant /bin/sh. - -On many (but not all!) systems, /bin/sh is provided by Bash, so errors -like this aren't spotted. Notably Debian defaults to /bin/sh provided -by dash which doesn't tolerate such bashisms as '=='. - -This retains compatibility with bash. - -Fixes configure warnings/errors like: -``` -checking for gs... /usr/sbin/gs -./configure: 31719: test: #: unexpected operator -checking for Windows fonts directory (location of arial.ttf)... /usr/share/fonts/corefonts/ -``` - ---- a/configure.ac -+++ b/configure.ac -@@ -3148,7 +3148,7 @@ have_ralcgm='no' ; if test "$CGMDecodeD - AM_CONDITIONAL([HasPSDelegate],[test "$have_gs" = 'yes']) - - # Tests for programs only used while in maintainer mode --if test "$MAINT" == '' ; then -+if test "$MAINT" = '' ; then - # Test for optional rst2html.py utility and define automake conditional HasRST2HTML if found. - AC_CHECK_PROGS([RST2HTML],[rst2html.py rst2html]) - diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r5.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r5.ebuild deleted file mode 100644 index 18c3f3286591..000000000000 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r5.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -MY_P=${P/graphicsm/GraphicsM} -DESCRIPTION="Collection of tools and libraries for many image formats" -HOMEPAGE="http://www.graphicsmagick.org/ https://hg.osdn.net/view/graphicsmagick/GM" - -if [[ ${PV} == 9999 ]] ; then - inherit mercurial - EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code" -else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bobfriesenhahn.asc - inherit verify-sig - SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )" - S="${WORKDIR}/${MY_P}" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )" -fi - -LICENSE="MIT" -SLOT="0/${PV%.*}" - -IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma" -IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc tiff truetype" -IUSE+=" webp wmf X zlib zstd" - -RDEPEND=" - dev-libs/libltdl - bzip2? ( app-arch/bzip2 ) - fpx? ( media-libs/libfpx ) - heif? ( media-libs/libheif:= ) - imagemagick? ( !media-gfx/imagemagick ) - jbig? ( media-libs/jbigkit ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( media-libs/libjxl:= ) - lcms? ( media-libs/lcms:2 ) - lzma? ( app-arch/xz-utils ) - perl? ( dev-lang/perl:= ) - png? ( media-libs/libpng:= ) - postscript? ( app-text/ghostscript-gpl ) - svg? ( dev-libs/libxml2 ) - tcmalloc? ( dev-util/google-perftools:= ) - tiff? ( media-libs/tiff:= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd:= ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.36-flags.patch - "${FILESDIR}"/${PN}-1.3.19-perl.patch - "${FILESDIR}"/${P}-configure-bashism.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local depth=8 - - use q16 && depth=16 - use q32 && depth=32 - - local myeconfargs=( - --enable-largefile - --enable-shared - $(use_enable static-libs static) - $(use_enable debug prof) - $(use_enable debug gcov) - $(use_enable imagemagick magick-compat) - $(use_enable openmp) - --with-threads - $(use_with dynamic-loading modules) - --with-quantum-depth=${depth} - --without-frozenpaths - $(use_with cxx magick-plus-plus) - $(use_with heif) - $(use_with jpegxl jxl) - $(use_with perl) - --with-perl-options=INSTALLDIRS=vendor - $(use_with bzip2 bzlib) - $(use_with postscript dps) - $(use_with fpx) - $(use_with jbig) - $(use_with webp) - $(use_with jpeg) - # Needs last-rited/unpackaged jasper - --without-jp2 - $(use_with lcms lcms2) - $(use_with lzma) - $(use_with png) - $(use_with tcmalloc) - $(use_with tiff) - --without-trio - $(use_with truetype ttf) - $(use_with wmf) - --with-fontpath="${EPREFIX}"/usr/share/fonts - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts - $(use_with svg xml) - $(use_with zlib) - $(use_with zstd) - $(use_with X x) - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - use perl && emake perl-build -} - -src_test() { - unset DISPLAY # some perl tests fail when DISPLAY is set - - default -} - -src_install() { - default - - if use perl ; then - emake -C PerlMagick DESTDIR="${D}" install - - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die -} diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.39.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.39.ebuild deleted file mode 100644 index 8171180c0101..000000000000 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.39.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -MY_P=${P/graphicsm/GraphicsM} -DESCRIPTION="Collection of tools and libraries for many image formats" -HOMEPAGE="http://www.graphicsmagick.org/ https://hg.osdn.net/view/graphicsmagick/GM" - -if [[ ${PV} == 9999 ]] ; then - inherit mercurial - EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code" -else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bobfriesenhahn.asc - inherit verify-sig - SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.asc )" - S="${WORKDIR}/${MY_P}" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )" -fi - -LICENSE="MIT" -SLOT="0/${PV%.*}" - -IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma" -IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc tiff truetype" -IUSE+=" webp wmf X zlib zstd" - -RDEPEND=" - dev-libs/libltdl - bzip2? ( app-arch/bzip2 ) - fpx? ( media-libs/libfpx ) - heif? ( media-libs/libheif:= ) - imagemagick? ( !media-gfx/imagemagick ) - jbig? ( media-libs/jbigkit ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( media-libs/libjxl:= ) - lcms? ( media-libs/lcms:2 ) - lzma? ( app-arch/xz-utils ) - perl? ( dev-lang/perl:= ) - png? ( media-libs/libpng:= ) - postscript? ( app-text/ghostscript-gpl ) - svg? ( dev-libs/libxml2 ) - tcmalloc? ( dev-util/google-perftools:= ) - tiff? ( media-libs/tiff:= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd:= ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.36-flags.patch - "${FILESDIR}"/${PN}-1.3.19-perl.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local depth=8 - - use q16 && depth=16 - use q32 && depth=32 - - local myeconfargs=( - --enable-largefile - --enable-shared - $(use_enable static-libs static) - $(use_enable debug prof) - $(use_enable debug gcov) - $(use_enable imagemagick magick-compat) - $(use_enable openmp) - --with-threads - $(use_with dynamic-loading modules) - --with-quantum-depth=${depth} - --without-frozenpaths - $(use_with cxx magick-plus-plus) - $(use_with heif) - $(use_with jpegxl jxl) - $(use_with perl) - --with-perl-options=INSTALLDIRS=vendor - $(use_with bzip2 bzlib) - $(use_with postscript dps) - $(use_with fpx) - $(use_with jbig) - $(use_with webp) - $(use_with jpeg) - # Needs last-rited/unpackaged jasper - --without-jp2 - $(use_with lcms lcms2) - $(use_with lzma) - $(use_with png) - $(use_with tcmalloc) - $(use_with tiff) - --without-trio - $(use_with truetype ttf) - $(use_with wmf) - --with-fontpath="${EPREFIX}"/usr/share/fonts - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts - $(use_with svg xml) - $(use_with zlib) - $(use_with zstd) - $(use_with X x) - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - use perl && emake perl-build -} - -src_test() { - unset DISPLAY # some perl tests fail when DISPLAY is set - - default -} - -src_install() { - default - - if use perl ; then - emake -C PerlMagick DESTDIR="${D}" install - - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die -} diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 1c1886aa7d5e..9ca2558d359a 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -3,11 +3,13 @@ AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57 DIST ImageMagick-6.9.12-64.tar.xz 9174728 BLAKE2B 8d6f4b6d5b8c2bd6aae3ac38ee5662c5eecfc94e98f8c5e7497b28fec69a9e1fc8b6a4f88bd794b0ed1649db88c8cd9836a335ee17ada27b11361488f4e23566 SHA512 307dd4ed4505b977282cc08065fd735200ce39e9a391d3b0faa47dedc788900c21cbf6b9bbd71cac0c9fafea6cc9b6f22a22f7c50a1764067fcf901d06e89025 DIST ImageMagick-6.9.12-76.tar.xz 9227560 BLAKE2B 69353e23281852669a2775e28c972ffefe11a2d50f1ef386fb36e1968d2ade61bfd8dd6495b4fce91763beb907f93c1744f338a2b7d94c1586b9726d815d5295 SHA512 cfcbfa7556ec08e4a5b4420d8c594cca6e5a679b94cea8f3c9d07b0534b6bf854fd671ff118d51e0f90c3449c29363bd16db21db7c526b749c3470a161c49245 +DIST ImageMagick-6.9.12-77.tar.xz 9220608 BLAKE2B 11050da1710f381084f6758f0665270974c1913e164a0f4b1ee51433948fcf3b4c60c6b7cf5bc4be4958ef863bb14cb3311b08a1aff60907dc595c31eadcc67f SHA512 ab6ad08496f955af28ed16669690fa07222ea741c62a4f98e1ae2b80a916557263d1ccbe66b3470c5edd3f0422bf626149560ae3574f76425ede69910b48faa2 DIST ImageMagick-7.1.0-48.tar.xz 10353180 BLAKE2B 49abad77414b8ad0a692aefae2199050f48161c9c891ae9120692cba27eb9d491808068a5d1d49556f0fb6bad78d9b8bcc91d96da3762d10b84acfc3db664eff SHA512 c161a08765ceea358e9a186d95b5466aef36ff6a07dea976fd40ad36d583baa0bc4bede704b78947ceb02d6bebecd74b0084bd997380f3b1b3507012e3a361e5 -DIST ImageMagick-7.1.0-61.tar.xz 10362768 BLAKE2B abea3c30faa76337233e43256c328ec738c1a31ba70f80c090d1844b1321f05b24589cae845071744d27409cf655289f0a6896d17501da8123377f5af9385854 SHA512 d6537b782d26add6443191d15a9b9a6c6997c0554bad3faed59e7328fa1cc7aba93edce9aa9e9f9625dbe6b2a47c36fc47255c7b2224b6110df9d007018cf7e9 +DIST ImageMagick-7.1.0-62.tar.xz 10359080 BLAKE2B 6f0c91f81cd7c43017b3b58b5bea032ef8ccdbbede05b1963e647d39813153d20f11cc24d3b7b50d5455a6c3075e765f468bdcf2b88725b2f37d139a2326956c SHA512 db299bc84585b1f37d6fb5bfbc08264b19f4aa1b3e3dc28f14606310c5150ad103b8456d0856c1fae1efed137e0b02eb2beeccb504dfa39a10cb2aaacbfe47d3 EBUILD imagemagick-6.9.12.64-r1.ebuild 7285 BLAKE2B 332bd486f9807138c1f173ee9c91d0d888f4da09314b492aaf5ca22552d8e0467235fde94799612cbdbf7b9e43d9b839e5ef0f71c07d2bcd9611c49e4984be73 SHA512 8e176e41f60abd639c0c39f949afc59ca1c4468d8c2059b592d3d4edf8c6a8591c0a2fa89a14e4bba259ed16786f726a67024f5f59d313fe38bd06fc538a45f7 EBUILD imagemagick-6.9.12.76.ebuild 7293 BLAKE2B 5ae637c7150be8bd560325070adb1c86b64ba070e395d1e3c3d87c4563381bbe822dc46bc68289c8ff930881bd8d77ef75f977dc1aa71217c297ae2042a15abe SHA512 c1cae6257b2d415f11ba892653cae1c8a1307fba4d12ca6a5f5acdcda89631cb54d82dc6988faf1c5ff8588b1310d997a6ec07012183c71dfb24fb1d340b6893 +EBUILD imagemagick-6.9.12.77.ebuild 7434 BLAKE2B 35b81957b99859ca85ab40f7c72ae808650220700e7d207ee1d97cebdbd79196cde4fd602640645ddffb60d9c769a2e8cd87a59e55cf36f4588682e1489b631c SHA512 cc84cacfdbaf6a72b1e56c345f22f0537e497b3dcb7a15279db6ac60dd8c6dd8ebbd9e4d4dc5e72bd82ee6a567e5da7ddf5eb50b85923374517aefb30853be99 EBUILD imagemagick-7.1.0.48-r1.ebuild 7577 BLAKE2B 5c27bbf9e6a4c9c2dbb4f09e8411f62cc33d02e7f41157e21cafa56230ebd0f714ec02e940f3284150298470ef44b0548af7706dbfefa5dc8f81a06b3154e7b5 SHA512 0f8fc26cee154bcdba9c774ec2f2ff33741453f655ab77418743d6f35f96d9e7bf5293bca769a8a351e9f5b4a71268e3609a4ed87755ec1d4ac8b1c23c720308 -EBUILD imagemagick-7.1.0.61.ebuild 7585 BLAKE2B 2a93b93f9eb49808ae18b6799d290f5ad9c76212e8f5065059e554c9d1ed03e3276ebfea0a75fff5fbfd55e4f363c242cc252522fa83c960299da2ddacbd1ab4 SHA512 70f7c735c1293de688e5bda8cc750a7db0c9d0d9bfe1b003fee95d393b7e94f2ae77884d7c591ceb551af1bf3109be91c53ece2b1d7730b0b18c4273a7bed1f1 -EBUILD imagemagick-9999.ebuild 7585 BLAKE2B c0b9d4706dd35e3bf37e43360ff5842ac0d473ea573e8ec66effc00b24b97a192a53e23250cf10ece516d1129cb631357e82c9e397d36c42a04ac025b93e88e6 SHA512 7858812f68e9c0e30c5530eca50441138c9dcdaeab2be9a6f118253276fd1a1de2ea78ac76dc08e2f4a351faefab868e439467efea425b4bae711a3bff205855 +EBUILD imagemagick-7.1.0.62.ebuild 7727 BLAKE2B 52db3be561b94cec427ccc5cf1f33320e0d14cc2765ced34d445a4e87255da185b1968b22a5af6c477430424e59ede005361607f9d4b33508f4ab84638f47244 SHA512 32017d9bbd09359633cde35328b16a035fd7322cddebcaae3a76d91ee5aa49cf704b7899439d224e9408af18a52bb0d40ad913068c76fe0c54f2f74fc4bb3d43 +EBUILD imagemagick-9999.ebuild 7727 BLAKE2B 52db3be561b94cec427ccc5cf1f33320e0d14cc2765ced34d445a4e87255da185b1968b22a5af6c477430424e59ede005361607f9d4b33508f4ab84638f47244 SHA512 32017d9bbd09359633cde35328b16a035fd7322cddebcaae3a76d91ee5aa49cf704b7899439d224e9408af18a52bb0d40ad913068c76fe0c54f2f74fc4bb3d43 MISC metadata.xml 1191 BLAKE2B f46c54e4670eac69d9bb9d819810f482af66c4ef6448cc911c45d3ff2a8d52f41f8686b2fd4a0f02c5d73dbd50717c2edf37fa84174d115b57b4cecc8412aae0 SHA512 07fb6c52e6c93d53ceb2d72ad570bc76fed043410e51b0573688a6124173ed0a7927906d0a03ad369aa5d536d5202150a847375ff433214ba25954a0dfeeb7ab diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.77.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.77.ebuild new file mode 100644 index 000000000000..b8d2fa1c3ff7 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.9.12.77.ebuild @@ -0,0 +1,271 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QA_PKGCONFIG_VERSION=$(ver_cut 1-3) +inherit flag-o-matic libtool perl-functions toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://www.imagemagick.org/" + +LICENSE="imagemagick" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-58" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" + +REQUIRED_USE="corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts )" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !media-gfx/graphicsmagick[imagemagick] + dev-libs/libltdl + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:=[x265] ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:= ) + png? ( media-libs/libpng:= ) + postscript? ( app-text/ghostscript-gpl:= ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2 ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib:= )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND="virtual/pkgconfig" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + # Apply hardening, bug #664236 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die + sed -i -e '/^<policymap>$/ { + r policy-hardening.snippet + d + }' \ + config/policy.xml || \ + die "Failed to apply hardening of policy.xml" + einfo "policy.xml hardened" + + # for Darwin modules + elibtoolize + + # For testsuite, see bug #500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + $(use_enable openmp) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --with-gcc-arch=no-automagic + ) + + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in ${HOME} for test suite, bug #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + # bug #472766 + doins "${T}"/99${PN} + fi + + insinto /usr/share/${PN} + doins config/*icm +} + +pkg_postinst() { + local _show_policy_xml_notice= + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + _show_policy_xml_notice=yes + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! ver_test "${v}" -gt "6.9.10.10-r2"; then + # This is an upgrade + _show_policy_xml_notice=yes + + # Show this elog only once + break + fi + done + fi + + if [[ -n "${_show_policy_xml_notice}" ]]; then + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" + elog "which will prevent the usage of the following coders by default:" + elog "" + elog " - PS" + elog " - PS2" + elog " - PS3" + elog " - EPS" + elog " - PDF" + elog " - XPS" + fi +} diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.61.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.62.ebuild index 568ce31eb232..516ae1cca24a 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.0.61.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.0.62.ebuild @@ -23,7 +23,9 @@ DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/" LICENSE="imagemagick" -SLOT="0/7.1.0-43" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-43" IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" REQUIRED_USE="corefonts? ( truetype ) diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index 0b385cf01cad..516ae1cca24a 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,9 @@ DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/" LICENSE="imagemagick" -SLOT="0/7.1.0-43" +# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. +# If ABI is broken, change the bit after the '-'. +SLOT="0/$(ver_cut 1-3)-43" IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" REQUIRED_USE="corefonts? ( truetype ) diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest index 892b4c2566fb..46612940cb13 100644 --- a/media-gfx/mypaint/Manifest +++ b/media-gfx/mypaint/Manifest @@ -4,5 +4,5 @@ AUX mypaint-2.0.1-r1-build-system.patch 638 BLAKE2B 8e0209eb8fdba535cb8c0075e183 AUX mypaint-2.0.1-setuptools.patch 2647 BLAKE2B e9212c40830e51ed8abe217204ce3bcad65fac99c7ad00f38ae6275eb404c3464598672431a6c857f7de42950830a63f25bcfcb5f19685a443f963251ed1a9be SHA512 4d834558ab0e5419aae98a2a8f30c285d330392d3627e21d25def869b16e2ef4100d45d6a78b3f1714bd72e1e7b8cb7de24f89893c6c98d87bcefe74aff5965a DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562 EBUILD mypaint-2.0.1-r2.ebuild 1816 BLAKE2B 3e278d5222a482bc44e669f91cf1e40c59b8df4012e0ef65c6d7b48a3ae6c16a16e93ef2f0ef5b7b669caa63ed697f35ce9425a3473dffaee5cbc348ec3fb3f8 SHA512 0aa21f8a60b698ddaf94c0ef67f977d5daaf25ba10d92b6e37f85ef271b73d207179c1f2328fe271a8f3e56e99fbf87ebf2b0e37cfba0c4b5f86e9725b060200 -EBUILD mypaint-2.0.1-r3.ebuild 1898 BLAKE2B dc639c72c0d98f77029790a9956357ff021f9c1554ce0d094521b1291b3d8a21746130b549033d73b7a33d5d85adbc5eceee78f0749304a3aabfa6b55c56defd SHA512 292b90f3d5e6f2e2337837ba4bf641037adb638a53e6888699f661098e24bac0e66c0abdab43d148f5f5decf2dfaaa65cd25cdf808dc5452b56edc7bb27abde7 +EBUILD mypaint-2.0.1-r3.ebuild 1897 BLAKE2B 32fd6a797fbcb85137bea20f1605fa099627e6a849fd63d03153653ab98d9295228774798de734342d354ddf4849fafa6b0af273f147223bae67b917080b202a SHA512 dfd7083328c6a6baa42d197a0c3df9eaf04fab1cfdad2b7ea97a357f5ab7f5accddb6beffb21a33b0ae928529074ff0ad7477a55c8ac9e3805b4492484afe719 MISC metadata.xml 320 BLAKE2B 17a66707a8182c8eb1a0206b8ec86cdc307ce2d965beb66aa08e3e2b31700eebc05213b7e27e98aef40e566fd028561476d6f614aeb2a0450f560801f187b060 SHA512 cb54ae739d86722c2959d8ff63d8f20394b0611ef3f3a6587e517f3de6625748201659d782e6ec8ca65e55c285a6ff52408b3586088ce2546ba42872dfd07133 diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild index 46937aba7d14..bbf6566e2906 100644 --- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild +++ b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="openmp" LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW" diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index 3ec39ca2a126..693b01af92a0 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1,7 +1,10 @@ AUX zbar-0.23.90-fix-gtk-default.patch 1222 BLAKE2B 5d7bb46e1d1eafa34c75818bce154dc54528f88140d7959c0e1849c01189dd7e2019d0b1c9b254662c408eee05acc3ccc2f1d26387096745005a34bddae2a2fa SHA512 a7c2f51bde791fbf906a6226af067065dce71efe942d1c26e62ac1005577d05574fb96c4e15ed394b12acec0ca2b225aa4a97c29d59ddb305c2ff076c61fdc48 AUX zbar-0.23.90-fix-qt5x11extras-detect.patch 641 BLAKE2B ec0b86a83a149ef2a62585ea8a4db088e5fdc63ed28ff57f358b30372dff86b898364e6c0983a689efbbd6a4df82bc9764dc2dedf1f6beb68dcc1852336bce1b SHA512 5ca82734a32d12ac2aa451cba87081f44df46a4a9afc5ff8a60adf59cce30dbdca06866313b1a511c778e690f6e40994f22e868a7a9d098d69e4c62a9b26a004 AUX zbar-0.23.90-fix-unittest.patch 2711 BLAKE2B 58d1bbebf60bb9533a7c2b40a29afa7e8229b79a925ebcd05e26c3a67c2144173baedc31f0d92d0341c51ccfb3763e95840ce2073012e7b61a0f252287d5d6b4 SHA512 cc5aaef37155ad72d6b72e05c2f53523268e15b84f573117e780e3f39cc4df3981d080558db83d0fb52d2daa47beeaab4f194e4f912e732648ac4c5bc683e11d +AUX zbar-0.23.92-py311-set-size.patch 1100 BLAKE2B be9b804d7ba1c5c1bae2a20853154da852a6ca1922f9a65f0583ea8d68f76d04e0e009c940417d24539cfb6577e47d8a6ee1d342de1a32b797afd4ebde284560 SHA512 9980027fdda6f995577c15c5c6337a45557802ed534da07208edb20cd99b8575f0c9864f1e48b2f300d973e682e73a0bac105a9eee7429db48224ddbcd15e8d1 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7 DIST zbar-0.23.90.tar.gz 1005314 BLAKE2B 5d0c193509602dfb55741b421e1d28f1424ecec50aa3be584912544a587922c053284c41cf14ff0b4824095d0d376381ed055e7faf9ff394bd8d44fd9ed2971d SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb +DIST zbar-0.23.92.tar.gz 1005358 BLAKE2B 97af3c399333abfcd64e45e6c4f38e5da6ed1540447f35f0efe9bc0fb8d296d80c964452afa29d26d22bddd8de31bc3ca6582db38afe8416e9480f11b939e040 SHA512 cae47fb199173fc1c052984865ca0e6aeab330bd6d77506a0937994d459deb4419a3e54e2dcd2e9830ffb8acf14f29e22e0a6becc9e4cfe19b07dad1babe9513 EBUILD zbar-0.23.90.ebuild 5343 BLAKE2B 360b76986b1fe8c0088777e761b694e6ed6f49e6b877da1c3fbfac88da5e48d497c77d8e701e0fbcad4fd1864e341b4879797bffe1c8829be8840a2c25d2119b SHA512 3e8205bc97c04253ee18a0611ec19d84f336d94e9429ed0dce027d179d5c538076381e0cecb7edb1e30ccd5af912f9134099602547c0bcda129a40c792957a4b +EBUILD zbar-0.23.92.ebuild 5479 BLAKE2B 5b8e1c94dd9dab5aeb04a817c99ea4ee03c755da0474e159797de20c00773e658f85d18d37494984412034060d9fe6042edd13108d9c9d30051ad628fdb4d6b5 SHA512 1a0058f92aea6149c8bf7a4621552bc3859fa996630893857210f3bfc99d0d96b7dda1da0eb710fdb6a0561d4b004e5d7db3be8d31a58df48b874cc148998ca8 MISC metadata.xml 738 BLAKE2B a5f5f0f157f7339f3dd39dde18b79427b35c6ce0b079b1ed03a0f2de821bc14f3a9c76fbd68bfd836444a4750a604be0012e4501207e75dfe4fc39aef7e65827 SHA512 334a091fc54d950a8b3e7572af7ae9766d20fd0d49aaa9fd18f5ea75966b45a53a861e290bcf9ca0fd8cc160cba669185aa01a9c8e77a585f2cb84d10f3b1e80 diff --git a/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch b/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch new file mode 100644 index 000000000000..a51193af7777 --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch @@ -0,0 +1,30 @@ +Upstream-PR: https://github.com/mchehab/zbar/pull/231 + +diff --git a/python/enum.c b/python/enum.c +index ba22ba63..4644509e 100644 +--- a/python/enum.c ++++ b/python/enum.c +@@ -50,7 +50,11 @@ static zbarEnumItem *enumitem_new(PyTypeObject *type, PyObject *args, + + /* we assume the "fast path" for a single-digit ints (see longobject.c) */ + /* this also holds if we get a small_int preallocated long */ ++#if PY_VERSION_HEX >= 0x030900A4 ++ Py_SET_SIZE(&self->val, Py_SIZE(longval)); ++#else + Py_SIZE(&self->val) = Py_SIZE(longval); ++#endif + self->val.ob_digit[0] = longval->ob_digit[0]; + Py_DECREF(longval); + #else +@@ -129,7 +133,11 @@ zbarEnumItem *zbarEnumItem_New(PyObject *byname, PyObject *byvalue, int val, + + /* we assume the "fast path" for a single-digit ints (see longobject.c) */ + /* this also holds if we get a small_int preallocated long */ ++#if PY_VERSION_HEX >= 0x030900A4 ++ Py_SET_SIZE(&self->val, Py_SIZE(longval)); ++#else + Py_SIZE(&self->val) = Py_SIZE(longval); ++#endif + self->val.ob_digit[0] = longval->ob_digit[0]; + Py_DECREF(longval); + diff --git a/media-gfx/zbar/zbar-0.23.92.ebuild b/media-gfx/zbar/zbar-0.23.92.ebuild new file mode 100644 index 000000000000..f2233c1e697c --- /dev/null +++ b/media-gfx/zbar/zbar-0.23.92.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 qmake-utils virtualx + +DESCRIPTION="Library and tools for reading barcodes from images or video" +HOMEPAGE="https://github.com/mchehab/zbar" +SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv" + +REQUIRED_USE=" + introspection? ( gtk ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( + ${PYTHON_REQUIRED_USE} + X? ( imagemagick ) + ) + xv? ( X )" + +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + gtk? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[${MULTILIB_USEDEP}] + introspection? ( dev-libs/gobject-introspection ) + ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] ) + ) + jpeg? ( media-libs/libjpeg-turbo:0[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + ) + v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) + )" + +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.8 )" + +DEPEND="${COMMON_DEPEND} + java? ( + >=virtual/jdk-1.8 + test? ( + dev-java/hamcrest-core:1.3 + dev-java/junit:4 + ) + ) + test? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pillow[${PYTHON_USEDEP}] + ') + elibc_musl? ( sys-libs/argp-standalone ) + )" + +BDEPEND=" + app-text/xmlto + sys-devel/gettext + virtual/pkgconfig + gtk? ( dev-util/glib-utils ) + nls? ( + sys-devel/gettext + virtual/libiconv + )" + +DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog ) + +PATCHES=( + # git master + "${FILESDIR}/${PN}-0.23.90-fix-gtk-default.patch" + # TODO: upstream? + "${FILESDIR}/${PN}-0.23_fix_python_detect.patch" + "${FILESDIR}/${PN}-0.23.90-fix-unittest.patch" + "${FILESDIR}/${PN}-0.23.90-fix-qt5x11extras-detect.patch" + "${FILESDIR}/${P}-py311-set-size.patch" +) + +pkg_setup() { + if use python || use test; then + python-single-r1_pkg_setup + fi + use java && java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + + if use python || use test; then + if use test; then + # make tests happy + # because one of the test requires loadable py module from the current ${BUILD_DIR} + sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \ + -i test/Makefile.am.inc || die + fi + + python_fix_shebang \ + examples/*.py \ + test/{test_python,barcodetest}.py # test_pygtk.py — py2 only + fi + + if use java; then + java-pkg-opt-2_src_prepare + sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \ + -i java/Makefile.am || die + fi + + # do not install {LICENSE,INSTALL,etc} doc files with 'make install' (use DOCS=() instead) + sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die + + eautoreconf +} + +multilib_src_configure() { + append-cppflags -DNDEBUG + + local myeconfargs=( + $(use_with dbus) + $(use_with gtk gtk gtk3) # avoid 'auto' + $(use_with jpeg) + $(multilib_native_use_with introspection gir) + $(multilib_native_use_with java) + $(multilib_native_use_with python python auto) + $(use_enable nls) + $(use_enable static-libs static) + $(use_enable threads pthread) + $(use_enable v4l video) + $(use_with X x) + $(use_with X xshm) + $(use_with xv xv) + ) + + if multilib_is_native_abi; then + # both must be enabled to use GraphicsMagick + if use imagemagick && use graphicsmagick; then + myeconfargs+=( + --with-graphicsmagick + --without-imagemagick + ) + elif ! use graphicsmagick && use imagemagick; then + myeconfargs+=( + --with-imagemagick + --without-graphicsmagick + ) + else + myeconfargs+=( + --without-imagemagick + --without-graphicsmagick + ) + fi + + if use java; then + export JAVACFLAGS="$(java-pkg_javac-args)" + append-cflags "$(java-pkg_get-jni-cflags)" + if use test; then # bug 629078 + myeconfargs+=( --with-java-unit ) + CLASSPATH+=":$(java-pkg_getjar --build-only junit-4 junit.jar)" + CLASSPATH+=":$(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)" + fi + fi + + if use qt5; then + myeconfargs+=( + --with-qt + --with-qt5 + ) + else + myeconfargs+=( --without-qt ) + fi + + if use test && use elibc_musl; then + append-ldflags -largp + fi + + else + myeconfargs+=( + --without-graphicsmagick + --without-imagemagick + --without-qt + ) + + # zbarimg tests with native abi only + # (this option from the patch above, stay up to date) + use test && myeconfargs+=( --without-zbarimg-tests ) + fi + + # use bash (bug 721370) + CONFIG_SHELL='/bin/bash' \ + ECONF_SOURCE="${S}" \ + MOC="$(qt5_get_bindir)"/moc \ + econf "${myeconfargs[@]}" + + # work around out-of-source build issues for multilib systems (bug 672184) + mkdir qt zbarcam || die +} + +src_test() { + virtx multilib-minimal_src_test +} + +src_install() { + if use qt5; then + local MULTILIB_WRAPPED_HEADERS=( + /usr/include/zbar/QZBar.h + /usr/include/zbar/QZBarImage.h + ) + fi + multilib-minimal_src_install +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} + +pkg_preinst() { + use java && java-pkg-opt-2_pkg_preinst +} |