Date: Friday, December 18, 2020 @ 23:40:05
Author: heftig
Revision: 404507
archrelease: copy trunk to extra-x86_64
Added:
ossp/repos/extra-x86_64/0001-Log-the-right-slave-program-name.patch
(from rev 404506, ossp/trunk/0001-Log-the-right-slave-program-name.patch)
ossp/repos/extra-x86_64/0002-Hack-to-work-with-modern-PulseAudio.patch
(from rev 404506, ossp/trunk/0002-Hack-to-work-with-modern-PulseAudio.patch)
ossp/repos/extra-x86_64/PKGBUILD
(from rev 404506, ossp/trunk/PKGBUILD)
Deleted:
ossp/repos/extra-x86_64/PKGBUILD
+
0001-Log-the-right-slave-program-name.patch| 127 +++
0002-Hack-to-work-with-modern-PulseAudio.patch | 38 ++
PKGBUILD | 126 --
3 files changed, 232 insertions(+), 59 deletions(-)
Copied: ossp/repos/extra-x86_64/0001-Log-the-right-slave-program-name.patch
(from rev 404506, ossp/trunk/0001-Log-the-right-slave-program-name.patch)
===
--- 0001-Log-the-right-slave-program-name.patch (rev 0)
+++ 0001-Log-the-right-slave-program-name.patch 2020-12-18 23:40:05 UTC (rev
404507)
@@ -0,0 +1,127 @@
+From Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)"
+Date: Fri, 18 Dec 2020 23:08:02 +
+Subject: [PATCH] Log the right slave program name
+
+---
+ ossp-alsap.c | 2 +-
+ ossp-padsp.c | 2 +-
+ ossp-slave.c | 40
+ ossp-slave.h | 2 +-
+ 4 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/ossp-alsap.c b/ossp-alsap.c
+index 72f3bd5..6b8228b 100644
+--- a/ossp-alsap.c
b/ossp-alsap.c
+@@ -577,7 +577,7 @@ int main(int argc, char **argv)
+ {
+ int rc;
+
+- ossp_slave_init(argc, argv);
++ ossp_slave_init("ossp-alsap", argc, argv);
+
+ page_size = sysconf(_SC_PAGE_SIZE);
+
+diff --git a/ossp-padsp.c b/ossp-padsp.c
+index 3143960..c505b57 100644
+--- a/ossp-padsp.c
b/ossp-padsp.c
+@@ -1479,7 +1479,7 @@ int main(int argc, char **argv)
+ {
+ int rc;
+
+- ossp_slave_init(argc, argv);
++ ossp_slave_init("ossp-padsp", argc, argv);
+
+ page_size = sysconf(_SC_PAGE_SIZE);
+
+diff --git a/ossp-slave.c b/ossp-slave.c
+index a290636..a0a9590 100644
+--- a/ossp-slave.c
b/ossp-slave.c
+@@ -21,27 +21,27 @@
+
+ #include "ossp-slave.h"
+
+-static const char *usage =
+-"usage: ossp-SLAVE [options]\n"
+-"\n"
+-"proxies commands from osspd to pulseaudio\n"
+-"\n"
+-"options:\n"
+-"-u UIDuid to use\n"
+-"-g GIDgid to use\n"
+-"-c CMD_FD fd to receive commands from osspd\n"
+-"-n NOTIFY_FD fd to send async notifications to osspd\n"
+-"-m MMAP_FDfd to use for mmap\n"
+-"-o MMAP_OFFSETmmap offset\n"
+-"-s MMAP_SIZE mmap size\n"
+-"-l LOG_LEVEL set log level\n"
+-"-tenable log timestamps\n";
++#define USAGE \
++ "usage: %s [options]\n" \
++ "\n" \
++ "proxies commands from osspd to audio output\n" \
++ "\n" \
++ "options:\n" \
++ "-u UIDuid to use\n" \
++ "-g GIDgid to use\n" \
++ "-c CMD_FD fd to receive commands from osspd\n" \
++ "-n NOTIFY_FD fd to send async notifications to osspd\n" \
++ "-m MMAP_FDfd to use for mmap\n" \
++ "-o MMAP_OFFSETmmap offset\n" \
++ "-s MMAP_SIZE mmap size\n" \
++ "-l LOG_LEVEL set log level\n" \
++ "-tenable log timestamps\n"
+
+ char ossp_user_name[OSSP_USER_NAME_LEN];
+ int ossp_cmd_fd = -1, ossp_notify_fd = -1;
+ void *ossp_mmap_addr[2];
+
+-void ossp_slave_init(int argc, char **argv)
++void ossp_slave_init(const char *slave_name, int argc, char **argv)
+ {
+ int have_uid = 0, have_gid = 0;
+ uid_t uid;
+@@ -89,23 +89,23 @@ void ossp_slave_init(int argc, char **argv)
+ }
+
+ if (!have_uid || !have_gid || ossp_cmd_fd < 0 || ossp_notify_fd < 0) {
+- fputs(usage, stderr);
++ fprintf(stderr, USAGE, slave_name);
+ _exit(1);
+ }
+
+ snprintf(ossp_user_name, sizeof(ossp_user_name), "uid%d", uid);
+ if (getpwuid_r(uid, &pw_buf, pw_sbuf, sizeof(pw_sbuf), &pw) == 0)
+ snprintf(ossp_user_name, sizeof(ossp_user_name), "%s",
+pw->pw_name);
+
+- snprintf(ossp_log_name, sizeof(ossp_log_name), "ossp-padsp[%s:%d]",
+- ossp_user_name, getpid());
++ snprintf(ossp_log_name, sizeof(ossp_log_name), "%s[%s:%d]",
++ slave_name, ossp_user_name, getpid());
+
+ if (mmap_fd >= 0) {
+ void *p;
+
+ if (!mmap_off || !mmap_size) {
+- fputs(usage, stderr);
++ fprintf(std
