Date: Tue, 19 Nov 2024 09:36:10 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 58625b6da7a6 - main - graphics/libskiasharp: bundle chromium's libjpeg-turbo version Message-ID: <202411190936.4AJ9aAgE088573@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=58625b6da7a6c3b4c1fea0e7fb0bd97be77bb24c commit 58625b6da7a6c3b4c1fea0e7fb0bd97be77bb24c Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2024-11-19 09:24:01 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411190936.4AJ9aAgE088573>