pkgsrc-WIP-changes archive

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

pipewire: define __LOCALE_C_ONLY in spa/utils/string.h on NetBSD



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Tue Jan 13 15:09:03 2026 +0100
Changeset:	6c2c40255acda1d34282eb8a6c01a40452ff240d

Modified Files:
	pipewire/Makefile
	pipewire/PLIST
	pipewire/buildlink3.mk
	pipewire/distinfo
Added Files:
	pipewire/patches/patch-spa_include_spa_utils_string.h

Log Message:
pipewire: define __LOCALE_C_ONLY in spa/utils/string.h on NetBSD

Avoid requiring 'CFLAGS.NetBSD+= -D__LOCALE_C_ONLY' in all
packages that include PipeWire public headers

Tested with wip/xdg-desktop-portal

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

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

diffstat:
 pipewire/Makefile                                     |  5 ++++-
 pipewire/PLIST                                        |  1 -
 pipewire/buildlink3.mk                                |  2 +-
 pipewire/distinfo                                     |  1 +
 pipewire/patches/patch-spa_include_spa_utils_string.h | 18 ++++++++++++++++++
 5 files changed, 24 insertions(+), 3 deletions(-)

diffs:
diff --git a/pipewire/Makefile b/pipewire/Makefile
index 534f673ce5..1b296c21d6 100644
--- a/pipewire/Makefile
+++ b/pipewire/Makefile
@@ -16,7 +16,6 @@ USE_TOOLS+=		msgfmt pkg-config xgettext
 
 CPPFLAGS.NetBSD+=	-UHAVE_MEMFD_CREATE
 
-CFLAGS.NetBSD+=	-D__LOCALE_C_ONLY
 CFLAGS.NetBSD+=	-D_NETBSD_SOURCE #should be _POSIX_C_SOURCE or _XOPEN_COURCE
 
 .include "../../mk/bsd.fast.prefs.mk"
@@ -50,6 +49,10 @@ MESON_ARGS+=	-Dsdl2=disabled
 MESON_ARGS+=	-Dalsa=disabled
 MESON_ARGS+=	-Dpipewire-alsa=disabled
 
+post-install :
+	${RM} ${DESTDIR}${PREFIX}/include/spa-0.2/spa/utils/endian.h.orig
+	${RM} ${DESTDIR}${PREFIX}/include/spa-0.2/spa/utils/string.h.orig
+
 #.include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../audio/jack/buildlink3.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
diff --git a/pipewire/PLIST b/pipewire/PLIST
index 6b41f6389b..6cd04f83cf 100644
--- a/pipewire/PLIST
+++ b/pipewire/PLIST
@@ -224,7 +224,6 @@ include/spa-0.2/spa/utils/defs.h
 include/spa-0.2/spa/utils/dict.h
 include/spa-0.2/spa/utils/dll.h
 include/spa-0.2/spa/utils/endian.h
-include/spa-0.2/spa/utils/endian.h.orig
 include/spa-0.2/spa/utils/enum-types.h
 include/spa-0.2/spa/utils/hook.h
 include/spa-0.2/spa/utils/json-core.h
diff --git a/pipewire/buildlink3.mk b/pipewire/buildlink3.mk
index 6153c90370..74325a73e7 100644
--- a/pipewire/buildlink3.mk
+++ b/pipewire/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	pipewire
 PIPEWIRE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pipewire+=	pipewire>=1.2.5
-BUILDLINK_PKGSRCDIR.pipewire?=	../../multimedia/pipewire
+BUILDLINK_PKGSRCDIR.pipewire?=	../../wip/pipewire
 
 .endif	# PIPEWIRE_BUILDLINK3_MK
 
diff --git a/pipewire/distinfo b/pipewire/distinfo
index bc719189f0..6b4442a506 100644
--- a/pipewire/distinfo
+++ b/pipewire/distinfo
@@ -6,6 +6,7 @@ Size (pipewire-1.4.7.tar.bz2) = 1928174 bytes
 SHA1 (patch-meson.build) = ce08fa4175f16228d93a2513d23d5d8d2323f4cb
 SHA1 (patch-pipewire-jack_src_pipewire-jack.c) = 84d1054ec44fe205bbeb9d83b3c83ae30a9d0cc4
 SHA1 (patch-spa_include_spa_utils_endian.h) = 4377e65a3cab0889c353d355bf4294529860cedf
+SHA1 (patch-spa_include_spa_utils_string.h) = e1fb8739e7197dab7f7ba660a900306912c0a1d9
 SHA1 (patch-spa_plugins_alsa_alsa-pcm.c) = 92903d37f6c825e798c0217cbd196bf12fc960fe
 SHA1 (patch-spa_plugins_filter-graph_filter-graph.c) = 264977f256e09aa9a1a07afb0ac759b9f4250725
 SHA1 (patch-spa_plugins_meson.build) = defc725affd4f598b7c0e02a6c1c01e151883188
diff --git a/pipewire/patches/patch-spa_include_spa_utils_string.h b/pipewire/patches/patch-spa_include_spa_utils_string.h
new file mode 100644
index 0000000000..6823176e18
--- /dev/null
+++ b/pipewire/patches/patch-spa_include_spa_utils_string.h
@@ -0,0 +1,18 @@
+$NetBSD$
+
+* NetBSD has no uselocale()
+
+--- spa/include/spa/utils/string.h.orig	2026-01-13 13:54:22.877334597 +0000
++++ spa/include/spa/utils/string.h
+@@ -13,7 +13,11 @@ extern "C" {
+ #include <stdbool.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#if defined(__NetBSD__)
++#define __LOCALE_C_ONLY 1
++#else
+ #include <locale.h>
++#endif
+ 
+ #include <spa/utils/defs.h>
+ 


Home | Main Index | Thread Index | Old Index