Compare commits

..

84 commits

Author SHA1 Message Date
Fedora Release Engineering
5539e087c1 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 09:01:03 +00:00
Fedora Release Engineering
fcfc7f73c0 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:27:38 +00:00
Fedora Release Engineering
90520da929 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:37:47 +00:00
Dmitry Butskoy
5f0ef07e61 Switch to PolicyKit, and no more use /usr/sbin 2025-01-24 09:04:15 +03:00
Fedora Release Engineering
364667d071 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 15:25:48 +00:00
Miroslav Suchý
6af3948a1e convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 03:45:05 +02:00
Fedora Release Engineering
09b65267ec Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 09:42:55 +00:00
Software Management Team
445fad2a08 Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:50 +02:00
Dmitry Butskoy
44737a4de3 Fix incompatible pointer types warning (#2261796) 2024-01-30 04:35:57 +03:00
Fedora Release Engineering
e0b4184086 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 09:19:54 +00:00
Fedora Release Engineering
efb101deb2 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 18:31:24 +00:00
Fedora Release Engineering
496626024f Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 07:09:06 +00:00
Fedora Release Engineering
8a7f5f3cff Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 12:47:20 +00:00
Fedora Release Engineering
d18ea31e7a - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 04:48:34 +00:00
Fedora Release Engineering
c72181f987 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 21:16:58 +00:00
Fedora Release Engineering
ea3dd8d395 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 23:47:49 +00:00
Tom Stellard
e4cf0a3547 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-09 01:08:14 +00:00
Dmitry Butskoy
bb1260368d . 2020-09-26 15:35:43 +03:00
Fedora Release Engineering
f4ea785147 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 14:27:27 +00:00
Jeff Law
4b091097da - Use strsignal, not sys_siglist 2020-07-23 21:52:05 -06:00
Mauro Carvalho Chehab
7261b17c4f Bump to version 3.107
- fix some issues with gcc 10.1;
- some fixes at v4l-conf for it to check if a devnode exists,
  before opening it in R/W mode.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2020-05-16 01:46:01 +02:00
buc
0d20a2cee9 Build with -fcommon 2020-02-01 18:20:07 +03:00
Fedora Release Engineering
af40cc698f - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 04:06:17 +00:00
Fedora Release Engineering
ab9e269d8c - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 03:52:36 +00:00
Mauro Carvalho Chehab
f8017eb993 Update sources for xawtv 3.106
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2019-02-21 08:35:45 -03:00
Mauro Carvalho Chehab
5a9d90ebe9 Bump to version 3.106
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2019-02-21 08:26:06 -03:00
Fedora Release Engineering
aebfe0f362 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 12:06:31 +00:00
34c6498d57 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:55 +01:00
487aa2a55f
Remove obsolete scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-27 13:21:08 +01:00
Fedora Release Engineering
5995ae4dd5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 09:05:54 +00:00
Igor Gnatenko
cd97179701 add BuildRequires: gcc
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-09 19:06:53 +02:00
Mauro Carvalho Chehab
8574b3a8fa Add some sanity checks to prevent errors with high res cameras
When the cameras have a resolution that is higher than the
framebuffer, segmentation fault may occur. Prevent that.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-06-12 06:26:53 -03:00
Mauro Carvalho Chehab
c672668122 Cleanup FB console if an error happens
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-06-12 06:26:53 -03:00
Mauro Carvalho Chehab
d2a451213d Update sources to point to xawtv 3.105
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-06-11 11:57:03 -03:00
Mauro Carvalho Chehab
b5b452bdbf Bump xawtv to the newer 3.105 version
This version already include sysmacros and improve console font
support to the newer PSF formats. So, none of the existing
patches are needed.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-06-11 10:53:10 -03:00
buc
4980bd5977 fix fbtv console font 2018-06-01 01:06:23 +03:00
buc
8a475fd3a5 . 2018-03-18 02:18:48 +03:00
buc
b714d2044d explicitly include sys/sysmacros.h in the source 2018-03-18 02:17:34 +03:00
buc
7b9d75b9dd fileutils no more exists 2018-03-15 20:42:47 +03:00
Fedora Release Engineering
b57871c2d4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 21:19:39 +00:00
Fedora Release Engineering
c6b4a45600 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 10:28:16 +00:00
Fedora Release Engineering
84786bf523 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 21:52:47 +00:00
Petr Písař
9d484fcf70 perl dependency renamed to perl-interpreter <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules> 2017-07-12 14:49:36 +02:00
Ralf Corsépius
c7f1e06c37 Add BR: perl (Fix F26BFS). 2017-02-15 10:21:43 +01:00
Fedora Release Engineering
fe0fef6a6a - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 17:38:57 +00:00
buc
c5431e99f2 drop unneeded source 2016-02-17 03:49:32 +03:00
Hans de Goede
af19002a66 Drop no longer used xawtv.desktop 2016-02-15 23:23:55 +01:00
Hans de Goede
3871b59e2b Bring in several bugfix patch from upstream
- Fix crash with saa7134 driver (rhbz#1305389)
- Use png instead of xpm for icons
- Add appdata
- Build motv and mtt now that we have a FOSS motif, put them in
  xawtv-motv resp xawtv-mtt sub-packages
- Remove changelog entries older then 10 years
2016-02-15 23:20:16 +01:00
Fedora Release Engineering
71907b01bd - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-05 03:16:15 +00:00
Dennis Gilmore
167bb34f6f - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-19 03:43:39 +00:00
buc
35ae9c7bd1 Fix #1155784 2015-01-04 20:52:31 +03:00
888273a32b - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-18 09:14:01 +00:00
Dennis Gilmore
9e9efb6ab4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-08 00:12:15 -05:00
Dennis Gilmore
1572a1c265 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-04 02:33:55 -05:00
Hans de Goede
32962aeab9 New upstream version 3.103 2013-04-02 16:05:57 +02:00
Parag Nemade
32b70d3232 Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
- Cleanup spec as per recently changed packaging guidelines
2013-02-10 22:43:04 +05:30
Adam Tkac
579f120ffa Rebuild due to "jpeg8-ABI" feature drop
Signed-off-by: Adam Tkac <atkac@redhat.com>
2013-01-21 18:00:04 +01:00
Adam Tkac
54fddde3dc rebuild against new libjpeg
Signed-off-by: Adam Tkac <atkac@redhat.com>
2012-12-21 20:39:46 +01:00
Dennis Gilmore
726e0ba84c - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-21 23:23:29 -05:00
Dennis Gilmore
cc66d3a876 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-14 02:37:01 -06:00
Adam Jackson
a7c3cd2b50 Rebuild for new libpng 2011-12-06 01:32:06 -05:00
Mauro Carvalho Chehab
324fe03bf0 Add changelog entry for xawtv 3.101
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-07-03 12:07:42 -03:00
Mauro Carvalho Chehab
d9eb7efdf6 Bump version to 3.101
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-07-03 11:44:43 -03:00
Mauro Carvalho Chehab
41701062f6 Update to version 3.100
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-03-02 09:45:17 -03:00
Dmitry Butskoy
768ba1d65f update to 3.99.rc6 2011-02-17 18:28:27 +03:00
Dennis Gilmore
8cbf40b085 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-07 21:34:32 -06:00
Dmitry Butskoy
ea450c95b7 update to 3.99.rc4 2011-02-03 17:53:15 +03:00
Mauro Carvalho Chehab
361ad50293 Bump to version 3.99-rc3
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-02-02 19:29:17 -02:00
Dmitry Butskoy
0789f412d5 drop old fontconfig patch 2011-02-02 20:14:26 +03:00
Dmitry Butskoy
b4c19f09c9 add the actual patch for compatibility with xft > 2.2.0 2011-02-02 20:03:14 +03:00
Dmitry Butskoy
45ce1bddbe temporary drop patch0 to see the problem's build report 2011-02-02 19:29:46 +03:00
Dmitry Butskoy
1a35c97310 Spec file cleanup 2011-02-02 18:14:46 +03:00
Mauro Carvalho Chehab
2a8a85aa89 Bump to version 3.99-rc2
Almost all patches are now upstream. Just one build fix remains.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-02-01 20:31:08 -02:00
Mauro Carvalho Chehab
674a33e057 Re-apply xawtv-3.95-vbi-compile-fix.patch
While this patch doesn't seem to be needed with Fedora 14, Fedora 15
build now requires it:

gcc -ldl -Wl,-E -o x11/xawtv x11/xawtv.o x11/wmhooks.o x11/atoms.o x11/x11.o x11/blit.o x11/xt.o x11/xv.o x11/toolbox.o x11/conf.o x11/complete-xaw.o x11/vbi-x11.o jwz/remote.o common/channel.o common/vbi-data.o common/lirc.o common/joystick.o common/midictrl.o common/sound.o common/webcam.o common/frequencies.o common/commands.o common/parseconfig.o common/capture.o common/event.o libng/libng.a -lpthread -lncursesw -lasound -lXft -lXv -lXrandr -lXrender -lXinerama -lXxf86vm -lXxf86dga -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lzvbi -lpthread -lm -lpng -lz -lGL -lm -ljpeg -lm
/usr/bin/ld: x11/vbi-x11.o: undefined reference to symbol 'FcNameParse'
/usr/bin/ld: note: 'FcNameParse' is defined in DSO /usr/lib64/libfontconfig.so.1 so try adding it to the linker command line
/usr/lib64/libfontconfig.so.1: could not read symbols: Invalid operation
collect2: ld returned 1 exit status

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-01-29 09:39:08 -02:00
Mauro Carvalho Chehab
8e04ae60c1 Update to version 3.99.rc1
Fixes radio application. Tested with an Avermedia m135 board.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-01-28 21:21:22 -02:00
Dmitry Butskoy
a02d01fcd9 some spec file cleanups 2011-01-28 20:22:49 +03:00
Mauro Carvalho Chehab
959826a772 Updated source
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-01-28 12:00:28 -02:00
Dmitry Butskoy
28bd9ed387 fix typo in version 2011-01-28 16:43:18 +03:00
Mauro Carvalho Chehab
3ff71a48d0 Bump version to 3.98
Several patches from Fedora were applied upstream, so we can just remove
them. The other patches are:
    - xawtv-3.95-strip.patch:
	Fedora-specific customization;
    - xawtv-3.95-libv4l2.patch:
	libv4l2 patch (we prefer to keep this out-of-tree for now,
	since pure-xawtv is useful for some tests. Maybe later,
	we may have a separate driver for V4L2 and for libv4l2.
    - xawtv-3.95-font.patch
	Not sure if this is fedora-specific, or if it is related to
	pure upstream changes at Xorg fonts;
    - xawtv-3.95-vbi-compile-fix.patch
	Seems to be either uneeded or Fedora-specific. Upstream compiles
	fine without this change on RHEL6.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-01-28 01:00:49 -02:00
Hans de Goede
92c776ba0b Fix compile with newer zvbi 2010-11-17 11:46:58 +01:00
Hans de Goede
4f5ee9823b - Protect the exit code from being called twice. This fixes a double
free error when the user tries to exit twice when xawtv is stuck (#608344)
2010-11-17 10:57:18 +01:00
Fedora Release Engineering
d143be26a4 dist-git conversion 2010-07-29 15:32:45 +00:00
909eba02c0 - Fix xawtv not starting due to it not finding its fonts 2010-03-12 16:02:45 +00:00
Bill Nottingham
9e15857d52 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 22:40:54 +00:00
9 changed files with 238 additions and 339 deletions

6
.gitignore vendored
View file

@ -3,6 +3,10 @@ xawtv-3.98.tar.bz2
/xawtv-3.99.rc2.tar.bz2
/xawtv-3.99.rc3.tar.bz2
/xawtv-3.99.rc4.tar.bz2
/xawtv-3.99.rc5.tar.bz2
/xawtv-3.99.rc6.tar.bz2
/xawtv-3.100.tar.bz2
/xawtv-3.101.tar.bz2
/xawtv-3.103.tar.bz2
/xawtv-3.105.tar.bz2
/xawtv-3.106.tar.bz2
/xawtv-3.107.tar.bz2

View file

@ -1,84 +0,0 @@
From 185c8b182ac6f7fa6a5c69975f9dabdb9af6fce0 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Mon, 11 Jun 2018 13:34:08 -0300
Subject: [PATCH 1/3] fbtv: don't keep a black screen in case of fatal errors
If something bad happens and fbtv exits, it should restore
the VT window, as otherwise the error messages won't be
displayed.
So, be sure to call fb_cleanup() before calling exit().
Let's also start ncurses later, as this is used only to get
keys, and this happens only within the image display loop.
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
console/fbtv.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/console/fbtv.c b/console/fbtv.c
index aba517e4fc8e..33372385b7c6 100644
--- a/console/fbtv.c
+++ b/console/fbtv.c
@@ -279,8 +279,8 @@ fb_initcolors(int fd, int gray)
#endif
break;
default:
- fprintf(stderr, "Oops: %i bit/pixel ???\n",
- fb_var.bits_per_pixel);
+ fb_cleanup();
+ fprintf(stderr, "Oops: %i bit/pixel ???\n", fb_var.bits_per_pixel);
exit(1);
}
@@ -404,6 +404,7 @@ static void do_capture(int from, int to, int tmp_switch)
if (0 != ng_grabber_setformat(&fmt,1)) {
gfmt = fmt;
if (NULL == (conv = ng_grabber_findconv(&gfmt,0))) {
+ fb_cleanup();
fprintf(stderr,"can't find useful capture format\n");
exit(1);
}
@@ -528,6 +529,7 @@ grabber_init(void)
drv = ng_vid_open(&ng_dev.video, ng_dev.driver, &screen, 0, &h_drv);
if (NULL == drv) {
+ fb_cleanup();
fprintf(stderr,"no grabber device available\n");
exit(1);
}
@@ -724,7 +726,6 @@ main(int argc, char *argv[])
exit_hook = do_exit;
fullscreen_hook = do_fullscreen;
- tty_init();
memset(&act,0,sizeof(act));
act.sa_handler = ctrlc;
sigemptyset(&act.sa_mask);
@@ -770,6 +771,7 @@ main(int argc, char *argv[])
}
#endif
+ tty_init();
fb_memset(fb_mem+fb_mem_offset,0,fb_fix.smem_len);
for (;!sig;) {
if ((fb_switch_state == FB_ACTIVE || keep_dma_on) && !quiet) {
@@ -824,6 +826,14 @@ main(int argc, char *argv[])
fps++;
/* grab + convert frame */
if (NULL == (buf = ng_grabber_grab_image(0))) {
+ do_va_cmd(2,"capture","off");
+ if (mute)
+ audio_off();
+ drv->close(h_drv);
+ if (fb_switch_state == FB_ACTIVE)
+ fb_memset(fb_mem+fb_mem_offset,0,fb_fix.smem_len);
+ tty_cleanup();
+ fb_cleanup();
fprintf(stderr,"capturing image failed\n");
exit(1);
}
--
2.17.1

View file

@ -1,74 +0,0 @@
From bc3b0ec4d5f2af3e9b8e70287b4bdc885111f174 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Mon, 11 Jun 2018 16:54:13 -0300
Subject: [PATCH 2/3] fbdev: prevent writing outsize framebuffer area
There are a series of things at the code that could overflow
and make it to try writing past the framebuffer. Prevent it.
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
console/fbtv.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/console/fbtv.c b/console/fbtv.c
index 33372385b7c6..1d700e6f945f 100644
--- a/console/fbtv.c
+++ b/console/fbtv.c
@@ -377,6 +377,14 @@ static void do_capture(int from, int to, int tmp_switch)
break;
}
+ /* Sanity check: don't accept resolution higher than framebuffer */
+ if (ww && hh) {
+ if (ww > fb_var.xres)
+ ww = fb_var.xres;
+ if (hh > fb_var.yres)
+ hh = fb_var.yres;
+ }
+
/* on */
memset(&buf,0,sizeof(buf));
switch (to) {
@@ -411,8 +419,9 @@ static void do_capture(int from, int to, int tmp_switch)
ch = ng_convert_alloc(conv,&gfmt,&fmt);
ng_convert_init(ch);
}
- dx += (fb_var.xres-24-fmt.width)/2;
- dy += (fb_var.yres-16-fmt.height)/2;
+
+ dx += (fb_var.xres - 24 - fmt.width)/2;
+ dy += (fb_var.yres - 16 - fmt.height)/2;
if (f_drv & CAN_CAPTURE)
drv->startvideo(h_drv,-1,2);
@@ -464,6 +473,12 @@ static void do_capture(int from, int to, int tmp_switch)
}
break;
}
+
+ /* Sanity checks: some of the formula above could overflow */
+ if (dx < 0 || dx > fb_var.xres)
+ dx = 0;
+ if (dy < 0 || dy > fb_var.yres)
+ dy = 0;
}
static void
@@ -848,7 +863,13 @@ main(int argc, char *argv[])
linesize = buf->fmt.width * (ng_vfmt_to_depth[fmt.fmtid] / 8);
+ /* Prevent writing at the next line */
+ if (linesize > fb_fix.line_length)
+ linesize = fb_fix.line_length;
for (ui = 0; ui < buf->fmt.height; ui++) {
+ if ((char *)dst + linesize > (char *)fb_mem + fb_mem_offset + fb_fix.smem_len)
+ break;
+
memcpy(dst, src, linesize);
src += buf->fmt.bytesperline;
dst += fb_fix.line_length;
--
2.17.1

View file

@ -1,85 +0,0 @@
From a4493b399e45a97b9dd14499f54719cc4095f447 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Mon, 11 Jun 2018 17:04:14 -0300
Subject: [PATCH 3/3] fbtv: allow displaying texts over the camera streaming
screen
When the image is too big, there won't be a f->height space
before the streaming window. So, allow overwriting the fonts
on the top of it.
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
console/fbtv.c | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/console/fbtv.c b/console/fbtv.c
index 1d700e6f945f..278443fcbf3c 100644
--- a/console/fbtv.c
+++ b/console/fbtv.c
@@ -604,7 +604,7 @@ main(int argc, char *argv[])
unsigned long freq;
struct timeval tv;
time_t t;
- char text[145],event[64],*env,*src,*dst;
+ char text1[145], text2[145], event[64], *env, *src, *dst;
fd_set set;
struct sigaction act,old;
@@ -790,26 +790,28 @@ main(int argc, char *argv[])
fb_memset(fb_mem+fb_mem_offset,0,fb_fix.smem_len);
for (;!sig;) {
if ((fb_switch_state == FB_ACTIVE || keep_dma_on) && !quiet) {
- /* clear first lines */
- fb_memset(fb_mem+fb_mem_offset,0,f->height*fb_fix.line_length);
if (message[0] != '\0') {
- strcpy(text,message);
+ strcpy(text1, message);
} else {
- sprintf(text,"Framebuffer TV - %s",default_title);
+ sprintf(text1, "Framebuffer TV - %s",default_title);
}
/* debugging + preformance monitoring */
switch (cur_capture) {
case CAPTURE_GRABDISPLAY:
- sprintf(text+strlen(text), " - grab %d.%d fps",fps/5,(fps*2)%10);
+ sprintf(text1 + strlen(text1), " - grab %d.%d fps",
+ fps / 5, (fps * 2) % 10);
break;
}
- text_out(0,0,text);
- if (dy > 0) {
- /* display time */
- time(&t);
- strftime(text,16,"%H:%M",localtime(&t));
- text_out(fb_var.xres - text_width(text) - f->width, 0, text);
+ /* display time */
+ time(&t);
+ strftime(text2, 16, "%H:%M", localtime(&t));
+
+ if (dy >= f->height) {
+ /* clear first lines */
+ fb_memset(fb_mem+fb_mem_offset,0,f->height*fb_fix.line_length);
+ text_out(0,0,text1);
+ text_out(fb_var.xres - text_width(text2) - f->width, 0, text2);
}
}
if (switch_last != fb_switch_state)
@@ -883,6 +885,13 @@ main(int argc, char *argv[])
tv.tv_usec = 0;
rc = select(fdmax,&set,NULL,NULL,&tv);
}
+
+ /* If space is too short, overlay text at screen */
+ if ((fb_switch_state == FB_ACTIVE || keep_dma_on) && !quiet && dy < f->height) {
+ text_out(0,0,text1);
+ text_out(fb_var.xres - text_width(text2) - f->width, 0, text2);
+ }
+
err = errno;
if (switch_last != fb_switch_state)
console_switch();
--
2.17.1

View file

@ -1 +1 @@
SHA512 (xawtv-3.105.tar.bz2) = 0c1e2c3a73b3452778762b26a061f5646ef2a34de80027e17777ee9f6ca91ca5370b4790e2bdbe4b5edc864fe9775c9125c52e951fb08c83dc1706afbdf21e55
SHA512 (xawtv-3.107.tar.bz2) = 29935e9265a96223097e6c4ab65d06c45233238992901d63aa3008e6f35cb59d474cebabd4136e47451242ba35df9ef08f9ef762c01ad688833429bc72d61536

View file

@ -1,35 +0,0 @@
diff --git a/console/v4l-conf.c b/console/v4l-conf.c
index c38bf16..c96886b 100644
--- a/console/v4l-conf.c
+++ b/console/v4l-conf.c
@@ -141,20 +141,23 @@ dev_open(const char *device, int major)
exit(1);
}
- /* open & check v4l device */
- if (-1 == (fd = open(device,O_RDWR))) {
- fprintf(stderr, "can't open %s: %s\n", device, strerror(errno));
+ /* First check if the device is really a devnode of the right type */
+ if (-1 == stat(device, &stb)) {
+ fprintf(stderr, "stat(%s): %s\n", device, strerror(errno));
exit(1);
}
- if (-1 == fstat(fd,&stb)) {
- fprintf(stderr, "fstat(%s): %s\n", device, strerror(errno));
- exit(1);
- }
if (!S_ISCHR(stb.st_mode) || (major(stb.st_rdev) != major)) {
fprintf(stderr, "%s: wrong device\n", device);
exit(1);
}
+
+ /* Then open it */
+ if (-1 == (fd = open(device,O_RDWR))) {
+ fprintf(stderr, "can't open %s: %s\n", device, strerror(errno));
+ exit(1);
+ }
+
return fd;
}

View file

@ -0,0 +1,28 @@
#
# Since https://gitlab.freedesktop.org/xorg/lib/libxaw/-/commit/197e9d055f3cd351
# XawListChange() want the second argument to be (const char **) instead of (char **).
#
# To avoid compiler issues when -Wcompatible-pointer-types just cast it to (void *) .
#
diff -Nrup xawtv-3.107/x11/propwatch.c xawtv-3.107-OK/x11/propwatch.c
--- xawtv-3.107/x11/propwatch.c 2020-05-16 02:32:25.000000000 +0300
+++ xawtv-3.107-OK/x11/propwatch.c 2024-01-30 04:16:55.411559253 +0300
@@ -316,7 +316,7 @@ RebuildList(void)
for (i=0, this=watchlist; this!=NULL; i++, this=this->next)
str_list[i] = this->text;
qsort(str_list,str_count,sizeof(char*),cmp);
- XawListChange(bl,str_count ? str_list : &empty,
+ XawListChange(bl,(void *)(str_count ? str_list : &empty),
str_count ? str_count : 1,1000,1);
}
@@ -495,7 +495,7 @@ ProcessPropertyChange(Display *dpy, XEve
AddWatch(dpy,event->xproperty.window, i);
else {
Update(dpy,event->xproperty.window,event->xproperty.atom);
- XawListChange(bl,str_list,str_count,1000,1);
+ XawListChange(bl,(void *)str_list,str_count,1000,1);
}
}
}

47
xawtv-strsignal.patch Normal file
View file

@ -0,0 +1,47 @@
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);

