From nobody Sun Oct 16 21:23:40 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MrCmD65fPz4g6h7; Sun, 16 Oct 2022 21:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MrCmD57sTz3SXj; Sun, 16 Oct 2022 21:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665955420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/w2JTMXj85PNPy7XS57CQuq0Xs/xC94u6amHpj+Cq34=; b=jxCRAQlWf4nIx86Lmz6fz/x9qoGnwWr6MCKh0JvaLvRDe3WUZEVLK6PfCrrl4r7uveI2Fn iBV07H14HjVOpT7mihNLrXhSD6MSqi7QaTKRIrUOGdXEDa5nwQoXfb984uqX5RTzzsEScn ttTc+LF51WMwBJPb6U3lzW5sB+xgVjlAkiveOhg2QodykWya0FZlUr/US15o5j1s6/rVmk TGrBwijbScaP+IKHVNEm+8iiNlICQJXuEbH6aDnRp/4cc/ApRn25e7w+ooic0pkaYdLZ5g LkQ6edIVcU0eB5PpmQlHvxJ1Fhe+8sOQDzJn+8bwT0xsUPGu2ZcyjgMfb+wgKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MrCmD48FHzbKH; Sun, 16 Oct 2022 21:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29GLNetc045537; Sun, 16 Oct 2022 21:23:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29GLNeSr045536; Sun, 16 Oct 2022 21:23:40 GMT (envelope-from git) Date: Sun, 16 Oct 2022 21:23:40 GMT Message-Id: <202210162123.29GLNeSr045536@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 9f4f89ec9470 - main - graphics/png: Update to 1.6.38 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f4f89ec947067351dee8e6887d268e92ec0f317 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665955420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/w2JTMXj85PNPy7XS57CQuq0Xs/xC94u6amHpj+Cq34=; b=Vrc94lDZfSVhHTOZR33k8TklTcvAffiTsn41bUx2rl1GIudh7yWkIAWYsVtla0yngatyG9 hvUIlL/LvEFTzarRIVSMhW4iJ7qRJXX9VN0uJS2qzLk7rgFDhDJAycI20djFolCbTiISsQ gXEyfxf9EUfJkQi+XxHLv6tMYpgqmj0scdax8wJAVKOemRRkPgvqTXQItGEZRO5H8T5qus TLLqUQ3JtOJON+lvjHQXzQ4o+3j4E0Wzk78j/jsvbpsBc71075fmRIZSSTHU4qh8J4guzu 15PN0+155bCor7QgMB4wwiz1CP/+GTuuvylG3DCcmZHybuYg6FrJtjHHYzc8+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665955420; a=rsa-sha256; cv=none; b=EpfTpYmQoq0MLH37xSjKCM+hPwFl8R1U6Sc/s+kyU6uY9ZZnK2o7MyhsDgYZO7Bo+7akLF xp4CVpdnFH8O8APe9oG9o/r4+fGTss5bi2zDIWBGBqXCDM06bESOqWwm1aeNCaMQbuzaiU TzXBUEJKK6fMttCGIICGEYNzybde32nq9Nm+oy2VRLmzgLTn1WbY04LEtI3hcZsafpUXjU ZfKnuiScoKYlxLDXufNi9dQjWzyIsZ3kuv+AHOjuQfVdeSvV7vEYDcPxyyfvIY50vKWrnZ GVIRLYRf11unRgUQ8SEkpOnHo1sWEQMXElquEtPVWGKD1FML7zSFbOHZu2spww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f4f89ec947067351dee8e6887d268e92ec0f317 commit 9f4f89ec947067351dee8e6887d268e92ec0f317 Author: Daniel Engberg AuthorDate: 2022-10-16 19:42:23 +0000 Commit: Daniel Engberg CommitDate: 2022-10-16 21:21:17 +0000 graphics/png: Update to 1.6.38 - Switch to CMake - Switch apng repo to https://sourceforge.net/projects/libpng-apng Changelog: https://github.com/glennrp/libpng/blob/v1.6.38/CHANGES PR: 266599 Approved by: desktop (arrowd) Exp-run by: antoine --- graphics/png/Makefile | 27 ++++++++++++--------------- graphics/png/distinfo | 10 +++++----- graphics/png/files/patch-configure | 11 ----------- graphics/png/pkg-plist | 10 ++++++---- 4 files changed, 23 insertions(+), 35 deletions(-) diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 9a088e442f44..566dd86d9111 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,11 +1,9 @@ PORTNAME= png -PORTVERSION= 1.6.37 -PORTREVISION= 1 +DISTVERSION= 1.6.38 CATEGORIES= graphics -MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}16/${PORTVERSION} \ - ftp://ftp.simplesystems.org/pub/lib${PORTNAME}/${PORTNAME}/src/lib${PORTNAME}16/ -PATCH_SITES= SF/apng/lib${PORTNAME}/lib${PORTNAME}16/ -DISTNAME= lib${PORTNAME}-${PORTVERSION} +MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}16/${DISTVERSION}/ +PATCH_SITES= SF/lib${PORTNAME}-apng/lib${PORTNAME}16/${DISTVERSION}/ +DISTNAME= lib${PORTNAME}-${DISTVERSION} MAINTAINER= desktop@FreeBSD.org COMMENT= Library for manipulating PNG images @@ -17,23 +15,22 @@ LICENSE_NAME= libpng License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USE_CSTD= gnu89 -USES= cpe libtool tar:xz +USES= cmake:testing cpe pathfix tar:xz CPE_PRODUCT= libpng -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig -INSTALL_TARGET= install-strip -TEST_TARGET= check-TESTS USE_LDCONFIG= yes +CMAKE_OFF= PNG_TESTS +CMAKE_TESTING_ON= PNG_TESTS + OPTIONS_DEFINE= APNG SIMD OPTIONS_DEFAULT=APNG OPTIONS_DEFAULT_aarch64= SIMD OPTIONS_DEFAULT_amd64= SIMD OPTIONS_DEFAULT_powerpc64le= SIMD + APNG_DESC=Enable Animated PNG support -SIMD_CONFIGURE_OFF= --enable-hardware-optimizations=no -SIMD_CONFIGURE_ON= --enable-hardware-optimizations=yes + +SIMD_CMAKE_BOOL= PNG_HARDWARE_OPTIMIZATIONS .include @@ -43,7 +40,7 @@ CFLAGS+= -maltivec -mvsx .endif .if ${PORT_OPTIONS:MAPNG} || make(makesum) -PATCHFILES= ${DISTNAME}-apng.patch.gz +PATCHFILES= ${DISTNAME}-apng.patch.gz:-p1 .endif .include diff --git a/graphics/png/distinfo b/graphics/png/distinfo index 6bd81a53e9d1..b0b61065fd10 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1556098534 -SHA256 (libpng-1.6.37.tar.xz) = 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca -SIZE (libpng-1.6.37.tar.xz) = 1012272 -SHA256 (libpng-1.6.37-apng.patch.gz) = 10d9e0cb60e2b387a79b355eb7527c0bee2ed8cbd12cf04417cabc4d6976683c -SIZE (libpng-1.6.37-apng.patch.gz) = 10334 +TIMESTAMP = 1664110848 +SHA256 (libpng-1.6.38.tar.xz) = b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be +SIZE (libpng-1.6.38.tar.xz) = 1023168 +SHA256 (libpng-1.6.38-apng.patch.gz) = 8c0363977c44ee1c7d5d42cc02d82b83eeb2d49ec4f7c2f4d475a80c8311989f +SIZE (libpng-1.6.38-apng.patch.gz) = 10766 diff --git a/graphics/png/files/patch-configure b/graphics/png/files/patch-configure deleted file mode 100644 index 0bf0bec66031..000000000000 --- a/graphics/png/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2021-01-21 14:33:24 UTC -+++ configure -@@ -13533,7 +13533,7 @@ $as_echo "#define PNG_ARM_NEON_OPT 0" >>confdefs.h - $as_echo "#define PNG_MIPS_MSA_OPT 0" >>confdefs.h - - ;; -- i?86|x86_64) -+ i?86|x86_64|amd64) - enable_intel_sse=yes - - $as_echo "#define PNG_INTEL_SSE_OPT 1" >>confdefs.h diff --git a/graphics/png/pkg-plist b/graphics/png/pkg-plist index 23fc99d4174f..bd0e2fdd43ab 100644 --- a/graphics/png/pkg-plist +++ b/graphics/png/pkg-plist @@ -10,12 +10,14 @@ include/pngconf.h include/pnglibconf.h lib/libpng.a lib/libpng.so +lib/libpng/libpng16-%%CMAKE_BUILD_TYPE%%.cmake +lib/libpng/libpng16.cmake lib/libpng16.a lib/libpng16.so lib/libpng16.so.16 -lib/libpng16.so.16.37.0 +lib/libpng16.so.16.38.0 libdata/pkgconfig/libpng.pc libdata/pkgconfig/libpng16.pc -man/man3/libpng.3.gz -man/man3/libpngpf.3.gz -man/man5/png.5.gz +share/man/man3/libpng.3.gz +share/man/man3/libpngpf.3.gz +share/man/man5/png.5.gz