From nobody Wed Mar 20 22:06:58 2024 X-Original-To: dev-commits-ports-all@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 4V0N3l0kcDz5F4YS; Wed, 20 Mar 2024 22:06:59 +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 4V0N3l09kKz4ZQ4; Wed, 20 Mar 2024 22:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710972419; 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=OFk5jzTyo/pnr1GzABdJyNJ3ktFUmAjMyMSXynvUHVo=; b=ngh178vLfXY0Q2oj3kYkSr/8ckWsUy1Fwr9iBBbBYADMhizKMRSc8Sby1V6RCxpoVW8BBy jVFi7AwKSxi/RGV1v5MLfIc/wQwhDoIMGMxDmpOEKWVkn/EnU8q/YGWnrKlGixhAjPKwYO E9ri5zu0awkXdiNx5TxbTMDxbt+Mi5/QBWMXGYJeCkzE9MCHqHdltAqIPjpWMhOMV7QbRG csna6k5Bd3d5BFccoa0VoNsuULuhetEujPxbvEo82wvgJECMV5/DYmy0cRrd60kO+bHe09 K+9k88OWTM+SdR8f0UveYXHndP9CvS6XJ6Xkida9eFOSMqLi5Tj/+hLl+m9U3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710972419; a=rsa-sha256; cv=none; b=Vje26KUhnVWra4tPGnMXkeY9fEm9pINLcooqG411OM5tzqxKxIXzdwOPp2SCD4Rt/Z4FOx IwYEd8E/2H//2i5g8M8BVpa8ObLct1k6bfJ41qKIDwpTzqzhkI8HXaDiMItPmdPFGUdiRj cc0RC8Pzq3C156RRMTZemfir6wqk9Tyc6SZ6+oQxsVIt+pOSuMBzZCfK6D8D+iUDdbdcGr 4BPYoRdjptkaBQNhsSjlLjdJpFGqFWzXIt9ZI5oxzigJPxNDpXdk/pi/UNE74ckOeWQGZ7 JCaP8DfGnWHzf0SR/95XKazGgRxenbgBTW+dvr2p/dVE8Typn6KomFzrTFuOzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710972419; 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=OFk5jzTyo/pnr1GzABdJyNJ3ktFUmAjMyMSXynvUHVo=; b=xSBxjvH5ZRN7BQ+rFegWhVQLVQcMDs2k3uIwrLt7v+/dwOgy8eCYv0+RZ/MJgUo2j41DyG l01h1RztIXqvKsPaTk4/z/QRNbz+J1RwZWHutJC+7IvtpwskzFSCmQ8t459wzUFFlbTgmY v9hG85GpBw40hA6LZti/+9bv5h9yUTGVWYyp5WKFpxfKCcTel5a4cZq0ICkvj8u48NVGJi pACwAVQ5gWevi+rP7g4TvsM89Tg0en+xWVHzWp8rV5MMX6GAkk6ZZtjmZyzI/POSJvw5vV YZC76x9vFAb0EdJkCNZcbNPZ5i4KH831FNLyG8tcYfLZAQ1Wkvp0ZHNpArejQQ== 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 4V0N3k6SlFz170W; Wed, 20 Mar 2024 22:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42KM6w1S097878; Wed, 20 Mar 2024 22:06:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KM6wLN097876; Wed, 20 Mar 2024 22:06:58 GMT (envelope-from git) Date: Wed, 20 Mar 2024 22:06:58 GMT Message-Id: <202403202206.42KM6wLN097876@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 1f350d89aca7 - main - www/fgallery: Migrate to oxipng List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f350d89aca79fc0ddac47301eb904a97aaa2037 Auto-Submitted: auto-generated The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f350d89aca79fc0ddac47301eb904a97aaa2037 commit 1f350d89aca79fc0ddac47301eb904a97aaa2037 Author: Daniel Engberg AuthorDate: 2024-03-20 22:05:18 +0000 Commit: Emanuel Haupt CommitDate: 2024-03-20 22:06:48 +0000 www/fgallery: Migrate to oxipng Replace pngcrush with oxipng as pngcrush no longer compiles and will be removed. Also switch to ImageMagick 7 PR: 277761 --- www/fgallery/Makefile | 13 +++++++++---- www/fgallery/files/patch-fgallery | 11 +++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/www/fgallery/Makefile b/www/fgallery/Makefile index e4c462781019..eef5145f794c 100644 --- a/www/fgallery/Makefile +++ b/www/fgallery/Makefile @@ -1,6 +1,6 @@ PORTNAME= fgallery PORTVERSION= 1.9.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www graphics MAINTAINER= ehaupt@FreeBSD.org @@ -15,7 +15,7 @@ RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool \ exiftran:graphics/exiftran \ p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS -USES= magick:6,run +USES= magick:7,run USE_GITHUB= yes GH_ACCOUNT= wavexx GH_TAGNAME= 45a8629 @@ -23,21 +23,26 @@ GH_TAGNAME= 45a8629 NO_ARCH= yes NO_BUILD= yes -OPTIONS_DEFINE= 7ZIP FACEDETECT JPEGOPTIM -OPTIONS_DEFAULT= 7ZIP FACEDETECT JPEGOPTIM +OPTIONS_DEFINE= 7ZIP FACEDETECT JPEGOPTIM OXIPNG +OPTIONS_DEFAULT= 7ZIP FACEDETECT JPEGOPTIM OXIPNG 7ZIP_DESC= Use 7-Zip for better zip compression FACEDETECT_DESC= Face detection for improved thumbnail centering JPEGOPTIM_DESC= Use jpegoptim for JPEG size optimization +OXIPNG_DESC= Use oxipng for PNG size optimization 7ZIP_RUN_DEPENDS= 7zz:archivers/7-zip 7ZIP_RUN_DEPENDS_OFF= zip:archivers/zip FACEDETECT_RUN_DEPENDS= facedetect:graphics/facedetect JPEGOPTIM_RUN_DEPENDS= jpegoptim:graphics/jpegoptim +OXIPNG_RUN_DEPENDS= oxipng:graphics/oxipng post-patch-7ZIP-on: @${REINPLACE_CMD} -e 's|7za|7zz|g' ${WRKSRC}/${PORTNAME} +post-patch-OXIPNG-on: + @${REINPLACE_CMD} -e 's|pngcrush|oxipng|g' ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1 + do-install: .for d in album view (cd ${WRKSRC} && \ diff --git a/www/fgallery/files/patch-fgallery b/www/fgallery/files/patch-fgallery new file mode 100644 index 000000000000..a621910e33ce --- /dev/null +++ b/www/fgallery/files/patch-fgallery @@ -0,0 +1,11 @@ +--- fgallery.orig 2024-03-17 13:48:32 UTC ++++ fgallery +@@ -649,7 +649,7 @@ sub process_img + sys('jpegoptim', '-q', $fout); + } elsif($pngoptim && $props{FileType} eq "PNG") + { +- sys('pngcrush', '-q', $fout, $ftmp); ++ sys('pngcrush', '-q --out', $ftmp, $fout); + rename($ftmp, $fout); + } +