pkgsrc-WIP-changes archive

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

pipewire: SYSCONFDIR files should be installed indirectly



Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Wed Dec 24 10:58:50 2025 +1300
Changeset:	61f7da42952fb80ae86dc748526a13c3f63aa02d

Modified Files:
	pipewire/Makefile
	pipewire/PLIST
	pipewire/distinfo
Added Files:
	pipewire/patches/patch-src_modules_module-rt_meson.build

Log Message:
pipewire: SYSCONFDIR files should be installed indirectly

In this case the subdirectory it wants to install in clashes
with NetBSD's /etc/security file so don't actually install.

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

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

diffstat:
 pipewire/Makefile                                        |  4 ++++
 pipewire/PLIST                                           |  2 +-
 pipewire/distinfo                                        |  1 +
 pipewire/patches/patch-src_modules_module-rt_meson.build | 15 +++++++++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diffs:
diff --git a/pipewire/Makefile b/pipewire/Makefile
index b322bcc06e..534f673ce5 100644
--- a/pipewire/Makefile
+++ b/pipewire/Makefile
@@ -31,6 +31,10 @@ BUILDLINK_TRANSFORM+=	rm:-Werror=format # %m in printf
 LDFLAGS+=	-L${PREFIX}/lib/pipewire-0.3
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/pipewire-0.3
 
+# Only relevant on linux, install clashes with /etc/security script on NetBSD
+#CONF_FILES+=	${PREFIX}/share/examples/pipewire/25-pw-rlimits.conf \
+#		${PKG_SYSCONFDIR}/security/limits.d/25-pw-rlimits.conf
+
 MESON_ARGS+=	-Dv4l2=disabled
 MESON_ARGS+=	-Dpipewire-v4l2=disabled
 MESON_ARGS+=	-Dsession-managers=disabled
diff --git a/pipewire/PLIST b/pipewire/PLIST
index 08e2b92987..6b41f6389b 100644
--- a/pipewire/PLIST
+++ b/pipewire/PLIST
@@ -28,7 +28,6 @@ bin/spa-inspect
 bin/spa-json-dump
 bin/spa-monitor
 bin/spa-resample
-etc/security/limits.d/25-pw-rlimits.conf
 include/pipewire-0.3/pipewire/array.h
 include/pipewire-0.3/pipewire/buffers.h
 include/pipewire-0.3/pipewire/client.h
@@ -308,6 +307,7 @@ lib/spa-0.2/support/libspa-dbus.so
 lib/spa-0.2/support/libspa-support.so
 lib/spa-0.2/videoconvert/libspa-videoconvert.so
 lib/spa-0.2/videotestsrc/libspa-videotestsrc.so
+share/examples/pipewire/25-pw-rlimits.conf
 share/locale/af/LC_MESSAGES/pipewire.mo
 share/locale/as/LC_MESSAGES/pipewire.mo
 share/locale/be/LC_MESSAGES/pipewire.mo
diff --git a/pipewire/distinfo b/pipewire/distinfo
index ba25807a90..bc719189f0 100644
--- a/pipewire/distinfo
+++ b/pipewire/distinfo
@@ -17,6 +17,7 @@ SHA1 (patch-src_modules_module-netjack2-manager.c) = 698a991a634fd603ec26d7f0b9a
 SHA1 (patch-src_modules_module-protocol-native_test-connection.c) = 26504b447acce99c7def1fd88e9b278ef58747f2
 SHA1 (patch-src_modules_module-protocol-pulse_utils.c) = f0d3009287376502db2f93315dacbeeed3dcc431
 SHA1 (patch-src_modules_module-rt.c) = c6b2370cd13a445747dbf52a6da53658557589a1
+SHA1 (patch-src_modules_module-rt_meson.build) = 2f77b98d6f0330e924bc5300c011e8b19cbd60dd
 SHA1 (patch-src_modules_module-rtp-sap.c) = c8dcbaf64dbc318046dc937ce471c249224174b6
 SHA1 (patch-src_modules_module-rtp-session.c) = bed76eceb46fa71fc7b836ac7b5de2ddf6a29efe
 SHA1 (patch-src_modules_module-rtp-source.c) = 6ea2fae1ae17c989150f3c7a932c28fcf59cd644
diff --git a/pipewire/patches/patch-src_modules_module-rt_meson.build b/pipewire/patches/patch-src_modules_module-rt_meson.build
new file mode 100644
index 0000000000..8c3c6a835d
--- /dev/null
+++ b/pipewire/patches/patch-src_modules_module-rt_meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+install via examples dir
+
+--- src/modules/module-rt/meson.build.orig	2025-07-23 15:42:58.000000000 +0000
++++ src/modules/module-rt/meson.build
+@@ -7,7 +7,7 @@ rlimits_data.set('MEMLOCK', get_option('
+ configure_file(input: '25-pw-rlimits.conf.in',
+   output: '25-pw-rlimits.conf',
+   install: rlimits_install,
+-  install_dir: get_option('sysconfdir') / 'security' / 'limits.d',
++  install_dir: get_option('datadir') / 'examples' / 'pipewire',
+   configuration: rlimits_data)
+ summary({'RLIMITs': '@0@ limits.d file affecting matching PAM users'.format(rlimits_install ? 'with' : 'without')})
+ 


Home | Main Index | Thread Index | Old Index