diff options
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/Manifest.gz | bin | 38365 -> 38370 bytes | |||
| -rw-r--r-- | media-gfx/xloadimage/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-musl.patch | 14 | ||||
| -rw-r--r-- | media-gfx/xloadimage/xloadimage-4.1-r18.ebuild | 97 |
4 files changed, 113 insertions, 0 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 60e5d37daa15..2450de9a93f3 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest index 026e274fe34b..49749af09de8 100644 --- a/media-gfx/xloadimage/Manifest +++ b/media-gfx/xloadimage/Manifest @@ -1,6 +1,7 @@ AUX xloadimage-4.1-bracket.patch 518 BLAKE2B fca92d66bc559f17e091d544f2b726d1db11d54e72a71e901917d19da1e0bef3538f538cee329ad84a867ba3482085367bb0fa3017b5d99d69e1ea581a8bc7bf SHA512 f73b8077c7fe03ca688646f63df24c6dcecf21b1ebccf9983c7c6fb0332b371b17f835985ffccbe39fcb7bfd553a78df70c94d734930e35310a1b8ba0e30bf34 AUX xloadimage-4.1-c99.patch 381 BLAKE2B b4ef27066cc4dcac1260e8a73975a7d8bc00c2e5d43c8349c19b853e4f99ed5aa059597b0fc1ec92e0cb261ccc86659ca80cbd7306535f9b974a5bf2092dcbbc SHA512 150dc9b13e236f48209b6fec0599a804773e48275e807e5e6074a276ed28736fabe5a4e2819fb26e6a19c42725ac5cee92ee0dacaeb1e7946a07b1cd56a88880 AUX xloadimage-4.1-endif.patch 321 BLAKE2B dc140933e4b61e9a243f9cc2c4c78b5406a7d4defe0d7ae796c46ea8e21607d27c79481fe528f4c3e40dbfa5b27db09b47600a61454aaa3882c2ff267f18931a SHA512 503fd3672ae22a468ae6ec71a62b3113dc3df2e5bed4b90b641320d954c563118eb53b8681ad38edaff5a87a385fb063592ac422c24c2150084e0171f4f17d25 +AUX xloadimage-4.1-fix-incomp-function-pointer-musl.patch 562 BLAKE2B 194ec4c03aded4e4b2ff2ab1d83a45d64feef85c3f004ec15a35bf469d7d7b3b64b6fff2799d8920d81f4345324d3ffe6aa2b3be8d032b6de93ba21f0b353032 SHA512 665e2150b0b634b634cef9dad12d54f62721846edb9ffaa6920103e98cc3ef37bc07c1414c0380e34419f32b4b86a55805f62eb3b6f2544c3e5c1d71cad4365e AUX xloadimage-4.1-fix-incomp-function-pointer-types.patch 582 BLAKE2B 5ac8bf2e35e58bc476bde54228620089fa90bdeb7dc25bffa344775e0d149cbad238e3526a6669f9ee0fe539d68dbad52a62be752e71ef9412d220a4a2d05a19 SHA512 16d3c30d1baa16dbaf8fb3314b2721996d2fbfca9fc73471108ada969b69b4aaf1607cbe6bda284daaeaf6168d5b485dabf68495a51f6a31a925b2fd975627fa AUX xloadimage-4.1-include-errno_h.patch 303 BLAKE2B f82f4beadf42e2b5ba0f20ed6c16ea88e829c0b224c219a257c9986d30a8568d8d59e92f686469c26238eb33c6a51f3ba90e854a3f8c9c9c386a4848f745c8f2 SHA512 208261855d1677a755e34b421bbb4f95cbbe1d9d494cb3c895e9f799a376f2162a3f8e08134b06029da5acd318c873c798bd2c64eaf0aaf1d0e2970a56f4ef2f AUX xloadimage-4.1-ldflags_and_exit.patch 775 BLAKE2B e2107eca87d99d28d19f2213877bb6e3f6cfa5294c69a2ba9eeb01407b4f2b54f9f96de4b15e1ddd67acde45e8c2df0d4ed135001fdd3dc78afff9a367975fa1 SHA512 724484e06868c818c6c66cfdca9b07972da6c6b7977da9dad4e05109506751641e211dd34a9afbf925fed712ed046764362856079dda11b628b32fe3f6813f59 @@ -14,4 +15,5 @@ DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e4 EBUILD xloadimage-4.1-r15.ebuild 2482 BLAKE2B da71736b8f2ba9eb0e539e0d0ecf72f23b1b6636d0ceadcae6711f2586e6f480214f565caabc348d32eb35eeaaa5f659746208549fdcf54de90032a0ee4f2c14 SHA512 be5ef8f4ca1934bded0a8f21fac46db5c3f00fb3c779ddd99f6fc0e6914602b8dd29ec37afa9283280ecfec2a23661c305944af4ccd0b6a4b29d98db156994dd EBUILD xloadimage-4.1-r16.ebuild 2545 BLAKE2B 32e8f96d2df57893d49c053355f5dd3999495de59807236ea8349cf569a9b2c7ec6d3b695431fbc4a14c2b7d3c862854a049400cda85dcda583df0c5fecfc4d6 SHA512 aa2ecb526c49f3f58c6d8b822668eeceb6846782ca7a9a927b49d3940f0e18d86c6d719139fb3ecff86ff2228df571b6e6c83faff9669a2f41ecf71cf0b676a5 EBUILD xloadimage-4.1-r17.ebuild 2621 BLAKE2B 5f3336248857dd0d3f4a0acf13f1aad12144edac25ac591a35db61826af6c3bf2229a27e38f4ad4ebafa2347377580006a320fee5915b3e5b56c4a25d7036cf0 SHA512 9477605f5bb95995e928fadfdb98daa05078505a1d9cc4c8f49ff0a3e37bb7a9bd329c495b86c7d4da8f40769a8bfbc6c9d376671b3af437ac41daa0248d40bc +EBUILD xloadimage-4.1-r18.ebuild 2620 BLAKE2B fea6f9d29acecec09a3b659601435bb37d19a1fd75735c96cc778a7dfa106b54eaf87f3516225aaddfeb0b442fd7e95a992d5d6ad228644db9f8d8b41faddd37 SHA512 026f62a676d98e54971fcbbf3a667250895916ad046d7d40fbb261e03805fd89a69916cfd485cf9e4136e75827a1b03fa24ffaed232d3811889efaab400f7a94 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5 diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-musl.patch b/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-musl.patch new file mode 100644 index 000000000000..ab76b835c899 --- /dev/null +++ b/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-musl.patch @@ -0,0 +1,14 @@ +__signalhandler_t isn't defined on musl, one needs to drill down to bare type definition +so code builds both on glibc and musl systems +https://bugs.gentoo.org/924114 +--- a/window.c ++++ b/window.c +@@ -833,7 +833,7 @@ char imageInWindow (Display *disp, int scrn, Image *image, OptionSet *global_opt + /* reset alarm to -delay seconds after every event */ + #ifdef ENABLE_TIMEOUT + AlarmWentOff = 0; +- signal(SIGALRM, delayAlarmHandler); ++ signal(SIGALRM, (void (*)(int))delayAlarmHandler); + alarm(delay); + #endif /* ENABLE_TIMEOUT */ + } diff --git a/media-gfx/xloadimage/xloadimage-4.1-r18.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r18.ebuild new file mode 100644 index 000000000000..848cd70d77c4 --- /dev/null +++ b/media-gfx/xloadimage/xloadimage-4.1-r18.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Utility to view many different types of images under X11" +HOMEPAGE="https://sioseis.ucsd.edu/xloadimage.html https://tracker.debian.org/pkg/xloadimage" +SRC_URI=" + ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz + mirror://gentoo/${P}-gentoo-r1.diff.bz2 + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix-build-for-clang16.patch.xz +" +S="${WORKDIR}"/${P/-/.} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="tiff jpeg png" + +RDEPEND="x11-libs/libX11 + tiff? ( media-libs/tiff:= ) + png? ( media-libs/libpng:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + !media-gfx/xli" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${WORKDIR}"/${P}-gentoo-r1.diff + "${FILESDIR}"/${P}-zio-shell-meta-char.diff + "${FILESDIR}"/${P}-endif.patch + # Do not define errno extern, but rather include errno.h + # <azarah@gentoo.org> (1 Jan 2003) + "${FILESDIR}"/${P}-include-errno_h.patch + "${FILESDIR}"/xloadimage-gentoo.patch + "${FILESDIR}"/${P}-unaligned-access.patch + "${FILESDIR}"/${P}-ldflags_and_exit.patch + "${FILESDIR}"/${P}-libpng15.patch + "${WORKDIR}"/${P}-fix-build-for-clang16.patch + # One of the previous patches screws up a bracket... + "${FILESDIR}"/${P}-bracket.patch + "${FILESDIR}"/${P}-fix-incomp-function-pointer-musl.patch + "${FILESDIR}"/${P}-c99.patch +) + +src_prepare() { + default + + sed -i -e "s|OPT_FLAGS=|OPT_FLAGS=$CFLAGS|" Make.conf || die + sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die + # qa-sed sees no-op on the next sed on non-gentoo-prefix systems, + # but that is alright + sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die + sed -i \ + -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ + png.c || die + + eautoreconf +} + +src_configure() { + append-cflags -std=gnu17 + + # Set TIFFHeader to TIFFHeaderCommon wrt #319383 + has_version '>=media-libs/tiff-4.0.0_pre' && \ + append-flags -DTIFFHeader=TIFFHeaderCommon + + tc-export CC + econf $(use_with jpeg) \ + $(use_with png) \ + $(use_with tiff) +} + +src_compile() { + emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage +} + +src_install() { + dobin xloadimage uufilter + + dosym xloadimage /usr/bin/xsetbg + dosym xloadimage /usr/bin/xview + + insinto /etc/X11 + doins xloadimagerc + + newman xloadimage.man xloadimage.1 + newman uufilter.man uufilter.1 + + echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die + doman "${T}"/xsetbg.1 + newman "${T}"/xsetbg.1 xview.1 + + dodoc README +} |