From nobody Tue Nov 19 09:36:10 2024 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 4Xszrq0Q19z5dpyX; Tue, 19 Nov 2024 09:36:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xszrp6bfTz4dCW; Tue, 19 Nov 2024 09:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732008970; 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=s3f6ogV1LRiy4NitSnOms6Hber2OO+CCHKaDVzag1TM=; b=xsml8WJfahdsmA/xOv0+FLzj5iTeMR5NIluIVTfVpBfF6EWjyGxcCMBg8JgUrStyXVyQTM LnUtJb4QkB4FdvVB7nkYk+57k7Mdd0/abQYk0Dpu7CCzfYH63Rx1oOaTfWlxf3gFEWdSRu 50GDkQTuL69kQEr1FIzoZou9WWts4/7uoGCvYEpp5yvFUsm8MGiT2i0C4earhvGVz1RP+i 1Ydf0acls0e2oQv4HOyFpRO6ef9+EcIShCEdnAjvFB1ffy05g/kuHv/FCHdXF9p6aRzcmP KQbpgVy/H/ZiGLjxQADcsv9TB1QEDyoPPlJV0XjzKD/yq3H2FbwFVUMIBkGDMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732008970; 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=s3f6ogV1LRiy4NitSnOms6Hber2OO+CCHKaDVzag1TM=; b=lFpxHpkrDPuy9TesMkRulzbEQAHIorukSg37vcmyECBjkaRUyQOp2vjjUhHAnAEZzdY7tr n/tAnbobB+JDZIhwj06ftBKTiC5ArNPdyzAiBLLh8yF1ko0cQYSypiYirYsB9pSlba5/oe XkAR3n92fM7GAN+WwZB+LMcpprU2At4gx1PjR6UJp19qHzHSIGd0zfUwel/nDCaDMEAdDB Mm1Y2H/3Kds4ndZ9uVYJx+R6qSvLa6RbL4YpP5Rg5oSJeiW5hwElBNvBRhI5bj8T6z6bvC eZkQ+vlGW6HrpFnB6BuDUeb1a7SN90L2yD8UE8xUSKcztKvjolniVGEFheYhiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732008970; a=rsa-sha256; cv=none; b=fLWXVuMr3iLcid0osk47Qw02w+MUN/BBJJNxD0FlHZJxAAM4jmwySvkztluXaX2llzvEKc rqjtg2NUzGVCrYSUfOX8zRgRQpHqHNpYpqt23UqCba2rIuJtc1ovvPoGUSfXHOVztpj8qi OFIEkZ9041fYwBMsz4tFjISJtBzWTOCCWK49quKkp8FV4ugxtrVRbRSrPi3GDoNOP4v1GX 8+6lq9TMAkUVw7+9U845OZGHB8sIdSDhnx5z58Z7qMCvKSfZBh/cIhv78WyFNXhkhBZl01 H6js4NW1JonIoRlR0/o9d+fdtaTXY3W8MfTnDyCGKuyOJyDbaFVEw4yO2yIlpw== 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 4Xszrp5hvQz1J0x; Tue, 19 Nov 2024 09:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AJ9aAtN088576; Tue, 19 Nov 2024 09:36:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJ9aAgE088573; Tue, 19 Nov 2024 09:36:10 GMT (envelope-from git) Date: Tue, 19 Nov 2024 09:36:10 GMT Message-Id: <202411190936.4AJ9aAgE088573@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 58625b6da7a6 - main - graphics/libskiasharp: bundle chromium's libjpeg-turbo version 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58625b6da7a6c3b4c1fea0e7fb0bd97be77bb24c Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=58625b6da7a6c3b4c1fea0e7fb0bd97be77bb24c commit 58625b6da7a6c3b4c1fea0e7fb0bd97be77bb24c Author: Baptiste Daroussin AuthorDate: 2024-11-19 09:24:01 +0000 Commit: Baptiste Daroussin CommitDate: 2024-11-19 09:35:27 +0000 graphics/libskiasharp: bundle chromium's libjpeg-turbo version Apparently libskasharp (abuses the libjpeg-turbo's API) which results in some crashes: - https://github.com/Thefrank/jellyfin-server-freebsd/issues/89 - https://github.com/libjpeg-turbo/libjpeg-turbo/issues/795 - https://github.com/jellyfin/jellyfin/issues/13016 PR: 282704 --- graphics/libskiasharp/Makefile | 13 ++++++++++++- graphics/libskiasharp/distinfo | 4 +++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/graphics/libskiasharp/Makefile b/graphics/libskiasharp/Makefile index 0c040c8e5354..669af43325f8 100644 --- a/graphics/libskiasharp/Makefile +++ b/graphics/libskiasharp/Makefile @@ -1,7 +1,10 @@ PORTNAME= libskiasharp DISTVERSIONPREFIX= v DISTVERSION= 2.88.3 +PORTREVISION= 1 CATEGORIES= graphics +MASTER_SITES= LOCAL/bapt:libjpeg_turbo +DISTFILES= libjpeg_turbo-${LIBJPEG_TURBO_REV}.tar.gz:libjpeg_turbo MAINTAINER= bapt@FreeBSD.org COMMENT= Complete 2D graphic library for drawing Text, Geometries, and Images @@ -23,10 +26,14 @@ USE_GITHUB= yes GH_ACCOUNT= mono GH_PROJECT= skia +LIBJPEG_TURBO_REV= 22f1a22c99e9dde8cd3c72ead333f425c5a7aa77 + USE_LDCONFIG= yes USE_BINUTILS= yes SOVERSION= 118.0.0 +# +# see https://github.com/libjpeg-turbo/libjpeg-turbo/issues/795#issuecomment-2484148592 GN_ARGS= is_official_build=true \ skia_enable_tools=false \ target_os="linux" \ @@ -35,7 +42,7 @@ GN_ARGS= is_official_build=true \ skia_use_piex=true \ skia_use_harfbuzz=false \ skia_use_system_expat=true \ - skia_use_system_libjpeg_turbo=true \ + skia_use_system_libjpeg_turbo=false \ skia_use_system_freetype2=true \ skia_use_system_libpng=true \ skia_use_system_libwebp=true \ @@ -60,6 +67,10 @@ BUILD_WRKSRC= ${WRKSRC}/out PLIST_FILES= lib/libSkiaSharp.so \ lib/libSkiaSharp.so.${SOVERSION} +post-extract: + ${MKDIR} ${WRKSRC}/third_party/externals + ${RLN} ${WRKDIR}/libjpeg_turbo ${WRKSRC}/third_party/externals/libjpeg-turbo + do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} gn gen 'out' --args='${GN_ARGS}' diff --git a/graphics/libskiasharp/distinfo b/graphics/libskiasharp/distinfo index a35a3a85b843..68dc2ab49ef0 100644 --- a/graphics/libskiasharp/distinfo +++ b/graphics/libskiasharp/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1730816381 +TIMESTAMP = 1732007783 +SHA256 (libjpeg_turbo-22f1a22c99e9dde8cd3c72ead333f425c5a7aa77.tar.gz) = 774aadf0ae4827ce77645442f8fba552c0be068c0bec7933fa99f4a490931433 +SIZE (libjpeg_turbo-22f1a22c99e9dde8cd3c72ead333f425c5a7aa77.tar.gz) = 2382951 SHA256 (mono-skia-v2.88.3_GH0.tar.gz) = 899ee3693575dd5f1e769070672253beb03ece414ab2803228e346889f268dda SIZE (mono-skia-v2.88.3_GH0.tar.gz) = 51816808