diff options
Diffstat (limited to 'media-gfx/xv')
-rw-r--r-- | media-gfx/xv/Manifest | 9 | ||||
-rw-r--r-- | media-gfx/xv/files/xv-5.2.0-osx-bsd.patch | 51 | ||||
-rw-r--r-- | media-gfx/xv/metadata.xml | 6 | ||||
-rw-r--r-- | media-gfx/xv/xv-3.10a-r22.ebuild | 5 | ||||
-rw-r--r-- | media-gfx/xv/xv-5.2.0.ebuild | 58 | ||||
-rw-r--r-- | media-gfx/xv/xv-6.0.0.ebuild | 66 |
6 files changed, 192 insertions, 3 deletions
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest index a60c09120518..93219a337bc4 100644 --- a/media-gfx/xv/Manifest +++ b/media-gfx/xv/Manifest @@ -5,8 +5,13 @@ AUX xv-3.10a-libpng15-r1.patch 16530 BLAKE2B 6233c9e49f021ba3e62f9a5e9da4e360126 AUX xv-3.10a-osx-bsd-20070520.patch 1497 BLAKE2B 1dcd54c8de29b9552a50069e627fd9dbbd327a22a8e18a12f260c1aaec2978b536cbdc571d47f17cca3f477dd574730dca7748532e6ed41f4697fa76774d5384 SHA512 a6f1160c0658ae4f3394cf2bb0b324392593010539ac2dd52176a587c41844cd5bca61823af31633d765f3399a9cb52e0296f894a2f08060ef4c2b4d687d8b51 AUX xv-3.10a-vdcomp-osx-20070520.patch 455 BLAKE2B fa6cfa3657f74da7254cce5e73140c2a82614df2398a66e98c57d3056b1f574fbe80b9bce925f2f0988133596fdc4ea5c580371613a23a0283e9b09343a700a9 SHA512 8e389040ae3ac52dd086fbc1858699ea4bef417053952766a5569aab4ec70dbbd674a4e26adbc9434c0b411754d9643064d4254e72fbc79f99d3aefaf35f997b AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1d638dd556ff30c60c5983f6e8158fa63b49a66c97c919bdac5084c766df2b9587597c4f103fff3e2718cff8a006c1c05 SHA512 7e1150fdda9359e7b105729c92b8059bf5c762d468bcdaeadbb91ed75c2517b0ad627784a7a6f2bb8f7857884dc47f2d41c7c7247824fa4af8533dc023ceea52 +AUX xv-5.2.0-osx-bsd.patch 2103 BLAKE2B f12287becac8bfa5227523677c6118816f9dd43fd8b41c400dd6695ea4b6c610bc713f6ffdd9d2d75f8bd2b4de1f228c5349f71d3b8f7c77f10c01ac30b77301 SHA512 e2b6673d202b20a9d88dfd7711e63f702a67de7ca56de049ab27803a76b8833745ba1057ffbc53b246d077e870bce44746d28b1ced0eca31d4d9746c2a3fe57f DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f -EBUILD xv-3.10a-r22.ebuild 2555 BLAKE2B 92911c150ebbbafeb7001347c864bd6579c96e92de3bff55349b10da50261fc57a48bac74ae8d3023e2c3a6318c1c774203575f784442eb8657841f18b189c20 SHA512 c8db57ebd0e1ad53ad0013e57874975176356d8d6bc1f3ce6e701a715d1703f85e9472e51716a75e76687e41bbbaa60be82958c7b0f742e061af632e70f4e406 -MISC metadata.xml 250 BLAKE2B 699d6b9629cb9e0fac6509f4eec3bd2a175002f57ddadb07c2041b583ac4fd57e8cf78506850997f3a140201cbe4bbbab49a768634a50aba337e0e72630eb4b2 SHA512 efce6490cf2258fec1a8f6c77dc22583376cc0adb5aa1f862b88beccc82a7492d12addd2276a58c0a14810a3b02d9750f8ad3f28ffa74d858a86f204e8c9ab01 +DIST xv-5.2.0.tar.gz 4785784 BLAKE2B 46dc637cbbeabfe1c034c34e73040de6efebbf5f423fe429028ebfeefd2fce5af0fdaff1c52db4807b8eb88de89dae6b7f0e2c8a3522a3d9b103d5777783a52d SHA512 0af7ff6db152be849c27be9fba116513595deeca9e3eb42ec6fd74a4756d0c525b55a40de49aa37dd5d2ea4a29e6d644c8c4c709f0e1ec0a98cbc0ae7221b110 +DIST xv-6.0.0.tar.gz 5051786 BLAKE2B 42c6e06848c5cc7a3f7da1d5c5b10a7d665601f41eb79bda4b3e904c103e88592da416559adc9565c820c6402c9b03271521f515b8f7c873cc959dfd3b5652e8 SHA512 600fde882e1279b5c7147089790006bcbd4e31ba6220309a272aca43242c56062d4c85b181fb1f2d4b0497f1546347206d7827204c2ebbbabaaf3de40c50191a +EBUILD xv-3.10a-r22.ebuild 2682 BLAKE2B 108e6f933866f1b663086d58b9418d5acd1d4f07fa332359325e8bb1e2e08009549f608f1d5f3d7ddbdff634dccbda9c78edf5e2abf7757f3ab29ccacb37b4d1 SHA512 3103387c8b54716418435c1f037138995df5761220b009b31583c9537395a53de0ff9684e2f488d7d047b449e76745989951dab662cfe892541aea56e130c100 +EBUILD xv-5.2.0.ebuild 1359 BLAKE2B ce8ef5bc29eb554de83dc43061810347af9477bc7bbe7c7789d12f344deaaa9e9658273cc0e6e6f098b22dbea2c28d6d45993ea41097f2a4d63b00e3647f9724 SHA512 16873c37bfdd2b656ac0482681016eb917a405a4cae2eeb6669ae650c233072c19f28d3f42b33f7e69849252015edd91fbcc973bd52e4716dce7411d5d906a6c +EBUILD xv-6.0.0.ebuild 1465 BLAKE2B 30fcbd9c7fbcaecdf32b543b20117039b3ace64164bcda5f447f52cc15e6fd94f1a6db3e0ebfb44d38f4380c22efb06f068940db378add096274e66eec15861e SHA512 430191195ef448e2067f1ab7781dfa5f4b877b69a773ee8deec0ea5e486ac605d49dda27e7889961aeeb2bd19830c1c07b9faf2188bf080a780f95e2093910fb +MISC metadata.xml 392 BLAKE2B e1e306f8f6bd480912d6e45b5af362d54900117ae05a21995023e6611c1410af6682af867150179ecebd9d319a9f9810723dffec59a26e3f9f9ecc0a56061127 SHA512 e8aad6d1b24943fc3aeb6533fb0dc048ea0d3edc04abe2efa9a27930698ff3ddb0185dc3a2da69e08c050c4545d907c8580add6732fd8e3258ed496784902364 diff --git a/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch b/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch new file mode 100644 index 000000000000..27059386446d --- /dev/null +++ b/media-gfx/xv/files/xv-5.2.0-osx-bsd.patch @@ -0,0 +1,51 @@ +diff '--color=auto' -ur a/src/vdcomp.c b/src/vdcomp.c +--- a/src/vdcomp.c 2024-07-17 09:37:04.957769272 -0500 ++++ b/src/vdcomp.c 2024-07-17 09:44:30.582594953 -0500 +@@ -130,6 +130,8 @@ + + # if defined(hp300) || defined(hp800) || defined(NeXT) + # include <sys/malloc.h> /* it's in "sys" on HPs and NeXT */ ++# elif defined(__APPLE__) ++# include <malloc/malloc.h> + # else + # include <malloc.h> /* FIXME: should explicitly list systems that NEED this, not everyone that doesn't */ + # endif +diff '--color=auto' -ur a/src/xv.h b/src/xv.h +--- a/src/xv.h 2024-07-17 09:37:04.957769272 -0500 ++++ b/src/xv.h 2024-07-17 09:41:42.912041683 -0500 +@@ -183,7 +183,7 @@ + + #ifndef VMS + # include <errno.h> +-# ifndef __NetBSD__ ++# if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__) + # if !(defined(__GLIBC__) && __GLIBC__ >= 2) && !defined(__OpenBSD__) + extern int errno; /* SHOULD be in errno.h, but often isn't */ + # ifndef XV_HAVE_SYSERRLISTDECL +@@ -199,7 +199,7 @@ + # ifdef VMS + # define ERRSTR(x) strerror(x, vaxc$errno) + # else +-# if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */ ++# if defined(__BEOS__) || defined(__linux__) || defined(__APPLE__) /* or all modern/glibc systems? */ + # define ERRSTR(x) strerror(x) + # else + # define ERRSTR(x) sys_errlist[x] +@@ -236,6 +236,8 @@ + #ifdef NEED_MALLOC_H + # if defined(hp300) || defined(hp800) || defined(NeXT) + # include <sys/malloc.h> /* it's in "sys" on HPs and NeXT */ ++# elif defined(__APPLE__) ++# include <malloc/malloc.h> + # else + # include <malloc.h> + # endif +@@ -399,7 +401,7 @@ + * them later. */ + #ifndef VMS /* VMS hates multi-line definitions */ + # if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || \ +- defined(__bsdi__) ++ defined(__FreeBSD__) || defined(__bsdi__) || defined(__APPLE__) + # ifndef USE_MKSTEMP + # define USE_MKSTEMP /* use 'mkstemp()' instead of 'mktemp()' */ + # endif /* >> SECURITY ISSUE << */ diff --git a/media-gfx/xv/metadata.xml b/media-gfx/xv/metadata.xml index 03458a5affcb..6f2f9f849997 100644 --- a/media-gfx/xv/metadata.xml +++ b/media-gfx/xv/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> <upstream> <remote-id type="sourceforge">png-mng</remote-id> + <remote-id type="github">jasper-software/xv</remote-id> </upstream> </pkgmetadata> diff --git a/media-gfx/xv/xv-3.10a-r22.ebuild b/media-gfx/xv/xv-3.10a-r22.ebuild index 6349d9814431..9141002ec745 100644 --- a/media-gfx/xv/xv-3.10a-r22.ebuild +++ b/media-gfx/xv/xv-3.10a-r22.ebuild @@ -70,6 +70,11 @@ src_prepare() { } src_compile() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/859823 + # https://github.com/jasper-software/xv/issues/25 + filter-lto + emake \ CC="$(tc-getCC)" CCOPTS="${CPPFLAGS} ${CFLAGS}" LDFLAGS="${LDFLAGS}" \ PREFIX="${EPREFIX}"/usr \ diff --git a/media-gfx/xv/xv-5.2.0.ebuild b/media-gfx/xv/xv-5.2.0.ebuild new file mode 100644 index 000000000000..a1e2d3e14fb9 --- /dev/null +++ b/media-gfx/xv/xv-5.2.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop flag-o-matic + +JUMBOV=20070520 +DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats" +HOMEPAGE="https://github.com/jasper-software/xv/" +SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + mirror://gentoo/xv-3.10a.png.bz2" + +LICENSE="xv" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="jpeg tiff png webp" + +DEPEND=" + x11-libs/libXt + jpeg? ( media-libs/libjpeg-turbo:= ) + tiff? ( media-libs/tiff:= ) + png? ( + >=media-libs/libpng-1.2:= + sys-libs/zlib + ) + webp? ( media-libs/libwebp:= ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/xv-5.2.0-osx-bsd.patch" +) + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/859823 + # https://github.com/jasper-software/xv/issues/25 + filter-lto + + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + -DXV_ENABLE_JPEG=$(usex jpeg) + -DXV_ENABLE_JP2K=OFF + -DXV_ENABLE_PNG=$(usex png) + -DXV_ENABLE_TIFF=$(usex tiff) + -DXV_ENABLE_WEBP=$(usex webp) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newicon "${WORKDIR}"/xv-3.10a.png ${PN}.png + make_desktop_entry xv "" "" "Graphics;Viewer" +} diff --git a/media-gfx/xv/xv-6.0.0.ebuild b/media-gfx/xv/xv-6.0.0.ebuild new file mode 100644 index 000000000000..2983ac332da6 --- /dev/null +++ b/media-gfx/xv/xv-6.0.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop flag-o-matic xdg-utils + +JUMBOV=20070520 +DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats" +HOMEPAGE="https://github.com/jasper-software/xv/" +SRC_URI="https://github.com/jasper-software/xv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + mirror://gentoo/xv-3.10a.png.bz2" + +LICENSE="xv" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="jpeg tiff png webp" + +DEPEND=" + x11-libs/libXt + jpeg? ( media-libs/libjpeg-turbo:= ) + tiff? ( media-libs/tiff:= ) + png? ( + >=media-libs/libpng-1.2:= + sys-libs/zlib + ) + webp? ( media-libs/libwebp:= ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/xv-5.2.0-osx-bsd.patch" +) + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/859823 + # https://github.com/jasper-software/xv/issues/25 + filter-lto + + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + -DXV_ENABLE_JPEG=$(usex jpeg) + -DXV_ENABLE_JP2K=OFF + -DXV_ENABLE_PNG=$(usex png) + -DXV_ENABLE_TIFF=$(usex tiff) + -DXV_ENABLE_WEBP=$(usex webp) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newicon "${WORKDIR}"/xv-3.10a.png ${PN}.png + make_desktop_entry xv "" "" "Graphics;Viewer" +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} |