From 04092be5ecd421ee24c421b2e57b6379f55e0ca1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Sep 2023 23:26:34 +0100 Subject: gentoo auto-resync : 25:09:2023 - 23:26:33 --- media-libs/Manifest.gz | Bin 69165 -> 69172 bytes media-libs/mesa/Manifest | 4 +- media-libs/mesa/mesa-23.2.0_rc4.ebuild | 2 +- media-libs/mesa/mesa-9999.ebuild | 2 +- media-libs/netpbm/Manifest | 8 +- media-libs/netpbm/netpbm-11.2.3.ebuild | 258 --------------------------------- media-libs/netpbm/netpbm-11.2.4.ebuild | 258 +++++++++++++++++++++++++++++++++ media-libs/netpbm/netpbm-11.3.5.ebuild | 258 --------------------------------- media-libs/netpbm/netpbm-11.3.6.ebuild | 258 +++++++++++++++++++++++++++++++++ media-libs/waffle/Manifest | 6 +- media-libs/waffle/waffle-1.7.3.ebuild | 74 ++++++++++ media-libs/waffle/waffle-1.8.0.ebuild | 97 +++++++++++++ media-libs/waffle/waffle-9999.ebuild | 39 ++++- 13 files changed, 731 insertions(+), 533 deletions(-) delete mode 100644 media-libs/netpbm/netpbm-11.2.3.ebuild create mode 100644 media-libs/netpbm/netpbm-11.2.4.ebuild delete mode 100644 media-libs/netpbm/netpbm-11.3.5.ebuild create mode 100644 media-libs/netpbm/netpbm-11.3.6.ebuild create mode 100644 media-libs/waffle/waffle-1.7.3.ebuild create mode 100644 media-libs/waffle/waffle-1.8.0.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 2906e1692f9c..e920f84d6374 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 39ecbf5223f2..1c3e6cf8ffbb 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -8,6 +8,6 @@ EBUILD mesa-23.1.6.ebuild 12426 BLAKE2B eabd8a66168d13e7abad3c86708e9cc45bc7f4ed EBUILD mesa-23.1.7.ebuild 12433 BLAKE2B 9b3e18d6d87a73e6a176ff1386590c8a938c858ca8d68b3c0e250b7063224a2d359dd3786768ac657ee48799630605b34a10d6f8cd7dff346564310298871668 SHA512 d0600515bd3e541d2b1c48f8ebe51774c4d797ceb7faa85c5dcbbc701ffaa7aa7fb19ba15ef1070a510be9a7564696b218d2df815f6607ab21ba5f3225a98c9d EBUILD mesa-23.1.8.ebuild 12433 BLAKE2B 9b3e18d6d87a73e6a176ff1386590c8a938c858ca8d68b3c0e250b7063224a2d359dd3786768ac657ee48799630605b34a10d6f8cd7dff346564310298871668 SHA512 d0600515bd3e541d2b1c48f8ebe51774c4d797ceb7faa85c5dcbbc701ffaa7aa7fb19ba15ef1070a510be9a7564696b218d2df815f6607ab21ba5f3225a98c9d EBUILD mesa-23.2.0_rc3.ebuild 12491 BLAKE2B 903224980095b456711c36dee36198d78377bb0592b340d9fed43637f1330383701f88a68bd3a4aa5fb8d2dfd40917454e97afef757563314a6d0353e96bab53 SHA512 64961c0db12c380a0b1cbbe443b7c122f5590a3955bd63c6a5bcbd46d40acdb1038e49bc3b12724b88f20eae9f5dd35de8c477d0f6c93b82395d3bcfc219a52d -EBUILD mesa-23.2.0_rc4.ebuild 12337 BLAKE2B 898c966be3dc6c00d59f491881ee7ee1b56eb28ca35aa1cf250bd2464569678399e66e6cb0fff4d38f87cc20a50d2bc7adc228fd53c819b1a598c5d6378f5e3f SHA512 bd46da042e7bebf1525f4d88e243aa4f5fd24a792c9507e8ca7812bf95c8cf5debd911047abd7087e36bccba572473eb18dae5c5a614fe04062f67997a2fe50a -EBUILD mesa-9999.ebuild 12362 BLAKE2B 65326af1729dc5a92a621a8735aaaad71217773b0da1a8930df945071ed821efa3f24c76170d627f81c11eff52899ba7fb57609014bc2acf12f4289c5cacb26d SHA512 34447b66e911adbe37ae09c89a1d350ec096095535755f53d511804b30a8d9476fdc9feb6508e4c077c39354b34da649f818df1b4b6411eec39175c293942f29 +EBUILD mesa-23.2.0_rc4.ebuild 12356 BLAKE2B 086619680bda72989b305bb7a6b22cc0bab02631046b1194dea43bee4af9764db44ada8bc85b7b3a76be9ac55bff5596760c70435bb2f3f94b496b8d5c5b1e7f SHA512 03af22e67c757a156ca786492eb28a4d890f99f146c2791a93d688244d4c2b62125edcbfc409034669c40cf720e22c8d84fbe69476a119799b3b57a67da7ab02 +EBUILD mesa-9999.ebuild 12381 BLAKE2B 52a177a587e1f46443f1854c10eaefd94ddc87147baff6e023c825cab6a3f0d2de44c35aee7d9cbfb47c6fb4af4bd8c2bf4878a681ae3654fb1ebe9370313cb3 SHA512 05382d5d1b7fb790bc62dbc9e6c6f41251d7038504107b406f0c139a865992e26e5aed0a32937ba0b922115a42dd25024ad3aca5983b8202aa80a236bb43466b MISC metadata.xml 1488 BLAKE2B 7b776f0a6d92b34baec90c58d019d61af537044766ce34a6e139ef679a0724e57fe65d600307c7f9dc0c48618445527618322e2af737191082dece3e547d5533 SHA512 1d573d534f1099eb1f1912567cf559aeae28111eabefa806b292a66d1f1e539e86394a76ca40a1481a6bfb4b6f7a0b117344e39d7b4d2eac615ef49b8f62acb9 diff --git a/media-libs/mesa/mesa-23.2.0_rc4.ebuild b/media-libs/mesa/mesa-23.2.0_rc4.ebuild index 1e9a747d40b1..aec9de0ef437 100644 --- a/media-libs/mesa/mesa-23.2.0_rc4.ebuild +++ b/media-libs/mesa/mesa-23.2.0_rc4.ebuild @@ -367,7 +367,7 @@ multilib_src_configure() { fi if use llvm && use opencl; then - PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst emesonargs+=( $(meson_native_true gallium-rusticl) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 17968a139f56..8a7607d2aa2e 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -368,7 +368,7 @@ multilib_src_configure() { fi if use llvm && use opencl; then - PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst emesonargs+=( $(meson_native_true gallium-rusticl) diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index 9ca1c8305d31..b688dd7ccf80 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -3,9 +3,9 @@ AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55c AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5e5bf8fb1ae9aff1ff1d7859cf1bb0d5f74fa1143681b451d36323f93d5e7fa3876e485d6538958e30779cac081df5b8 SHA512 7135533660b15a113df5a38298725f895e8cbd6ac4695eb5f2d40bd214c43cb9d1c261063e0cea162a6ca6071cda5f4e0380d29eefa6af57e7d67ce319fe2216 AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de DIST netpbm-11.2.0.tar.xz 3777372 BLAKE2B d9a2de49db61f642df75fe1c1fcda752f837535ac7cc698fb50e7c2c93dacfe3894fc46b402af30d07e3617f0f421a36d8d6a3d846c07d6b3526724dce93283b SHA512 70bde6e6112ae595e18be588ea95d2b2acb08e42bb36d0fc93b9584c4b2adf72e35f80ff87823a8e3d98a8ffd0ff907401d351533b9170d7a11a28515c10fdbd -DIST netpbm-11.2.3.tar.xz 3777060 BLAKE2B f72546858701e37a33a6a53b2af6dbf31c2730aa99f3453744c3e2f52434a54972a52a41f1b3cd16da95dcfe769c6df61fb3113b6909b7d8493fe412adc88591 SHA512 b4d112d8a6bf99875eb03ac497105939ac291e9a10dc77f9f5e19b7cf888076f92f481dc63d5649effc451338dcd8f8be9eec45c87231f17d3bea04f873969f8 -DIST netpbm-11.3.5.tar.xz 3779776 BLAKE2B 89fdf74b7107f4c2cb07acad75a3d7fd56906e2465ffd27f7e71f06648234b481ffeb3b1f1fe694536acad6147b7ffadfd7f1c69fbe1a35f71f6cba6570eb1b2 SHA512 8e6206ec5f6d7009dcc3ef66c5c1c4dd98c1c81c21111c0f3cd50d4e9405af20037dbe86f8d053f32d6ca81ec58bd1138ba08cea9ed091cd3c33cd91c7c0b6b5 +DIST netpbm-11.2.4.tar.xz 3791116 BLAKE2B bc3c4c7dd1c473cf6a0511c1a756dc11ddac693bd288daa8cac5d997d75f48ea9f039552decaff601a46fcdc1b08bba55596fc116547eee5a0ab78cf9a0ea55c SHA512 41219fcf8c02eb1f9bb8619d972312d63f0781e071f1c494ba5b2e1f2b614c37d78097259bcf39cb85feac783c811fcc24f088ec2cd406786296ae055ee10318 +DIST netpbm-11.3.6.tar.xz 3793216 BLAKE2B 9aad0279d4e639c8788fb24e62b80a8d326f2fd67aef23c8f8b64d269ce8aa5d9af9281b006199b180733cd38ae1ec9eea4df2c6caf12a19d64f763f10b40ec2 SHA512 0db3efa8679db998f9d6d7d973aa1e24c0db297070858297ca8ddb0a3926c7483a1608f75e7aa112a560850188845088d328582803baab8db8f4cef6e990ddba EBUILD netpbm-11.2.0.ebuild 6830 BLAKE2B c07e114dd61e0aef2f08f93bd722f72fac8021bbe9d369b111084a706e64f93e76913074e74758bc37780abd13eff479e58f00b524daf1a6ba2171b57272d825 SHA512 9cc1e468d04a7e8538e4ed1964e5a34834c8b3e637c4db7c79dde6c0290500d713ed09f3d746a07f0c6bce9fbf812f5be497050d79c6360a65aaadb1e793c83e -EBUILD netpbm-11.2.3.ebuild 6838 BLAKE2B dbae0fa94f43bf2b7f0dc6a0797448a5b776730c9ae03277bddafca0d95e6e47769bdd0220772ccc65a3aaf54b0c8c22b1818a128cc62e92411b2aa75dd8f862 SHA512 1e0cfdde5a2e5856402edc684aa1dbc21a3141f288cb78ee1905efada4a7c0ba84f4b1a6cf4557777cf16be2c7754f0e2668c9544aa0b2bb5605ce63c889cdd2 -EBUILD netpbm-11.3.5.ebuild 6840 BLAKE2B 079ef16532536ddbc0435da2c49c63eaef668a6e1f2542d8fa02acccb41272acabc760f47b06c83ca77e6044944ca00cbe753a6ba3edcf0df36869955051de30 SHA512 e4a794b998ade53ece428a675ba4f4208400385e10bf6ad3a433eb47e9e34e306a816c3c641254a08460e29cf4eefa8388f961e67c4e97e083ca64f0b6879969 +EBUILD netpbm-11.2.4.ebuild 6838 BLAKE2B dbae0fa94f43bf2b7f0dc6a0797448a5b776730c9ae03277bddafca0d95e6e47769bdd0220772ccc65a3aaf54b0c8c22b1818a128cc62e92411b2aa75dd8f862 SHA512 1e0cfdde5a2e5856402edc684aa1dbc21a3141f288cb78ee1905efada4a7c0ba84f4b1a6cf4557777cf16be2c7754f0e2668c9544aa0b2bb5605ce63c889cdd2 +EBUILD netpbm-11.3.6.ebuild 6840 BLAKE2B 079ef16532536ddbc0435da2c49c63eaef668a6e1f2542d8fa02acccb41272acabc760f47b06c83ca77e6044944ca00cbe753a6ba3edcf0df36869955051de30 SHA512 e4a794b998ade53ece428a675ba4f4208400385e10bf6ad3a433eb47e9e34e306a816c3c641254a08460e29cf4eefa8388f961e67c4e97e083ca64f0b6879969 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80 diff --git a/media-libs/netpbm/netpbm-11.2.3.ebuild b/media-libs/netpbm/netpbm-11.2.3.ebuild deleted file mode 100644 index e22e58d3b22b..000000000000 --- a/media-libs/netpbm/netpbm-11.2.3.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multilib toolchain-funcs - -# Upstream has 3 flavors of netpbm: super stable, stable and advanced. -# They only provide a tarball for super stable, but super stable is a bit lagging. -# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable[.rev]" -# and the advanced branch of their svn (currently versions 11.3.yy) on SLOT "0/advanced[.rev]". -# The stable branch is stabilized according to usual Gentoo rules, while the -# advanced branch will not be stabilized. -# A detailed explanation is here https://netpbm.sourceforge.net/release.html - -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="https://netpbm.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz" - -LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain" -SLOT="0/stable.102" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" - -# app-text/ghostscript-gpl is really needed for postscript -# some utilities execute /usr/bin/gs -# some installed programs are perl scripts -RDEPEND=" - dev-lang/perl - jbig? ( media-libs/jbigkit:= ) - jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) - png? ( - >=media-libs/libpng-1.4:0= - sys-libs/zlib - ) - postscript? ( - app-text/ghostscript-gpl - sys-libs/zlib - ) - rle? ( media-libs/urt:= ) - svga? ( media-libs/svgalib ) - tiff? ( >=media-libs/tiff-3.5.5:= ) - xml? ( dev-libs/libxml2 ) - X? ( x11-libs/libX11 ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - app-arch/xz-utils - sys-devel/flex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/netpbm-10.86.21-build.patch - "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch - "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch -) - -netpbm_libtype() { - case ${CHOST} in - *-darwin*) echo dylib;; - *) echo unixshared;; - esac -} - -netpbm_libsuffix() { - local suffix=$(get_libname) - echo ${suffix//\.} -} - -netpbm_ldshlib() { - case ${CHOST} in - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; - esac -} - -netpbm_config_lib() { - usex ${1} -l${2:-$1} NONE -} - -# for bug #828127 -netpbm_cflags_for_build() { - if is-flagq -fPIC; then - echo -fPIC - fi -} - -src_prepare() { - default - - # make sure we use system libs - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die - rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die - - # fix typo in a test - sed -i \ - -e 's:^o#! /bin/sh:#! /bin/sh:' \ - test/stdin-ppm3.test || die - - # take care of the importinc stuff ourselves by only doing it once - # at the top level and having all subdirs use that one set #149843 - sed -i \ - -e '/^importinc:/s|^|importinc:\nmanual_|' \ - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ - common.mk || die - sed -i \ - -e '/%.c/s: importinc$::' \ - common.mk lib/Makefile lib/util/Makefile || die - sed -i \ - -e 's:pkg-config:$(PKG_CONFIG):' \ - GNUmakefile converter/other/Makefile other/pamx/Makefile || die - - # The postscript knob is currently bound up with a fork test. - if ! use postscript ; then - sed -i \ - -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ - converter/other/Makefile generator/Makefile || die - sed -i -r \ - -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ - test/all-in-place.{ok,test} || die - sed -i \ - -e 's:lps-roundtrip.*::' \ - -e 's:pbmtextps-dump.*::' \ - -e 's:pbmtextps.*::' \ - test/Test-Order || die - sed -i \ - -e '/^$/d' \ - test/all-in-place.ok || die - sed -i \ - '2iexit 80' \ - test/ps-{alt-,flate-,}roundtrip.test || die - fi - - # the new postscript test needs +x - chmod +x test/lps-roundtrip.test || die - - # Do not test png if not built - if ! use png ; then - sed -i -E \ - -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ - test/all-in-place.{ok,test} || die - sed -i \ - -e '/^$/d' \ - test/all-in-place.ok || die - - sed -i -E \ - -e 's:(pamrgbatopng|pngtopnm).*::' \ - test/legacy-names.{ok,test} || die - sed -i \ - -e '/^$/d' \ - test/legacy-names.ok || die - sed -i \ - -e 's:png-roundtrip.*::' \ - -e 's:winicon-roundtrip.*::' \ - test/Test-Order || die - fi - - # this test requires LC_ALL=en_US.iso88591, not available on musl - if use elibc_musl; then - sed -i \ - -e 's:pbmtext-iso88591.*::' \ - test/Test-Order || die - fi -} - -src_configure() { - cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" - # Misc stuff - BUILD_FIASCO = N - SYMLINK = ln -sf - - # These vars let src_test work by default - PKGDIR_DEFAULT = ${T}/netpbm - RESULTDIR_DEFAULT = ${T}/netpbm-test - - # Toolchain options - CC = $(tc-getCC) -Wall - LD = \$(CC) - CC_FOR_BUILD = $(tc-getBUILD_CC) - LD_FOR_BUILD = \$(CC_FOR_BUILD) - AR = $(tc-getAR) - RANLIB = $(tc-getRANLIB) - PKG_CONFIG = $(tc-getPKG_CONFIG) - - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) - - LDRELOC = \$(LD) -r - LDSHLIB = $(netpbm_ldshlib) - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to - LINKERISCOMPILER = Y - NETPBMLIBSUFFIX = $(netpbm_libsuffix) - NETPBMLIBTYPE = $(netpbm_libtype) - STATICLIB_TOO = $(usex static-libs Y N) - - # The var is called SSE, but the code is actually SSE2. - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) - - # Gentoo build options - TIFFLIB = $(netpbm_config_lib tiff) - # Let tiff worry about its own dependencies #395753 - TIFFLIB_NEEDS_JPEG = N - TIFFLIB_NEEDS_Z = N - JPEGLIB = $(netpbm_config_lib jpeg) - PNGLIB = $(netpbm_config_lib png) - ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) - LINUXSVGALIB = $(netpbm_config_lib svga vga) - XML2_LIBS = $(netpbm_config_lib xml xml2) - JBIGLIB = $(netpbm_config_lib jbig) - JBIGHDR_DIR = - JASPERLIB = NONE - JASPERHDR_DIR = - URTLIB = $(netpbm_config_lib rle) - URTHDR_DIR = - X11LIB = $(netpbm_config_lib X X11) - X11HDR_DIR = - EOF -} - -src_compile() { - emake -j1 pm_config.h version.h manual_importinc #149843 - emake -} - -src_test() { - # The code wants to install everything first and then test the result. - emake install.{bin,lib,data} - emake check -} - -src_install() { - # Subdir make targets like to use `mkdir` all over the place - # without any actual dependencies, thus the -j1. - emake -j1 package pkgdir="${ED}"/usr - - if [[ $(get_libdir) != "lib" ]] ; then - mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die - fi - - # Remove cruft that we don't need, and move around stuff we want - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die - - dodir /usr/share - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die - - doman userguide/*.[0-9] - dodoc README - - cd doc || die - dodoc HISTORY Netpbm.programming USERDOC - docinto html - dodoc -r ../userguide/*.html -} diff --git a/media-libs/netpbm/netpbm-11.2.4.ebuild b/media-libs/netpbm/netpbm-11.2.4.ebuild new file mode 100644 index 000000000000..e22e58d3b22b --- /dev/null +++ b/media-libs/netpbm/netpbm-11.2.4.ebuild @@ -0,0 +1,258 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib toolchain-funcs + +# Upstream has 3 flavors of netpbm: super stable, stable and advanced. +# They only provide a tarball for super stable, but super stable is a bit lagging. +# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable[.rev]" +# and the advanced branch of their svn (currently versions 11.3.yy) on SLOT "0/advanced[.rev]". +# The stable branch is stabilized according to usual Gentoo rules, while the +# advanced branch will not be stabilized. +# A detailed explanation is here https://netpbm.sourceforge.net/release.html + +DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" +HOMEPAGE="https://netpbm.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz" + +LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain" +SLOT="0/stable.102" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" + +# app-text/ghostscript-gpl is really needed for postscript +# some utilities execute /usr/bin/gs +# some installed programs are perl scripts +RDEPEND=" + dev-lang/perl + jbig? ( media-libs/jbigkit:= ) + jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) + png? ( + >=media-libs/libpng-1.4:0= + sys-libs/zlib + ) + postscript? ( + app-text/ghostscript-gpl + sys-libs/zlib + ) + rle? ( media-libs/urt:= ) + svga? ( media-libs/svgalib ) + tiff? ( >=media-libs/tiff-3.5.5:= ) + xml? ( dev-libs/libxml2 ) + X? ( x11-libs/libX11 ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + app-arch/xz-utils + sys-devel/flex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/netpbm-10.86.21-build.patch + "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch + "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch +) + +netpbm_libtype() { + case ${CHOST} in + *-darwin*) echo dylib;; + *) echo unixshared;; + esac +} + +netpbm_libsuffix() { + local suffix=$(get_libname) + echo ${suffix//\.} +} + +netpbm_ldshlib() { + case ${CHOST} in + *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; + *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; + esac +} + +netpbm_config_lib() { + usex ${1} -l${2:-$1} NONE +} + +# for bug #828127 +netpbm_cflags_for_build() { + if is-flagq -fPIC; then + echo -fPIC + fi +} + +src_prepare() { + default + + # make sure we use system libs + sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die + rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die + + # fix typo in a test + sed -i \ + -e 's:^o#! /bin/sh:#! /bin/sh:' \ + test/stdin-ppm3.test || die + + # take care of the importinc stuff ourselves by only doing it once + # at the top level and having all subdirs use that one set #149843 + sed -i \ + -e '/^importinc:/s|^|importinc:\nmanual_|' \ + -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ + common.mk || die + sed -i \ + -e '/%.c/s: importinc$::' \ + common.mk lib/Makefile lib/util/Makefile || die + sed -i \ + -e 's:pkg-config:$(PKG_CONFIG):' \ + GNUmakefile converter/other/Makefile other/pamx/Makefile || die + + # The postscript knob is currently bound up with a fork test. + if ! use postscript ; then + sed -i \ + -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ + converter/other/Makefile generator/Makefile || die + sed -i -r \ + -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ + test/all-in-place.{ok,test} || die + sed -i \ + -e 's:lps-roundtrip.*::' \ + -e 's:pbmtextps-dump.*::' \ + -e 's:pbmtextps.*::' \ + test/Test-Order || die + sed -i \ + -e '/^$/d' \ + test/all-in-place.ok || die + sed -i \ + '2iexit 80' \ + test/ps-{alt-,flate-,}roundtrip.test || die + fi + + # the new postscript test needs +x + chmod +x test/lps-roundtrip.test || die + + # Do not test png if not built + if ! use png ; then + sed -i -E \ + -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ + test/all-in-place.{ok,test} || die + sed -i \ + -e '/^$/d' \ + test/all-in-place.ok || die + + sed -i -E \ + -e 's:(pamrgbatopng|pngtopnm).*::' \ + test/legacy-names.{ok,test} || die + sed -i \ + -e '/^$/d' \ + test/legacy-names.ok || die + sed -i \ + -e 's:png-roundtrip.*::' \ + -e 's:winicon-roundtrip.*::' \ + test/Test-Order || die + fi + + # this test requires LC_ALL=en_US.iso88591, not available on musl + if use elibc_musl; then + sed -i \ + -e 's:pbmtext-iso88591.*::' \ + test/Test-Order || die + fi +} + +src_configure() { + cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" + # Misc stuff + BUILD_FIASCO = N + SYMLINK = ln -sf + + # These vars let src_test work by default + PKGDIR_DEFAULT = ${T}/netpbm + RESULTDIR_DEFAULT = ${T}/netpbm-test + + # Toolchain options + CC = $(tc-getCC) -Wall + LD = \$(CC) + CC_FOR_BUILD = $(tc-getBUILD_CC) + LD_FOR_BUILD = \$(CC_FOR_BUILD) + AR = $(tc-getAR) + RANLIB = $(tc-getRANLIB) + PKG_CONFIG = $(tc-getPKG_CONFIG) + + STRIPFLAG = + CFLAGS_SHLIB = -fPIC + CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) + + LDRELOC = \$(LD) -r + LDSHLIB = $(netpbm_ldshlib) + LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to + LINKERISCOMPILER = Y + NETPBMLIBSUFFIX = $(netpbm_libsuffix) + NETPBMLIBTYPE = $(netpbm_libtype) + STATICLIB_TOO = $(usex static-libs Y N) + + # The var is called SSE, but the code is actually SSE2. + WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) + + # Gentoo build options + TIFFLIB = $(netpbm_config_lib tiff) + # Let tiff worry about its own dependencies #395753 + TIFFLIB_NEEDS_JPEG = N + TIFFLIB_NEEDS_Z = N + JPEGLIB = $(netpbm_config_lib jpeg) + PNGLIB = $(netpbm_config_lib png) + ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) + LINUXSVGALIB = $(netpbm_config_lib svga vga) + XML2_LIBS = $(netpbm_config_lib xml xml2) + JBIGLIB = $(netpbm_config_lib jbig) + JBIGHDR_DIR = + JASPERLIB = NONE + JASPERHDR_DIR = + URTLIB = $(netpbm_config_lib rle) + URTHDR_DIR = + X11LIB = $(netpbm_config_lib X X11) + X11HDR_DIR = + EOF +} + +src_compile() { + emake -j1 pm_config.h version.h manual_importinc #149843 + emake +} + +src_test() { + # The code wants to install everything first and then test the result. + emake install.{bin,lib,data} + emake check +} + +src_install() { + # Subdir make targets like to use `mkdir` all over the place + # without any actual dependencies, thus the -j1. + emake -j1 package pkgdir="${ED}"/usr + + if [[ $(get_libdir) != "lib" ]] ; then + mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die + fi + + # Remove cruft that we don't need, and move around stuff we want + rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die + + dodir /usr/share + mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die + + doman userguide/*.[0-9] + dodoc README + + cd doc || die + dodoc HISTORY Netpbm.programming USERDOC + docinto html + dodoc -r ../userguide/*.html +} diff --git a/media-libs/netpbm/netpbm-11.3.5.ebuild b/media-libs/netpbm/netpbm-11.3.5.ebuild deleted file mode 100644 index 886d2f5cab79..000000000000 --- a/media-libs/netpbm/netpbm-11.3.5.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multilib toolchain-funcs - -# Upstream has 3 flavors of netpbm: super stable, stable and advanced. -# They only provide a tarball for super stable, but super stable is a bit lagging. -# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable[.rev]" -# and the advanced branch of their svn (currently versions 11.3.yy) on SLOT "0/advanced[.rev]". -# The stable branch is stabilized according to usual Gentoo rules, while the -# advanced branch will not be stabilized. -# A detailed explanation is here https://netpbm.sourceforge.net/release.html - -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="https://netpbm.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz" - -LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain" -SLOT="0/advanced.103" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" - -# app-text/ghostscript-gpl is really needed for postscript -# some utilities execute /usr/bin/gs -# some installed programs are perl scripts -RDEPEND=" - dev-lang/perl - jbig? ( media-libs/jbigkit:= ) - jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) - png? ( - >=media-libs/libpng-1.4:0= - sys-libs/zlib - ) - postscript? ( - app-text/ghostscript-gpl - sys-libs/zlib - ) - rle? ( media-libs/urt:= ) - svga? ( media-libs/svgalib ) - tiff? ( >=media-libs/tiff-3.5.5:= ) - xml? ( dev-libs/libxml2 ) - X? ( x11-libs/libX11 ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - app-arch/xz-utils - sys-devel/flex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/netpbm-10.86.21-build.patch - "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch - "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch -) - -netpbm_libtype() { - case ${CHOST} in - *-darwin*) echo dylib;; - *) echo unixshared;; - esac -} - -netpbm_libsuffix() { - local suffix=$(get_libname) - echo ${suffix//\.} -} - -netpbm_ldshlib() { - case ${CHOST} in - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; - esac -} - -netpbm_config_lib() { - usex ${1} -l${2:-$1} NONE -} - -# for bug #828127 -netpbm_cflags_for_build() { - if is-flagq -fPIC; then - echo -fPIC - fi -} - -src_prepare() { - default - - # make sure we use system libs - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die - rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die - - # fix typo in a test - sed -i \ - -e 's:^o#! /bin/sh:#! /bin/sh:' \ - test/stdin-ppm3.test || die - - # take care of the importinc stuff ourselves by only doing it once - # at the top level and having all subdirs use that one set #149843 - sed -i \ - -e '/^importinc:/s|^|importinc:\nmanual_|' \ - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ - common.mk || die - sed -i \ - -e '/%.c/s: importinc$::' \ - common.mk lib/Makefile lib/util/Makefile || die - sed -i \ - -e 's:pkg-config:$(PKG_CONFIG):' \ - GNUmakefile converter/other/Makefile other/pamx/Makefile || die - - # The postscript knob is currently bound up with a fork test. - if ! use postscript ; then - sed -i \ - -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ - converter/other/Makefile generator/Makefile || die - sed -i -r \ - -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ - test/all-in-place.{ok,test} || die - sed -i \ - -e 's:lps-roundtrip.*::' \ - -e 's:pbmtextps-dump.*::' \ - -e 's:pbmtextps.*::' \ - test/Test-Order || die - sed -i \ - -e '/^$/d' \ - test/all-in-place.ok || die - sed -i \ - '2iexit 80' \ - test/ps-{alt-,flate-,}roundtrip.test || die - fi - - # the new postscript test needs +x - chmod +x test/lps-roundtrip.test || die - - # Do not test png if not built - if ! use png ; then - sed -i -E \ - -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ - test/all-in-place.{ok,test} || die - sed -i \ - -e '/^$/d' \ - test/all-in-place.ok || die - - sed -i -E \ - -e 's:(pamrgbatopng|pngtopnm).*::' \ - test/legacy-names.{ok,test} || die - sed -i \ - -e '/^$/d' \ - test/legacy-names.ok || die - sed -i \ - -e 's:png-roundtrip.*::' \ - -e 's:winicon-roundtrip.*::' \ - test/Test-Order || die - fi - - # this test requires LC_ALL=en_US.iso88591, not available on musl - if use elibc_musl; then - sed -i \ - -e 's:pbmtext-iso88591.*::' \ - test/Test-Order || die - fi -} - -src_configure() { - cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" - # Misc stuff - BUILD_FIASCO = N - SYMLINK = ln -sf - - # These vars let src_test work by default - PKGDIR_DEFAULT = ${T}/netpbm - RESULTDIR_DEFAULT = ${T}/netpbm-test - - # Toolchain options - CC = $(tc-getCC) -Wall - LD = \$(CC) - CC_FOR_BUILD = $(tc-getBUILD_CC) - LD_FOR_BUILD = \$(CC_FOR_BUILD) - AR = $(tc-getAR) - RANLIB = $(tc-getRANLIB) - PKG_CONFIG = $(tc-getPKG_CONFIG) - - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) - - LDRELOC = \$(LD) -r - LDSHLIB = $(netpbm_ldshlib) - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to - LINKERISCOMPILER = Y - NETPBMLIBSUFFIX = $(netpbm_libsuffix) - NETPBMLIBTYPE = $(netpbm_libtype) - STATICLIB_TOO = $(usex static-libs Y N) - - # The var is called SSE, but the code is actually SSE2. - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) - - # Gentoo build options - TIFFLIB = $(netpbm_config_lib tiff) - # Let tiff worry about its own dependencies #395753 - TIFFLIB_NEEDS_JPEG = N - TIFFLIB_NEEDS_Z = N - JPEGLIB = $(netpbm_config_lib jpeg) - PNGLIB = $(netpbm_config_lib png) - ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) - LINUXSVGALIB = $(netpbm_config_lib svga vga) - XML2_LIBS = $(netpbm_config_lib xml xml2) - JBIGLIB = $(netpbm_config_lib jbig) - JBIGHDR_DIR = - JASPERLIB = NONE - JASPERHDR_DIR = - URTLIB = $(netpbm_config_lib rle) - URTHDR_DIR = - X11LIB = $(netpbm_config_lib X X11) - X11HDR_DIR = - EOF -} - -src_compile() { - emake -j1 pm_config.h version.h manual_importinc #149843 - emake -} - -src_test() { - # The code wants to install everything first and then test the result. - emake install.{bin,lib,data} - emake check -} - -src_install() { - # Subdir make targets like to use `mkdir` all over the place - # without any actual dependencies, thus the -j1. - emake -j1 package pkgdir="${ED}"/usr - - if [[ $(get_libdir) != "lib" ]] ; then - mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die - fi - - # Remove cruft that we don't need, and move around stuff we want - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die - - dodir /usr/share - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die - - doman userguide/*.[0-9] - dodoc README - - cd doc || die - dodoc HISTORY Netpbm.programming USERDOC - docinto html - dodoc -r ../userguide/*.html -} diff --git a/media-libs/netpbm/netpbm-11.3.6.ebuild b/media-libs/netpbm/netpbm-11.3.6.ebuild new file mode 100644 index 000000000000..886d2f5cab79 --- /dev/null +++ b/media-libs/netpbm/netpbm-11.3.6.ebuild @@ -0,0 +1,258 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib toolchain-funcs + +# Upstream has 3 flavors of netpbm: super stable, stable and advanced. +# They only provide a tarball for super stable, but super stable is a bit lagging. +# So we package the stable branch of their svn (currently versions 11.2.xx) on SLOT "0/stable[.rev]" +# and the advanced branch of their svn (currently versions 11.3.yy) on SLOT "0/advanced[.rev]". +# The stable branch is stabilized according to usual Gentoo rules, while the +# advanced branch will not be stabilized. +# A detailed explanation is here https://netpbm.sourceforge.net/release.html + +DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" +HOMEPAGE="https://netpbm.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz" + +LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain" +SLOT="0/advanced.103" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" + +# app-text/ghostscript-gpl is really needed for postscript +# some utilities execute /usr/bin/gs +# some installed programs are perl scripts +RDEPEND=" + dev-lang/perl + jbig? ( media-libs/jbigkit:= ) + jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) + png? ( + >=media-libs/libpng-1.4:0= + sys-libs/zlib + ) + postscript? ( + app-text/ghostscript-gpl + sys-libs/zlib + ) + rle? ( media-libs/urt:= ) + svga? ( media-libs/svgalib ) + tiff? ( >=media-libs/tiff-3.5.5:= ) + xml? ( dev-libs/libxml2 ) + X? ( x11-libs/libX11 ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + app-arch/xz-utils + sys-devel/flex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/netpbm-10.86.21-build.patch + "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch + "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch +) + +netpbm_libtype() { + case ${CHOST} in + *-darwin*) echo dylib;; + *) echo unixshared;; + esac +} + +netpbm_libsuffix() { + local suffix=$(get_libname) + echo ${suffix//\.} +} + +netpbm_ldshlib() { + case ${CHOST} in + *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; + *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; + esac +} + +netpbm_config_lib() { + usex ${1} -l${2:-$1} NONE +} + +# for bug #828127 +netpbm_cflags_for_build() { + if is-flagq -fPIC; then + echo -fPIC + fi +} + +src_prepare() { + default + + # make sure we use system libs + sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die + rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die + + # fix typo in a test + sed -i \ + -e 's:^o#! /bin/sh:#! /bin/sh:' \ + test/stdin-ppm3.test || die + + # take care of the importinc stuff ourselves by only doing it once + # at the top level and having all subdirs use that one set #149843 + sed -i \ + -e '/^importinc:/s|^|importinc:\nmanual_|' \ + -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ + common.mk || die + sed -i \ + -e '/%.c/s: importinc$::' \ + common.mk lib/Makefile lib/util/Makefile || die + sed -i \ + -e 's:pkg-config:$(PKG_CONFIG):' \ + GNUmakefile converter/other/Makefile other/pamx/Makefile || die + + # The postscript knob is currently bound up with a fork test. + if ! use postscript ; then + sed -i \ + -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ + converter/other/Makefile generator/Makefile || die + sed -i -r \ + -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ + test/all-in-place.{ok,test} || die + sed -i \ + -e 's:lps-roundtrip.*::' \ + -e 's:pbmtextps-dump.*::' \ + -e 's:pbmtextps.*::' \ + test/Test-Order || die + sed -i \ + -e '/^$/d' \ + test/all-in-place.ok || die + sed -i \ + '2iexit 80' \ + test/ps-{alt-,flate-,}roundtrip.test || die + fi + + # the new postscript test needs +x + chmod +x test/lps-roundtrip.test || die + + # Do not test png if not built + if ! use png ; then + sed -i -E \ + -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ + test/all-in-place.{ok,test} || die + sed -i \ + -e '/^$/d' \ + test/all-in-place.ok || die + + sed -i -E \ + -e 's:(pamrgbatopng|pngtopnm).*::' \ + test/legacy-names.{ok,test} || die + sed -i \ + -e '/^$/d' \ + test/legacy-names.ok || die + sed -i \ + -e 's:png-roundtrip.*::' \ + -e 's:winicon-roundtrip.*::' \ + test/Test-Order || die + fi + + # this test requires LC_ALL=en_US.iso88591, not available on musl + if use elibc_musl; then + sed -i \ + -e 's:pbmtext-iso88591.*::' \ + test/Test-Order || die + fi +} + +src_configure() { + cat config.mk.in - >> config.mk <<-EOF || die "writing config.mk failed" + # Misc stuff + BUILD_FIASCO = N + SYMLINK = ln -sf + + # These vars let src_test work by default + PKGDIR_DEFAULT = ${T}/netpbm + RESULTDIR_DEFAULT = ${T}/netpbm-test + + # Toolchain options + CC = $(tc-getCC) -Wall + LD = \$(CC) + CC_FOR_BUILD = $(tc-getBUILD_CC) + LD_FOR_BUILD = \$(CC_FOR_BUILD) + AR = $(tc-getAR) + RANLIB = $(tc-getRANLIB) + PKG_CONFIG = $(tc-getPKG_CONFIG) + + STRIPFLAG = + CFLAGS_SHLIB = -fPIC + CFLAGS_FOR_BUILD += $(netpbm_cflags_for_build) + + LDRELOC = \$(LD) -r + LDSHLIB = $(netpbm_ldshlib) + LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to + LINKERISCOMPILER = Y + NETPBMLIBSUFFIX = $(netpbm_libsuffix) + NETPBMLIBTYPE = $(netpbm_libtype) + STATICLIB_TOO = $(usex static-libs Y N) + + # The var is called SSE, but the code is actually SSE2. + WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) + + # Gentoo build options + TIFFLIB = $(netpbm_config_lib tiff) + # Let tiff worry about its own dependencies #395753 + TIFFLIB_NEEDS_JPEG = N + TIFFLIB_NEEDS_Z = N + JPEGLIB = $(netpbm_config_lib jpeg) + PNGLIB = $(netpbm_config_lib png) + ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) + LINUXSVGALIB = $(netpbm_config_lib svga vga) + XML2_LIBS = $(netpbm_config_lib xml xml2) + JBIGLIB = $(netpbm_config_lib jbig) + JBIGHDR_DIR = + JASPERLIB = NONE + JASPERHDR_DIR = + URTLIB = $(netpbm_config_lib rle) + URTHDR_DIR = + X11LIB = $(netpbm_config_lib X X11) + X11HDR_DIR = + EOF +} + +src_compile() { + emake -j1 pm_config.h version.h manual_importinc #149843 + emake +} + +src_test() { + # The code wants to install everything first and then test the result. + emake install.{bin,lib,data} + emake check +} + +src_install() { + # Subdir make targets like to use `mkdir` all over the place + # without any actual dependencies, thus the -j1. + emake -j1 package pkgdir="${ED}"/usr + + if [[ $(get_libdir) != "lib" ]] ; then + mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die + fi + + # Remove cruft that we don't need, and move around stuff we want + rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die + + dodir /usr/share + mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die + + doman userguide/*.[0-9] + dodoc README + + cd doc || die + dodoc HISTORY Netpbm.programming USERDOC + docinto html + dodoc -r ../userguide/*.html +} diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest index 1031b283d4c0..4a01d5a84490 100644 --- a/media-libs/waffle/Manifest +++ b/media-libs/waffle/Manifest @@ -1,4 +1,8 @@ DIST waffle-v1.7.2.tar.bz2 305728 BLAKE2B d78e54857d5fd4a20526d23a9a2edc5abacceaf4a2a6fd21b3432e4b68ef8084c93748592232b7698bd0587db83a5396cf92258f8cbfec2dbc1f6335d89e5bf6 SHA512 015bd82ae592d639403136e91681912827ad81b42400b7dd5353076d6af53ceec8d3cba7e9b076e99676c37a75a9e5f6440c22e14d89c978901b1e3f3d95052f +DIST waffle-v1.7.3.tar.bz2 305863 BLAKE2B efbffd252d085140f587a02e626a3eda75fd5ba3f445a03b6ae03bd74667c797f4590e63330f303dc45394353d57c9ada7973a1552ec68f0de83352719f7975e SHA512 922507b9f7b8996de0d705f0b705feeb567101d5826a0971f9267b9d58c595b2541d85c0810e43ccdaacbf4ccae0686274ce411d837e7179892ef5ab5d705b0f +DIST waffle-v1.8.0.tar.bz2 310657 BLAKE2B cfc5f6fb32ae379457d9e1a9806504f8e2d22a2e320afab81db04a8e459cc2e127ea546e27a01a36cbb76a3095ca1d87bf96d40286f78f8ef7e1c270a6170521 SHA512 432786f1e255638a866af5c95d4ec0421ce9ffa661696482f9b40f9dbad9198f93caca484a0739a34d37d7a7070efb007771fcc6ea7acb70152c34892466e1e4 EBUILD waffle-1.7.2.ebuild 1781 BLAKE2B 5634eb6ba97b53e1fb3478cb088505b077af97ad97ee7e856e2fc9b44096c9bc3617c799e523a7874c89a254d7eeb34456f538c6161557e5fe67581300ef6a01 SHA512 1471e3b0972c2742989b40b8b2cd9f84b14c74d0e9b41f1e6500f66bc7d0d506078f4f8d4a29aff7daa7ac8c81de2c4ac2442112752dcb0d8cc6b6a416a0b573 -EBUILD waffle-9999.ebuild 1784 BLAKE2B 843f6302e66c98430f3fff54c9686112a8b93c61307046fc986ac8569827709e45b6ec55f130d4b93fbf80907247275ddbd0389999f83bc20def70d6ac7de3d0 SHA512 0722fab6e73e38b2483e2a39f229a3674cd4a54dc7203786cea794ae164f0a3fc4cb5913bf23980853c11a033dd00731f431a41d8d5a3b36a14bb186aff0596d +EBUILD waffle-1.7.3.ebuild 1784 BLAKE2B 843f6302e66c98430f3fff54c9686112a8b93c61307046fc986ac8569827709e45b6ec55f130d4b93fbf80907247275ddbd0389999f83bc20def70d6ac7de3d0 SHA512 0722fab6e73e38b2483e2a39f229a3674cd4a54dc7203786cea794ae164f0a3fc4cb5913bf23980853c11a033dd00731f431a41d8d5a3b36a14bb186aff0596d +EBUILD waffle-1.8.0.ebuild 2232 BLAKE2B ff02fd006b2aa45fa80bc122f8b3ff7c36a209d84d96aa878e9902ffe080b7cf7efbd82e1fabf59bda989d069962e549b76297fe4ee8fa6012b5bb9dd267b40b SHA512 eb360c4bea12fe6f9296c29bf7249d61e1423e5864666681470a5b60b2486938708a3a558258d2dbeb2b743256fa36273aeae43957bf7da2ee859a9768072700 +EBUILD waffle-9999.ebuild 2232 BLAKE2B ff02fd006b2aa45fa80bc122f8b3ff7c36a209d84d96aa878e9902ffe080b7cf7efbd82e1fabf59bda989d069962e549b76297fe4ee8fa6012b5bb9dd267b40b SHA512 eb360c4bea12fe6f9296c29bf7249d61e1423e5864666681470a5b60b2486938708a3a558258d2dbeb2b743256fa36273aeae43957bf7da2ee859a9768072700 MISC metadata.xml 532 BLAKE2B c0c240a536c012ce3eb478dff1af25d8ddb0b9ce0d565df3a5a82941179c661552d3b6616c2851344a8c47c1a3b568b0f042e003e6133218be46313262f47d1f SHA512 d75a395ae334e6d3c364db676a654939560d591cae77c2ccc55d4c44474b168a9922b68c01349243a899feb0214d057c260f64a6a5029ee292cc86f6ade01906 diff --git a/media-libs/waffle/waffle-1.7.3.ebuild b/media-libs/waffle/waffle-1.7.3.ebuild new file mode 100644 index 000000000000..70895cc711f7 --- /dev/null +++ b/media-libs/waffle/waffle-1.7.3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}" + GIT_ECLASS="git-r3" +else + SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + S="${WORKDIR}"/${PN}-v${PV} +fi +inherit meson-multilib multilib ${GIT_ECLASS} + +DESCRIPTION="Library that allows selection of GL API and of window system at runtime" +HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle" + +LICENSE="BSD-2" +SLOT="0" +IUSE="doc +egl +gbm wayland X" +RESTRICT="test" # gl_basic tests don't work when run from portage + +RDEPEND=" + >=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}] + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] + ) + gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + X? ( >=x11-base/xcb-proto-1.8-r3 ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + dev-util/wayland-scanner +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/wflinfo$(get_exeext) +) + +multilib_src_configure() { + local emesonargs=( + $(meson_feature X glx) + $(meson_feature wayland) + $(meson_feature X x11_egl) + $(meson_feature gbm) + $(meson_feature egl surfaceless_egl) + $(meson_native_true build-manpages) + -Dbuild-tests=false + ) + meson_src_configure +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + einstalldocs + + rm -r \ + "${ED}"/usr/share/doc/${P} \ + "${ED}"/usr/share/doc/waffle1/release-notes || die + mv "${ED}"/usr/share/doc/{waffle1,${P}} || die + if ! use doc; then + rm -rf \ + "${ED}"/usr/share/man/man{3,7} || die + fi +} diff --git a/media-libs/waffle/waffle-1.8.0.ebuild b/media-libs/waffle/waffle-1.8.0.ebuild new file mode 100644 index 000000000000..23baef47c53e --- /dev/null +++ b/media-libs/waffle/waffle-1.8.0.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}" + GIT_ECLASS="git-r3" +else + SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + S="${WORKDIR}"/${PN}-v${PV} +fi +inherit meson-multilib multilib virtualx ${GIT_ECLASS} + +DESCRIPTION="Library that allows selection of GL API and of window system at runtime" +HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle" + +LICENSE="BSD-2" +SLOT="0" +IUSE="doc test wayland X" +RESTRICT="!test? ( test ) test" # gl_basic tests don't work when run under sandbox + +RDEPEND=" + >=media-libs/mesa-23[${MULTILIB_USEDEP}] + >=virtual/libudev-208:=[${MULTILIB_USEDEP}] + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] + ) + wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + X? ( >=x11-base/xcb-proto-1.8-r3 ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + dev-util/wayland-scanner +" +# test? ( +# wayland? ( dev-libs/weston[headless] ) +# ) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/wflinfo$(get_exeext) +) + +multilib_src_configure() { + local emesonargs=( + $(meson_feature X glx) + $(meson_feature wayland) + $(meson_feature X x11_egl) + -Dgbm=enabled + -Dsurfaceless_egl=enabled + + $(meson_use test build-tests) + $(meson_native_true build-manpages) + -Dbuild-htmldocs=false + -Dbuild-examples=false + ) + meson_src_configure +} + +multilib_src_test() { + if use wayland; then + export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" + + weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 & + compositor=$! + export WAYLAND_DISPLAY=wayland-6 + fi + + export MESA_SHADER_CACHE_DISABLE=true + virtx meson_src_test + + if use wayland; then + kill ${compositor} + fi +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + einstalldocs + + rm -r \ + "${ED}"/usr/share/doc/${P} \ + "${ED}"/usr/share/doc/waffle1/release-notes || die + mv "${ED}"/usr/share/doc/{waffle1,${P}} || die + if ! use doc; then + rm -rf \ + "${ED}"/usr/share/man/man{3,7} || die + fi +} diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild index 70895cc711f7..23baef47c53e 100644 --- a/media-libs/waffle/waffle-9999.ebuild +++ b/media-libs/waffle/waffle-9999.ebuild @@ -11,23 +11,23 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" S="${WORKDIR}"/${PN}-v${PV} fi -inherit meson-multilib multilib ${GIT_ECLASS} +inherit meson-multilib multilib virtualx ${GIT_ECLASS} DESCRIPTION="Library that allows selection of GL API and of window system at runtime" HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle" LICENSE="BSD-2" SLOT="0" -IUSE="doc +egl +gbm wayland X" -RESTRICT="test" # gl_basic tests don't work when run from portage +IUSE="doc test wayland X" +RESTRICT="!test? ( test ) test" # gl_basic tests don't work when run under sandbox RDEPEND=" - >=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}] + >=media-libs/mesa-23[${MULTILIB_USEDEP}] + >=virtual/libudev-208:=[${MULTILIB_USEDEP}] X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] ) - gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} @@ -38,6 +38,9 @@ BDEPEND=" dev-libs/libxslt dev-util/wayland-scanner " +# test? ( +# wayland? ( dev-libs/weston[headless] ) +# ) MULTILIB_CHOST_TOOLS=( /usr/bin/wflinfo$(get_exeext) @@ -48,14 +51,34 @@ multilib_src_configure() { $(meson_feature X glx) $(meson_feature wayland) $(meson_feature X x11_egl) - $(meson_feature gbm) - $(meson_feature egl surfaceless_egl) + -Dgbm=enabled + -Dsurfaceless_egl=enabled + + $(meson_use test build-tests) $(meson_native_true build-manpages) - -Dbuild-tests=false + -Dbuild-htmldocs=false + -Dbuild-examples=false ) meson_src_configure } +multilib_src_test() { + if use wayland; then + export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" + + weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 & + compositor=$! + export WAYLAND_DISPLAY=wayland-6 + fi + + export MESA_SHADER_CACHE_DISABLE=true + virtx meson_src_test + + if use wayland; then + kill ${compositor} + fi +} + multilib_src_install() { meson_src_install } -- cgit v1.2.3