diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-08-11 11:34:09 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-09-12 23:04:44 +0200 |
| commit | 883bdf8070d413ae1b11d7af797db934b4eb9e29 (patch) | |
| tree | 6a95a899f02673a11ddfa0f32280d0a099c4843f /pkgs/applications/video/xawtv | |
| parent | 7f02eca8cc62cf87112d62ed89ebd455c11e2e32 (diff) | |
xawtv: fix build w/glibc-2.32
Also emailed the patch to the maintainer.
Diffstat (limited to 'pkgs/applications/video/xawtv')
| -rw-r--r-- | pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch | 63 | ||||
| -rw-r--r-- | pkgs/applications/video/xawtv/default.nix | 4 |
2 files changed, 67 insertions, 0 deletions
diff --git a/pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch b/pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch new file mode 100644 index 0000000000000..227559f1f91c1 --- /dev/null +++ b/pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch @@ -0,0 +1,63 @@ +From 009c426ab37ef7f8d9d8e30f45096225203d694a Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Tue, 11 Aug 2020 11:27:21 +0200 +Subject: [PATCH] Fix build for glibc-2.32 + +The `sys_siglist`-array has been removed. Instead, `strsignal` should be +used. +--- + console/fbtools.c | 2 +- + console/record.c | 2 +- + x11/rootv.c | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/console/fbtools.c b/console/fbtools.c +index 9f876df..07739ff 100644 +--- a/console/fbtools.c ++++ b/console/fbtools.c +@@ -520,6 +520,6 @@ fb_catch_exit_signals(void) + + /* cleanup */ + fb_cleanup(); +- fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]); ++ fprintf(stderr,"Oops: %s\n",strsignal(termsig)); + exit(42); + } +diff --git a/console/record.c b/console/record.c +index 685221b..90f0c85 100644 +--- a/console/record.c ++++ b/console/record.c +@@ -429,7 +429,7 @@ ctrlc(int signal) + { + if (verbose) + fprintf(stderr,"\n%s - exiting\n", +- sys_siglist[signal]); ++ strsignal(signal)); + stop = 1; + } + +diff --git a/x11/rootv.c b/x11/rootv.c +index 60a8406..4bf458b 100644 +--- a/x11/rootv.c ++++ b/x11/rootv.c +@@ -133,7 +133,7 @@ catch_sig(int signal) + termsig = signal; + if (verbose) + fprintf(stderr,"received signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig,strsignal(termsig)); + } + + static void usage(FILE *fp) +@@ -422,7 +422,7 @@ main(int argc, char *argv[]) + } + if (verbose && termsig) + fprintf(stderr,"exiting on signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig,strsignal(termsig)); + if (do_mute && have_mute) + XvSetPortAttribute(dpy,port,XV_MUTE,1); + XvStopVideo(dpy,port,win); +-- +2.25.4 + diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index a82ea0444073d..ee2f811cb4a13 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { sha256 = "055p0wia0xsj073l8mg4ifa6m81dmv6p45qyh99brramq5iylfy5"; }; + patches = [ + ./0001-Fix-build-for-glibc-2.32.patch + ]; + buildInputs = [ ncurses libjpeg |