commit 5f2cd6016e170b9a912b917d971271f1685d6699
Author: Jakub Bogusz <[email protected]>
Date: Sat Sep 12 21:47:30 2020 +0200
- updated to 3.107
- added glibc patch (fix build with glibc 2.32: replace uses of sys_siglist
by strsignal)
xawtv-glibc.patch | 41 +++++++++++++++++++++++++++++++++++++++++
xawtv.spec | 11 ++++++-----
2 files changed, 47 insertions(+), 5 deletions(-)
---
diff --git a/xawtv.spec b/xawtv.spec
index 12df85e..129fe2c 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -14,12 +14,12 @@ Summary(pt_BR.UTF-8): Visualizador de fluxos de
imagens obtidas através do Vide
Summary(ru.UTF-8): Просмотр и запись видеопотоков
Summary(uk.UTF-8): Перегляд та запис відеопотоків
Name: xawtv
-Version: 3.106
+Version: 3.107
Release: 1
-License: GPL
+License: GPL v2
Group: X11/Applications
Source0: https://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2
-# Source0-md5: 1fd7c98fa8973f501d52449202c71ca7
+# Source0-md5: 3c9171aeeda7ca3eb2287f45ca7e86a9
Source1: Xawtv.ad-pl
Source2: %{name}.desktop
Source3: %{name}-noxv.desktop
@@ -31,7 +31,8 @@ Patch1:
%{name}-channels_list-cable_poland_PTK.patch
Patch2: %{name}-fullscreen.patch
Patch3: %{name}-libng_fix.patch
Patch4: %{name}-path-fix.patch
-URL: http://bytesex.org/xawtv/
+Patch5: %{name}-glibc.patch
+URL: https://www.kraxel.org/blog/linux/xawtv/
BuildRequires: OpenGL-devel
%{?with_aalib:BuildRequires: aalib-devel}
BuildRequires: alsa-lib-devel
@@ -217,11 +218,11 @@ telewizyjnych:
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
%{__autoconf}
CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
-# -I/usr/include/X11/fonts"
%configure \
%{!?with_aalib:--disable-aalib} \
%{!?with_lirc:--disable-lirc} \
diff --git a/xawtv-glibc.patch b/xawtv-glibc.patch
new file mode 100644
index 0000000..fc01bac
--- /dev/null
+++ b/xawtv-glibc.patch
@@ -0,0 +1,41 @@
+--- xawtv-3.107/console/record.c.orig 2020-05-16 01:32:25.000000000 +0200
++++ xawtv-3.107/console/record.c 2020-09-12 21:34:51.025822065 +0200
+@@ -429,7 +429,7 @@
+ {
+ if (verbose)
+ fprintf(stderr,"\n%s - exiting\n",
+- sys_siglist[signal]);
++ strsignal(signal));
+ stop = 1;
+ }
+
+--- xawtv-3.107/console/fbtools.c.orig 2020-05-16 01:32:25.000000000 +0200
++++ xawtv-3.107/console/fbtools.c 2020-09-12 21:42:49.666562379 +0200
+@@ -520,6 +520,6 @@
+
+ /* cleanup */
+ fb_cleanup();
+- fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]);
++ fprintf(stderr,"Oops: %s\n",strsignal(termsig));
+ exit(42);
+ }
+--- xawtv-3.107/x11/rootv.c.orig 2020-09-12 21:39:10.401083576 +0200
++++ xawtv-3.107/x11/rootv.c 2020-09-12 21:43:49.016240854 +0200
+@@ -137,7 +137,7 @@
+ termsig = signal;
+ if (verbose)
+ fprintf(stderr,"received signal %d [%s]\n",
+- termsig,sys_siglist[termsig]);
++ termsig,strsignal(termsig));
+ }
+
+ static void usage(FILE *fp)
+@@ -426,7 +426,7 @@
+ }
+ 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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xawtv.git/commitdiff/5f2cd6016e170b9a912b917d971271f1685d6699
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
