From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58E6F1581EE for ; Tue, 08 Apr 2025 17:41:03 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 43BD43406A2 for ; Tue, 08 Apr 2025 17:41:03 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 862E11104B7; Tue, 08 Apr 2025 17:40:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 80D861104B7 for ; Tue, 08 Apr 2025 17:40:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A7BE34306C for ; Tue, 08 Apr 2025 17:40:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86CE3159F for ; Tue, 08 Apr 2025 17:40:57 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1744134041.663969c0d9e76629fe01962d73b48abf1a79df61.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/netpbm/Manifest media-libs/netpbm/netpbm-11.10.1.ebuild X-VCS-Directories: media-libs/netpbm/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: 663969c0d9e76629fe01962d73b48abf1a79df61 X-VCS-Branch: master Date: Tue, 08 Apr 2025 17:40:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 38a074a7-2bec-4c0e-9203-46393939fb51 X-Archives-Hash: 810d13eb6d3ec75f428cb288e6970106 commit: 663969c0d9e76629fe01962d73b48abf1a79df61 Author: Viorel Munteanu gentoo org> AuthorDate: Tue Apr 8 17:17:44 2025 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Tue Apr 8 17:40:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663969c0 media-libs/netpbm: add 11.10.1 Signed-off-by: Viorel Munteanu gentoo.org> media-libs/netpbm/Manifest | 1 + media-libs/netpbm/netpbm-11.10.1.ebuild | 261 ++++++++++++++++++++++++++++++++ 2 files changed, 262 insertions(+) diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index caadbfb08bfe..c253b33301cb 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -1,4 +1,5 @@ DIST netpbm-11.10.0.tar.xz 3811704 BLAKE2B 49ca8ab366a9d181f9223440cbefba4f94e29c7c3a4133b451b0caf189edb2b68f15f79250bad7911b0f6f2ca02b91dd91efb3f8dbba52cbdc655f171a929167 SHA512 6d6cb4cd9ee1f1f952d97182c391ac67eb0e97361731b11c32570d5fd12e94dd4e71497f652ecbdb7ec7037aab1cf4ed303b51ea614d2070f83be90c5d99ae52 +DIST netpbm-11.10.1.tar.xz 3812112 BLAKE2B 4d9867dba7e4976a3c302069fef6827b89edf75032e49a20b6ce261bc11f5d2cbbe32e8d32722e63c38740fa284f670a702a9fa96f892a28cb03836f13db9af0 SHA512 c77b87ae471cc0c71e33d070cde039be1c0c3f3b1896a2bf3047020b1b18ebb8e53adb8712e24b021885480ada75403b5727f3884dfc2a632e4c6ba1a9b03fbb DIST netpbm-11.2.11.tar.xz 3782252 BLAKE2B 422b9cefee2a54a9c222236935291f0c8d1f13f064f4ebd277d0f92974b9ce3d7e3d9ae6a0410d767553704a03c2de14ca8456996a53fca0f95d61f9ae72605f SHA512 3d94c0c8c25873a16c78af960c964f5756b3e7a29463f001345956acc3bf1378b0b0b4fc0c57d7388dced0979ba4e8cee0def2200092544dd96fc7d04304660b DIST netpbm-11.2.13.tar.xz 3784752 BLAKE2B f96bd1867363402175208778619308bf5cd19967e36ff46103e88367d46c28a6aa1e8c8128af454c22de616ad414ddbc5d48ce857e64423724f2dd026c6e9639 SHA512 ffe3b63dccaeb8066fa80a202dae01b70a379359769540f7668f417b6da32361d878ef1ccbeccd8a24bcda83c5b1cfba5b8e00ce5fc5dbe4c28571e437051432 DIST netpbm-11.2.14.tar.xz 3785868 BLAKE2B 1a503270757c84a0dc0b54e9ce8dd04084253aa2bb8f68a129cbda371064e6fde0fd478bfd9489600d0e0c01e2f823e016404041eff6a35762b78165c10c7147 SHA512 01d0eb2a9ed13000e0e26d89c72f3f0e26b74a4c66435e3af4a443ccf0badb387f5afd9503de5b2f2c7f7a39aec4c435dc966c55c4e5a1d444ea6b552cf41e3c diff --git a/media-libs/netpbm/netpbm-11.10.1.ebuild b/media-libs/netpbm/netpbm-11.10.1.ebuild new file mode 100644 index 000000000000..dec8f670b637 --- /dev/null +++ b/media-libs/netpbm/netpbm-11.10.1.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2025 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" +# and the advanced branch of their svn (currently versions 11.9.yy) on SLOT "0/advanced". +# 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 test tiff X xml" +RESTRICT="!test? ( test )" + +# 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 + app-alternatives/lex + virtual/pkgconfig + test? ( + dev-lang/perl + ) +" + +PATCHES=( + "${FILESDIR}"/netpbm-11.9.0-build.patch + "${FILESDIR}"/netpbm-11.0.0-misc-deps.patch + "${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch + "${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.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 '/SUPPORT_SUBDIRS/s:urt::' -i GNUmakefile || die + rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || 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 \ + -e '/^importinc:/s|^|importinc:\nmanual_|' \ + -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ + -i common.mk || die + sed \ + -e '/%.c/s: importinc$::' \ + -i common.mk lib/Makefile lib/util/Makefile || die + sed \ + -e 's:pkg-config:$(PKG_CONFIG):' \ + -i GNUmakefile converter/other/Makefile other/pamx/Makefile || die + + # The postscript knob is currently bound up with a fork test. + if ! use postscript ; then + sed \ + -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \ + -i converter/other/Makefile generator/Makefile || die + sed -r \ + -e 's:(pbmtextps|pnmtops|pstopnm).*::' \ + -i test/all-in-place.{ok,test} || die + sed \ + -e 's:lps-roundtrip.*::' \ + -e 's:pbmtextps-dump.*::' \ + -e 's:pbmtextps.*::' \ + -i test/Test-Order || die + sed \ + -e '/^$/d' \ + -i test/all-in-place.ok || die + sed \ + '2iexit 80' \ + -i test/ps-{alt-,flate-,}roundtrip.test || die + fi + + # Do not test png if not built + if ! use png ; then + sed -E \ + -e 's:(pamtopng|pngtopam|pnmtopng).*::' \ + -i test/all-in-place.{ok,test} || die + sed \ + -e '/^$/d' \ + -i test/all-in-place.ok || die + + sed -E \ + -e 's:(pamrgbatopng|pngtopnm).*::' \ + -i test/legacy-names.{ok,test} || die + sed \ + -e '/^$/d' \ + -i test/legacy-names.ok || die + sed \ + -e 's:png-roundtrip.*::' \ + -e 's:winicon-roundtrip.*::' \ + -i test/Test-Order || die + fi + + # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl + # pbmtext-utf8 requires locale, not available on musl + # ppmpat-random and pnmindex are broken on musl + # bug #907295 + if use elibc_musl; then + sed \ + -e 's:pbmtext-iso88591.*::' \ + -e 's:pbmtext-utf8.*::' \ + -e 's:ppmpat-random.*::' \ + -e 's:pnmindex.*::' \ + -i 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 USERDOC + docinto html + dodoc -r ../userguide/*.html +}