View file

@ -2,23 +2,23 @@
Summary: TV applications for video4linux compliant devices
Name: xawtv
Version: 3.105
Release: 2%{?dist}
Group: Applications/Multimedia
License: GPLv2+
Version: 3.107
Release: 18%{?dist}
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
URL: http://linuxtv.org/wiki/index.php/Xawtv
Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2
Patch0: 0001-fbtv-don-t-keep-a-black-screen-in-case-of-fatal-erro.patch
Patch1: 0002-fbdev-prevent-writing-outsize-framebuffer-area.patch
Patch2: 0003-fbtv-allow-displaying-texts-over-the-camera-streamin.patch
Patch3: xawtv-3.105-cve_2020_13696.patch
Patch0: xawtv-strsignal.patch
Patch1: xawtv-3.107-XawListChange.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel
BuildRequires: libXft-devel, libXinerama-devel
BuildRequires: libXpm-devel, libXrandr-devel, libXt-devel
BuildRequires: libXxf86dga-devel, libXv-devel
BuildRequires: openmotif-devel
BuildRequires: motif-devel
%{?with_quicktime:BuildRequires: libquicktime-devel}
BuildRequires: ncurses-devel, coreutils, libjpeg-devel, libpng-devel
@ -28,10 +28,11 @@ BuildRequires: libdv-devel
%endif
BuildRequires: zvbi-devel, aalib-devel
BuildRequires: gpm-devel, slang-devel
BuildRequires: ImageMagick desktop-file-utils
BuildRequires: ImageMagick desktop-file-utils libappstream-glib
BuildRequires: libv4l-devel
BuildRequires: perl-interpreter
Requires: usermode xorg-x11-fonts-misc hicolor-icon-theme
Requires: polkit xorg-x11-fonts-misc hicolor-icon-theme
%description
Xawtv is a simple xaw-based TV program which uses the bttv driver or
@ -59,14 +60,11 @@ which support teletext.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch -P0 -p1
%patch -P1 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -fcommon"
%configure %{!?_with_quicktime: --disable-quicktime}
make %{?_smp_mflags} verbose=yes
@ -84,64 +82,69 @@ for i in 16x16 32x32 48x48; do
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps/%{name}.png
done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
for i in xawtv motv mtt; do
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
contrib/$i.desktop
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
contrib/$i.desktop
install -p -m 0644 contrib/$i.*.xml $RPM_BUILD_ROOT%{_datadir}/appdata
appstream-util validate-relax --nonet \
$RPM_BUILD_ROOT%{_datadir}/appdata/$i.*.xml
done
# v4l-conf stuff
mkdir -p $RPM_BUILD_ROOT%{_sbindir} \
$RPM_BUILD_ROOT%{_sysconfdir}/pam.d \
$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps \
mkdir -p $RPM_BUILD_ROOT%{_libexecdir} $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions
cat >v4l-conf.pam <<!
#%%PAM-1.0
auth sufficient pam_rootok.so
auth required pam_console.so
account required pam_permit.so
session required pam_permit.so
session optional pam_xauth.so
!
install -m 0644 v4l-conf.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/v4l-conf
mv $RPM_BUILD_ROOT%{_bindir}/v4l-conf $RPM_BUILD_ROOT%{_libexecdir}/
cat >v4l-conf.apps <<!
SESSION=true
USER=root
PROGRAM=%{_sbindir}/v4l-conf
!
install -p -m 0644 v4l-conf.apps $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/v4l-conf
cat >v4l-conf.sh <<EOF
#!/bin/sh
exec %{_bindir}/pkexec %{_libexecdir}/v4l-conf
EOF
install -p -m 755 v4l-conf.sh $RPM_BUILD_ROOT%{_bindir}/v4l-conf
mv $RPM_BUILD_ROOT%{_bindir}/v4l-conf $RPM_BUILD_ROOT%{_sbindir}/
ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf
cat >v4l-conf.policy <<EOF
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policyconfig PUBLIC
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
<policyconfig>
<vendor>XawTV Project</vendor>
<vendor_url>%{url}</vendor_url>
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
<action id="org.fedoraproject.v4l.conf.pkexec.run">
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
<description>Run v4l-conf with privileges required</description>
<message>Authentication is required for privileged operations of v4l-conf</message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>no</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
<annotate key="org.freedesktop.policykit.exec.path">%{_libexecdir}/v4l-conf</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
</policyconfig>
EOF
install -p -m 644 v4l-conf.policy $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/org.fedoraproject.v4l.conf.policy
%files
%doc COPYING README TODO contrib/frequencies*
%config(noreplace) %{_sysconfdir}/pam.d/v4l-conf
%config(noreplace) %{_sysconfdir}/security/console.apps/v4l-conf
%doc README TODO contrib/frequencies*
%license COPYING
%{_bindir}/*
%exclude %{_bindir}/motv
%exclude %{_bindir}/mtt
%{_sbindir}/*
%{_libexecdir}/*
%{_libdir}/xawtv
%{_datadir}/xawtv
%{_datadir}/X11/app-defaults/Xawtv
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/polkit-1/actions/*
%{_mandir}/man?/*
%exclude %{_mandir}/man1/motv.1*
%exclude %{_mandir}/man1/mtt.1*
@ -155,28 +158,123 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%lang(de) %{_datadir}/X11/de_DE.UTF-8/app-defaults/MoTV*
%lang(fr) %{_datadir}/X11/fr_FR.UTF-8/app-defaults/MoTV*
%lang(it) %{_datadir}/X11/it_IT.UTF-8/app-defaults/MoTV*
%{_datadir}/appdata/motv.metainfo.xml
%{_datadir}/applications/motv.desktop
%files mtt
%{_bindir}/mtt
%{_mandir}/man1/mtt.1*
%{_datadir}/X11/app-defaults/mtt*
%{_datadir}/appdata/mtt.metainfo.xml
%{_datadir}/applications/mtt.desktop
%changelog
* Sat Sep 26 2020 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.105-2
- fix CVE-2020-13696 (#1882287)
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Tue Jun 19 2018 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.105-1
- Upgrade to 3.105
- spec file cleanup
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Wed Feb 17 2016 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.103-8
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jan 24 2025 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.107-15
- switch to PolicyKit (#502723)
- avoid /usr/sbin dir (#2341562)
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 3.107-13
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Jan 30 2024 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.107-11
- fix incompatible pointer types warnings (#2261796)
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jul 23 2020 Jeff Law <law@redhta.com> - 3.107-2
- Use strsignal, not sys_siglist
* Sat May 16 2020 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 3.107-1
- upgrade to version 3.107
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.106-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
- Use gcc -fcommon flag to build
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.106-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Feb 21 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 3.106-1
- upgrade to version 3.106
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.105-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.105-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jun 11 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 3.105-2
- cleanup FB console if an error happens
* Mon Jun 11 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 3.105-1
- upgrade to version 3.105
* Fri Jun 1 2018 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.103-15
- fix default console font for fbtv(1) (#1406549)
* Thu Mar 15 2018 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.103-14
- fileutils no more exists (#1556548)
- explicitly include sys/sysmacros.h
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.103-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.103-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.103-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Wed Feb 15 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.103-10
- Add BR: perl (Fix F26BFS).
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.103-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Feb 15 2016 Hans de Goede <hdegoede@redhat.com> - 3.103-8
- Bring in several bugfix patch from upstream
- Fix crash with saa7134 driver (rhbz#1305389)
- Use png instead of xpm for icons
- Build motv and mtt now since we have a openmotif, put them in
- Add appdata
- Build motv and mtt now that we have a FOSS motif, put them in
xawtv-motv resp xawtv-mtt sub-packages
- Remove changelog entries older then 10 years