pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

skia-git: fix NetBSD build



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Thu May 8 13:03:54 2025 +0200
Changeset:	b4eca115be33d1c24d795ab346c41aef37793b64

Modified Files:
	skia-git/Makefile
	skia-git/distinfo
Added Files:
	skia-git/patches/patch-src_gpu_ganesh_GrAutoLocaleSetter.h
	skia-git/patches/patch-third__party_externals_dng__sdk_source_RawEnvironment.h

Log Message:
skia-git: fix NetBSD build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b4eca115be33d1c24d795ab346c41aef37793b64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 skia-git/Makefile                                           |  3 +++
 skia-git/distinfo                                           |  2 ++
 skia-git/patches/patch-src_gpu_ganesh_GrAutoLocaleSetter.h  | 13 +++++++++++++
 ...-third__party_externals_dng__sdk_source_RawEnvironment.h | 13 +++++++++++++
 4 files changed, 31 insertions(+)

diffs:
diff --git a/skia-git/Makefile b/skia-git/Makefile
index 9799c5c39c..2e69ebca4a 100644
--- a/skia-git/Makefile
+++ b/skia-git/Makefile
@@ -27,6 +27,8 @@ GN_ARGS+=	is_official_build=true
 GN_ARGS+=	is_debug=false
 GN_ARGS+=	skia_system_freetype2_include_path="${BUILDLINK_PREFIX.freetype2}/include/freetype2"
 
+BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
+
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths+=	third_party/harfbuzz/BUILD.gn
@@ -70,6 +72,7 @@ git-depends.mk:
 	${SETENV} REQUIRED_REPOS="${REQUIRED_REPOS}" ${AWK} -f ${FILESDIR}/gen-git-depends.awk < ${WRKSRC}/DEPS > ${.TARGET}.new
 	mv ${.TARGET}.new ${.TARGET}
 
+.include "../../lang/python/tool.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/skia-git/distinfo b/skia-git/distinfo
index 83ed573a38..8783abbec7 100644
--- a/skia-git/distinfo
+++ b/skia-git/distinfo
@@ -2,6 +2,8 @@ $NetBSD$
 
 SHA1 (patch-gn_skia_BUILD.gn) = 39bca4b8dba757869ea6a40714c627f33eff3383
 SHA1 (patch-modules_skcms_BUILD.gn) = 064519f2fd7cfe3cfdae70779416c2aa204098a9
+SHA1 (patch-src_gpu_ganesh_GrAutoLocaleSetter.h) = dfa8f3c6b501dde779b1e0a54398f8e825e11f21
+SHA1 (patch-third__party_externals_dng__sdk_source_RawEnvironment.h) = 6b122f837dd702676ac2b3c6de511f3499deba14
 SHA1 (patch-third__party_externals_piex_src_image__type__recognition_image__type__recognition__lite.cc) = 3f0d9416829866239cde6c2c8c2382d1dcd50002
 SHA1 (patch-third__party_harfbuzz_BUILD.gn) = a704d5deec6345717430b08c78820c01cface7f7
 SHA1 (patch-third__party_icu_BUILD.gn) = 20bfc1be2f919123ec53cd4edd7b9b4fb39fbf39
diff --git a/skia-git/patches/patch-src_gpu_ganesh_GrAutoLocaleSetter.h b/skia-git/patches/patch-src_gpu_ganesh_GrAutoLocaleSetter.h
new file mode 100644
index 0000000000..cdf440cd99
--- /dev/null
+++ b/skia-git/patches/patch-src_gpu_ganesh_GrAutoLocaleSetter.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/gpu/ganesh/GrAutoLocaleSetter.h.orig	2025-05-08 10:57:41.968142662 +0000
++++ src/gpu/ganesh/GrAutoLocaleSetter.h
+@@ -27,7 +27,7 @@
+ #define HAVE_XLOCALE 0
+ #endif
+ 
+-#if defined(SK_BUILD_FOR_ANDROID) || defined(__UCLIBC__) || defined(_NEWLIB_VERSION)
++#if defined(SK_BUILD_FOR_ANDROID) || defined(__UCLIBC__) || defined(_NEWLIB_VERSION) || defined(__NetBSD__)
+ #define HAVE_LOCALE_T 0
+ #else
+ #define HAVE_LOCALE_T 1
diff --git a/skia-git/patches/patch-third__party_externals_dng__sdk_source_RawEnvironment.h b/skia-git/patches/patch-third__party_externals_dng__sdk_source_RawEnvironment.h
new file mode 100644
index 0000000000..9e66fbd92f
--- /dev/null
+++ b/skia-git/patches/patch-third__party_externals_dng__sdk_source_RawEnvironment.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- third_party/externals/dng_sdk/source/RawEnvironment.h.orig	2025-05-08 10:54:57.565238139 +0000
++++ third_party/externals/dng_sdk/source/RawEnvironment.h
+@@ -5,7 +5,7 @@
+ // compilation. The constants qMacOS and qWinOS must be defined on all
+ // platforms. Other constants, such as qLinux, only need to be defined if we're
+ // actually compiling for that platform.
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__NetBSD__)
+ #define qMacOS 0
+ #define qWinOS 0
+ #define qLinux 1


Home | Main Index | Thread Index | Old Index