From 9e15857d52872ff4380e963fe03fdbe3f0aad59c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:54 +0000 Subject: [PATCH 01/84] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index aa12db0..ae7fc11 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xawtv -# $Id$ +# $Id: Makefile,v 1.1 2007/06/22 19:26:22 kevin Exp $ NAME := xawtv SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 909eba02c0e05590b04d7132d5c86cb433662cac Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 12 Mar 2010 16:02:45 +0000 Subject: [PATCH 02/84] - Fix xawtv not starting due to it not finding its fonts --- xawtv-3.95-font.patch | 54 ++++++++++++++++++++++++++++++++++--------- xawtv.spec | 7 ++++-- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/xawtv-3.95-font.patch b/xawtv-3.95-font.patch index 02f279e..e26ec7d 100644 --- a/xawtv-3.95-font.patch +++ b/xawtv-3.95-font.patch @@ -1,7 +1,7 @@ -diff -Nrbu xawtv-3.95/vbistuff/alevt.css.in xawtv-3.95-OK/vbistuff/alevt.css.in ---- xawtv-3.95/vbistuff/alevt.css.in 2003-02-14 17:14:08.000000000 +0300 -+++ xawtv-3.95-OK/vbistuff/alevt.css.in 2007-03-02 19:38:26.000000000 +0300 -@@ -3,7 +3,7 @@ +diff -up xawtv-3.95/vbistuff/alevt.css.in.font xawtv-3.95/vbistuff/alevt.css.in +--- xawtv-3.95/vbistuff/alevt.css.in.font 2003-02-14 15:14:08.000000000 +0100 ++++ xawtv-3.95/vbistuff/alevt.css.in 2010-03-12 12:25:48.465315533 +0100 +@@ -3,7 +3,7 @@ body { background-color: white; color: pre.vt { border: 1pt solid black; padding: 12pt } pre.vt { background-color: #c0c0c0; width: auto; float: left } pre.vt { white-space: pre } @@ -10,16 +10,48 @@ diff -Nrbu xawtv-3.95/vbistuff/alevt.css.in xawtv-3.95-OK/vbistuff/alevt.css.in div.quick { clear: both } -diff -Nrbu xawtv-3.95/x11/Xawtv.ad xawtv-3.95-OK/x11/Xawtv.ad ---- xawtv-3.95/x11/Xawtv.ad 2003-02-18 19:31:33.000000000 +0300 -+++ xawtv-3.95-OK/x11/Xawtv.ad 2007-03-02 19:37:26.000000000 +0300 -@@ -382,9 +382,7 @@ +diff -up xawtv-3.95/x11/Xawtv.ad.font xawtv-3.95/x11/Xawtv.ad +--- xawtv-3.95/x11/Xawtv.ad.font 2003-02-18 17:31:33.000000000 +0100 ++++ xawtv-3.95/x11/Xawtv.ad 2010-03-12 12:33:52.024563695 +0100 +@@ -5,24 +5,12 @@ + Xawtv*international: true + Xawtv*font: 7x13bold + Xawtv*fontSet: \ +- -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \ +- -*-courier-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \ +- -gnu-unifont-bold-r-normal--16-*-*-*-c-*-*-*, \ +- -efont-biwidth-bold-r-normal--16-*-*-*-*-*-*-*, \ +- -*-*-bold-r-normal-*-16-*-*-*-m-*-*-*, \ +- -*-*-bold-r-normal-*-16-*-*-*-c-*-*-*, \ +- -*-*-*-*-*-*-16-*-*-*-*-*-*-*, * ++ -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-* + + TopLevelShell*international: true + TopLevelShell*font: 7x13bold + TopLevelShell*fontSet: \ +- -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \ +- -*-courier-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \ +- -gnu-unifont-bold-r-normal--16-*-*-*-c-*-*-*, \ +- -efont-biwidth-bold-r-normal--16-*-*-*-*-*-*-*, \ +- -*-*-bold-r-normal-*-16-*-*-*-m-*-*-*, \ +- -*-*-bold-r-normal-*-16-*-*-*-c-*-*-*, \ +- -*-*-*-*-*-*-16-*-*-*-*-*-*-*,* ++ -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-* + + *popup_help.title: Welcome to xawtv! + xawtv.tv.help: \ +@@ -382,13 +370,8 @@ xawtv.onscreen*background: black xawtv.onscreen*borderColor: black xawtv.onscreen*foreground: lightgreen xawtv.onscreen.label.justify: left -xawtv.onscreen.label.font: -*-ledfixed-medium-r-*--39-*-*-*-c-*-*-* xawtv.onscreen.label.fontSet: \ - -*-ledfixed-medium-r-semicondensed--39-*-*-*-c-*-*-*, \ - -*-bitstream vera sans-medium-r-normal--39-*-*-*-*-*-*-*, \ - -*-luxi sans-medium-r-normal--39-*-*-*-*-*-*-*, \ - -*-*-r-normal--39-*-*-*-*-*-*-*, \ +- -*-bitstream vera sans-medium-r-normal--39-*-*-*-*-*-*-*, \ +- -*-luxi sans-medium-r-normal--39-*-*-*-*-*-*-*, \ +- -*-*-r-normal--39-*-*-*-*-*-*-*, \ +- -*-*-*-*--39-*-*-*-*-*-*-*,* ++ -*-nimbus sans l-medium-r-normal--39-*-*-*-*-*-*-* + + xawtv.vtx.allowShellResize: true + xawtv.vtx.label.resize: true diff --git a/xawtv.spec b/xawtv.spec index ba3536d..2d01a68 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.95 -Release: 12%{?dist}.1 +Release: 13%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://bytesex.org/xawtv/ @@ -45,7 +45,7 @@ BuildRequires: gpm-devel, slang-devel BuildRequires: autoconf, desktop-file-utils %{!?_without_libv4l:BuildRequires: libv4l-devel} -Requires: usermode +Requires: usermode xorg-x11-fonts-ISO8859-1-75dpi urw-fonts BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -164,6 +164,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Fri Mar 12 2010 Hans de Goede 3.95-13 +- Fix xawtv not starting due to it not finding its fonts + * Mon Jul 27 2009 Fedora Release Engineering - 3.95-12.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From d143be26a43292bf22c7e431000f65c6c153920a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:32:45 +0000 Subject: [PATCH 03/84] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ae7fc11..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xawtv -# $Id: Makefile,v 1.1 2007/06/22 19:26:22 kevin Exp $ -NAME := xawtv -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 4f5ee9823b3cd07b004160684cbda87caa44805e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 17 Nov 2010 10:57:18 +0100 Subject: [PATCH 04/84] - 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) --- xawtv-3.95-no-double-exit.patch | 23 +++++++++++++++++++++++ xawtv.spec | 8 +++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 xawtv-3.95-no-double-exit.patch diff --git a/xawtv-3.95-no-double-exit.patch b/xawtv-3.95-no-double-exit.patch new file mode 100644 index 0000000..a45a765 --- /dev/null +++ b/xawtv-3.95-no-double-exit.patch @@ -0,0 +1,23 @@ +xawtv uses an idle callback to exit when a user requests it to exit. When xawtv +is blocked waiting for a video frame from a stuck video device, the user can +try to quit multiple times, which will lead to ExitCB getting called multiple +times, which leads to a double free error. + +This patch protects ExitCB against being called twice. Also see: +https://bugzilla.redhat.com/show_bug.cgi?id=608344 +diff -up xawtv-3.95/x11/xt.c~ xawtv-3.95/x11/xt.c +--- xawtv-3.95/x11/xt.c~ 2010-11-17 10:37:53.000000000 +0100 ++++ xawtv-3.95/x11/xt.c 2010-11-17 10:39:24.617724003 +0100 +@@ -313,6 +313,12 @@ ExitWP(XtPointer client_data) + void + ExitCB(Widget widget, XtPointer client_data, XtPointer calldata) + { ++ static int exit_pending = 0; ++ ++ if (exit_pending) ++ return; ++ ++ exit_pending = 1; + audio_off(); + video_overlay(0); + video_close(); diff --git a/xawtv.spec b/xawtv.spec index 2d01a68..79188e8 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.95 -Release: 13%{?dist} +Release: 14%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://bytesex.org/xawtv/ @@ -25,6 +25,7 @@ Patch10: xawtv-3.95-fixes.patch Patch11: xawtv-3.95-no-dga.patch Patch12: xawtv-3.95-bpl.patch Patch13: xawtv-3.95-v4l2-old-drop.patch +Patch14: xawtv-3.95-no-double-exit.patch # add libv4l2 layer... Patch100: xawtv-3.95-libv4l2.patch @@ -73,6 +74,7 @@ Xawtv also includes a grabber driver for vic. %patch11 -p1 -b .no-dga %patch12 -p1 -b .bpl %patch13 -p1 -b .v4l2-old-drop +%patch14 -p1 %{!?_without_libv4l:%patch100 -p1 -b .libv4l} sed -i -e 's,/usr/X11R6/lib/X11,%{_datadir}/X11,g' configure.ac @@ -164,6 +166,10 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Wed Nov 17 2010 Hans de Goede 3.95-14 +- 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) + * Fri Mar 12 2010 Hans de Goede 3.95-13 - Fix xawtv not starting due to it not finding its fonts From 92c776ba0bdc4b5ff906ea533872a348667c0d32 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 17 Nov 2010 11:46:58 +0100 Subject: [PATCH 05/84] Fix compile with newer zvbi --- xawtv-3.95-vbi-compile-fix.patch | 12 ++++++++++++ xawtv.spec | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 xawtv-3.95-vbi-compile-fix.patch diff --git a/xawtv-3.95-vbi-compile-fix.patch b/xawtv-3.95-vbi-compile-fix.patch new file mode 100644 index 0000000..0253cc3 --- /dev/null +++ b/xawtv-3.95-vbi-compile-fix.patch @@ -0,0 +1,12 @@ +diff -up xawtv-3.95/configure.ac~ xawtv-3.95/configure.ac +--- xawtv-3.95/configure.ac~ 2010-11-17 11:42:27.000000000 +0100 ++++ xawtv-3.95/configure.ac 2010-11-17 11:44:51.891724004 +0100 +@@ -200,7 +200,7 @@ AC_SUBST(LIBZVBI) + LIBZVBI="" + if test "$enable_zvbi" != "no"; then + AC_CHECK_LIB(zvbi, vbi_capture_fd, +- AC_DEFINE(HAVE_ZVBI,1,"have zvbi") FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -lpthread -lm -lpng -lz",,$LIBPTHREAD) ++ AC_DEFINE(HAVE_ZVBI,1,"have zvbi") FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -lpthread -lm -lpng -lz -lfontconfig",,$LIBPTHREAD) + else + echo "*** zvbi disabled" + fi diff --git a/xawtv.spec b/xawtv.spec index 79188e8..8ad3e06 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -26,6 +26,7 @@ Patch11: xawtv-3.95-no-dga.patch Patch12: xawtv-3.95-bpl.patch Patch13: xawtv-3.95-v4l2-old-drop.patch Patch14: xawtv-3.95-no-double-exit.patch +Patch15: xawtv-3.95-vbi-compile-fix.patch # add libv4l2 layer... Patch100: xawtv-3.95-libv4l2.patch @@ -75,6 +76,7 @@ Xawtv also includes a grabber driver for vic. %patch12 -p1 -b .bpl %patch13 -p1 -b .v4l2-old-drop %patch14 -p1 +%patch15 -p1 %{!?_without_libv4l:%patch100 -p1 -b .libv4l} sed -i -e 's,/usr/X11R6/lib/X11,%{_datadir}/X11,g' configure.ac @@ -89,7 +91,7 @@ autoheader export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" %configure --x-libraries=%{_libdir} --disable-motif --disable-quicktime -make +make verbose=yes for man in `find man -name "*.[1-9]" -print` do From 3ff71a48d06edce77ccb01df78bd0cc15e029ca7 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 27 Jan 2011 22:42:03 -0200 Subject: [PATCH 06/84] 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 --- sources | 2 +- xawtv-3.95-bpl.patch | 85 -------------- xawtv-3.95-curses-utf8.patch | 65 ----------- xawtv-3.95-fixes.patch | 72 ------------ xawtv-3.95-gcc4.patch | 79 ------------- xawtv-3.95-man.patch | 190 -------------------------------- xawtv-3.95-no-dga.patch | 120 -------------------- xawtv-3.95-no-double-exit.patch | 23 ---- xawtv-3.95-open.patch | 42 ------- xawtv-3.95-oss.patch | 19 ---- xawtv-3.95-pagesize.patch | 41 ------- xawtv-3.95-region.patch | 22 ---- xawtv-3.95-scantv.patch | 87 --------------- xawtv-3.95-v4l2-old-drop.patch | 19 ---- xawtv.spec | 38 ++----- 15 files changed, 9 insertions(+), 895 deletions(-) delete mode 100644 xawtv-3.95-bpl.patch delete mode 100644 xawtv-3.95-curses-utf8.patch delete mode 100644 xawtv-3.95-fixes.patch delete mode 100644 xawtv-3.95-gcc4.patch delete mode 100644 xawtv-3.95-man.patch delete mode 100644 xawtv-3.95-no-dga.patch delete mode 100644 xawtv-3.95-no-double-exit.patch delete mode 100644 xawtv-3.95-open.patch delete mode 100644 xawtv-3.95-oss.patch delete mode 100644 xawtv-3.95-pagesize.patch delete mode 100644 xawtv-3.95-region.patch delete mode 100644 xawtv-3.95-scantv.patch delete mode 100644 xawtv-3.95-v4l2-old-drop.patch diff --git a/sources b/sources index 024e5c3..27c4847 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad25e03f7e128b318e392cb09f52207d xawtv-3.95.tar.gz +395ce8d61e46080df87aa6f6b3412296 xawtv-3.98.tar.bz2 diff --git a/xawtv-3.95-bpl.patch b/xawtv-3.95-bpl.patch deleted file mode 100644 index 1a8c626..0000000 --- a/xawtv-3.95-bpl.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -Nrbu xawtv-3.95/console/v4l-conf.c xawtv-3.95-OK/console/v4l-conf.c ---- xawtv-3.95/console/v4l-conf.c 2008-08-26 19:37:34.000000000 +0400 -+++ xawtv-3.95-OK/console/v4l-conf.c 2008-08-26 19:39:28.000000000 +0400 -@@ -53,6 +53,7 @@ - int v4l2 = 1; - int user_bpp = 0; - int user_shift = 0; -+int user_bpl = 0; - void *user_base = NULL; - char *display = NULL; - char *fbdev = NULL; -@@ -385,7 +386,15 @@ - } - if (yuv) - fb.fmt.pixelformat = V4L2_PIX_FMT_YUYV; -+ /* Prefer an already configured bpl (if it makes sense) over our found bpl -+ if we did not find a base as our bpl is not very reliable when we did -+ not find a base */ -+ if (user_bpl || d->base || -+ fb.fmt.bytesperline < (fb.fmt.width * ((d->bpp + 7) / 8))) - fb.fmt.bytesperline = d->bpl; -+ else -+ fprintf(stderr,"WARNING: keeping fbuf pitch at: %d, as no base addr was detected\n", -+ (int)fb.fmt.bytesperline); - fb.fmt.sizeimage = fb.fmt.height * fb.fmt.bytesperline; - if (NULL != d->base) - fb.base = d->base; -@@ -498,7 +507,7 @@ - - /* parse options */ - for (;;) { -- if (-1 == (c = getopt(argc, argv, "hyq12d:c:b:s:fa:"))) -+ if (-1 == (c = getopt(argc, argv, "hyq12d:c:b:s:fa:p:"))) - break; - switch (c) { - case 'q': -@@ -543,6 +552,14 @@ - exit(1); - } - break; -+ case 'p': -+ if (0 == getuid()) { -+ sscanf(optarg,"%d",&user_bpl); -+ } else { -+ fprintf(stderr,"only root is allowed to use the -p option\n"); -+ exit(1); -+ } -+ break; - case 'h': - default: - fprintf(stderr, -@@ -560,6 +577,8 @@ - " -a set framebuffer address to \n" - " (in hex, root only, successful autodetect\n" - " will overwrite this address)\n" -+ " -p set framebuffer pitch to bytes\n" -+ " (decimal, root only)\n" - " -1 force v4l API\n" - " -2 force v4l2 API\n", - argv[0], -@@ -626,6 +645,9 @@ - (d.depth == 15 || d.depth == 16)) - d.depth = user_bpp; - -+ if (user_bpl) -+ d.bpl = user_bpl; -+ - if (verbose) { - fprintf(stderr,"mode: %dx%d, depth=%d, bpp=%d, bpl=%d, ", - d.width,d.height,d.depth,d.bpp,d.bpl); -diff -Nrbu xawtv-3.95/man/v4l-conf.8 xawtv-3.95-OK/man/v4l-conf.8 ---- xawtv-3.95/man/v4l-conf.8 2008-08-26 19:37:34.000000000 +0400 -+++ xawtv-3.95-OK/man/v4l-conf.8 2008-08-26 19:45:02.000000000 +0400 -@@ -62,6 +62,11 @@ - autodetected value, this switch is only useful if autodetect doesn't - work because the X-Server lacks DGA support. You can put this into - /etc/conf.modules, as "post-install bttv ..." for example. -+.TP 4 -+\fB-p\fP pitch -+Set framebuffer pitch to \fBpitch\fP bytes. The value should be specified -+in decimal. Allowed for root only. (Currently it is a distro-specific option -+added by Fedora). - .SH BUGS - Hope I haven't any security flaws in there. If you find one, drop me a - note. Mails with patches are preferred :-) diff --git a/xawtv-3.95-curses-utf8.patch b/xawtv-3.95-curses-utf8.patch deleted file mode 100644 index 48f916e..0000000 --- a/xawtv-3.95-curses-utf8.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Nrbu xawtv-3.95/configure.ac xawtv-3.95-OK/configure.ac ---- xawtv-3.95/configure.ac 2004-08-18 19:48:09.000000000 +0400 -+++ xawtv-3.95-OK/configure.ac 2006-12-27 19:01:29.000000000 +0300 -@@ -110,7 +110,10 @@ - AC_CHECK_LIB(c_r,pthread_create,LIBPTHREAD="-lc_r") - fi - AC_CHECK_LIB(ossaudio,main,LIBOSS="-lossaudio") --AC_CHECK_LIB(ncurses,initscr,LIBCURSES="-lncurses") -+AC_CHECK_LIB(ncursesw,initscr,LIBCURSES="-lncursesw") -+if test "$LIBCURSES" = ""; then -+ AC_CHECK_LIB(ncurses,initscr,LIBCURSES="-lncurses") -+fi - if test "$LIBCURSES" = ""; then - AC_CHECK_LIB(curses,initscr,LIBCURSES="-lcurses") - fi -@@ -120,6 +123,9 @@ - echo " you need also the *-devel packages." - exit 1 - fi -+if test "$LIBCURSES" = "-lncursesw"; then -+ CFLAGS="$CFLAGS -I/usr/include/ncursesw" -+fi - AC_SUBST(LIBPTHREAD) - AC_SUBST(LIBOSS) - AC_SUBST(LIBCURSES) -diff -Nrbu xawtv-3.95/console/radio.c xawtv-3.95-OK/console/radio.c ---- xawtv-3.95/console/radio.c 2003-04-16 19:35:13.000000000 +0400 -+++ xawtv-3.95-OK/console/radio.c 2006-12-27 19:13:06.000000000 +0300 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -398,6 +399,8 @@ - int quit=0, scan=0, arg_mute=0; - struct video_tuner tuner; - -+ setlocale(LC_ALL,""); -+ - /* parse args */ - for (;;) { - c = getopt(argc, argv, "mhiqdsSf:c:"); -diff -Nrbu xawtv-3.95/console/record.c xawtv-3.95-OK/console/record.c ---- xawtv-3.95/console/record.c 2003-04-03 14:51:00.000000000 +0400 -+++ xawtv-3.95-OK/console/record.c 2006-12-27 19:13:18.000000000 +0300 -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -574,6 +575,8 @@ - record = 0; - nr = 0; - -+ setlocale(LC_ALL,""); -+ - /* parse options */ - for (;;) { - if (-1 == (c = getopt(argc, argv, "vhlci:o:d:m:r:t:s:L:p:n:"))) diff --git a/xawtv-3.95-fixes.patch b/xawtv-3.95-fixes.patch deleted file mode 100644 index 36fd60f..0000000 --- a/xawtv-3.95-fixes.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -Nrbu xawtv-3.95/libng/plugins/drv0-v4l2.c xawtv-3.95-OK/libng/plugins/drv0-v4l2.c ---- xawtv-3.95/libng/plugins/drv0-v4l2.c 2005-02-11 20:56:24.000000000 +0300 -+++ xawtv-3.95-OK/libng/plugins/drv0-v4l2.c 2008-08-26 19:27:18.000000000 +0400 -@@ -91,6 +91,7 @@ - struct ng_video_fmt fmt_me; - struct v4l2_requestbuffers reqbufs; - struct v4l2_buffer buf_v4l2[WANTED_BUFFERS]; -+ int buf_v4l2_size[WANTED_BUFFERS]; - struct ng_video_buf buf_me[WANTED_BUFFERS]; - unsigned int queue,waiton; - -@@ -166,7 +167,7 @@ - int rc; - - rc = ioctl(fd,cmd,arg); -- if (0 == rc && ng_debug < 2) -+ if (rc >= 0 && ng_debug < 2) - return rc; - if (mayfail && errno == mayfail && ng_debug < 2) - return rc; -@@ -768,6 +769,7 @@ - /* get it */ - memset(&buf,0,sizeof(buf)); - buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; -+ buf.memory = V4L2_MEMORY_MMAP; - if (-1 == xioctl(h->fd,VIDIOC_DQBUF,&buf, 0)) - return -1; - h->waiton++; -@@ -812,6 +814,7 @@ - h->buf_v4l2[i].memory = V4L2_MEMORY_MMAP; - if (-1 == xioctl(h->fd, VIDIOC_QUERYBUF, &h->buf_v4l2[i], 0)) - return -1; -+ h->buf_v4l2_size[i] = h->buf_v4l2[i].length; - h->buf_me[i].fmt = h->fmt_me; - h->buf_me[i].size = h->buf_me[i].fmt.bytesperline * - h->buf_me[i].fmt.height; -@@ -865,12 +868,16 @@ - ng_waiton_video_buf(&h->buf_me[i]); - if (ng_debug) - print_bufinfo(&h->buf_v4l2[i]); -- if (-1 == munmap(h->buf_me[i].data,h->buf_me[i].size)) -+ if (-1 == munmap(h->buf_me[i].data, h->buf_v4l2_size[i])) - perror("munmap"); - } - h->queue = 0; - h->waiton = 0; - -+ /* unrequest buffers (only needed for some drivers) */ -+ h->reqbufs.count = 0; -+ xioctl(h->fd, VIDIOC_REQBUFS, &h->reqbufs, EINVAL); -+ - /* turn on preview (if needed) */ - if (h->ov_on != h->ov_enabled) { - h->ov_on = h->ov_enabled; -@@ -907,6 +914,17 @@ - fmt->width = h->fmt_v4l2.fmt.pix.width; - fmt->height = h->fmt_v4l2.fmt.pix.height; - fmt->bytesperline = h->fmt_v4l2.fmt.pix.bytesperline; -+ /* struct v4l2_format.fmt.pix.bytesperline is bytesperline for the -+ main plane for planar formats, where as we want it to be the total -+ bytesperline for all planes */ -+ switch (fmt->fmtid) { -+ case VIDEO_YUV422P: -+ fmt->bytesperline *= 2; -+ break; -+ case VIDEO_YUV420P: -+ fmt->bytesperline = fmt->bytesperline * 3 / 2; -+ break; -+ } - if (0 == fmt->bytesperline) - fmt->bytesperline = fmt->width * ng_vfmt_to_depth[fmt->fmtid] / 8; - h->fmt_me = *fmt; diff --git a/xawtv-3.95-gcc4.patch b/xawtv-3.95-gcc4.patch deleted file mode 100644 index e514744..0000000 --- a/xawtv-3.95-gcc4.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -Nrbu xawtv-3.95/common/capture.c xawtv-3.95-OK/common/capture.c ---- xawtv-3.95/common/capture.c 2004-10-12 14:16:34.000000000 +0400 -+++ xawtv-3.95-OK/common/capture.c 2006-12-27 19:55:59.000000000 +0300 -@@ -527,12 +527,12 @@ - - if (h->vfmt.fmtid != VIDEO_NONE && h->afmt.fmtid != AUDIO_NONE) { - for (frames = 0; frames < 16; frames++) { -- stopby = (uint64_t)(h->frames + frames) * (uint64_t)1000000000000 / h->fps; -+ stopby = (uint64_t)(h->frames + frames) * (uint64_t)1000000000000ULL / h->fps; - if (stopby > h->ats) - break; - } - frames++; -- h->stopby = (uint64_t)(h->frames + frames) * (uint64_t)1000000000000 / h->fps; -+ h->stopby = (uint64_t)(h->frames + frames) * (uint64_t)1000000000000ULL / h->fps; - while (frames) { - movie_grab_put_video(h,NULL); - frames--; -@@ -594,11 +594,11 @@ - (h->rdrift > 0) ? '+' : '-', - (int)((abs(h->rdrift) / 1000000000)), - (int)((abs(h->rdrift) % 1000000000) / 10000000), -- (int)(h->rdrift * h->fps / (uint64_t)1000000000000), -+ (int)(h->rdrift * h->fps / (uint64_t)1000000000000ULL), - (h->vdrift > 0) ? '+' : '-', - (int)((abs(h->vdrift) / 1000000000)), - (int)((abs(h->vdrift) % 1000000000) / 10000000), -- (int)(h->vdrift * h->fps / (uint64_t)1000000000000)); -+ (int)(h->vdrift * h->fps / (uint64_t)1000000000000ULL)); - rec_status(line); - } - -@@ -623,7 +623,7 @@ - #endif - - /* rate control */ -- expected = (buf->info.ts - h->vdrift) * h->fps / (uint64_t)1000000000000; -+ expected = (buf->info.ts - h->vdrift) * h->fps / (uint64_t)1000000000000ULL; - if (expected < h->frames-1) { - if (debug > 1) - fprintf(stderr,"rate: ignoring frame [%d %d]\n", -diff -Nrbu xawtv-3.95/console/showqt.c xawtv-3.95-OK/console/showqt.c ---- xawtv-3.95/console/showqt.c 2003-03-27 13:37:08.000000000 +0300 -+++ xawtv-3.95-OK/console/showqt.c 2006-12-27 19:52:51.000000000 +0300 -@@ -25,14 +25,14 @@ - (((uint32_t)x<<8) & (uint32_t)0x00ff0000) |\ - (((uint32_t)x<<24) & (uint32_t)0xff000000)) - --# define SWAP8(x) ((((uint64_t)x>>56) & (uint64_t)0x00000000000000ff) |\ -- (((uint64_t)x>>40) & (uint64_t)0x000000000000ff00) |\ -- (((uint64_t)x>>24) & (uint64_t)0x0000000000ff0000) |\ -- (((uint64_t)x>> 8) & (uint64_t)0x00000000ff000000) |\ -- (((uint64_t)x<< 8) & (uint64_t)0x000000ff00000000) |\ -- (((uint64_t)x<<24) & (uint64_t)0x0000ff0000000000) |\ -- (((uint64_t)x<<40) & (uint64_t)0x00ff000000000000) |\ -- (((uint64_t)x<<56) & (uint64_t)0xff00000000000000)) -+# define SWAP8(x) ((((uint64_t)x>>56) & (uint64_t)0x00000000000000ffULL) |\ -+ (((uint64_t)x>>40) & (uint64_t)0x000000000000ff00ULL) |\ -+ (((uint64_t)x>>24) & (uint64_t)0x0000000000ff0000ULL) |\ -+ (((uint64_t)x>> 8) & (uint64_t)0x00000000ff000000ULL) |\ -+ (((uint64_t)x<< 8) & (uint64_t)0x000000ff00000000ULL) |\ -+ (((uint64_t)x<<24) & (uint64_t)0x0000ff0000000000ULL) |\ -+ (((uint64_t)x<<40) & (uint64_t)0x00ff000000000000ULL) |\ -+ (((uint64_t)x<<56) & (uint64_t)0xff00000000000000ULL)) - #else - # define SWAP2(a) (a) - # define SWAP4(a) (a) -diff -Nrbu xawtv-3.95/libng/plugins/read-dv.c xawtv-3.95-OK/libng/plugins/read-dv.c ---- xawtv-3.95/libng/plugins/read-dv.c 2003-02-14 17:14:05.000000000 +0300 -+++ xawtv-3.95-OK/libng/plugins/read-dv.c 2006-12-27 19:58:49.000000000 +0300 -@@ -125,7 +125,7 @@ - "dv: height=%d width=%d frame_size=%ld\n", - h->dec->quality, h->dec->system, h->dec->std, - h->dec->sampling, h->dec->num_dif_seqs, h->dec->height, -- h->dec->width, h->dec->frame_size); -+ h->dec->width, (long) h->dec->frame_size); - fprintf(stderr, "dv: audio: %d Hz, %d bits, %d channels," - " emphasis %s\n", - h->dec->audio->frequency, diff --git a/xawtv-3.95-man.patch b/xawtv-3.95-man.patch deleted file mode 100644 index 792789f..0000000 --- a/xawtv-3.95-man.patch +++ /dev/null @@ -1,190 +0,0 @@ -# A patch for various manual typos. -# -# Derived from the Debian's patches: -# 04_man_typo.dpatch -# 17_scantv_man_typo.dpatch -# (both were written by A. Costa -# - -diff -Nrbu xawtv-3.95/man/fbtv.1 xawtv-3.95-OK/man/fbtv.1 ---- xawtv-3.95/man/fbtv.1 2003-02-14 17:14:07.000000000 +0300 -+++ xawtv-3.95-OK/man/fbtv.1 2008-08-26 18:51:25.000000000 +0400 -@@ -98,7 +98,7 @@ - The BT8xx cards can produce images up to 768x576 pixels. In order to - have fbtv make use of your entire monitor-size and get maximum image - quality, you need to create a 768x576 pixels framebufferconsole. This --can be accomplished with the fbset(1) utility, which is availabile at -+can be accomplished with the fbset(1) utility, which is available at - various locations. See: http://www.cs.kuleuven.ac.be/~geert/bin/ - .P - Or, you can let fbtv handle the videomode changes with the -m switch. -diff -Nrbu xawtv-3.95/man/pia.1 xawtv-3.95-OK/man/pia.1 ---- xawtv-3.95/man/pia.1 2003-02-14 17:14:07.000000000 +0300 -+++ xawtv-3.95-OK/man/pia.1 2008-08-26 18:51:25.000000000 +0400 -@@ -5,7 +5,7 @@ - .B pia [ options ] movie - .SH DESCRIPTION - .B pia --is a small X11 tool which playes movie files. -+is a small X11 tool which plays movie files. - .SH OPTIONS - .B pia - understands the usual toolkit options (-geometry + friends). -@@ -24,7 +24,7 @@ - Use OSS device for sound. - .TP - .B -noxv --Disable Xvideo extention. -+Disable Xvideo extension. - .TP - .B -nogl - Disable OpenGL. -@@ -41,7 +41,7 @@ - .SH SUPPORTED MOVIE FORMATS - Main purpose of this utility is to playback movie files recorded by - xawtv, motv and streamer. It should be able to playback every AVI or --QuickTime movie written by one of the mentioned utilites. Feel free -+QuickTime movie written by one of the mentioned utilities. Feel free - to submit a bug report if this doesn't work for some file. - .SS QuickTime - .B pia -diff -Nrbu xawtv-3.95/man/record.1 xawtv-3.95-OK/man/record.1 ---- xawtv-3.95/man/record.1 2003-02-14 17:14:07.000000000 +0300 -+++ xawtv-3.95-OK/man/record.1 2008-08-26 18:51:25.000000000 +0400 -@@ -16,7 +16,7 @@ - .TP - .B -o file - basename for the output file(s), a number and the .wav --extention are added by record. Default is "record". -+extension are added by record. Default is "record". - .TP - .B -i dev - mixer control. This should be the one where you can adjust the record -diff -Nrbu xawtv-3.95/man/rootv.1 xawtv-3.95-OK/man/rootv.1 ---- xawtv-3.95/man/rootv.1 2003-02-14 17:14:07.000000000 +0300 -+++ xawtv-3.95-OK/man/rootv.1 2008-08-26 18:51:25.000000000 +0400 -@@ -1,6 +1,6 @@ - .TH rootv 1 "(c) 2000-2002 Gerd Knorr" - .SH NAME --rootv - display TV using the Xvideo extention -+rootv - display TV using the Xvideo extension - .SH SYNOPSIS - .B rootv [ options ] - .SH DESCRIPTION -@@ -9,7 +9,7 @@ - but you can also ask it to use the root window (thus the name) or any - other window. - .B rootv --needs the Xvideo extention. -+needs the Xvideo extension. - .P - .B rootv - itself provides no way to control video/audio/tuner. You can use -diff -Nrbu xawtv-3.95/man/scantv.1 xawtv-3.95-OK/man/scantv.1 ---- xawtv-3.95/man/scantv.1 2003-02-14 17:14:07.000000000 +0300 -+++ xawtv-3.95-OK/man/scantv.1 2008-08-26 18:51:44.000000000 +0400 -@@ -18,7 +18,7 @@ - none is given. - .TP - .B -o outfile --specify \fBo\fPutput file. If none is specified, scantv write -+specify \fBo\fPutput file. If none is specified, scantv writes - to stdout. - .TP - .B -c device -diff -Nrbu xawtv-3.95/man/subtitles.1 xawtv-3.95-OK/man/subtitles.1 ---- xawtv-3.95/man/subtitles.1 2003-02-14 17:14:07.000000000 +0300 -+++ xawtv-3.95-OK/man/subtitles.1 2008-08-26 18:51:25.000000000 +0400 -@@ -8,7 +8,7 @@ - fetches the given teletext page with the alevt-cap utility and - displays it using xawtv-remote in an endless loop. It's most - useful for pages which carry subtitles for the current TV program. --It's page 150 in germany. -+It's page 150 in Germany. - .SH OPTIONS - .TP - .B -help -diff -Nrbu xawtv-3.95/man/v4l-conf.8 xawtv-3.95-OK/man/v4l-conf.8 ---- xawtv-3.95/man/v4l-conf.8 2003-02-14 17:14:07.000000000 +0300 -+++ xawtv-3.95-OK/man/v4l-conf.8 2008-08-26 18:51:25.000000000 +0400 -@@ -20,7 +20,7 @@ - knows three ways to get the informations: - .TP 3 - * --Query the X-Server using the XF86 DGA extention. This is the default -+Query the X-Server using the XF86 DGA extension. This is the default - if the DISPLAY environment variable is set. - .TP 3 - * -@@ -63,7 +63,7 @@ - work because the X-Server lacks DGA support. You can put this into - /etc/conf.modules, as "post-install bttv ..." for example. - .SH BUGS --Hope I havn't any security flaws in there. If you find one, drop me a -+Hope I haven't any security flaws in there. If you find one, drop me a - note. Mails with patches are preferred :-) - .SH SEE ALSO - xawtv(1), fbtv(1) -diff -Nrbu xawtv-3.95/man/webcam.1 xawtv-3.95-OK/man/webcam.1 ---- xawtv-3.95/man/webcam.1 2003-02-14 17:14:07.000000000 +0300 -+++ xawtv-3.95-OK/man/webcam.1 2008-08-26 18:51:25.000000000 +0400 -@@ -150,7 +150,7 @@ - paper "Correcting Distortion of Image by Image Registration" of Toru - Tamaki, Tsuyoshi Yamamura and Noboru Ahnishi. More your lens has an - important distortion, more 'distor_k' must be neared of 0. 700 is the --défault value. Coefficient k of program is x100 than article. -+default value. Coefficient k of program is x100 than article. - .TP - .B distor_cx = 192 - .TP -diff -Nrbu xawtv-3.95/man/xawtv-remote.1 xawtv-3.95-OK/man/xawtv-remote.1 ---- xawtv-3.95/man/xawtv-remote.1 2003-02-14 17:14:07.000000000 +0300 -+++ xawtv-3.95-OK/man/xawtv-remote.1 2008-08-26 18:51:25.000000000 +0400 -@@ -136,14 +136,14 @@ - .TP - .B vtx line1 line2 [ ... ] - Display subtitles. It pops up a small window at the bottom of the screen. --It is supported to be used as interface for displaying subtitles (often on --videotext page 150 in europe, thats why the name) by external programs. -+It is intended to be used as an interface for displaying subtitles (often on -+videotext page 150 in Europe, that's why the name) by external programs. - .br - Every command line argument is one line, zero lines removes the window. - You can colorize the text with the control sequence "ESC foreground - background". foreground/background has the range 0-7 (ansi term colors). - Example: "\\03347 hello world " is blue on white. "\\033" must be a real --escape character, the string does'nt work. With the bash you'll get it -+escape character, the string doesn't work. With the bash you'll get it - with ^V ESC. vtx does also understand the ANSI tty escape sequences for - color. - .TP -diff -Nrbu xawtv-3.95/man/xawtv.1 xawtv-3.95-OK/man/xawtv.1 ---- xawtv-3.95/man/xawtv.1 2003-02-14 17:14:07.000000000 +0300 -+++ xawtv-3.95-OK/man/xawtv.1 2008-08-26 18:51:25.000000000 +0400 -@@ -70,7 +70,7 @@ - .TP - \fB-remote\fP - X11 display is remote. This basically disables overlay mode, you --might need this if xawtv failes to autodetect a remote X11 display. -+might need this if xawtv fails to autodetect a remote X11 display. - .br - Resource: xawtv.remote (bool). - .TP -@@ -155,7 +155,7 @@ - more details and hints on how to setup Xvideo. - .SH GETTING STARTED - Just start xawtv. Then verify the settings in the options menu (right --mouse button) and adjust the settings (TV norm, Video source, freqency -+mouse button) and adjust the settings (TV norm, Video source, frequency - table). With the cursor keys you can control the tuner and look for - TV Stations. Other useful hotkeys are listed below. - .P -@@ -190,7 +190,7 @@ - Z Channel Hopper (\fIz\fPapping, tune in every - station a few seconds) - Ctrl+Z Fast Channel Hopping (grab the images for the -- Channel Bottons) -+ Channel Buttons) - - up/down tune up/down one channel - left/right fine tuning diff --git a/xawtv-3.95-no-dga.patch b/xawtv-3.95-no-dga.patch deleted file mode 100644 index 0298cef..0000000 --- a/xawtv-3.95-no-dga.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -Nrbu xawtv-3.95/console/v4l-conf.c xawtv-3.95-OK/console/v4l-conf.c ---- xawtv-3.95/console/v4l-conf.c 2005-02-09 15:27:36.000000000 +0300 -+++ xawtv-3.95-OK/console/v4l-conf.c 2008-08-26 19:35:18.000000000 +0400 -@@ -221,6 +221,21 @@ - } - } - -+#ifdef HAVE_LIBXXF86DGA -+static int dga_error = 0; -+static int dga_error_base; -+static int (*orig_xfree_error_handler)(Display *, XErrorEvent *); -+ -+static int dga_error_handler(Display *d, XErrorEvent *e) -+{ -+ if (e->error_code == (dga_error_base + XF86DGANoDirectVideoMode)) { -+ dga_error = 1; -+ return 0; -+ } -+ return orig_xfree_error_handler(d, e); -+} -+#endif -+ - static void - displayinfo_dga(Display *dpy, struct DISPLAYINFO *d) - { -@@ -228,7 +243,7 @@ - int width,bar,foo,major,minor,flags=0; - void *base = NULL; - -- if (!XF86DGAQueryExtension(dpy,&foo,&bar)) { -+ if (!XF86DGAQueryExtension(dpy,&foo,&dga_error_base)) { - fprintf(stderr,"WARNING: Your X-Server has no DGA support.\n"); - return; - } -@@ -240,7 +255,14 @@ - fprintf(stderr,"WARNING: No DGA support available for this display.\n"); - return; - } -+ orig_xfree_error_handler = XSetErrorHandler(dga_error_handler); - XF86DGAGetVideoLL(dpy,XDefaultScreen(dpy),(void*)&base,&width,&foo,&bar); -+ XSync(dpy, 0); -+ XSetErrorHandler(orig_xfree_error_handler); -+ if (dga_error) { -+ fprintf(stderr,"WARNING: No DGA direct video mode for this display.\n"); -+ return; -+ } - d->bpl = width * d->bpp/8; - d->base = base; - #else -diff -Nrbu xawtv-3.95/libng/plugins/drv0-v4l2.c xawtv-3.95-OK/libng/plugins/drv0-v4l2.c ---- xawtv-3.95/libng/plugins/drv0-v4l2.c 2008-08-26 19:31:52.000000000 +0400 -+++ xawtv-3.95-OK/libng/plugins/drv0-v4l2.c 2008-08-26 19:35:18.000000000 +0400 -@@ -593,7 +593,7 @@ - return -1; - - /* double-check settings */ -- if (NULL != base && h->ov_fb.base != base) { -+ if ((NULL != base && h->ov_fb.base != base) || h->ov_fb.base == NULL) { - fprintf(stderr,"v4l2: WARNING: framebuffer base address mismatch\n"); - fprintf(stderr,"v4l2: me=%p v4l=%p\n",base,h->ov_fb.base); - h->ov_error = 1; -diff -Nrbu xawtv-3.95/x11/xt.c xawtv-3.95-OK/x11/xt.c ---- xawtv-3.95/x11/xt.c 2005-01-11 12:26:43.000000000 +0300 -+++ xawtv-3.95-OK/x11/xt.c 2008-08-26 19:35:18.000000000 +0400 -@@ -1247,18 +1247,21 @@ - } - - /*----------------------------------------------------------------------*/ -+#ifdef HAVE_LIBXXF86DGA -+static int xfree_dga_error_base; -+#endif - - void - xfree_dga_init(Display *dpy) - { - #ifdef HAVE_LIBXXF86DGA -- int flags,foo,bar,ma,mi; -+ int flags,foo,ma,mi; - - if (!do_overlay) - return; - - if (args.dga) { -- if (XF86DGAQueryExtension(dpy,&foo,&bar)) { -+ if (XF86DGAQueryExtension(dpy,&foo,&xfree_dga_error_base)) { - XF86DGAQueryDirectVideo(dpy,XDefaultScreen(dpy),&flags); - if (flags & XF86DGADirectPresent) { - XF86DGAQueryVersion(dpy,&ma,&mi); -@@ -1348,6 +1351,19 @@ - #endif - } - -+#ifdef HAVE_LIBXXF86DGA -+static int (*orig_xfree_error_handler)(Display *, XErrorEvent *); -+ -+static int xfree_dga_error_handler(Display *d, XErrorEvent *e) -+{ -+ if (e->error_code == (xfree_dga_error_base + XF86DGANoDirectVideoMode)) { -+ have_dga = 0; -+ return 0; -+ } -+ return orig_xfree_error_handler(d, e); -+} -+#endif -+ - void - grabber_init() - { -@@ -1358,8 +1374,11 @@ - #ifdef HAVE_LIBXXF86DGA - if (have_dga) { - int bar,fred; -+ orig_xfree_error_handler = XSetErrorHandler(xfree_dga_error_handler); - XF86DGAGetVideoLL(dpy,XDefaultScreen(dpy),(void*)&base, - &screen.bytesperline,&bar,&fred); -+ XSync(dpy, 0); -+ XSetErrorHandler(orig_xfree_error_handler); - } - #endif - if (!do_overlay) { diff --git a/xawtv-3.95-no-double-exit.patch b/xawtv-3.95-no-double-exit.patch deleted file mode 100644 index a45a765..0000000 --- a/xawtv-3.95-no-double-exit.patch +++ /dev/null @@ -1,23 +0,0 @@ -xawtv uses an idle callback to exit when a user requests it to exit. When xawtv -is blocked waiting for a video frame from a stuck video device, the user can -try to quit multiple times, which will lead to ExitCB getting called multiple -times, which leads to a double free error. - -This patch protects ExitCB against being called twice. Also see: -https://bugzilla.redhat.com/show_bug.cgi?id=608344 -diff -up xawtv-3.95/x11/xt.c~ xawtv-3.95/x11/xt.c ---- xawtv-3.95/x11/xt.c~ 2010-11-17 10:37:53.000000000 +0100 -+++ xawtv-3.95/x11/xt.c 2010-11-17 10:39:24.617724003 +0100 -@@ -313,6 +313,12 @@ ExitWP(XtPointer client_data) - void - ExitCB(Widget widget, XtPointer client_data, XtPointer calldata) - { -+ static int exit_pending = 0; -+ -+ if (exit_pending) -+ return; -+ -+ exit_pending = 1; - audio_off(); - video_overlay(0); - video_close(); diff --git a/xawtv-3.95-open.patch b/xawtv-3.95-open.patch deleted file mode 100644 index 13109d1..0000000 --- a/xawtv-3.95-open.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nrbu xawtv-3.95/console/webcam.c xawtv-3.95-OK/console/webcam.c ---- xawtv-3.95/console/webcam.c 2005-09-30 14:07:58.000000000 +0400 -+++ xawtv-3.95-OK/console/webcam.c 2007-08-30 16:46:12.000000000 +0400 -@@ -813,7 +813,7 @@ - tmpdir = (NULL != getenv("TMPDIR")) ? getenv("TMPDIR") : "/tmp"; - list_for_each(item,&connections) { - s = list_entry(item, struct xfer_state, list); -- s->ops->open(s); -+ (s->ops->open)(s); - } - - /* print config */ -diff -Nrbu xawtv-3.95/libng/grab-ng.c xawtv-3.95-OK/libng/grab-ng.c ---- xawtv-3.95/libng/grab-ng.c 2003-03-28 15:19:28.000000000 +0300 -+++ xawtv-3.95-OK/libng/grab-ng.c 2007-08-30 16:49:19.000000000 +0400 -@@ -572,7 +572,7 @@ - continue; - if (ng_debug) - fprintf(stderr,"vid-open: trying: %s... \n", drv->name); -- if (NULL != (*handle = drv->open(device))) -+ if (NULL != (*handle = (drv->open)(device))) - break; - if (ng_debug) - fprintf(stderr,"vid-open: failed: %s\n",drv->name); -@@ -603,7 +603,7 @@ - continue; - if (ng_debug) - fprintf(stderr,"dsp-open: trying: %s... \n", drv->name); -- if (NULL != (*handle = drv->open(device,fmt,record))) -+ if (NULL != (*handle = (drv->open)(device,fmt,record))) - break; - if (ng_debug) - fprintf(stderr,"dsp-open: failed: %s\n", drv->name); -@@ -628,7 +628,7 @@ - drv = list_entry(item, struct ng_mix_driver, list); - if (ng_debug) - fprintf(stderr,"mix-init: trying: %s... \n", drv->name); -- if (NULL != (handle = drv->open(device))) { -+ if (NULL != (handle = (drv->open)(device))) { - if (NULL != (attrs = drv->volctl(handle,channel))) - break; - drv->close(handle); diff --git a/xawtv-3.95-oss.patch b/xawtv-3.95-oss.patch deleted file mode 100644 index 9c6ab72..0000000 --- a/xawtv-3.95-oss.patch +++ /dev/null @@ -1,19 +0,0 @@ -# A patch to avoid streamer exit when a read from oss sound returns EAGAIN -# -# Derived from the Debian's patch: -# 08_oss_audio.dpatch -# (which was written by Kristof Koehler -# - -diff -Nrbu xawtv-3.95/libng/plugins/snd-oss.c xawtv-3.95-OK/libng/plugins/snd-oss.c ---- xawtv-3.95/libng/plugins/snd-oss.c 2003-02-14 17:14:05.000000000 +0300 -+++ xawtv-3.95-OK/libng/plugins/snd-oss.c 2008-08-26 18:57:44.000000000 +0400 -@@ -441,7 +441,7 @@ - for (;;) { - rc = read(fd,buffer+count,blocksize-count); - if (rc < 0) { -- if (EINTR == errno) -+ if ((EINTR == errno) || (EAGAIN == errno)) - continue; - perror("oss: read"); - exit(1); diff --git a/xawtv-3.95-pagesize.patch b/xawtv-3.95-pagesize.patch deleted file mode 100644 index 0b44ef7..0000000 --- a/xawtv-3.95-pagesize.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Nrbu xawtv-3.95/console/fbtools.c xawtv-3.95-OK/console/fbtools.c ---- xawtv-3.95/console/fbtools.c 2003-02-14 17:14:04.000000000 +0300 -+++ xawtv-3.95-OK/console/fbtools.c 2007-06-25 17:17:58.000000000 +0400 -@@ -21,8 +21,6 @@ - #include - #include - --#include -- - #include "fbtools.h" - - /* -------------------------------------------------------------------- */ -@@ -424,7 +422,7 @@ - goto err; - } - #endif -- fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK); -+ fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (getpagesize()-1); - fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset, - PROT_READ|PROT_WRITE,MAP_SHARED,fb,0); - if (-1L == (long)fb_mem) { -diff -Nrbu xawtv-3.95/console/matrox.c xawtv-3.95-OK/console/matrox.c ---- xawtv-3.95/console/matrox.c 2005-02-03 13:40:41.000000000 +0300 -+++ xawtv-3.95-OK/console/matrox.c 2007-06-25 17:19:02.000000000 +0400 -@@ -9,7 +9,6 @@ - #include - #include - --#include /* PAGE_SIZE */ - #include - - #include "byteswap.h" -@@ -226,7 +225,7 @@ - return -1; - } - off = (unsigned long)fb_fix.mmio_start - -- ((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1)); -+ ((unsigned long)fb_fix.mmio_start & ~(getpagesize()-1)); - bmmio += off; - mmio = (uint32_t*)bmmio; - return 0; diff --git a/xawtv-3.95-region.patch b/xawtv-3.95-region.patch deleted file mode 100644 index a4b54dc..0000000 --- a/xawtv-3.95-region.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nrbu xawtv-3.95/common/vbi-data.c xawtv-3.95-OK/common/vbi-data.c ---- xawtv-3.95/common/vbi-data.c 2003-02-14 17:14:04.000000000 +0300 -+++ xawtv-3.95-OK/common/vbi-data.c 2007-03-01 20:33:44.000000000 +0300 -@@ -48,6 +48,18 @@ - if (NULL == vbi->dec) - goto oops; - -+ /* -+ * Give the user possibility to change default zvbi region (16, West-Europe) -+ * Sometimes the region value just not reported in the stream etc... -+ */ -+ if (1) { -+ char *env = getenv("ALEVTD_REGION"); -+ unsigned int region; -+ -+ if (env && (region = strtoul(env,NULL,0)) != 0) -+ vbi_teletext_set_default_region(vbi->dec,region); -+ } -+ - if (vbi->sim) { - vbi->par = init_sim(625,services); - /* simulation for select */ diff --git a/xawtv-3.95-scantv.patch b/xawtv-3.95-scantv.patch deleted file mode 100644 index bd890e9..0000000 --- a/xawtv-3.95-scantv.patch +++ /dev/null @@ -1,87 +0,0 @@ -# Allow scantv(1) to use different (not Television only) card input. -# -# Derived from the Debian patch: -# 14_scantv_input_override.dpatch -# (which was written by Adrian Phillips -# plus add required changes in the manual -# - -diff -Nrbu xawtv-3.95/console/scantv.c xawtv-3.95-OK/console/scantv.c ---- xawtv-3.95/console/scantv.c 2005-09-30 14:07:02.000000000 +0400 -+++ xawtv-3.95-OK/console/scantv.c 2008-08-26 19:03:30.000000000 +0400 -@@ -116,6 +116,7 @@ - "options:\n" - " -h print this text\n" - " -o outfile set output file. [%s]\n" -+ " -i input set input.\n" - " -n norm set tv norm.\n" - " -f table set frequency table.\n" - " -c device set video device file. [%s]\n" -@@ -137,6 +138,7 @@ - unsigned int f,f1,f2,fc; - char *name,dummy[32]; - char *tvnorm = NULL; -+ char *tvinput = NULL; - char *freqtab = NULL; - char *outfile = NULL; - FILE *conf = stdout; -@@ -144,7 +146,7 @@ - /* parse options */ - ng_init(); - for (;;) { -- if (-1 == (c = getopt(argc, argv, "hsadn:f:o:c:C:"))) -+ if (-1 == (c = getopt(argc, argv, "hsadi:n:f:o:c:C:"))) - break; - switch (c) { - case 'd': -@@ -156,6 +158,9 @@ - case 'a': - fullscan=1; - break; -+ case 'i': -+ tvinput = optarg; -+ break; - case 'n': - tvnorm = optarg; - break; -@@ -203,12 +208,15 @@ - attr = ng_attr_byid(attrs,ATTR_ID_NORM); - i = menu("please select your TV norm",attr->choices,tvnorm); - j = menu("please select a frequency table",chanlist_names,freqtab); -+ if (tvinput == NULL) { -+ tvinput = "Television"; -+ } - - fprintf(conf,"[global]\n"); - fprintf(conf,"freqtab = %s\n",chanlist_names[j].str); - fprintf(conf,"\n"); - fprintf(conf,"[defaults]\n"); -- fprintf(conf,"input = Television\n"); -+ fprintf(conf,"input = %s\n", tvinput); - fprintf(conf,"norm = %s\n",ng_attr_getstr(attr,i)); - fprintf(conf,"\n"); - fflush(conf); -@@ -220,7 +228,7 @@ - exit(0); - } - set_defaults(); -- do_va_cmd(2,"setinput","television"); -+ do_va_cmd(2,"setinput",tvinput); - do_va_cmd(2,"setnorm",ng_attr_getstr(attr,i)); - do_va_cmd(2,"setfreqtab",chanlist_names[j].str); - -diff -Nrbu xawtv-3.95/man/scantv.1 xawtv-3.95-OK/man/scantv.1 ---- xawtv-3.95/man/scantv.1 2008-08-26 19:01:50.000000000 +0400 -+++ xawtv-3.95-OK/man/scantv.1 2008-08-26 19:12:58.000000000 +0400 -@@ -9,6 +9,11 @@ - xawtv/fbtv config file. - .SH OPTIONS - .TP -+.B -i input -+set tv \fBi\fPnput (Television/Composite1/S-video and so on). -+Default is Television. (Currently it is a distro-specific option -+added by Fedora and Debian). -+.TP - .B -n norm - set tv \fBn\fPorm. scantv will ask interactively if - none is given. diff --git a/xawtv-3.95-v4l2-old-drop.patch b/xawtv-3.95-v4l2-old-drop.patch deleted file mode 100644 index 9b53d25..0000000 --- a/xawtv-3.95-v4l2-old-drop.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nrbu xawtv-3.95/libng/plugins/Subdir.mk xawtv-3.95-OK/libng/plugins/Subdir.mk ---- xawtv-3.95/libng/plugins/Subdir.mk 2008-08-26 19:55:00.000000000 +0400 -+++ xawtv-3.95-OK/libng/plugins/Subdir.mk 2008-08-26 19:58:40.000000000 +0400 -@@ -21,7 +21,6 @@ - ifeq ($(FOUND_OS),linux) - TARGETS-plugins += \ - libng/plugins/drv0-v4l2.so \ -- libng/plugins/drv0-v4l2-old.so \ - libng/plugins/drv1-v4l.so \ - libng/plugins/snd-oss.so - endif -@@ -55,7 +54,6 @@ - - libng/plugins/conv-mjpeg.so: libng/plugins/conv-mjpeg.o - libng/plugins/drv0-bsd.so: libng/plugins/drv0-bsd.o --libng/plugins/drv0-v4l2-old.so: libng/plugins/drv0-v4l2-old.o - libng/plugins/flt-debug.so: libng/plugins/flt-debug.o - libng/plugins/flt-disor.so: libng/plugins/flt-disor.o - libng/plugins/flt-gamma.so: libng/plugins/flt-gamma.o diff --git a/xawtv.spec b/xawtv.spec index 8ad3e06..845cfa8 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -2,30 +2,17 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.95 -Release: 14%{?dist} +Version: 3.98 +Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ -URL: http://bytesex.org/xawtv/ +URL: http://git.linuxtv.org/xawtv3.git -Source0: http://dl.bytesex.org/releases/xawtv/%{name}-%{version}.tar.gz +Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 Source1: xawtv.desktop Patch0: xawtv-3.95-strip.patch -Patch1: xawtv-3.95-curses-utf8.patch -Patch2: xawtv-3.95-gcc4.patch Patch3: xawtv-3.95-font.patch -Patch4: xawtv-3.95-region.patch -Patch5: xawtv-3.95-pagesize.patch -Patch6: xawtv-3.95-open.patch -Patch7: xawtv-3.95-man.patch -Patch8: xawtv-3.95-oss.patch -Patch9: xawtv-3.95-scantv.patch -Patch10: xawtv-3.95-fixes.patch -Patch11: xawtv-3.95-no-dga.patch -Patch12: xawtv-3.95-bpl.patch -Patch13: xawtv-3.95-v4l2-old-drop.patch -Patch14: xawtv-3.95-no-double-exit.patch Patch15: xawtv-3.95-vbi-compile-fix.patch # add libv4l2 layer... @@ -62,20 +49,7 @@ Xawtv also includes a grabber driver for vic. %prep %setup -q %patch0 -p1 -b .strip -%patch1 -p1 -b .curses-utf8 -%patch2 -p1 -b .gcc4 %patch3 -p1 -b .font -%patch4 -p1 -b .region -%patch5 -p1 -b .pagesize -%patch6 -p1 -b .open -%patch7 -p1 -b .man -%patch8 -p1 -b .oss -%patch9 -p1 -b .scantv -%patch10 -p1 -b .fixes -%patch11 -p1 -b .no-dga -%patch12 -p1 -b .bpl -%patch13 -p1 -b .v4l2-old-drop -%patch14 -p1 %patch15 -p1 %{!?_without_libv4l:%patch100 -p1 -b .libv4l} @@ -168,6 +142,10 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Thu Jan 27 2011 Mauro Carvalho Chehab 3.97-1 +- Update to Xawtv version 3.97 +- Removes V4L1 support and adds some new stuff + * Wed Nov 17 2010 Hans de Goede 3.95-14 - 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) From 28bd9ed3870f4a9e607744c92e8dc72c106e5142 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Fri, 28 Jan 2011 16:43:18 +0300 Subject: [PATCH 07/84] fix typo in version --- xawtv.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index 845cfa8..2b37489 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -142,8 +142,8 @@ rm -fr $RPM_BUILD_ROOT %changelog -* Thu Jan 27 2011 Mauro Carvalho Chehab 3.97-1 -- Update to Xawtv version 3.97 +* Thu Jan 27 2011 Mauro Carvalho Chehab 3.98-1 +- Update to Xawtv version 3.98 - Removes V4L1 support and adds some new stuff * Wed Nov 17 2010 Hans de Goede 3.95-14 From 959826a772e918591b132f0377bdcef9b6df0e5b Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 28 Jan 2011 11:58:38 -0200 Subject: [PATCH 08/84] Updated source Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c817e19..a9e8a9f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -xawtv-3.95.tar.gz +xawtv-3.98.tar.bz2 From a02d01fcd9e9032b51a4f94495c0e3f279c42fe7 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Fri, 28 Jan 2011 20:22:49 +0300 Subject: [PATCH 09/84] some spec file cleanups --- xawtv.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index 2b37489..646f1ee 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -50,12 +50,9 @@ Xawtv also includes a grabber driver for vic. %setup -q %patch0 -p1 -b .strip %patch3 -p1 -b .font -%patch15 -p1 +#%patch15 -p1 %{!?_without_libv4l:%patch100 -p1 -b .libv4l} -sed -i -e 's,/usr/X11R6/lib/X11,%{_datadir}/X11,g' configure.ac -sed -i -e 's,/usr/X11R6/include/X11,%{_includedir}/X11,g' Makefile.in - autoconf autoheader @@ -64,7 +61,7 @@ autoheader export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" -%configure --x-libraries=%{_libdir} --disable-motif --disable-quicktime +%configure --disable-motif --disable-quicktime make verbose=yes for man in `find man -name "*.[1-9]" -print` From 8e04ae60c18801ce6b96744601c8d69072a38145 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 28 Jan 2011 21:21:22 -0200 Subject: [PATCH 10/84] Update to version 3.99.rc1 Fixes radio application. Tested with an Avermedia m135 board. Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 1 + sources | 2 +- xawtv.spec | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a9e8a9f..3dd79a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xawtv-3.98.tar.bz2 +/xawtv-3.99.rc1.tar.bz2 diff --git a/sources b/sources index 27c4847..6bfb3fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -395ce8d61e46080df87aa6f6b3412296 xawtv-3.98.tar.bz2 +bab94421a7493ccd45e319e028138af4 xawtv-3.99.rc1.tar.bz2 diff --git a/xawtv.spec b/xawtv.spec index 646f1ee..8c4918e 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -2,7 +2,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.98 +Version: 3.99.rc1 Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -139,6 +139,11 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Thu Jan 28 2011 Mauro Carvalho Chehab 3.99.rc1.1 +- Update to Xawtv version 3.99.rc1 +- Applied some fixes upstream fixing radio application and also some + improvements from other patches that were found on Fedora. + * Thu Jan 27 2011 Mauro Carvalho Chehab 3.98-1 - Update to Xawtv version 3.98 - Removes V4L1 support and adds some new stuff From 674a33e0574c5312893ed40bc6cd6765d2fa2886 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 29 Jan 2011 09:39:08 -0200 Subject: [PATCH 11/84] 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 --- xawtv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 8c4918e..754351c 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -50,7 +50,7 @@ Xawtv also includes a grabber driver for vic. %setup -q %patch0 -p1 -b .strip %patch3 -p1 -b .font -#%patch15 -p1 +%patch15 -p1 %{!?_without_libv4l:%patch100 -p1 -b .libv4l} autoconf From 2a8a85aa89cb588e817d747e6ceaec613f3fa6cc Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 1 Feb 2011 20:29:23 -0200 Subject: [PATCH 12/84] Bump to version 3.99-rc2 Almost all patches are now upstream. Just one build fix remains. Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 1 + sources | 2 +- xawtv-3.95-font.patch | 57 ------ xawtv-3.95-libv4l2.patch | 177 ------------------ xawtv-3.95-strip.patch | 48 ----- ...e-fix.patch => xawtv-vbi-compile-fix.patch | 0 xawtv.spec | 22 +-- 7 files changed, 10 insertions(+), 297 deletions(-) delete mode 100644 xawtv-3.95-font.patch delete mode 100644 xawtv-3.95-libv4l2.patch delete mode 100644 xawtv-3.95-strip.patch rename xawtv-3.95-vbi-compile-fix.patch => xawtv-vbi-compile-fix.patch (100%) diff --git a/.gitignore b/.gitignore index 3dd79a0..f56be94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xawtv-3.98.tar.bz2 /xawtv-3.99.rc1.tar.bz2 +/xawtv-3.99.rc2.tar.bz2 diff --git a/sources b/sources index 6bfb3fa..9df3baa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bab94421a7493ccd45e319e028138af4 xawtv-3.99.rc1.tar.bz2 +96d9ece978849b0a220fe799a7d04211 xawtv-3.99.rc2.tar.bz2 diff --git a/xawtv-3.95-font.patch b/xawtv-3.95-font.patch deleted file mode 100644 index e26ec7d..0000000 --- a/xawtv-3.95-font.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up xawtv-3.95/vbistuff/alevt.css.in.font xawtv-3.95/vbistuff/alevt.css.in ---- xawtv-3.95/vbistuff/alevt.css.in.font 2003-02-14 15:14:08.000000000 +0100 -+++ xawtv-3.95/vbistuff/alevt.css.in 2010-03-12 12:25:48.465315533 +0100 -@@ -3,7 +3,7 @@ body { background-color: white; color: - pre.vt { border: 1pt solid black; padding: 12pt } - pre.vt { background-color: #c0c0c0; width: auto; float: left } - pre.vt { white-space: pre } --pre.vt { font-family: "teletext, monospace"; font-size: 20px; line-height: 20px } -+pre.vt { font-family: "teletext"; font-size: 10px; line-height: 10px } - - div.quick { clear: both } - -diff -up xawtv-3.95/x11/Xawtv.ad.font xawtv-3.95/x11/Xawtv.ad ---- xawtv-3.95/x11/Xawtv.ad.font 2003-02-18 17:31:33.000000000 +0100 -+++ xawtv-3.95/x11/Xawtv.ad 2010-03-12 12:33:52.024563695 +0100 -@@ -5,24 +5,12 @@ - Xawtv*international: true - Xawtv*font: 7x13bold - Xawtv*fontSet: \ -- -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \ -- -*-courier-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \ -- -gnu-unifont-bold-r-normal--16-*-*-*-c-*-*-*, \ -- -efont-biwidth-bold-r-normal--16-*-*-*-*-*-*-*, \ -- -*-*-bold-r-normal-*-16-*-*-*-m-*-*-*, \ -- -*-*-bold-r-normal-*-16-*-*-*-c-*-*-*, \ -- -*-*-*-*-*-*-16-*-*-*-*-*-*-*, * -+ -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-* - - TopLevelShell*international: true - TopLevelShell*font: 7x13bold - TopLevelShell*fontSet: \ -- -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \ -- -*-courier-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \ -- -gnu-unifont-bold-r-normal--16-*-*-*-c-*-*-*, \ -- -efont-biwidth-bold-r-normal--16-*-*-*-*-*-*-*, \ -- -*-*-bold-r-normal-*-16-*-*-*-m-*-*-*, \ -- -*-*-bold-r-normal-*-16-*-*-*-c-*-*-*, \ -- -*-*-*-*-*-*-16-*-*-*-*-*-*-*,* -+ -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-* - - *popup_help.title: Welcome to xawtv! - xawtv.tv.help: \ -@@ -382,13 +370,8 @@ xawtv.onscreen*background: black - xawtv.onscreen*borderColor: black - xawtv.onscreen*foreground: lightgreen - xawtv.onscreen.label.justify: left --xawtv.onscreen.label.font: -*-ledfixed-medium-r-*--39-*-*-*-c-*-*-* - xawtv.onscreen.label.fontSet: \ -- -*-ledfixed-medium-r-semicondensed--39-*-*-*-c-*-*-*, \ -- -*-bitstream vera sans-medium-r-normal--39-*-*-*-*-*-*-*, \ -- -*-luxi sans-medium-r-normal--39-*-*-*-*-*-*-*, \ -- -*-*-r-normal--39-*-*-*-*-*-*-*, \ -- -*-*-*-*--39-*-*-*-*-*-*-*,* -+ -*-nimbus sans l-medium-r-normal--39-*-*-*-*-*-*-* - - xawtv.vtx.allowShellResize: true - xawtv.vtx.label.resize: true diff --git a/xawtv-3.95-libv4l2.patch b/xawtv-3.95-libv4l2.patch deleted file mode 100644 index 02f0f92..0000000 --- a/xawtv-3.95-libv4l2.patch +++ /dev/null @@ -1,177 +0,0 @@ -diff -Nrbu xawtv-3.95/libng/plugins/Subdir.mk xawtv-3.95-OK/libng/plugins/Subdir.mk ---- xawtv-3.95/libng/plugins/Subdir.mk 2008-08-26 19:46:59.000000000 +0400 -+++ xawtv-3.95-OK/libng/plugins/Subdir.mk 2008-08-26 19:48:40.000000000 +0400 -@@ -41,6 +41,7 @@ - libng/plugins/write-qt.so : LDLIBS := $(QT_LIBS) - libng/plugins/read-dv.so : LDLIBS := $(DV_LIBS) - libng/plugins/write-dv.so : LDLIBS := $(DV_LIBS) -+libng/plugins/drv0-v4l2.so: LDLIBS := -lv4l2 - - # global targets - all:: $(TARGETS-plugins) -diff -Nrbu xawtv-3.95/libng/plugins/drv0-v4l2.c xawtv-3.95-OK/libng/plugins/drv0-v4l2.c ---- xawtv-3.95/libng/plugins/drv0-v4l2.c 2008-08-26 19:46:59.000000000 +0400 -+++ xawtv-3.95-OK/libng/plugins/drv0-v4l2.c 2008-08-26 19:48:40.000000000 +0400 -@@ -29,11 +29,26 @@ - #include "struct-dump.h" - #include "struct-v4l2.h" - -+/* FIXME replace with autoconf detection */ -+#define HAVE_LIBV4L -+ -+#ifdef HAVE_LIBV4L -+#include -+#else -+#define v4l2_fd_open(fd, flags) (fd) -+#define v4l2_close close -+#define v4l2_dup dup -+#define v4l2_ioctl ioctl -+#define v4l2_read read -+#define v4l2_mmap mmap -+#define v4l2_munmap munmap -+#endif -+ - /* ---------------------------------------------------------------------- */ - - /* open+close */ --static void* v4l2_open(char *device); --static int v4l2_close(void *handle); -+static void* v4l2_open_handle(char *device); -+static int v4l2_close_handle(void *handle); - - /* attributes */ - static char* v4l2_devname(void *handle); -@@ -111,8 +126,8 @@ - - struct ng_vid_driver v4l2_driver = { - name: "v4l2", -- open: v4l2_open, -- close: v4l2_close, -+ open: v4l2_open_handle, -+ close: v4l2_close_handle, - - get_devname: v4l2_devname, - capabilities: v4l2_flags, -@@ -166,7 +181,7 @@ - { - int rc; - -- rc = ioctl(fd,cmd,arg); -+ rc = v4l2_ioctl(fd,cmd,arg); - if (rc >= 0 && ng_debug < 2) - return rc; - if (mayfail && errno == mayfail && ng_debug < 2) -@@ -220,7 +235,7 @@ - } - - h->streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; -- ioctl(h->fd,VIDIOC_G_PARM,&h->streamparm); -+ v4l2_ioctl(h->fd,VIDIOC_G_PARM,&h->streamparm); - - /* controls */ - for (i = 0; i < MAX_CTRL; i++) { -@@ -444,10 +459,10 @@ - /* ---------------------------------------------------------------------- */ - - static void* --v4l2_open(char *device) -+v4l2_open_handle(char *device) - { - struct v4l2_handle *h; -- int i; -+ int i, libv4l2_fd; - - h = malloc(sizeof(*h)); - if (NULL == h) -@@ -459,6 +474,16 @@ - goto err; - } - -+ /* Note the v4l2_xxx functions are designed so that if they get passed an -+ unknown fd, the will behave exactly as their regular xxx counterparts, so -+ if v4l2_fd_open fails, we continue as normal (missing the libv4l2 custom -+ cam format to normal formats conversion). Chances are big we will still -+ fail then though, as normally v4l2_fd_open only fails if the device is not -+ a v4l2 device. */ -+ libv4l2_fd = v4l2_fd_open(h->fd, 0); -+ if (libv4l2_fd != -1) -+ h->fd = libv4l2_fd; -+ - if (-1 == xioctl(h->fd,VIDIOC_QUERYCAP,&h->cap,EINVAL)) - goto err; - if (ng_debug) -@@ -495,21 +520,21 @@ - - err: - if (h->fd != -1) -- close(h->fd); -+ v4l2_close(h->fd); - if (h) - free(h); - return NULL; - } - - static int --v4l2_close(void *handle) -+v4l2_close_handle(void *handle) - { - struct v4l2_handle *h = handle; - - if (ng_debug) - fprintf(stderr, "v4l2: close\n"); - -- close(h->fd); -+ v4l2_close(h->fd); - free(h); - return 0; - } -@@ -818,7 +843,7 @@ - h->buf_me[i].fmt = h->fmt_me; - h->buf_me[i].size = h->buf_me[i].fmt.bytesperline * - h->buf_me[i].fmt.height; -- h->buf_me[i].data = mmap(NULL, h->buf_v4l2[i].length, -+ h->buf_me[i].data = v4l2_mmap(NULL, h->buf_v4l2[i].length, - PROT_READ | PROT_WRITE, MAP_SHARED, - h->fd, h->buf_v4l2[i].m.offset); - if (MAP_FAILED == h->buf_me[i].data) { -@@ -859,7 +884,7 @@ - unsigned int i; - - /* stop capture */ -- if (-1 == ioctl(h->fd,VIDIOC_STREAMOFF,&h->fmt_v4l2.type)) -+ if (-1 == v4l2_ioctl(h->fd,VIDIOC_STREAMOFF,&h->fmt_v4l2.type)) - perror("ioctl VIDIOC_STREAMOFF"); - - /* free buffers */ -@@ -868,7 +893,7 @@ - ng_waiton_video_buf(&h->buf_me[i]); - if (ng_debug) - print_bufinfo(&h->buf_v4l2[i]); -- if (-1 == munmap(h->buf_me[i].data, h->buf_v4l2_size[i])) -+ if (-1 == v4l2_munmap(h->buf_me[i].data, h->buf_v4l2_size[i])) - perror("munmap"); - } - h->queue = 0; -@@ -989,7 +1014,7 @@ - } else { - size = h->fmt_me.bytesperline * h->fmt_me.height; - buf = ng_malloc_video_buf(&h->fmt_me,size); -- rc = read(h->fd,buf->data,size); -+ rc = v4l2_read(h->fd,buf->data,size); - if (rc != size) { - if (-1 == rc) { - perror("v4l2: read"); -@@ -1023,11 +1048,11 @@ - size = h->fmt_me.bytesperline * h->fmt_me.height; - buf = ng_malloc_video_buf(&h->fmt_me,size); - if (h->cap.capabilities & V4L2_CAP_READWRITE) { -- rc = read(h->fd,buf->data,size); -+ rc = v4l2_read(h->fd,buf->data,size); - if (-1 == rc && EBUSY == errno && h->ov_on) { - h->ov_on = 0; - xioctl(h->fd, VIDIOC_OVERLAY, &h->ov_on, 0); -- rc = read(h->fd,buf->data,size); -+ rc = v4l2_read(h->fd,buf->data,size); - h->ov_on = 1; - xioctl(h->fd, VIDIOC_OVERLAY, &h->ov_on, 0); - } diff --git a/xawtv-3.95-strip.patch b/xawtv-3.95-strip.patch deleted file mode 100644 index 78fb68a..0000000 --- a/xawtv-3.95-strip.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nrbu xawtv-3.95/Makefile.in xawtv-3.95-OK/Makefile.in ---- xawtv-3.95/Makefile.in 2004-04-22 18:52:29.000000000 +0400 -+++ xawtv-3.95-OK/Makefile.in 2008-07-21 20:00:12.000000000 +0400 -@@ -19,7 +19,7 @@ - CC := @CC@ - CXX := @CXX@ - INSTALL := @INSTALL@ --INSTALL_PROGRAM := @INSTALL_PROGRAM@ -s -+INSTALL_PROGRAM := @INSTALL_PROGRAM@ - INSTALL_DATA := @INSTALL_DATA@ - INSTALL_DIR := @INSTALL@ -d -m 755 - -diff -Nrbu xawtv-3.95/libng/plugins/Subdir.mk xawtv-3.95-OK/libng/plugins/Subdir.mk ---- xawtv-3.95/libng/plugins/Subdir.mk 2003-02-14 17:14:05.000000000 +0300 -+++ xawtv-3.95-OK/libng/plugins/Subdir.mk 2008-07-21 20:00:12.000000000 +0400 -@@ -47,7 +47,7 @@ - - install:: - $(INSTALL_DIR) $(libdir) -- $(INSTALL_PROGRAM) -s $(TARGETS-plugins) $(libdir) -+ $(INSTALL_PROGRAM) $(TARGETS-plugins) $(libdir) - rm -f $(GONE-plugins) - - clean:: -diff -Nrbu xawtv-3.95/vbistuff/Subdir.mk xawtv-3.95-OK/vbistuff/Subdir.mk ---- xawtv-3.95/vbistuff/Subdir.mk 2003-02-14 17:14:08.000000000 +0300 -+++ xawtv-3.95-OK/vbistuff/Subdir.mk 2008-07-21 20:00:12.000000000 +0400 -@@ -32,7 +32,7 @@ - all:: $(TARGETS-vbistuff) - - install:: -- $(INSTALL_PROGRAM) -s $(TARGETS-vbistuff) $(bindir) -+ $(INSTALL_PROGRAM) $(TARGETS-vbistuff) $(bindir) - - clean:: - rm -f $(HTML-alevtd) -diff -Nrbu xawtv-3.95/x11/Subdir.mk xawtv-3.95-OK/x11/Subdir.mk ---- xawtv-3.95/x11/Subdir.mk 2005-01-05 13:25:03.000000000 +0300 -+++ xawtv-3.95-OK/x11/Subdir.mk 2008-07-21 20:00:12.000000000 +0400 -@@ -146,7 +146,7 @@ - - ifeq ($(FOUND_X11),yes) - install:: -- $(INSTALL_PROGRAM) -s $(TARGETS-x11) $(bindir) -+ $(INSTALL_PROGRAM) $(TARGETS-x11) $(bindir) - $(INSTALL_DIR) $(resdir)/app-defaults - $(INSTALL_DATA) $(srcdir)/x11/Xawtv.ad $(resdir)/app-defaults/Xawtv - endif diff --git a/xawtv-3.95-vbi-compile-fix.patch b/xawtv-vbi-compile-fix.patch similarity index 100% rename from xawtv-3.95-vbi-compile-fix.patch rename to xawtv-vbi-compile-fix.patch diff --git a/xawtv.spec b/xawtv.spec index 754351c..659e0a6 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -2,7 +2,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.99.rc1 +Version: 3.99.rc2 Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -10,14 +10,7 @@ URL: http://git.linuxtv.org/xawtv3.git Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 Source1: xawtv.desktop - -Patch0: xawtv-3.95-strip.patch -Patch3: xawtv-3.95-font.patch -Patch15: xawtv-3.95-vbi-compile-fix.patch - -# add libv4l2 layer... -Patch100: xawtv-3.95-libv4l2.patch - +Patch0: xawtv-vbi-compile-fix.patch BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libFS-devel, libXft-devel, libXinerama-devel @@ -48,10 +41,7 @@ Xawtv also includes a grabber driver for vic. %prep %setup -q -%patch0 -p1 -b .strip -%patch3 -p1 -b .font -%patch15 -p1 -%{!?_without_libv4l:%patch100 -p1 -b .libv4l} +%patch0 -p1 autoconf autoheader @@ -73,7 +63,7 @@ done %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT resdir=$RPM_BUILD_ROOT%{_datadir}/X11 SUID_ROOT="" install +make STRIP_FLAG=-s DESTDIR=$RPM_BUILD_ROOT resdir=$RPM_BUILD_ROOT%{_datadir}/X11 SUID_ROOT="" install # we have no motif support rm -f $RPM_BUILD_ROOT%{_mandir}/*/motv.* @@ -139,6 +129,10 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Tue Feb 01 2011 Mauro Carvalho Chehab 3.99.rc2.1 +- Update to Xawtv version 3.99.rc2 +- All other patches from Fedora are now upstream + * Thu Jan 28 2011 Mauro Carvalho Chehab 3.99.rc1.1 - Update to Xawtv version 3.99.rc1 - Applied some fixes upstream fixing radio application and also some From 1a35c97310c14242cf556bea6b630876901a4bfa Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Wed, 2 Feb 2011 18:14:46 +0300 Subject: [PATCH 13/84] Spec file cleanup --- xawtv.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index 659e0a6..fd0b5f5 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -1,5 +1,3 @@ -%define libv4l 0%{!?_without_libv4l:1} - Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.99.rc2 @@ -25,9 +23,9 @@ BuildRequires: libdv-devel BuildRequires: zvbi-devel, aalib-devel BuildRequires: gpm-devel, slang-devel BuildRequires: autoconf, desktop-file-utils -%{!?_without_libv4l:BuildRequires: libv4l-devel} +BuildRequires: libv4l-devel -Requires: usermode xorg-x11-fonts-ISO8859-1-75dpi urw-fonts +Requires: usermode xorg-x11-fonts-misc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,16 +52,11 @@ export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" %configure --disable-motif --disable-quicktime make verbose=yes -for man in `find man -name "*.[1-9]" -print` -do - iconv -f ISO8859-1 -t UTF-8 <$man >$man.new && mv -f $man.new $man -done - %install rm -rf $RPM_BUILD_ROOT -make STRIP_FLAG=-s DESTDIR=$RPM_BUILD_ROOT resdir=$RPM_BUILD_ROOT%{_datadir}/X11 SUID_ROOT="" install +make DESTDIR=$RPM_BUILD_ROOT SUID_ROOT="" install # we have no motif support rm -f $RPM_BUILD_ROOT%{_mandir}/*/motv.* From 45ce1bddbe3ac610da4e859848637df70a10c028 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Wed, 2 Feb 2011 19:29:46 +0300 Subject: [PATCH 14/84] temporary drop patch0 to see the problem's build report --- xawtv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index fd0b5f5..993bc9e 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -39,7 +39,7 @@ Xawtv also includes a grabber driver for vic. %prep %setup -q -%patch0 -p1 +#%patch0 -p1 autoconf autoheader From b4c19f09c9c662803de4f60388be21c8289e0155 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Wed, 2 Feb 2011 20:03:14 +0300 Subject: [PATCH 15/84] add the actual patch for compatibility with xft > 2.2.0 --- xawtv-xft.patch | 16 ++++++++++++++++ xawtv.spec | 5 +++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 xawtv-xft.patch diff --git a/xawtv-xft.patch b/xawtv-xft.patch new file mode 100644 index 0000000..48e28ec --- /dev/null +++ b/xawtv-xft.patch @@ -0,0 +1,16 @@ +diff -Nrbu xawtv-3.99.rc2/configure.ac xawtv-3.99.rc2-OK/configure.ac +--- xawtv-3.99.rc2/configure.ac 2011-02-02 18:35:50.000000000 +0300 ++++ xawtv-3.99.rc2-OK/configure.ac 2011-02-02 20:01:28.000000000 +0300 +@@ -148,9 +148,9 @@ + XFT_LIBS="" + if test "$enable_xft" != "no"; then + AC_MSG_CHECKING(for Xft) +- if test -x "`which pkg-config 2>/dev/null`" && pkg-config xft; then +- XFT_FLAGS="`pkg-config --cflags xft`" +- XFT_LIBS="`pkg-config --libs xft`" ++ if test -x "`which pkg-config 2>/dev/null`" && pkg-config xft && pkg-config fontconfig; then ++ XFT_FLAGS="`pkg-config --cflags xft fontconfig`" ++ XFT_LIBS="`pkg-config --libs xft fontconfig`" + AC_DEFINE(HAVE_XFT,1,"have xft") + AC_MSG_RESULT(yes) + else diff --git a/xawtv.spec b/xawtv.spec index 993bc9e..b1182f1 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -8,7 +8,8 @@ URL: http://git.linuxtv.org/xawtv3.git Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 Source1: xawtv.desktop -Patch0: xawtv-vbi-compile-fix.patch +#Patch0: xawtv-vbi-compile-fix.patch +Patch0: xawtv-xft.patch BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libFS-devel, libXft-devel, libXinerama-devel @@ -39,7 +40,7 @@ Xawtv also includes a grabber driver for vic. %prep %setup -q -#%patch0 -p1 +%patch0 -p1 autoconf autoheader From 0789f412d5c6c519ab718987981f8db4ae717153 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Wed, 2 Feb 2011 20:14:26 +0300 Subject: [PATCH 16/84] drop old fontconfig patch --- xawtv-vbi-compile-fix.patch | 12 ------------ xawtv.spec | 1 - 2 files changed, 13 deletions(-) delete mode 100644 xawtv-vbi-compile-fix.patch diff --git a/xawtv-vbi-compile-fix.patch b/xawtv-vbi-compile-fix.patch deleted file mode 100644 index 0253cc3..0000000 --- a/xawtv-vbi-compile-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xawtv-3.95/configure.ac~ xawtv-3.95/configure.ac ---- xawtv-3.95/configure.ac~ 2010-11-17 11:42:27.000000000 +0100 -+++ xawtv-3.95/configure.ac 2010-11-17 11:44:51.891724004 +0100 -@@ -200,7 +200,7 @@ AC_SUBST(LIBZVBI) - LIBZVBI="" - if test "$enable_zvbi" != "no"; then - AC_CHECK_LIB(zvbi, vbi_capture_fd, -- AC_DEFINE(HAVE_ZVBI,1,"have zvbi") FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -lpthread -lm -lpng -lz",,$LIBPTHREAD) -+ AC_DEFINE(HAVE_ZVBI,1,"have zvbi") FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -lpthread -lm -lpng -lz -lfontconfig",,$LIBPTHREAD) - else - echo "*** zvbi disabled" - fi diff --git a/xawtv.spec b/xawtv.spec index b1182f1..5ec140b 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -8,7 +8,6 @@ URL: http://git.linuxtv.org/xawtv3.git Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 Source1: xawtv.desktop -#Patch0: xawtv-vbi-compile-fix.patch Patch0: xawtv-xft.patch BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel From 361ad50293b878f158ec91b0fa403116b5cd6edd Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 2 Feb 2011 19:29:17 -0200 Subject: [PATCH 17/84] Bump to version 3.99-rc3 Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 1 + sources | 2 +- xawtv-xft.patch | 16 ---------------- xawtv.spec | 10 +++++++--- 4 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 xawtv-xft.patch diff --git a/.gitignore b/.gitignore index f56be94..a1ac2b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xawtv-3.98.tar.bz2 /xawtv-3.99.rc1.tar.bz2 /xawtv-3.99.rc2.tar.bz2 +/xawtv-3.99.rc3.tar.bz2 diff --git a/sources b/sources index 9df3baa..f0b4e9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96d9ece978849b0a220fe799a7d04211 xawtv-3.99.rc2.tar.bz2 +e8377493af56674dabab5c604fdf25e9 xawtv-3.99.rc3.tar.bz2 diff --git a/xawtv-xft.patch b/xawtv-xft.patch deleted file mode 100644 index 48e28ec..0000000 --- a/xawtv-xft.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nrbu xawtv-3.99.rc2/configure.ac xawtv-3.99.rc2-OK/configure.ac ---- xawtv-3.99.rc2/configure.ac 2011-02-02 18:35:50.000000000 +0300 -+++ xawtv-3.99.rc2-OK/configure.ac 2011-02-02 20:01:28.000000000 +0300 -@@ -148,9 +148,9 @@ - XFT_LIBS="" - if test "$enable_xft" != "no"; then - AC_MSG_CHECKING(for Xft) -- if test -x "`which pkg-config 2>/dev/null`" && pkg-config xft; then -- XFT_FLAGS="`pkg-config --cflags xft`" -- XFT_LIBS="`pkg-config --libs xft`" -+ if test -x "`which pkg-config 2>/dev/null`" && pkg-config xft && pkg-config fontconfig; then -+ XFT_FLAGS="`pkg-config --cflags xft fontconfig`" -+ XFT_LIBS="`pkg-config --libs xft fontconfig`" - AC_DEFINE(HAVE_XFT,1,"have xft") - AC_MSG_RESULT(yes) - else diff --git a/xawtv.spec b/xawtv.spec index 5ec140b..7427e7e 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -1,6 +1,6 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.99.rc2 +Version: 3.99.rc3 Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -8,7 +8,6 @@ URL: http://git.linuxtv.org/xawtv3.git Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 Source1: xawtv.desktop -Patch0: xawtv-xft.patch BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libFS-devel, libXft-devel, libXinerama-devel @@ -39,7 +38,6 @@ Xawtv also includes a grabber driver for vic. %prep %setup -q -%patch0 -p1 autoconf autoheader @@ -122,6 +120,12 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Wed Feb 02 2011 Mauro Carvalho Chehab 3.99.rc3.1 +- Update to Xawtv version 3.99.rc3 +- Upstream applied some patches from Debian and from Fedora, making + compilation more portable along different distros. It also incudes + a couple minor fixes. + * Tue Feb 01 2011 Mauro Carvalho Chehab 3.99.rc2.1 - Update to Xawtv version 3.99.rc2 - All other patches from Fedora are now upstream From ea450c95b77e90eefa401fa1b240676d6cb261b7 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Thu, 3 Feb 2011 17:53:15 +0300 Subject: [PATCH 18/84] update to 3.99.rc4 --- .gitignore | 1 + sources | 2 +- xawtv.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a1ac2b2..d822fb0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xawtv-3.98.tar.bz2 /xawtv-3.99.rc1.tar.bz2 /xawtv-3.99.rc2.tar.bz2 /xawtv-3.99.rc3.tar.bz2 +/xawtv-3.99.rc4.tar.bz2 diff --git a/sources b/sources index f0b4e9f..3c565a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8377493af56674dabab5c604fdf25e9 xawtv-3.99.rc3.tar.bz2 +309e00604da2f82f2eb890bed29c7bf3 xawtv-3.99.rc4.tar.bz2 diff --git a/xawtv.spec b/xawtv.spec index 7427e7e..39b3089 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -1,6 +1,6 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.99.rc3 +Version: 3.99.rc4 Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -120,17 +120,20 @@ rm -fr $RPM_BUILD_ROOT %changelog -* Wed Feb 02 2011 Mauro Carvalho Chehab 3.99.rc3.1 +* Thu Feb 3 2011 Dmitry Butskoy - 3.99.rc4-1 +- update to Xawtv version 3.99.rc4 + +* Wed Feb 2 2011 Mauro Carvalho Chehab 3.99.rc3-1 - Update to Xawtv version 3.99.rc3 - Upstream applied some patches from Debian and from Fedora, making compilation more portable along different distros. It also incudes a couple minor fixes. -* Tue Feb 01 2011 Mauro Carvalho Chehab 3.99.rc2.1 +* Tue Feb 1 2011 Mauro Carvalho Chehab 3.99.rc2-1 - Update to Xawtv version 3.99.rc2 - All other patches from Fedora are now upstream -* Thu Jan 28 2011 Mauro Carvalho Chehab 3.99.rc1.1 +* Thu Jan 28 2011 Mauro Carvalho Chehab 3.99.rc1-1 - Update to Xawtv version 3.99.rc1 - Applied some fixes upstream fixing radio application and also some improvements from other patches that were found on Fedora. From 8cbf40b085bf18fbaff81cf4400a6ee0925e1f93 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 21:34:32 -0600 Subject: [PATCH 19/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 39b3089..4868150 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -1,7 +1,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.99.rc4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -120,6 +120,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 3.99.rc4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Feb 3 2011 Dmitry Butskoy - 3.99.rc4-1 - update to Xawtv version 3.99.rc4 From 768ba1d65f13b6243aef262e43b9933dd1a667a2 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Thu, 17 Feb 2011 18:28:27 +0300 Subject: [PATCH 20/84] update to 3.99.rc6 --- .gitignore | 1 + sources | 2 +- xawtv.spec | 34 +++++++++++++++++++++++++++------- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index d822fb0..2113563 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ 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.rc6.tar.bz2 diff --git a/sources b/sources index 3c565a2..f8491be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -309e00604da2f82f2eb890bed29c7bf3 xawtv-3.99.rc4.tar.bz2 +5dd4e1130f571bb0df68c72a3a3c3d43 xawtv-3.99.rc6.tar.bz2 diff --git a/xawtv.spec b/xawtv.spec index 4868150..76037e2 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -1,7 +1,10 @@ +%bcond_with motif +%bcond_with quicktime + Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.99.rc4 -Release: 2%{?dist} +Version: 3.99.rc6 +Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -13,6 +16,9 @@ BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libFS-devel, libXft-devel, libXinerama-devel BuildRequires: libXpm-devel, libXrandr-devel, libXt-devel BuildRequires: libXxf86dga-devel, libXv-devel +# Note: it compiles with lesstif-devel, but does not work properly. +%{?with_motif:BuildRequires: openmotif-devel} +%{?with_quicktime:BuildRequires: libquicktime-devel} BuildRequires: ncurses-devel, fileutils, libjpeg-devel, libpng-devel BuildRequires: alsa-lib-devel @@ -47,7 +53,14 @@ autoheader export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" -%configure --disable-motif --disable-quicktime +%if %{with motif} +export X_LIBS="-L/usr/lib/openmotif" +export X_CFLAGS="-I/usr/include/openmotif" +%endif + +%configure \ + %{!?_with_motif: --disable-motif} \ + %{!?_with_quicktime: --disable-quicktime} make verbose=yes @@ -56,11 +69,13 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT SUID_ROOT="" install -# we have no motif support +%if %{without motif} rm -f $RPM_BUILD_ROOT%{_mandir}/*/motv.* rm -f $RPM_BUILD_ROOT%{_mandir}/*/mtt.* -# we have no quicktime support +%endif +%if %{without quicktime} rm -f $RPM_BUILD_ROOT%{_bindir}/showqt +%endif mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps @@ -117,11 +132,16 @@ rm -fr $RPM_BUILD_ROOT %lang(es) %{_mandir}/es/*/* %lang(fr) %{_mandir}/fr/*/* %doc COPYING README TODO contrib/frequencies* +%if %{with motif} +%lang(de) %{_datadir}/X11/de_DE.UTF-8/app-defaults/* +%lang(fr) %{_datadir}/X11/fr_FR.UTF-8/app-defaults/* +%lang(fr) %{_datadir}/X11/it_IT.UTF-8/app-defaults/* +%endif %changelog -* Mon Feb 07 2011 Fedora Release Engineering - 3.99.rc4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild +* Thu Feb 17 2011 Dmitry Butskoy - 3.99.rc6-1 +- update to Xawtv version 3.99.rc6 * Thu Feb 3 2011 Dmitry Butskoy - 3.99.rc4-1 - update to Xawtv version 3.99.rc4 From 41701062f673fb58e872743e2aa44d3949c9a197 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 2 Mar 2011 09:45:17 -0300 Subject: [PATCH 21/84] Update to version 3.100 Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 1 + sources | 2 +- xawtv.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2113563..581620d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ xawtv-3.98.tar.bz2 /xawtv-3.99.rc3.tar.bz2 /xawtv-3.99.rc4.tar.bz2 /xawtv-3.99.rc6.tar.bz2 +/xawtv-3.100.tar.bz2 diff --git a/sources b/sources index f8491be..f1320d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5dd4e1130f571bb0df68c72a3a3c3d43 xawtv-3.99.rc6.tar.bz2 +adc458ae2a2d2e7a3cc6128688ce3fed xawtv-3.100.tar.bz2 diff --git a/xawtv.spec b/xawtv.spec index 76037e2..a623e61 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.99.rc6 +Version: 3.100 Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -140,6 +140,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Wed Mar 2 2011 Mauro Carvalho Chehab - 3.100-1 +- update to Xawtv version 3.100. Fixes control handling on xawtv. + * Thu Feb 17 2011 Dmitry Butskoy - 3.99.rc6-1 - update to Xawtv version 3.99.rc6 From d9eb7efdf64a4ad742cdd53680249292cac87db3 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 3 Jul 2011 11:44:43 -0300 Subject: [PATCH 22/84] Bump version to 3.101 Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 1 + sources | 2 +- xawtv.spec | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 581620d..5aa2e91 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xawtv-3.98.tar.bz2 /xawtv-3.99.rc4.tar.bz2 /xawtv-3.99.rc6.tar.bz2 /xawtv-3.100.tar.bz2 +/xawtv-3.101.tar.bz2 diff --git a/sources b/sources index f1320d6..49c241a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -adc458ae2a2d2e7a3cc6128688ce3fed xawtv-3.100.tar.bz2 +330ce1789595e370be34ad4cae3dc3fa xawtv-3.101.tar.bz2 diff --git a/xawtv.spec b/xawtv.spec index a623e61..bcfaab2 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.100 +Version: 3.101 Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ @@ -13,7 +13,7 @@ Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 Source1: xawtv.desktop BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel -BuildRequires: libFS-devel, libXft-devel, libXinerama-devel +BuildRequires: libXft-devel, libXinerama-devel BuildRequires: libXpm-devel, libXrandr-devel, libXt-devel BuildRequires: libXxf86dga-devel, libXv-devel # Note: it compiles with lesstif-devel, but does not work properly. From 324fe03bf0dc4fd09ca1cfd20b6470e12903340e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 3 Jul 2011 12:07:42 -0300 Subject: [PATCH 23/84] Add changelog entry for xawtv 3.101 Signed-off-by: Mauro Carvalho Chehab --- xawtv.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xawtv.spec b/xawtv.spec index bcfaab2..a3c75a3 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -140,6 +140,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Sun Jul 3 2011 Mauro Carvalho Chehab - 3.101-1 +- update to Xawtv version 3.101: Adds support for alsa streams + * Wed Mar 2 2011 Mauro Carvalho Chehab - 3.100-1 - update to Xawtv version 3.100. Fixes control handling on xawtv. From a7c3cd2b50af6b924d52f4226d4a1056ac89a79e Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 01:32:06 -0500 Subject: [PATCH 24/84] Rebuild for new libpng --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index a3c75a3..1eb8924 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.101 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -140,6 +140,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Tue Dec 06 2011 Adam Jackson - 3.101-2 +- Rebuild for new libpng + * Sun Jul 3 2011 Mauro Carvalho Chehab - 3.101-1 - update to Xawtv version 3.101: Adds support for alsa streams From cc66d3a87686a2024657552c816759cb72bb3c15 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:37:01 -0600 Subject: [PATCH 25/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 1eb8924..d943e2b 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.101 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -140,6 +140,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 3.101-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 06 2011 Adam Jackson - 3.101-2 - Rebuild for new libpng From 726e0ba84ccc60d66989c02788b49b01bcf59a6e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 23:23:29 -0500 Subject: [PATCH 26/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index d943e2b..0c99ed8 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.101 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -140,6 +140,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 3.101-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 3.101-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 54fddde3dc46ce07faa95530fb705b2eef0edf55 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 21 Dec 2012 20:39:46 +0100 Subject: [PATCH 27/84] rebuild against new libjpeg Signed-off-by: Adam Tkac --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 0c99ed8..b5ff624 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.101 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -140,6 +140,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Fri Dec 21 2012 Adam Tkac - 3.101-5 +- rebuild against new libjpeg + * Sun Jul 22 2012 Fedora Release Engineering - 3.101-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 579f120ffa69831ca30eaaf5ba0eb9c46db2c8f8 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 21 Jan 2013 18:00:04 +0100 Subject: [PATCH 28/84] Rebuild due to "jpeg8-ABI" feature drop Signed-off-by: Adam Tkac --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index b5ff624..d285abb 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.101 -Release: 5%{?dist} +Release: 6%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -140,6 +140,9 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Mon Jan 21 2013 Adam Tkac - 3.101-6 +- rebuild due to "jpeg8-ABI" feature drop + * Fri Dec 21 2012 Adam Tkac - 3.101-5 - rebuild against new libjpeg From 32b70d323213229c1941f26cb4e4fc1e7d87e33a Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Sun, 10 Feb 2013 22:43:04 +0530 Subject: [PATCH 29/84] Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 - Cleanup spec as per recently changed packaging guidelines --- xawtv.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index d285abb..50bdb36 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.101 -Release: 6%{?dist} +Release: 7%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -32,7 +32,6 @@ BuildRequires: libv4l-devel Requires: usermode xorg-x11-fonts-misc -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -65,8 +64,6 @@ make verbose=yes %install -rm -rf $RPM_BUILD_ROOT - make DESTDIR=$RPM_BUILD_ROOT SUID_ROOT="" install %if %{without motif} @@ -81,7 +78,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/showqt mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps install -p -m 0644 contrib/xawtv*.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} @@ -107,18 +104,14 @@ SESSION=true USER=root PROGRAM=%{_sbindir}/v4l-conf ! -install -m 0644 v4l-conf.apps $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/v4l-conf +install -p -m 0644 v4l-conf.apps $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/v4l-conf mv $RPM_BUILD_ROOT%{_bindir}/v4l-conf $RPM_BUILD_ROOT%{_sbindir}/ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf -%clean -rm -fr $RPM_BUILD_ROOT - %files -%defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/pam.d/v4l-conf %config(noreplace) %{_sysconfdir}/security/console.apps/v4l-conf %{_bindir}/* @@ -140,6 +133,10 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Sun Feb 10 2013 Parag Nemade - 3.101-7 +- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 +- Cleanup spec as per recently changed packaging guidelines + * Mon Jan 21 2013 Adam Tkac - 3.101-6 - rebuild due to "jpeg8-ABI" feature drop From 32962aeab9d438774e5bf88a3065f83eca0dab71 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 2 Apr 2013 16:05:57 +0200 Subject: [PATCH 30/84] New upstream version 3.103 --- .gitignore | 1 + sources | 2 +- xawtv.desktop | 6 ++---- xawtv.spec | 56 ++++++++++++++++++++++++++++++++------------------- 4 files changed, 39 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 5aa2e91..714cacc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ xawtv-3.98.tar.bz2 /xawtv-3.99.rc6.tar.bz2 /xawtv-3.100.tar.bz2 /xawtv-3.101.tar.bz2 +/xawtv-3.103.tar.bz2 diff --git a/sources b/sources index 49c241a..17789a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -330ce1789595e370be34ad4cae3dc3fa xawtv-3.101.tar.bz2 +18822bb3660540fa9ea8b643a5b30d6b xawtv-3.103.tar.bz2 diff --git a/xawtv.desktop b/xawtv.desktop index 0cf1760..9556c72 100644 --- a/xawtv.desktop +++ b/xawtv.desktop @@ -1,10 +1,8 @@ [Desktop Entry] -Encoding=UTF-8 Comment=X11 program for watching TV -Icon=xawtv32x32.xpm +Icon=xawtv Exec=xawtv Name=XawTV Television Viewer -GenericName=Television Viewer Terminal=false Type=Application -Categories=Application;AudioVideo; +Categories=AudioVideo; diff --git a/xawtv.spec b/xawtv.spec index 50bdb36..01c6258 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,8 +3,8 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.101 -Release: 7%{?dist} +Version: 3.103 +Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -27,12 +27,10 @@ BuildRequires: libdv-devel %endif BuildRequires: zvbi-devel, aalib-devel BuildRequires: gpm-devel, slang-devel -BuildRequires: autoconf, desktop-file-utils +BuildRequires: desktop-file-utils BuildRequires: libv4l-devel -Requires: usermode xorg-x11-fonts-misc - - +Requires: usermode xorg-x11-fonts-misc hicolor-icon-theme %description Xawtv is a simple xaw-based TV program which uses the bttv driver or @@ -44,12 +42,8 @@ Xawtv also includes a grabber driver for vic. %prep %setup -q -autoconf -autoheader - %build - export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" %if %{with motif} @@ -60,7 +54,7 @@ export X_CFLAGS="-I/usr/include/openmotif" %configure \ %{!?_with_motif: --disable-motif} \ %{!?_with_quicktime: --disable-quicktime} -make verbose=yes +make %{?_smp_mflags} verbose=yes %install @@ -74,12 +68,17 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/*/mtt.* rm -f $RPM_BUILD_ROOT%{_bindir}/showqt %endif +for i in 16x16 32x32 48x48; do + mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps + install -p -m 0644 contrib/%{name}$i.xpm \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps/%{name}.xpm +done -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m 0644 contrib/xawtv*.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps - -desktop-file-install \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ +desktop-file-install \ +%if 0%{?fedora} && 0%{?fedora} < 19 + --vendor fedora \ +%endif + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} @@ -90,7 +89,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} \ $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps \ cat >v4l-conf.pam </dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files %config(noreplace) %{_sysconfdir}/pam.d/v4l-conf @@ -119,7 +130,7 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %{_libdir}/xawtv %{_datadir}/xawtv %{_datadir}/X11/app-defaults/* -%{_datadir}/pixmaps/* +%{_datadir}/icons/hicolor/*/apps/%{name}.xpm %{_datadir}/applications/* %{_mandir}/man?/* %lang(es) %{_mandir}/es/*/* @@ -133,6 +144,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Tue Apr 2 2013 Hans de Goede 3.103-1 +- New upstream version 3.103 + * Sun Feb 10 2013 Parag Nemade - 3.101-7 - Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 - Cleanup spec as per recently changed packaging guidelines @@ -203,9 +217,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf - fix some typos in manuals (patch7, derived from Debian) - fix recording from oss (patch8, derived from Debian) - allow scantv to use another card's input (patch9, derived from Debian) -- some v4l2 code fixes (patch10, Hans de Goede ) -- skip dga automatically when not available (patch11, Hans de Goede) -- specifying of bpl pitch for v4l-conf (patch12, Hans de Goede) +- some v4l2 code fixes (patch10, Hans de Goede ) +- skip dga automatically when not available (patch11, Hans de Goede) +- specifying of bpl pitch for v4l-conf (patch12, Hans de Goede) - drop drv0-v4l2-old.so driver (assume not needed anyway now) - optional (default yes) build with libv4l wrapper library (patch100, Hans de Goede ) From 1572a1c26521a52ba1f0f8d1e9c5f7097f449ffd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 02:33:55 -0500 Subject: [PATCH 31/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 01c6258..b2220e6 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -144,6 +144,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 3.103-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Apr 2 2013 Hans de Goede 3.103-1 - New upstream version 3.103 From 9e9efb6ab40e912e771106e3d1067938169009a1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 00:12:15 -0500 Subject: [PATCH 32/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index b2220e6..bf9e094 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -144,6 +144,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 3.103-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 3.103-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 888273a32b3a997ef75d4be2e6296e149feb0134 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 09:14:01 +0000 Subject: [PATCH 33/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index bf9e094..1d57afd 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -144,6 +144,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 3.103-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 3.103-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 35ae9c7bd190a58e7ab9535c6d05a1f04d784494 Mon Sep 17 00:00:00 2001 From: buc Date: Sun, 4 Jan 2015 20:52:31 +0300 Subject: [PATCH 34/84] Fix #1155784 --- xawtv-3.103-cap_streaming.patch | 56 +++++++++++++++++++++++++++++++++ xawtv.spec | 9 +++++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 xawtv-3.103-cap_streaming.patch diff --git a/xawtv-3.103-cap_streaming.patch b/xawtv-3.103-cap_streaming.patch new file mode 100644 index 0000000..9679018 --- /dev/null +++ b/xawtv-3.103-cap_streaming.patch @@ -0,0 +1,56 @@ +From dddc0a9664387497e2701afac6c9feca72650e28 Mon Sep 17 00:00:00 2001 +From: Stas Sergeev +Date: Sat, 27 Dec 2014 22:04:58 +0300 +Subject: [PATCH] v4l2_getimage: prefer CAP_STREAMING over CAP_READWRITE + +--- + libng/plugins/drv0-v4l2.tmpl.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/libng/plugins/drv0-v4l2.tmpl.c b/libng/plugins/drv0-v4l2.tmpl.c +index ded868d..2cbd34b 100644 +--- a/libng/plugins/drv0-v4l2.tmpl.c ++++ b/libng/plugins/drv0-v4l2.tmpl.c +@@ -1241,7 +1241,19 @@ v4l2_getimage(void *handle) + + size = h->fmt_me.bytesperline * h->fmt_me.height; + buf = ng_malloc_video_buf(&h->fmt_me,size); +- if (h->cap.capabilities & V4L2_CAP_READWRITE) { ++ if (h->cap.capabilities & V4L2_CAP_STREAMING) { ++ if (-1 == v4l2_start_streaming(h,1)) { ++ v4l2_stop_streaming(h); ++ return NULL; ++ } ++ frame = v4l2_waiton(h); ++ if (-1 == frame) { ++ v4l2_stop_streaming(h); ++ return NULL; ++ } ++ memcpy(buf->data,h->buf_me[0].data,size); ++ v4l2_stop_streaming(h); ++ } else { + #ifndef USE_LIBV4L + rc = read(h->fd,buf->data,size); + #else /* USE_LIBV4L */ +@@ -1269,18 +1281,6 @@ v4l2_getimage(void *handle) + ng_release_video_buf(buf); + return NULL; + } +- } else { +- if (-1 == v4l2_start_streaming(h,1)) { +- v4l2_stop_streaming(h); +- return NULL; +- } +- frame = v4l2_waiton(h); +- if (-1 == frame) { +- v4l2_stop_streaming(h); +- return NULL; +- } +- memcpy(buf->data,h->buf_me[0].data,size); +- v4l2_stop_streaming(h); + } + return buf; + } +-- +2.1.0 + diff --git a/xawtv.spec b/xawtv.spec index 1d57afd..21b3e94 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -12,6 +12,8 @@ URL: http://git.linuxtv.org/xawtv3.git Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 Source1: xawtv.desktop +Patch1: xawtv-3.103-cap_streaming.patch + BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libXft-devel, libXinerama-devel BuildRequires: libXpm-devel, libXrandr-devel, libXt-devel @@ -32,6 +34,7 @@ BuildRequires: libv4l-devel Requires: usermode xorg-x11-fonts-misc hicolor-icon-theme + %description Xawtv is a simple xaw-based TV program which uses the bttv driver or video4linux. Xawtv contains various command-line utilities for @@ -41,6 +44,7 @@ Xawtv also includes a grabber driver for vic. %prep %setup -q +%patch1 -p1 %build @@ -144,6 +148,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Jan 4 2015 Dmitry Butskoy - 3.103-5 +- add workaround for kernels >= 3.16 (#1155784, patch from Stas Sergeev ) + * Mon Aug 18 2014 Fedora Release Engineering - 3.103-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 167bb34f6f46f96a76beea7fd16275c6470bea45 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 03:43:39 +0000 Subject: [PATCH 35/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 21b3e94..43a856d 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 5%{?dist} +Release: 6%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -148,6 +148,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 3.103-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Jan 4 2015 Dmitry Butskoy - 3.103-5 - add workaround for kernels >= 3.16 (#1155784, patch from Stas Sergeev ) From 71907b01bd7af5c97e0ad5d65c994f79f0405d2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:16:15 +0000 Subject: [PATCH 36/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 43a856d..e3b04b2 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 6%{?dist} +Release: 7%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://git.linuxtv.org/xawtv3.git @@ -148,6 +148,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.103-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 3.103-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 3871b59e2b27a603887fc918050c876c3b20500b Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 15 Feb 2016 23:20:16 +0100 Subject: [PATCH 37/84] 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 --- ...ix-segfault-under-certain-conditions.patch | 27 ++ ...efer-CAP_STREAMING-over-CAP_READWRIT.patch | 14 +- ...ng-able-to-get-a-larger-latency-on-c.patch | 84 +++++ ...low-setting-alsa_latency-from-.xawtv.patch | 83 +++++ ...round-for-bttv-kernel-driver-planar-.patch | 48 +++ ...s.c-Remove-superfluous-add-end-of-fu.patch | 45 +++ ...t-not-being-able-to-tune-tv-channels.patch | 28 ++ ...appdata-files-for-xawtv-motv-and-mtt.patch | 146 ++++++++ ...lementary-group-IDs-when-dropping-pr.patch | 44 +++ xawtv.spec | 348 +++++------------- 10 files changed, 603 insertions(+), 264 deletions(-) create mode 100644 0001-XV-Fix-segfault-under-certain-conditions.patch rename xawtv-3.103-cap_streaming.patch => 0002-v4l2_getimage-prefer-CAP_STREAMING-over-CAP_READWRIT.patch (78%) create mode 100644 0003-alsa-Fix-not-being-able-to-get-a-larger-latency-on-c.patch create mode 100644 0004-xawtv-Allow-setting-alsa_latency-from-.xawtv.patch create mode 100644 0005-v4l2-Add-a-workaround-for-bttv-kernel-driver-planar-.patch create mode 100644 0006-get_media_devices.c-Remove-superfluous-add-end-of-fu.patch create mode 100644 0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch create mode 100644 0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch create mode 100644 0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch diff --git a/0001-XV-Fix-segfault-under-certain-conditions.patch b/0001-XV-Fix-segfault-under-certain-conditions.patch new file mode 100644 index 0000000..43c0ffc --- /dev/null +++ b/0001-XV-Fix-segfault-under-certain-conditions.patch @@ -0,0 +1,27 @@ +From c69289c5c11e7a65d99db91e8ee38c0e58212c51 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Sat, 27 Dec 2014 14:42:24 +0100 +Subject: [PATCH xawtv3 1/9] XV: Fix segfault under certain conditions + +Signed-off-by: Hans de Goede +--- + x11/blit.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/x11/blit.c b/x11/blit.c +index 0ac88b8..7b1de1b 100644 +--- a/x11/blit.c ++++ b/x11/blit.c +@@ -937,7 +937,8 @@ void blit_putframe(struct blit_state *st, struct ng_video_buf *buf) + + #ifdef HAVE_LIBXV + case STATUS_XVIDEO: +- memcpy(st->xvimage->data,buf->data,buf->size); ++ memcpy(st->xvimage->data,buf->data, ++ buf->size < st->xvimage->data_size ? buf->size : st->xvimage->data_size); + ng_release_video_buf(buf); + xv_blit(XtDisplay(st->widget), XtWindow(st->widget), + st->gc, st->xvimage, +-- +2.7.1 + diff --git a/xawtv-3.103-cap_streaming.patch b/0002-v4l2_getimage-prefer-CAP_STREAMING-over-CAP_READWRIT.patch similarity index 78% rename from xawtv-3.103-cap_streaming.patch rename to 0002-v4l2_getimage-prefer-CAP_STREAMING-over-CAP_READWRIT.patch index 9679018..7d6daa4 100644 --- a/xawtv-3.103-cap_streaming.patch +++ b/0002-v4l2_getimage-prefer-CAP_STREAMING-over-CAP_READWRIT.patch @@ -1,8 +1,16 @@ -From dddc0a9664387497e2701afac6c9feca72650e28 Mon Sep 17 00:00:00 2001 +From 0f373e489aa12dbb42256c690899f9f4529c7f98 Mon Sep 17 00:00:00 2001 From: Stas Sergeev Date: Sat, 27 Dec 2014 22:04:58 +0300 -Subject: [PATCH] v4l2_getimage: prefer CAP_STREAMING over CAP_READWRITE +Subject: [PATCH xawtv3 2/9] v4l2_getimage: prefer CAP_STREAMING over + CAP_READWRITE +This patch fixes Fedora buzilla #1155784: + https://bugzilla.redhat.com/show_bug.cgi?id=1155784 + +And got merged at Fedora xawtv package by: + Dmitry Butskoy + +Signed-off-by: Mauro Carvalho Chehab --- libng/plugins/drv0-v4l2.tmpl.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) @@ -52,5 +60,5 @@ index ded868d..2cbd34b 100644 return buf; } -- -2.1.0 +2.7.1 diff --git a/0003-alsa-Fix-not-being-able-to-get-a-larger-latency-on-c.patch b/0003-alsa-Fix-not-being-able-to-get-a-larger-latency-on-c.patch new file mode 100644 index 0000000..7002bb1 --- /dev/null +++ b/0003-alsa-Fix-not-being-able-to-get-a-larger-latency-on-c.patch @@ -0,0 +1,84 @@ +From daf4665a0d3c1af65b31887575ea8848ad71ace2 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 1 Feb 2016 21:43:37 +0100 +Subject: [PATCH xawtv3 3/9] alsa: Fix not being able to get a larger latency + on capture devices with small max period sizes + +On some capture devices (e.g. bttv cards) the max period size is somewhat +small. Since we only use 2 perios on these devices we end up with only +allowing small latencies, which is a problem when e.g. using a usb codec +as output. + +This commit fixes this by adjusting the amount of periods on the capture +side when this happens. + +Signed-off-by: Hans de Goede +--- + common/alsa_stream.c | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +diff --git a/common/alsa_stream.c b/common/alsa_stream.c +index 3e33b5e..1165554 100644 +--- a/common/alsa_stream.c ++++ b/common/alsa_stream.c +@@ -109,9 +109,10 @@ static void getparams_periods(snd_pcm_t *handle, + snd_pcm_hw_params_t *params, + unsigned int *usecs, + unsigned int *count, +- const char *id) ++ int allow_adjust, const char *id) + { + unsigned min = 0, max = 0; ++ unsigned desired = *usecs * *count; + + snd_pcm_hw_params_get_periods_min(params, &min, 0); + snd_pcm_hw_params_get_periods_max(params, &max, 0); +@@ -137,6 +138,13 @@ static void getparams_periods(snd_pcm_t *handle, + if (*usecs > max) + *usecs = max; + } ++ ++ /* If we deviate from the desired size by more then 20% adjust count */ ++ if (allow_adjust && (((*usecs * *count) < (desired * 8 / 10)) || ++ ((*usecs * *count) > (desired * 12 / 10)))) { ++ *count = (desired + *usecs / 2) / *usecs; ++ getparams_periods(handle, params, usecs, count, 0, id); ++ } + } + + static int setparams_periods(snd_pcm_t *handle, +@@ -351,12 +359,16 @@ static int setparams(snd_pcm_t *phandle, snd_pcm_t *chandle, + /* Negotiate period parameters */ + + c_periodtime = latency * 1000 / c_periods; +- getparams_periods(chandle, c_hwparams, &c_periodtime, &c_periods, "capture"); ++ getparams_periods(chandle, c_hwparams, &c_periodtime, &c_periods, 1, "capture"); + p_periods = c_periods * 2; + p_periodtime = c_periodtime; +- getparams_periods(phandle, p_hwparams, &p_periodtime, &p_periods, "playback"); ++ getparams_periods(phandle, p_hwparams, &p_periodtime, &p_periods, 0, "playback"); + c_periods = p_periods / 2; + ++ if (verbose) ++ fprintf(error_fp, "alsa: Capture %u periods of %u usecs, Playback %u periods of %u usecs\n", ++ c_periods, c_periodtime, p_periods, p_periodtime); ++ + /* + * Some playback devices support a very limited periodtime range. If the user needs to + * use a higher latency to avoid overrun/underrun, use an alternate algorithm of incresing +@@ -365,10 +377,10 @@ static int setparams(snd_pcm_t *phandle, snd_pcm_t *chandle, + if (p_periodtime < c_periodtime) { + c_periodtime = p_periodtime; + c_periods = round (latency * 1000.0 / c_periodtime + 0.5); +- getparams_periods(chandle, c_hwparams, &c_periodtime, &c_periods, "capture"); ++ getparams_periods(chandle, c_hwparams, &c_periodtime, &c_periods, 0, "capture"); + p_periods = c_periods * 2; + p_periodtime = c_periodtime; +- getparams_periods(phandle, p_hwparams, &p_periodtime, &p_periods, "playback"); ++ getparams_periods(phandle, p_hwparams, &p_periodtime, &p_periods, 0, "playback"); + c_periods = p_periods / 2; + } + +-- +2.7.1 + diff --git a/0004-xawtv-Allow-setting-alsa_latency-from-.xawtv.patch b/0004-xawtv-Allow-setting-alsa_latency-from-.xawtv.patch new file mode 100644 index 0000000..7fb192a --- /dev/null +++ b/0004-xawtv-Allow-setting-alsa_latency-from-.xawtv.patch @@ -0,0 +1,83 @@ +From 196a14977a6c783cf4df531f8a71949763a63527 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Tue, 2 Feb 2016 12:46:46 +0100 +Subject: [PATCH xawtv3 4/9] xawtv: Allow setting alsa_latency from ~/.xawtv + +This avoids the need to always have to specify this on the cmdline on +systems which need a value different from the default. + +Signed-off-by: Hans de Goede +--- + man/xawtvrc.5 | 5 +++++ + x11/xt.c | 16 +++++++++++++--- + 2 files changed, 18 insertions(+), 3 deletions(-) + +diff --git a/man/xawtvrc.5 b/man/xawtvrc.5 +index 136ceba..f1c3333 100644 +--- a/man/xawtvrc.5 ++++ b/man/xawtvrc.5 +@@ -209,6 +209,11 @@ details. + .TP + .B filter = name + Enable the specified filter. ++.TP ++.B alsa_latency = time_in_ms ++This can be used to specify the latency for the ALSA digital sound loopback ++which xawtv does. The default is 30ms if you're getting sound dropouts on your ++system try increasing this setting. + .SS The [launch] section + You can start other programs from within xawtv. This is configured + with entries in the "[launch]" section: +diff --git a/x11/xt.c b/x11/xt.c +index 2065ff4..9affb4a 100644 +--- a/x11/xt.c ++++ b/x11/xt.c +@@ -65,6 +65,10 @@ + + /*----------------------------------------------------------------------*/ + ++#define ALSA_LATENCY_DEFAULT 30 ++#define STR(X) __STR(X) ++#define __STR(X) #X ++ + XtAppContext app_context; + Widget app_shell, tv; + Widget on_shell; +@@ -167,7 +171,7 @@ XtResource args_desc[] = { + "alsa_latency", + XtCValue, XtRInt, sizeof(int), + XtOffset(struct ARGS*,alsa_latency), +- XtRString, "30" ++ XtRString, STR(ALSA_LATENCY_DEFAULT) + },{ + /* Integer */ + "debug", +@@ -1414,9 +1418,15 @@ static void x11_mute_notify(int val) + { + if (val) + alsa_thread_stop(); +- else if (!alsa_thread_is_running()) ++ else if (!alsa_thread_is_running()) { ++ if (args.readconfig && args.alsa_latency == ALSA_LATENCY_DEFAULT) { ++ int val = cfg_get_int("global", "alsa_latency"); ++ if (val > 0) ++ args.alsa_latency = val; ++ } + alsa_thread_startup(alsa_out, alsa_cap, args.alsa_latency, + stderr, debug); ++ } + } + #endif + +@@ -1698,7 +1708,7 @@ usage(void) + " -(no)alsa enable/disable alsa streaming. Default: enabled\n" + " -(no)alsa-cap manually specify an alsa capture interface\n" + " -(no)alsa-pb manually specify an alsa playback interface\n" +- " -alsa-latency manually specify an alsa latency in ms. Default: 30\n" ++ " -alsa-latency manually specify an alsa latency in ms. Default: " STR(ALSA_LATENCY_DEFAULT) "\n" + #endif + " -b -bpp n color depth of the display is n (n=24,32)\n" + " -o -outfile file filename base for snapshots\n" +-- +2.7.1 + diff --git a/0005-v4l2-Add-a-workaround-for-bttv-kernel-driver-planar-.patch b/0005-v4l2-Add-a-workaround-for-bttv-kernel-driver-planar-.patch new file mode 100644 index 0000000..2a62d4a --- /dev/null +++ b/0005-v4l2-Add-a-workaround-for-bttv-kernel-driver-planar-.patch @@ -0,0 +1,48 @@ +From 033d4af24e572741d0ab4f6064f01665395c38f9 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Sun, 7 Feb 2016 17:21:19 +0100 +Subject: [PATCH xawtv3 5/9] v4l2: Add a workaround for bttv kernel driver + planar fmt width bug + +The bttv driver has a bug where it will return a width which is not +a multiple of 16 for planar formats, while it cannot handle this, +this commit adds a workaround for this. + +A kernel fix has been send upstream for this for 4.5 / 4.6, so +eventually this workaround should be removed again. + +Signed-off-by: Hans de Goede +--- + libng/plugins/drv0-v4l2.tmpl.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/libng/plugins/drv0-v4l2.tmpl.c b/libng/plugins/drv0-v4l2.tmpl.c +index 2cbd34b..8186ac7 100644 +--- a/libng/plugins/drv0-v4l2.tmpl.c ++++ b/libng/plugins/drv0-v4l2.tmpl.c +@@ -1122,6 +1122,22 @@ retry: + } + if (h->fmt_v4l2.fmt.pix.pixelformat != xawtv_pixelformat[fmt->fmtid]) + return -1; ++ ++ /* ++ * The bttv driver has a bug where it will return a width which is not ++ * a multiple of 16 for planar formats, while it cannot handle this, ++ * fix this up. ++ * ++ * A kernel fix has been send upstream for this for 4.5 / 4.6, so ++ * eventually this workaround should be removed. ++ */ ++ if (!strcmp(h->cap.driver, "bttv") && ++ (fmt->fmtid == VIDEO_YUV422P || fmt->fmtid == VIDEO_YUV420P) && ++ h->fmt_v4l2.fmt.pix.width % 16) { ++ fmt->width = h->fmt_v4l2.fmt.pix.width & ~15; ++ goto retry; ++ } ++ + fmt->width = h->fmt_v4l2.fmt.pix.width; + fmt->height = h->fmt_v4l2.fmt.pix.height; + fmt->bytesperline = h->fmt_v4l2.fmt.pix.bytesperline; +-- +2.7.1 + diff --git a/0006-get_media_devices.c-Remove-superfluous-add-end-of-fu.patch b/0006-get_media_devices.c-Remove-superfluous-add-end-of-fu.patch new file mode 100644 index 0000000..b29266a --- /dev/null +++ b/0006-get_media_devices.c-Remove-superfluous-add-end-of-fu.patch @@ -0,0 +1,45 @@ +From 5ccb09b039bcc517293bd1013faa86719a950a51 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Thu, 11 Feb 2016 13:11:48 +0100 +Subject: [PATCH xawtv3 6/9] get_media_devices.c: Remove superfluous ; add end + of functions + +Signed-off-by: Hans de Goede +--- + common/get_media_devices.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/common/get_media_devices.c b/common/get_media_devices.c +index a2d6354..619734e 100644 +--- a/common/get_media_devices.c ++++ b/common/get_media_devices.c +@@ -227,7 +227,7 @@ static int add_v4l_class(struct media_device_entry *md) + md->type = MEDIA_V4L_SUBDEV; + + return 0; +-}; ++} + + static int add_snd_class(struct media_device_entry *md) + { +@@ -270,7 +270,7 @@ static int add_snd_class(struct media_device_entry *md) + md->node = strdup(node); + + return 0; +-}; ++} + + static int add_dvb_class(struct media_device_entry *md) + { +@@ -294,7 +294,7 @@ static int add_dvb_class(struct media_device_entry *md) + md->type = MEDIA_DVB_OSD; + + return 0; +-}; ++} + + static int sort_media_device_entry(const void *a, const void *b) + { +-- +2.7.1 + diff --git a/0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch b/0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch new file mode 100644 index 0000000..af351e5 --- /dev/null +++ b/0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch @@ -0,0 +1,28 @@ +From d9a279f4d71edd070e7a549f29541951e546c60e Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 15 Feb 2016 22:07:50 +0100 +Subject: [PATCH xawtv3 7/9] mtt: Fix mtt not being able to tune tv channels + +Teletext should use the tv tuner not the radio tuner... + +Signed-off-by: Hans de Goede +--- + x11/vbi-gui.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/x11/vbi-gui.c b/x11/vbi-gui.c +index f4b19da..429c8b2 100644 +--- a/x11/vbi-gui.c ++++ b/x11/vbi-gui.c +@@ -917,7 +917,7 @@ static void vbi_station_cb(Widget widget, XtPointer client, XtPointer call) + struct v4l2_frequency frequency; + + memset (&frequency, 0, sizeof(frequency)); +- frequency.type = V4L2_TUNER_RADIO; ++ frequency.type = V4L2_TUNER_ANALOG_TV; + frequency.frequency = channels[i]->freq; + if (-1 == ioctl(vbi->fd, VIDIOC_S_FREQUENCY, &frequency)) + perror("ioctl VIDIOCSFREQ"); +-- +2.7.1 + diff --git a/0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch b/0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch new file mode 100644 index 0000000..84ee4b7 --- /dev/null +++ b/0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch @@ -0,0 +1,146 @@ +From b9f78802002fdca9e61cd67e257ad7ad9ef3ee28 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 15 Feb 2016 18:24:16 +0100 +Subject: [PATCH xawtv3 8/9] Add desktop and appdata files for xawtv, motv and + mtt + +Signed-off-by: Hans de Goede +--- + contrib/motv.desktop | 10 ++++++++++ + contrib/motv.metainfo.xml | 11 +++++++++++ + contrib/mtt.desktop | 10 ++++++++++ + contrib/mtt.metainfo.xml | 11 +++++++++++ + contrib/xawtv.appdata.xml | 33 +++++++++++++++++++++++++++++++++ + contrib/xawtv.desktop | 10 ++++++++++ + 6 files changed, 85 insertions(+) + create mode 100644 contrib/motv.desktop + create mode 100644 contrib/motv.metainfo.xml + create mode 100644 contrib/mtt.desktop + create mode 100644 contrib/mtt.metainfo.xml + create mode 100644 contrib/xawtv.appdata.xml + create mode 100644 contrib/xawtv.desktop + +diff --git a/contrib/motv.desktop b/contrib/motv.desktop +new file mode 100644 +index 0000000..37093d4 +--- /dev/null ++++ b/contrib/motv.desktop +@@ -0,0 +1,10 @@ ++[Desktop Entry] ++Comment=Analog TV viewing application ++Icon=xawtv ++Exec=motv ++Name=MoTV Television Viewer ++Terminal=false ++StartupNotify=false ++Type=Application ++Categories=AudioVideo;Video; ++Keywords=video;tv;viewer;v4l;v4l2;video4linux; +diff --git a/contrib/motv.metainfo.xml b/contrib/motv.metainfo.xml +new file mode 100644 +index 0000000..7d3bc31 +--- /dev/null ++++ b/contrib/motv.metainfo.xml +@@ -0,0 +1,11 @@ ++ ++ ++ motv.desktop ++ xawtv.desktop ++ CC0-1.0 ++ GPL-2.0+ ++ MoTV Television Viewer ++ Motif UI version of xawtv ++ http://linuxtv.org/wiki/index.php/Xawtv ++ jwrdegoede_at_fedoraproject.org ++ +diff --git a/contrib/mtt.desktop b/contrib/mtt.desktop +new file mode 100644 +index 0000000..f04c29a +--- /dev/null ++++ b/contrib/mtt.desktop +@@ -0,0 +1,10 @@ ++[Desktop Entry] ++Comment=Analog TV Teletext viewing application ++Icon=xawtv ++Exec=mtt ++Name=MTT Teletext Viewer ++Terminal=false ++StartupNotify=false ++Type=Application ++Categories=AudioVideo;Video; ++Keywords=video;tv;viewer;v4l;v4l2;video4linux;teletext; +diff --git a/contrib/mtt.metainfo.xml b/contrib/mtt.metainfo.xml +new file mode 100644 +index 0000000..28f5c84 +--- /dev/null ++++ b/contrib/mtt.metainfo.xml +@@ -0,0 +1,11 @@ ++ ++ ++ mtt.desktop ++ xawtv.desktop ++ CC0-1.0 ++ GPL-2.0+ ++ MTT Teletext Viewer ++ Easy to use Teletext GUI ++ http://linuxtv.org/wiki/index.php/Xawtv ++ jwrdegoede_at_fedoraproject.org ++ +diff --git a/contrib/xawtv.appdata.xml b/contrib/xawtv.appdata.xml +new file mode 100644 +index 0000000..92959d2 +--- /dev/null ++++ b/contrib/xawtv.appdata.xml +@@ -0,0 +1,33 @@ ++ ++ ++ xawtv.desktop ++ CC0-1.0 ++ GPL-2.0+ ++ xawtv ++ Analog TV viewing application ++ ++

++ xawtv was originally just an analog TV viewing application for Bttv ++ devices (bt848, bt878) using the Athena widgets, but evolved into a ++ small suite of X11 applications for V4L devices. ++

++

++ The xawtv package includes a number of useful console commandline ++ utilities: ++

++
    ++
  • alevtd - a http deamon for use with analogue TV teletext
    • ++
  • radio -- a console radio listening app
    • ++
  • scantv -- an analogue TV frequency scanner
    • ++
  • v4l-conf -- current video mode (size and color depth)
    • ++
  • v4lctl -- used to control a v4l device and set varying image parameters
    • ++
  • webcam -- capture images from a webcam
    • ++
++ ++ http://linuxtv.org/wiki/index.php/Xawtv ++ ++ http://www.easylinux.de/Artikel/ausgabe/2004/01/036-xawtv/tv_8.png ++ http://www.easylinux.de/Artikel/ausgabe/2004/01/036-xawtv/xawtv1.png ++ ++ jwrdegoede_at_fedoraproject.org ++ +diff --git a/contrib/xawtv.desktop b/contrib/xawtv.desktop +new file mode 100644 +index 0000000..349394d +--- /dev/null ++++ b/contrib/xawtv.desktop +@@ -0,0 +1,10 @@ ++[Desktop Entry] ++Comment=Analog TV viewing application ++Icon=xawtv ++Exec=xawtv ++Name=XawTV Television Viewer ++Terminal=false ++StartupNotify=false ++Type=Application ++Categories=AudioVideo;Video; ++Keywords=video;tv;viewer;v4l;v4l2;video4linux; +-- +2.7.1 + diff --git a/0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch b/0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch new file mode 100644 index 0000000..695a93f --- /dev/null +++ b/0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch @@ -0,0 +1,44 @@ +From 2344af22120f3092a044881c4ed14af17a0d6f41 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 15 Feb 2016 23:10:12 +0100 +Subject: [PATCH xawtv3 9/9] alevtd: Drop supplementary group IDs when dropping + privileges + +Noticed by rpmlint, seek POS36-C on the web for details about the problem. + +Signed-off-by: Hans de Goede +--- + vbistuff/alevtd.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/vbistuff/alevtd.c b/vbistuff/alevtd.c +index c6211d3..2df4886 100644 +--- a/vbistuff/alevtd.c ++++ b/vbistuff/alevtd.c +@@ -168,8 +168,10 @@ fix_ug(void) + } + + /* set group */ +- if (getegid() != gr->gr_gid || getgid() != gr->gr_gid) ++ if (getegid() != gr->gr_gid || getgid() != gr->gr_gid) { ++ setgroups(0, NULL); + setgid(gr->gr_gid); ++ } + if (getegid() != gr->gr_gid || getgid() != gr->gr_gid) { + xerror(LOG_ERR,"setgid failed",NULL); + exit(1); +@@ -177,8 +179,10 @@ fix_ug(void) + strncpy(group,gr->gr_name,16); + + /* set user */ +- if (geteuid() != pw->pw_uid || getuid() != pw->pw_uid) ++ if (geteuid() != pw->pw_uid || getuid() != pw->pw_uid) { ++ setgroups(0, NULL); + setuid(pw->pw_uid); ++ } + if (geteuid() != pw->pw_uid || getuid() != pw->pw_uid) { + xerror(LOG_ERR,"setuid failed",NULL); + exit(1); +-- +2.7.1 + diff --git a/xawtv.spec b/xawtv.spec index e3b04b2..b4edbf4 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -1,25 +1,31 @@ -%bcond_with motif %bcond_with quicktime Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 7%{?dist} +Release: 8%{?dist} Group: Applications/Multimedia License: GPLv2+ -URL: http://git.linuxtv.org/xawtv3.git +URL: http://linuxtv.org/wiki/index.php/Xawtv Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 Source1: xawtv.desktop -Patch1: xawtv-3.103-cap_streaming.patch +Patch1: 0001-XV-Fix-segfault-under-certain-conditions.patch +Patch2: 0002-v4l2_getimage-prefer-CAP_STREAMING-over-CAP_READWRIT.patch +Patch3: 0003-alsa-Fix-not-being-able-to-get-a-larger-latency-on-c.patch +Patch4: 0004-xawtv-Allow-setting-alsa_latency-from-.xawtv.patch +Patch5: 0005-v4l2-Add-a-workaround-for-bttv-kernel-driver-planar-.patch +Patch6: 0006-get_media_devices.c-Remove-superfluous-add-end-of-fu.patch +Patch7: 0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch +Patch8: 0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch +Patch9: 0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch 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 -# Note: it compiles with lesstif-devel, but does not work properly. -%{?with_motif:BuildRequires: openmotif-devel} +BuildRequires: motif-devel %{?with_quicktime:BuildRequires: libquicktime-devel} BuildRequires: ncurses-devel, fileutils, libjpeg-devel, libpng-devel @@ -29,12 +35,11 @@ BuildRequires: libdv-devel %endif BuildRequires: zvbi-devel, aalib-devel BuildRequires: gpm-devel, slang-devel -BuildRequires: desktop-file-utils +BuildRequires: ImageMagick desktop-file-utils libappstream-glib BuildRequires: libv4l-devel Requires: usermode xorg-x11-fonts-misc hicolor-icon-theme - %description Xawtv is a simple xaw-based TV program which uses the bttv driver or video4linux. Xawtv contains various command-line utilities for @@ -42,49 +47,62 @@ grabbing images and .avi movies, for tuning in to TV stations, etc. Xawtv also includes a grabber driver for vic. +%package motv +Summary: MoTV Analog Television Viewer +Requires: %{name} = %{version}-%{release} + +%description motv +Motif UI version of the xawtv analog television viewer. + + +%package mtt +Summary: Analog TV Teletext viewing application +Requires: %{name} = %{version}-%{release} + +%description mtt +Easy to use Motif UI for viewing analog tv teletext on video4linux devices +which support teletext. + + %prep %setup -q %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" - -%if %{with motif} -export X_LIBS="-L/usr/lib/openmotif" -export X_CFLAGS="-I/usr/include/openmotif" -%endif - -%configure \ - %{!?_with_motif: --disable-motif} \ - %{!?_with_quicktime: --disable-quicktime} +%configure %{!?_with_quicktime: --disable-quicktime} make %{?_smp_mflags} verbose=yes %install -make DESTDIR=$RPM_BUILD_ROOT SUID_ROOT="" install - -%if %{without motif} -rm -f $RPM_BUILD_ROOT%{_mandir}/*/motv.* -rm -f $RPM_BUILD_ROOT%{_mandir}/*/mtt.* -%endif +%make_install SUID_ROOT="" %if %{without quicktime} rm -f $RPM_BUILD_ROOT%{_bindir}/showqt %endif for i in 16x16 32x32 48x48; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps - install -p -m 0644 contrib/%{name}$i.xpm \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps/%{name}.xpm + convert contrib/%{name}$i.xpm \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps/%{name}.png done -desktop-file-install \ -%if 0%{?fedora} && 0%{?fedora} < 19 - --vendor fedora \ -%endif - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE1} - +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 + 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 @@ -127,27 +145,54 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files +%doc README TODO contrib/frequencies* +%license COPYING %config(noreplace) %{_sysconfdir}/pam.d/v4l-conf %config(noreplace) %{_sysconfdir}/security/console.apps/v4l-conf %{_bindir}/* +%exclude %{_bindir}/motv +%exclude %{_bindir}/mtt %{_sbindir}/* %{_libdir}/xawtv %{_datadir}/xawtv -%{_datadir}/X11/app-defaults/* -%{_datadir}/icons/hicolor/*/apps/%{name}.xpm -%{_datadir}/applications/* +%{_datadir}/X11/app-defaults/Xawtv +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/applications/%{name}.desktop %{_mandir}/man?/* +%exclude %{_mandir}/man1/motv.1* +%exclude %{_mandir}/man1/mtt.1* %lang(es) %{_mandir}/es/*/* %lang(fr) %{_mandir}/fr/*/* -%doc COPYING README TODO contrib/frequencies* -%if %{with motif} -%lang(de) %{_datadir}/X11/de_DE.UTF-8/app-defaults/* -%lang(fr) %{_datadir}/X11/fr_FR.UTF-8/app-defaults/* -%lang(fr) %{_datadir}/X11/it_IT.UTF-8/app-defaults/* -%endif + +%files motv +%{_bindir}/motv +%{_mandir}/man1/motv.1* +%{_datadir}/X11/app-defaults/MoTV* +%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 +* Mon Feb 15 2016 Hans de Goede - 3.103-8 +- 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 + * Fri Feb 05 2016 Fedora Release Engineering - 3.103-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild @@ -210,7 +255,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Update to Xawtv version 3.99.rc2 - All other patches from Fedora are now upstream -* Thu Jan 28 2011 Mauro Carvalho Chehab 3.99.rc1-1 +* Fri Jan 28 2011 Mauro Carvalho Chehab 3.99.rc1-1 - Update to Xawtv version 3.99.rc1 - Applied some fixes upstream fixing radio application and also some improvements from other patches that were found on Fedora. @@ -287,222 +332,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : bitstream-vera is now a default for "big" fullscreen-mode fonts. - add desktop entry and icons - add ALEVTD_REGION environment to change default teletext's region - - -* Tue Oct 21 2003 Florian La Roche -- add BuildReq for fontconfig-devel and freetype-devel, these seem - to get picked up - -* Mon Sep 01 2003 Than Ngo 3.88-5 -- Added missing BuildRequires for libpng-devel (bug #103447) - -* Tue Jun 17 2003 Than Ngo 3.88-4 -- fixed permission problem (bug #90921) - -* Tue Jun 17 2003 Than Ngo 3.88-3 -- rebuilt - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Tue May 6 2003 Than Ngo 3.88-1 -- 3.88 - -* Thu Mar 3 2003 Than Ngo 3.85-1 -- 3.85, (#85557, #81588, #74684, #61717) -- own /usr/lib/xawtv, (bug #73981) -- dependency on libjpeg-devel, (bug #48925) -- include alevtd daemon (bug #53878) -- create default configuration by install (bug #73270) - -* Sun Feb 10 2003 Than Ngo 3.81-6 -- install correct pam file, #83820 - -* Mon Jan 27 2003 Than Ngo 3.81-5 -- fix #81791 - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Tue Jan 21 2003 Than Ngo 3.81-3 -- fix #81851 - -* Mon Dec 16 2002 Than Ngo 3.81-2 -- rebuild - -* Fri Dec 13 2002 Than Ngo 3.81-1 -- update 3.81 -- move bitmap fonts to bitmap-fonts package - -* Tue Nov 12 2002 Nalin Dahyabhai 3.78-2 -- adjust PAM configuration to not use absolute paths so that the right module - set gets used for the current arch on multilib systems - -* Thu Nov 7 2002 Than Ngo 3.78-1 -- 3.78 - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Thu Jun 20 2002 Than Ngo 3.74-3 -- Don't forcibly strip binaries - -* Sun May 26 2002 Tim Powers -- automated rebuild - -* Thu May 23 2002 Harald Hoyer -- 3.74 - -* Sun Apr 07 2002 han Ngo 3.73-3 -- remove motv manpage (#62771) - -* Tue Apr 2 2002 Than Ngo 3.73-2 -- get rid of openmotif - -* Sun Mar 24 2002 Than Ngo 3.73-1 -- update -- fix bug #61719 - -* Fri Mar 22 2002 Tim Powers -- rebuilt motv against new openmotif-2.2.2 - -* Tue Feb 26 2002 Than Ngo 3.72-1 -- update to 3.72 - -* Tue Feb 19 2002 Bernhard Rosenkraenzer 3.71-1 -- 3.71 - -* Fri Jan 18 2002 Than Ngo 3.68-1 -- update to 3.68 -- enable XFree extensions -- fix Url -- add missing plugins - -* Wed Dec 5 2001 Than Ngo 3.65-1 -- update to 3.65 -- fix build on ia64 - -* Wed Nov 14 2001 Than Ngo 3.64-1 -- update to 3.64 - -* Mon Sep 17 2001 Than Ngo 3.62-1 -- update to 3.62 (bug #53711 #52847) - -* Tue Aug 28 2001 Than Ngo 3.54-5 -- fix spec file bug (Bug #52675) - -* Fri Aug 10 2001 Than Ngo 3.54-4 -- add requires usermode (bug #51474) - -* Sun Aug 5 2001 Nalin Dahyabhai 3.54-3 -- tweak PAM setup so that v4l-conf can access the display properly - -* Tue Jul 10 2001 Elliot Lee 3.54-2 -- Rebuild to remove libXv/libXxf86dga deps - -* Mon Jul 02 2001 Than Ngo -- update to 3.54 - -* Fri Jun 22 2001 Than Ngo -- update to 3.53 -- add buildprereq -- remove some uneeeded patches - -* Tue Jun 19 2001 Karsten Hopp -- excludearch s390 s390x - -* Wed Jun 13 2001 Than Ngo -- update to 3.51 - -* Thu Jun 07 2001 Than Ngo -- update to 3.50 - -* Thu May 31 2001 Than Ngo -- udate to 3.49 - -* Tue May 22 2001 Than Ngo -- update to 3.48 - -* Mon May 21 2001 Tim Powers -- built for the distro - -* Wed May 18 2001 Karsten Hopp -- make xawtv work with kernel-2.4 - -* Wed May 16 2001 Than Ngo -- update to 3.47 - -* Mon May 07 2001 Than Ngo -- update to 3.45 -- add missing fonts - -* Tue Feb 13 2001 Than Ngo -- update to 3.34 -- use consolehelper for v4l-conf -- add excludearch sparc, bdftopcf is broken on sparc - -* Wed Jan 24 2001 Than Ngo -- updated to 3.30 -- use /dev/video0 instead /dev/video (bug #24871) -- fixed dependencies (Bug #24881) - -* Sun Nov 19 2000 Than Ngo -- update to 3.24 -- add missing tools (rootv,scantv) -- add missing prereq on xset and mkfontdir - -* Fri Nov 3 2000 Than Ngo -- update to 3.23 - -* Wed Aug 23 2000 Tim Powers -- rebuilt against new XFree86 to fix DGA problems - -* Mon Aug 21 2000 Than Ngo -- update to 3.18 (Bugfix release) -- option -nodga to disable DGA (Bug #16577, #15702) -- compress fonts with gzip - -* Mon Aug 07 2000 Tim Powers -- fixed bug #15435 - -* Mon Aug 07 2000 Than Ngo -- rebuilt against the new DGA -- fixed in post and postun, so that it does not - emits to console (Bug #15436) - - -* Sat Jul 29 2000 Than Ngo -- update to 3.17 - -* Mon Jul 24 2000 Prospector -- rebuilt - -* Wed Jul 12 2000 Than Ngo -- FHS fixes - -* Mon Jul 03 2000 Prospector -- automatic rebuild - -* Sun May 28 2000 Ngo Than -- update to 3.14 for 7.0 -- put man page in correct place -- add webcam -- bzip2 source -- cleanup specfile - -* Wed Jan 19 2000 Preston Brown -- font fix (#8610) in post and postun -- add missing files in bin - -* Sun Jan 16 2000 Preston Brown -- whoops! 3.07 already bugfix release - -* Fri Jan 14 2000 Ngo Than -- updated to 3.06 - -* Mon Jul 26 1999 Tim Powers -- updated to 2.46 -- built for 6.1 - -* Wed Apr 28 1999 Preston Brown -- initial build for Powertools 6.0 From af19002a66186786813005ff69807da62f776a5b Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 15 Feb 2016 23:23:55 +0100 Subject: [PATCH 38/84] Drop no longer used xawtv.desktop --- xawtv.desktop | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 xawtv.desktop diff --git a/xawtv.desktop b/xawtv.desktop deleted file mode 100644 index 9556c72..0000000 --- a/xawtv.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Comment=X11 program for watching TV -Icon=xawtv -Exec=xawtv -Name=XawTV Television Viewer -Terminal=false -Type=Application -Categories=AudioVideo; From c5431e99f25213a2db17dd3e871dba1e21f3c827 Mon Sep 17 00:00:00 2001 From: buc Date: Wed, 17 Feb 2016 03:49:32 +0300 Subject: [PATCH 39/84] drop unneeded source --- xawtv.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index b4edbf4..a319860 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -9,7 +9,6 @@ License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 -Source1: xawtv.desktop Patch1: 0001-XV-Fix-segfault-under-certain-conditions.patch Patch2: 0002-v4l2_getimage-prefer-CAP_STREAMING-over-CAP_READWRIT.patch From fe0fef6a6a618fc895d45c9d233369f66fc52871 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:38:57 +0000 Subject: [PATCH 40/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index a319860..7335c6c 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 8%{?dist} +Release: 9%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -183,6 +183,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3.103-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Feb 15 2016 Hans de Goede - 3.103-8 - Bring in several bugfix patch from upstream - Fix crash with saa7134 driver (rhbz#1305389) From c7f1e06c3774505aebc6b9f4b8056ca634c8d180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Wed, 15 Feb 2017 10:21:43 +0100 Subject: [PATCH 41/84] Add BR: perl (Fix F26BFS). --- xawtv.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 7335c6c..3a04d4e 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 9%{?dist} +Release: 10%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -36,6 +36,7 @@ BuildRequires: zvbi-devel, aalib-devel BuildRequires: gpm-devel, slang-devel BuildRequires: ImageMagick desktop-file-utils libappstream-glib BuildRequires: libv4l-devel +BuildRequires: perl Requires: usermode xorg-x11-fonts-misc hicolor-icon-theme @@ -183,6 +184,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Feb 15 2017 Fedora Release Engineering - 3.103-10 +- Add BR: perl (Fix F26BFS). + * Sat Feb 11 2017 Fedora Release Engineering - 3.103-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 9d484fcf702c9fd4f9a1e28026c4e99a45745784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 12 Jul 2017 14:49:36 +0200 Subject: [PATCH 42/84] perl dependency renamed to perl-interpreter --- xawtv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 3a04d4e..f9884ff 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -36,7 +36,7 @@ BuildRequires: zvbi-devel, aalib-devel BuildRequires: gpm-devel, slang-devel BuildRequires: ImageMagick desktop-file-utils libappstream-glib BuildRequires: libv4l-devel -BuildRequires: perl +BuildRequires: perl-interpreter Requires: usermode xorg-x11-fonts-misc hicolor-icon-theme From 84786bf523b29418316995ee1f314547cba4747e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:52:47 +0000 Subject: [PATCH 43/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index f9884ff..7b9bcb9 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 10%{?dist} +Release: 11%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -184,6 +184,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.103-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Feb 15 2017 Fedora Release Engineering - 3.103-10 - Add BR: perl (Fix F26BFS). From c6b4a4560092181b97e460673cb9eb3ead4d1552 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:28:16 +0000 Subject: [PATCH 44/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 7b9bcb9..a1d8a45 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 11%{?dist} +Release: 12%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -184,6 +184,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.103-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 3.103-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From b57871c2d40a0b6c3f40e142e37adcc375192f42 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:19:39 +0000 Subject: [PATCH 45/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index a1d8a45..963805e 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 12%{?dist} +Release: 13%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -184,6 +184,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 3.103-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 3.103-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 7b9d75b9dd79c69f56bfef4b92723e6e7859a9ed Mon Sep 17 00:00:00 2001 From: buc Date: Thu, 15 Mar 2018 20:42:47 +0300 Subject: [PATCH 46/84] fileutils no more exists --- xawtv.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index 963805e..849bbcf 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 13%{?dist} +Release: 14%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -27,7 +27,7 @@ BuildRequires: libXxf86dga-devel, libXv-devel BuildRequires: motif-devel %{?with_quicktime:BuildRequires: libquicktime-devel} -BuildRequires: ncurses-devel, fileutils, libjpeg-devel, libpng-devel +BuildRequires: ncurses-devel, coreutils, libjpeg-devel, libpng-devel BuildRequires: alsa-lib-devel %ifnarch s390 s390x BuildRequires: libdv-devel @@ -184,6 +184,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Mar 15 2018 Dmitry Butskoy - 3.103-14 +- fileutils no more exists (#1556548) + * Fri Feb 09 2018 Fedora Release Engineering - 3.103-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b714d2044dda3bb0edc7468f9c67c3ecf7f86bd7 Mon Sep 17 00:00:00 2001 From: buc Date: Sun, 18 Mar 2018 02:17:34 +0300 Subject: [PATCH 47/84] explicitly include sys/sysmacros.h in the source --- xawtv-3.103-sysmacros.patch | 11 +++++++++++ xawtv.spec | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 xawtv-3.103-sysmacros.patch diff --git a/xawtv-3.103-sysmacros.patch b/xawtv-3.103-sysmacros.patch new file mode 100644 index 0000000..67647a5 --- /dev/null +++ b/xawtv-3.103-sysmacros.patch @@ -0,0 +1,11 @@ +diff -Nrbu xawtv-3.103/common/get_media_devices.c xawtv-3.103-OK/common/get_media_devices.c +--- xawtv-3.103/common/get_media_devices.c 2018-03-18 02:04:48.031773214 +0300 ++++ xawtv-3.103-OK/common/get_media_devices.c 2018-03-18 02:08:44.862810567 +0300 +@@ -21,6 +21,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/xawtv.spec b/xawtv.spec index 849bbcf..e6e3ba1 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -19,6 +19,7 @@ Patch6: 0006-get_media_devices.c-Remove-superfluous-add-end-of-fu.patch Patch7: 0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch Patch8: 0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch Patch9: 0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch +Patch10: xawtv-3.103-sysmacros.patch BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libXft-devel, libXinerama-devel @@ -75,6 +76,7 @@ which support teletext. %patch7 -p1 %patch8 -p1 %patch9 -p1 +$patch10 -p1 %build @@ -186,6 +188,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Thu Mar 15 2018 Dmitry Butskoy - 3.103-14 - fileutils no more exists (#1556548) +- explicitly include sys/sysmacros.h * Fri Feb 09 2018 Fedora Release Engineering - 3.103-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 8a475fd3a5bfe6135c19de80a449b48b8af0f508 Mon Sep 17 00:00:00 2001 From: buc Date: Sun, 18 Mar 2018 02:18:48 +0300 Subject: [PATCH 48/84] . --- xawtv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index e6e3ba1..0281c0c 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -76,7 +76,7 @@ which support teletext. %patch7 -p1 %patch8 -p1 %patch9 -p1 -$patch10 -p1 +%patch10 -p1 %build From 4980bd5977fbef75ff80045148e912868e764e2b Mon Sep 17 00:00:00 2001 From: buc Date: Fri, 1 Jun 2018 01:06:23 +0300 Subject: [PATCH 49/84] fix fbtv console font --- xawtv-3.103-consolefont.patch | 15 +++++++++++++++ xawtv.spec | 10 ++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 xawtv-3.103-consolefont.patch diff --git a/xawtv-3.103-consolefont.patch b/xawtv-3.103-consolefont.patch new file mode 100644 index 0000000..bdf5236 --- /dev/null +++ b/xawtv-3.103-consolefont.patch @@ -0,0 +1,15 @@ +diff -Nrbu xawtv-3.103/console/fs.c xawtv-3.103-OK/console/fs.c +--- xawtv-3.103/console/fs.c 2013-04-02 17:19:10.000000000 +0400 ++++ xawtv-3.103-OK/console/fs.c 2018-06-01 00:55:06.010404262 +0300 +@@ -198,6 +198,11 @@ + /* load console font file */ + + static char *default_font[] = { ++ ++ /* Fedora's default console font, which is still in psf1 format */ ++ "/usr/lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz", ++ "/lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz", ++ + /* why the heck every f*cking distribution picks another + location for these fonts ??? */ + "/usr/share/consolefonts/lat1-16.psf", diff --git a/xawtv.spec b/xawtv.spec index 0281c0c..20371d4 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.103 -Release: 14%{?dist} +Release: 15%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -20,6 +20,7 @@ Patch7: 0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch Patch8: 0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch Patch9: 0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch Patch10: xawtv-3.103-sysmacros.patch +Patch11: xawtv-3.103-consolefont.patch BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libXft-devel, libXinerama-devel @@ -77,6 +78,7 @@ which support teletext. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build @@ -86,7 +88,8 @@ make %{?_smp_mflags} verbose=yes %install -%make_install SUID_ROOT="" +make DESTDIR=$RPM_BUILD_ROOT SUID_ROOT="" install + %if %{without quicktime} rm -f $RPM_BUILD_ROOT%{_bindir}/showqt %endif @@ -186,6 +189,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Jun 1 2018 Dmitry Butskoy - 3.103-15 +- fix default console font for fbtv(1) (#1406549) + * Thu Mar 15 2018 Dmitry Butskoy - 3.103-14 - fileutils no more exists (#1556548) - explicitly include sys/sysmacros.h From b5b452bdbfd8086ac8d19d64a9db07105a4e61a2 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 11 Jun 2018 10:53:10 -0300 Subject: [PATCH 50/84] 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 --- ...ix-segfault-under-certain-conditions.patch | 27 ---- ...efer-CAP_STREAMING-over-CAP_READWRIT.patch | 64 -------- ...ng-able-to-get-a-larger-latency-on-c.patch | 84 ---------- ...low-setting-alsa_latency-from-.xawtv.patch | 83 ---------- ...round-for-bttv-kernel-driver-planar-.patch | 48 ------ ...s.c-Remove-superfluous-add-end-of-fu.patch | 45 ------ ...t-not-being-able-to-tune-tv-channels.patch | 28 ---- ...appdata-files-for-xawtv-motv-and-mtt.patch | 146 ------------------ ...lementary-group-IDs-when-dropping-pr.patch | 44 ------ xawtv-3.103-consolefont.patch | 15 -- xawtv-3.103-sysmacros.patch | 11 -- xawtv.spec | 31 +--- 12 files changed, 5 insertions(+), 621 deletions(-) delete mode 100644 0001-XV-Fix-segfault-under-certain-conditions.patch delete mode 100644 0002-v4l2_getimage-prefer-CAP_STREAMING-over-CAP_READWRIT.patch delete mode 100644 0003-alsa-Fix-not-being-able-to-get-a-larger-latency-on-c.patch delete mode 100644 0004-xawtv-Allow-setting-alsa_latency-from-.xawtv.patch delete mode 100644 0005-v4l2-Add-a-workaround-for-bttv-kernel-driver-planar-.patch delete mode 100644 0006-get_media_devices.c-Remove-superfluous-add-end-of-fu.patch delete mode 100644 0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch delete mode 100644 0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch delete mode 100644 0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch delete mode 100644 xawtv-3.103-consolefont.patch delete mode 100644 xawtv-3.103-sysmacros.patch diff --git a/0001-XV-Fix-segfault-under-certain-conditions.patch b/0001-XV-Fix-segfault-under-certain-conditions.patch deleted file mode 100644 index 43c0ffc..0000000 --- a/0001-XV-Fix-segfault-under-certain-conditions.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c69289c5c11e7a65d99db91e8ee38c0e58212c51 Mon Sep 17 00:00:00 2001 -From: "Bernhard M. Wiedemann" -Date: Sat, 27 Dec 2014 14:42:24 +0100 -Subject: [PATCH xawtv3 1/9] XV: Fix segfault under certain conditions - -Signed-off-by: Hans de Goede ---- - x11/blit.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/x11/blit.c b/x11/blit.c -index 0ac88b8..7b1de1b 100644 ---- a/x11/blit.c -+++ b/x11/blit.c -@@ -937,7 +937,8 @@ void blit_putframe(struct blit_state *st, struct ng_video_buf *buf) - - #ifdef HAVE_LIBXV - case STATUS_XVIDEO: -- memcpy(st->xvimage->data,buf->data,buf->size); -+ memcpy(st->xvimage->data,buf->data, -+ buf->size < st->xvimage->data_size ? buf->size : st->xvimage->data_size); - ng_release_video_buf(buf); - xv_blit(XtDisplay(st->widget), XtWindow(st->widget), - st->gc, st->xvimage, --- -2.7.1 - diff --git a/0002-v4l2_getimage-prefer-CAP_STREAMING-over-CAP_READWRIT.patch b/0002-v4l2_getimage-prefer-CAP_STREAMING-over-CAP_READWRIT.patch deleted file mode 100644 index 7d6daa4..0000000 --- a/0002-v4l2_getimage-prefer-CAP_STREAMING-over-CAP_READWRIT.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 0f373e489aa12dbb42256c690899f9f4529c7f98 Mon Sep 17 00:00:00 2001 -From: Stas Sergeev -Date: Sat, 27 Dec 2014 22:04:58 +0300 -Subject: [PATCH xawtv3 2/9] v4l2_getimage: prefer CAP_STREAMING over - CAP_READWRITE - -This patch fixes Fedora buzilla #1155784: - https://bugzilla.redhat.com/show_bug.cgi?id=1155784 - -And got merged at Fedora xawtv package by: - Dmitry Butskoy - -Signed-off-by: Mauro Carvalho Chehab ---- - libng/plugins/drv0-v4l2.tmpl.c | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/libng/plugins/drv0-v4l2.tmpl.c b/libng/plugins/drv0-v4l2.tmpl.c -index ded868d..2cbd34b 100644 ---- a/libng/plugins/drv0-v4l2.tmpl.c -+++ b/libng/plugins/drv0-v4l2.tmpl.c -@@ -1241,7 +1241,19 @@ v4l2_getimage(void *handle) - - size = h->fmt_me.bytesperline * h->fmt_me.height; - buf = ng_malloc_video_buf(&h->fmt_me,size); -- if (h->cap.capabilities & V4L2_CAP_READWRITE) { -+ if (h->cap.capabilities & V4L2_CAP_STREAMING) { -+ if (-1 == v4l2_start_streaming(h,1)) { -+ v4l2_stop_streaming(h); -+ return NULL; -+ } -+ frame = v4l2_waiton(h); -+ if (-1 == frame) { -+ v4l2_stop_streaming(h); -+ return NULL; -+ } -+ memcpy(buf->data,h->buf_me[0].data,size); -+ v4l2_stop_streaming(h); -+ } else { - #ifndef USE_LIBV4L - rc = read(h->fd,buf->data,size); - #else /* USE_LIBV4L */ -@@ -1269,18 +1281,6 @@ v4l2_getimage(void *handle) - ng_release_video_buf(buf); - return NULL; - } -- } else { -- if (-1 == v4l2_start_streaming(h,1)) { -- v4l2_stop_streaming(h); -- return NULL; -- } -- frame = v4l2_waiton(h); -- if (-1 == frame) { -- v4l2_stop_streaming(h); -- return NULL; -- } -- memcpy(buf->data,h->buf_me[0].data,size); -- v4l2_stop_streaming(h); - } - return buf; - } --- -2.7.1 - diff --git a/0003-alsa-Fix-not-being-able-to-get-a-larger-latency-on-c.patch b/0003-alsa-Fix-not-being-able-to-get-a-larger-latency-on-c.patch deleted file mode 100644 index 7002bb1..0000000 --- a/0003-alsa-Fix-not-being-able-to-get-a-larger-latency-on-c.patch +++ /dev/null @@ -1,84 +0,0 @@ -From daf4665a0d3c1af65b31887575ea8848ad71ace2 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 1 Feb 2016 21:43:37 +0100 -Subject: [PATCH xawtv3 3/9] alsa: Fix not being able to get a larger latency - on capture devices with small max period sizes - -On some capture devices (e.g. bttv cards) the max period size is somewhat -small. Since we only use 2 perios on these devices we end up with only -allowing small latencies, which is a problem when e.g. using a usb codec -as output. - -This commit fixes this by adjusting the amount of periods on the capture -side when this happens. - -Signed-off-by: Hans de Goede ---- - common/alsa_stream.c | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -diff --git a/common/alsa_stream.c b/common/alsa_stream.c -index 3e33b5e..1165554 100644 ---- a/common/alsa_stream.c -+++ b/common/alsa_stream.c -@@ -109,9 +109,10 @@ static void getparams_periods(snd_pcm_t *handle, - snd_pcm_hw_params_t *params, - unsigned int *usecs, - unsigned int *count, -- const char *id) -+ int allow_adjust, const char *id) - { - unsigned min = 0, max = 0; -+ unsigned desired = *usecs * *count; - - snd_pcm_hw_params_get_periods_min(params, &min, 0); - snd_pcm_hw_params_get_periods_max(params, &max, 0); -@@ -137,6 +138,13 @@ static void getparams_periods(snd_pcm_t *handle, - if (*usecs > max) - *usecs = max; - } -+ -+ /* If we deviate from the desired size by more then 20% adjust count */ -+ if (allow_adjust && (((*usecs * *count) < (desired * 8 / 10)) || -+ ((*usecs * *count) > (desired * 12 / 10)))) { -+ *count = (desired + *usecs / 2) / *usecs; -+ getparams_periods(handle, params, usecs, count, 0, id); -+ } - } - - static int setparams_periods(snd_pcm_t *handle, -@@ -351,12 +359,16 @@ static int setparams(snd_pcm_t *phandle, snd_pcm_t *chandle, - /* Negotiate period parameters */ - - c_periodtime = latency * 1000 / c_periods; -- getparams_periods(chandle, c_hwparams, &c_periodtime, &c_periods, "capture"); -+ getparams_periods(chandle, c_hwparams, &c_periodtime, &c_periods, 1, "capture"); - p_periods = c_periods * 2; - p_periodtime = c_periodtime; -- getparams_periods(phandle, p_hwparams, &p_periodtime, &p_periods, "playback"); -+ getparams_periods(phandle, p_hwparams, &p_periodtime, &p_periods, 0, "playback"); - c_periods = p_periods / 2; - -+ if (verbose) -+ fprintf(error_fp, "alsa: Capture %u periods of %u usecs, Playback %u periods of %u usecs\n", -+ c_periods, c_periodtime, p_periods, p_periodtime); -+ - /* - * Some playback devices support a very limited periodtime range. If the user needs to - * use a higher latency to avoid overrun/underrun, use an alternate algorithm of incresing -@@ -365,10 +377,10 @@ static int setparams(snd_pcm_t *phandle, snd_pcm_t *chandle, - if (p_periodtime < c_periodtime) { - c_periodtime = p_periodtime; - c_periods = round (latency * 1000.0 / c_periodtime + 0.5); -- getparams_periods(chandle, c_hwparams, &c_periodtime, &c_periods, "capture"); -+ getparams_periods(chandle, c_hwparams, &c_periodtime, &c_periods, 0, "capture"); - p_periods = c_periods * 2; - p_periodtime = c_periodtime; -- getparams_periods(phandle, p_hwparams, &p_periodtime, &p_periods, "playback"); -+ getparams_periods(phandle, p_hwparams, &p_periodtime, &p_periods, 0, "playback"); - c_periods = p_periods / 2; - } - --- -2.7.1 - diff --git a/0004-xawtv-Allow-setting-alsa_latency-from-.xawtv.patch b/0004-xawtv-Allow-setting-alsa_latency-from-.xawtv.patch deleted file mode 100644 index 7fb192a..0000000 --- a/0004-xawtv-Allow-setting-alsa_latency-from-.xawtv.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 196a14977a6c783cf4df531f8a71949763a63527 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Tue, 2 Feb 2016 12:46:46 +0100 -Subject: [PATCH xawtv3 4/9] xawtv: Allow setting alsa_latency from ~/.xawtv - -This avoids the need to always have to specify this on the cmdline on -systems which need a value different from the default. - -Signed-off-by: Hans de Goede ---- - man/xawtvrc.5 | 5 +++++ - x11/xt.c | 16 +++++++++++++--- - 2 files changed, 18 insertions(+), 3 deletions(-) - -diff --git a/man/xawtvrc.5 b/man/xawtvrc.5 -index 136ceba..f1c3333 100644 ---- a/man/xawtvrc.5 -+++ b/man/xawtvrc.5 -@@ -209,6 +209,11 @@ details. - .TP - .B filter = name - Enable the specified filter. -+.TP -+.B alsa_latency = time_in_ms -+This can be used to specify the latency for the ALSA digital sound loopback -+which xawtv does. The default is 30ms if you're getting sound dropouts on your -+system try increasing this setting. - .SS The [launch] section - You can start other programs from within xawtv. This is configured - with entries in the "[launch]" section: -diff --git a/x11/xt.c b/x11/xt.c -index 2065ff4..9affb4a 100644 ---- a/x11/xt.c -+++ b/x11/xt.c -@@ -65,6 +65,10 @@ - - /*----------------------------------------------------------------------*/ - -+#define ALSA_LATENCY_DEFAULT 30 -+#define STR(X) __STR(X) -+#define __STR(X) #X -+ - XtAppContext app_context; - Widget app_shell, tv; - Widget on_shell; -@@ -167,7 +171,7 @@ XtResource args_desc[] = { - "alsa_latency", - XtCValue, XtRInt, sizeof(int), - XtOffset(struct ARGS*,alsa_latency), -- XtRString, "30" -+ XtRString, STR(ALSA_LATENCY_DEFAULT) - },{ - /* Integer */ - "debug", -@@ -1414,9 +1418,15 @@ static void x11_mute_notify(int val) - { - if (val) - alsa_thread_stop(); -- else if (!alsa_thread_is_running()) -+ else if (!alsa_thread_is_running()) { -+ if (args.readconfig && args.alsa_latency == ALSA_LATENCY_DEFAULT) { -+ int val = cfg_get_int("global", "alsa_latency"); -+ if (val > 0) -+ args.alsa_latency = val; -+ } - alsa_thread_startup(alsa_out, alsa_cap, args.alsa_latency, - stderr, debug); -+ } - } - #endif - -@@ -1698,7 +1708,7 @@ usage(void) - " -(no)alsa enable/disable alsa streaming. Default: enabled\n" - " -(no)alsa-cap manually specify an alsa capture interface\n" - " -(no)alsa-pb manually specify an alsa playback interface\n" -- " -alsa-latency manually specify an alsa latency in ms. Default: 30\n" -+ " -alsa-latency manually specify an alsa latency in ms. Default: " STR(ALSA_LATENCY_DEFAULT) "\n" - #endif - " -b -bpp n color depth of the display is n (n=24,32)\n" - " -o -outfile file filename base for snapshots\n" --- -2.7.1 - diff --git a/0005-v4l2-Add-a-workaround-for-bttv-kernel-driver-planar-.patch b/0005-v4l2-Add-a-workaround-for-bttv-kernel-driver-planar-.patch deleted file mode 100644 index 2a62d4a..0000000 --- a/0005-v4l2-Add-a-workaround-for-bttv-kernel-driver-planar-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 033d4af24e572741d0ab4f6064f01665395c38f9 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Sun, 7 Feb 2016 17:21:19 +0100 -Subject: [PATCH xawtv3 5/9] v4l2: Add a workaround for bttv kernel driver - planar fmt width bug - -The bttv driver has a bug where it will return a width which is not -a multiple of 16 for planar formats, while it cannot handle this, -this commit adds a workaround for this. - -A kernel fix has been send upstream for this for 4.5 / 4.6, so -eventually this workaround should be removed again. - -Signed-off-by: Hans de Goede ---- - libng/plugins/drv0-v4l2.tmpl.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/libng/plugins/drv0-v4l2.tmpl.c b/libng/plugins/drv0-v4l2.tmpl.c -index 2cbd34b..8186ac7 100644 ---- a/libng/plugins/drv0-v4l2.tmpl.c -+++ b/libng/plugins/drv0-v4l2.tmpl.c -@@ -1122,6 +1122,22 @@ retry: - } - if (h->fmt_v4l2.fmt.pix.pixelformat != xawtv_pixelformat[fmt->fmtid]) - return -1; -+ -+ /* -+ * The bttv driver has a bug where it will return a width which is not -+ * a multiple of 16 for planar formats, while it cannot handle this, -+ * fix this up. -+ * -+ * A kernel fix has been send upstream for this for 4.5 / 4.6, so -+ * eventually this workaround should be removed. -+ */ -+ if (!strcmp(h->cap.driver, "bttv") && -+ (fmt->fmtid == VIDEO_YUV422P || fmt->fmtid == VIDEO_YUV420P) && -+ h->fmt_v4l2.fmt.pix.width % 16) { -+ fmt->width = h->fmt_v4l2.fmt.pix.width & ~15; -+ goto retry; -+ } -+ - fmt->width = h->fmt_v4l2.fmt.pix.width; - fmt->height = h->fmt_v4l2.fmt.pix.height; - fmt->bytesperline = h->fmt_v4l2.fmt.pix.bytesperline; --- -2.7.1 - diff --git a/0006-get_media_devices.c-Remove-superfluous-add-end-of-fu.patch b/0006-get_media_devices.c-Remove-superfluous-add-end-of-fu.patch deleted file mode 100644 index b29266a..0000000 --- a/0006-get_media_devices.c-Remove-superfluous-add-end-of-fu.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5ccb09b039bcc517293bd1013faa86719a950a51 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Thu, 11 Feb 2016 13:11:48 +0100 -Subject: [PATCH xawtv3 6/9] get_media_devices.c: Remove superfluous ; add end - of functions - -Signed-off-by: Hans de Goede ---- - common/get_media_devices.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/common/get_media_devices.c b/common/get_media_devices.c -index a2d6354..619734e 100644 ---- a/common/get_media_devices.c -+++ b/common/get_media_devices.c -@@ -227,7 +227,7 @@ static int add_v4l_class(struct media_device_entry *md) - md->type = MEDIA_V4L_SUBDEV; - - return 0; --}; -+} - - static int add_snd_class(struct media_device_entry *md) - { -@@ -270,7 +270,7 @@ static int add_snd_class(struct media_device_entry *md) - md->node = strdup(node); - - return 0; --}; -+} - - static int add_dvb_class(struct media_device_entry *md) - { -@@ -294,7 +294,7 @@ static int add_dvb_class(struct media_device_entry *md) - md->type = MEDIA_DVB_OSD; - - return 0; --}; -+} - - static int sort_media_device_entry(const void *a, const void *b) - { --- -2.7.1 - diff --git a/0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch b/0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch deleted file mode 100644 index af351e5..0000000 --- a/0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d9a279f4d71edd070e7a549f29541951e546c60e Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 15 Feb 2016 22:07:50 +0100 -Subject: [PATCH xawtv3 7/9] mtt: Fix mtt not being able to tune tv channels - -Teletext should use the tv tuner not the radio tuner... - -Signed-off-by: Hans de Goede ---- - x11/vbi-gui.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/x11/vbi-gui.c b/x11/vbi-gui.c -index f4b19da..429c8b2 100644 ---- a/x11/vbi-gui.c -+++ b/x11/vbi-gui.c -@@ -917,7 +917,7 @@ static void vbi_station_cb(Widget widget, XtPointer client, XtPointer call) - struct v4l2_frequency frequency; - - memset (&frequency, 0, sizeof(frequency)); -- frequency.type = V4L2_TUNER_RADIO; -+ frequency.type = V4L2_TUNER_ANALOG_TV; - frequency.frequency = channels[i]->freq; - if (-1 == ioctl(vbi->fd, VIDIOC_S_FREQUENCY, &frequency)) - perror("ioctl VIDIOCSFREQ"); --- -2.7.1 - diff --git a/0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch b/0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch deleted file mode 100644 index 84ee4b7..0000000 --- a/0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch +++ /dev/null @@ -1,146 +0,0 @@ -From b9f78802002fdca9e61cd67e257ad7ad9ef3ee28 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 15 Feb 2016 18:24:16 +0100 -Subject: [PATCH xawtv3 8/9] Add desktop and appdata files for xawtv, motv and - mtt - -Signed-off-by: Hans de Goede ---- - contrib/motv.desktop | 10 ++++++++++ - contrib/motv.metainfo.xml | 11 +++++++++++ - contrib/mtt.desktop | 10 ++++++++++ - contrib/mtt.metainfo.xml | 11 +++++++++++ - contrib/xawtv.appdata.xml | 33 +++++++++++++++++++++++++++++++++ - contrib/xawtv.desktop | 10 ++++++++++ - 6 files changed, 85 insertions(+) - create mode 100644 contrib/motv.desktop - create mode 100644 contrib/motv.metainfo.xml - create mode 100644 contrib/mtt.desktop - create mode 100644 contrib/mtt.metainfo.xml - create mode 100644 contrib/xawtv.appdata.xml - create mode 100644 contrib/xawtv.desktop - -diff --git a/contrib/motv.desktop b/contrib/motv.desktop -new file mode 100644 -index 0000000..37093d4 ---- /dev/null -+++ b/contrib/motv.desktop -@@ -0,0 +1,10 @@ -+[Desktop Entry] -+Comment=Analog TV viewing application -+Icon=xawtv -+Exec=motv -+Name=MoTV Television Viewer -+Terminal=false -+StartupNotify=false -+Type=Application -+Categories=AudioVideo;Video; -+Keywords=video;tv;viewer;v4l;v4l2;video4linux; -diff --git a/contrib/motv.metainfo.xml b/contrib/motv.metainfo.xml -new file mode 100644 -index 0000000..7d3bc31 ---- /dev/null -+++ b/contrib/motv.metainfo.xml -@@ -0,0 +1,11 @@ -+ -+ -+ motv.desktop -+ xawtv.desktop -+ CC0-1.0 -+ GPL-2.0+ -+ MoTV Television Viewer -+ Motif UI version of xawtv -+ http://linuxtv.org/wiki/index.php/Xawtv -+ jwrdegoede_at_fedoraproject.org -+ -diff --git a/contrib/mtt.desktop b/contrib/mtt.desktop -new file mode 100644 -index 0000000..f04c29a ---- /dev/null -+++ b/contrib/mtt.desktop -@@ -0,0 +1,10 @@ -+[Desktop Entry] -+Comment=Analog TV Teletext viewing application -+Icon=xawtv -+Exec=mtt -+Name=MTT Teletext Viewer -+Terminal=false -+StartupNotify=false -+Type=Application -+Categories=AudioVideo;Video; -+Keywords=video;tv;viewer;v4l;v4l2;video4linux;teletext; -diff --git a/contrib/mtt.metainfo.xml b/contrib/mtt.metainfo.xml -new file mode 100644 -index 0000000..28f5c84 ---- /dev/null -+++ b/contrib/mtt.metainfo.xml -@@ -0,0 +1,11 @@ -+ -+ -+ mtt.desktop -+ xawtv.desktop -+ CC0-1.0 -+ GPL-2.0+ -+ MTT Teletext Viewer -+ Easy to use Teletext GUI -+ http://linuxtv.org/wiki/index.php/Xawtv -+ jwrdegoede_at_fedoraproject.org -+ -diff --git a/contrib/xawtv.appdata.xml b/contrib/xawtv.appdata.xml -new file mode 100644 -index 0000000..92959d2 ---- /dev/null -+++ b/contrib/xawtv.appdata.xml -@@ -0,0 +1,33 @@ -+ -+ -+ xawtv.desktop -+ CC0-1.0 -+ GPL-2.0+ -+ xawtv -+ Analog TV viewing application -+ -+

-+ xawtv was originally just an analog TV viewing application for Bttv -+ devices (bt848, bt878) using the Athena widgets, but evolved into a -+ small suite of X11 applications for V4L devices. -+

-+

-+ The xawtv package includes a number of useful console commandline -+ utilities: -+

-+
    -+
  • alevtd - a http deamon for use with analogue TV teletext
    • -+
  • radio -- a console radio listening app
    • -+
  • scantv -- an analogue TV frequency scanner
    • -+
  • v4l-conf -- current video mode (size and color depth)
    • -+
  • v4lctl -- used to control a v4l device and set varying image parameters
    • -+
  • webcam -- capture images from a webcam
    • -+
-+ -+ http://linuxtv.org/wiki/index.php/Xawtv -+ -+ http://www.easylinux.de/Artikel/ausgabe/2004/01/036-xawtv/tv_8.png -+ http://www.easylinux.de/Artikel/ausgabe/2004/01/036-xawtv/xawtv1.png -+ -+ jwrdegoede_at_fedoraproject.org -+ -diff --git a/contrib/xawtv.desktop b/contrib/xawtv.desktop -new file mode 100644 -index 0000000..349394d ---- /dev/null -+++ b/contrib/xawtv.desktop -@@ -0,0 +1,10 @@ -+[Desktop Entry] -+Comment=Analog TV viewing application -+Icon=xawtv -+Exec=xawtv -+Name=XawTV Television Viewer -+Terminal=false -+StartupNotify=false -+Type=Application -+Categories=AudioVideo;Video; -+Keywords=video;tv;viewer;v4l;v4l2;video4linux; --- -2.7.1 - diff --git a/0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch b/0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch deleted file mode 100644 index 695a93f..0000000 --- a/0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 2344af22120f3092a044881c4ed14af17a0d6f41 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 15 Feb 2016 23:10:12 +0100 -Subject: [PATCH xawtv3 9/9] alevtd: Drop supplementary group IDs when dropping - privileges - -Noticed by rpmlint, seek POS36-C on the web for details about the problem. - -Signed-off-by: Hans de Goede ---- - vbistuff/alevtd.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/vbistuff/alevtd.c b/vbistuff/alevtd.c -index c6211d3..2df4886 100644 ---- a/vbistuff/alevtd.c -+++ b/vbistuff/alevtd.c -@@ -168,8 +168,10 @@ fix_ug(void) - } - - /* set group */ -- if (getegid() != gr->gr_gid || getgid() != gr->gr_gid) -+ if (getegid() != gr->gr_gid || getgid() != gr->gr_gid) { -+ setgroups(0, NULL); - setgid(gr->gr_gid); -+ } - if (getegid() != gr->gr_gid || getgid() != gr->gr_gid) { - xerror(LOG_ERR,"setgid failed",NULL); - exit(1); -@@ -177,8 +179,10 @@ fix_ug(void) - strncpy(group,gr->gr_name,16); - - /* set user */ -- if (geteuid() != pw->pw_uid || getuid() != pw->pw_uid) -+ if (geteuid() != pw->pw_uid || getuid() != pw->pw_uid) { -+ setgroups(0, NULL); - setuid(pw->pw_uid); -+ } - if (geteuid() != pw->pw_uid || getuid() != pw->pw_uid) { - xerror(LOG_ERR,"setuid failed",NULL); - exit(1); --- -2.7.1 - diff --git a/xawtv-3.103-consolefont.patch b/xawtv-3.103-consolefont.patch deleted file mode 100644 index bdf5236..0000000 --- a/xawtv-3.103-consolefont.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nrbu xawtv-3.103/console/fs.c xawtv-3.103-OK/console/fs.c ---- xawtv-3.103/console/fs.c 2013-04-02 17:19:10.000000000 +0400 -+++ xawtv-3.103-OK/console/fs.c 2018-06-01 00:55:06.010404262 +0300 -@@ -198,6 +198,11 @@ - /* load console font file */ - - static char *default_font[] = { -+ -+ /* Fedora's default console font, which is still in psf1 format */ -+ "/usr/lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz", -+ "/lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz", -+ - /* why the heck every f*cking distribution picks another - location for these fonts ??? */ - "/usr/share/consolefonts/lat1-16.psf", diff --git a/xawtv-3.103-sysmacros.patch b/xawtv-3.103-sysmacros.patch deleted file mode 100644 index 67647a5..0000000 --- a/xawtv-3.103-sysmacros.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nrbu xawtv-3.103/common/get_media_devices.c xawtv-3.103-OK/common/get_media_devices.c ---- xawtv-3.103/common/get_media_devices.c 2018-03-18 02:04:48.031773214 +0300 -+++ xawtv-3.103-OK/common/get_media_devices.c 2018-03-18 02:08:44.862810567 +0300 -@@ -21,6 +21,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/xawtv.spec b/xawtv.spec index 20371d4..7d7f71a 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -2,26 +2,14 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.103 -Release: 15%{?dist} +Version: 3.105 +Release: 1%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 -Patch1: 0001-XV-Fix-segfault-under-certain-conditions.patch -Patch2: 0002-v4l2_getimage-prefer-CAP_STREAMING-over-CAP_READWRIT.patch -Patch3: 0003-alsa-Fix-not-being-able-to-get-a-larger-latency-on-c.patch -Patch4: 0004-xawtv-Allow-setting-alsa_latency-from-.xawtv.patch -Patch5: 0005-v4l2-Add-a-workaround-for-bttv-kernel-driver-planar-.patch -Patch6: 0006-get_media_devices.c-Remove-superfluous-add-end-of-fu.patch -Patch7: 0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch -Patch8: 0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch -Patch9: 0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch -Patch10: xawtv-3.103-sysmacros.patch -Patch11: xawtv-3.103-consolefont.patch - BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libXft-devel, libXinerama-devel BuildRequires: libXpm-devel, libXrandr-devel, libXt-devel @@ -68,18 +56,6 @@ which support teletext. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 - %build export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" @@ -189,6 +165,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Jun 11 2018 Mauro Carvalho Chehab - 3.105-1 +- upgrade to version 3.105 + * Fri Jun 1 2018 Dmitry Butskoy - 3.103-15 - fix default console font for fbtv(1) (#1406549) From d2a451213d86933472bde9ecfe0fcbdd0648ea8c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 11 Jun 2018 11:57:03 -0300 Subject: [PATCH 51/84] Update sources to point to xawtv 3.105 Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 714cacc..cfadd14 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ xawtv-3.98.tar.bz2 /xawtv-3.100.tar.bz2 /xawtv-3.101.tar.bz2 /xawtv-3.103.tar.bz2 +/xawtv-3.105.tar.bz2 diff --git a/sources b/sources index 17789a2..ac973d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18822bb3660540fa9ea8b643a5b30d6b xawtv-3.103.tar.bz2 +SHA512 (xawtv-3.105.tar.bz2) = 0c1e2c3a73b3452778762b26a061f5646ef2a34de80027e17777ee9f6ca91ca5370b4790e2bdbe4b5edc864fe9775c9125c52e951fb08c83dc1706afbdf21e55 From c672668122c4db7e01363c36032bb8b3eb536131 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 11 Jun 2018 13:43:37 -0300 Subject: [PATCH 52/84] Cleanup FB console if an error happens Signed-off-by: Mauro Carvalho Chehab --- ...black-screen-in-case-of-fatal-errors.patch | 79 +++++++++++++++++++ xawtv.spec | 7 +- 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 0001-fbtv-dont-keep-black-screen-in-case-of-fatal-errors.patch diff --git a/0001-fbtv-dont-keep-black-screen-in-case-of-fatal-errors.patch b/0001-fbtv-dont-keep-black-screen-in-case-of-fatal-errors.patch new file mode 100644 index 0000000..a547897 --- /dev/null +++ b/0001-fbtv-dont-keep-black-screen-in-case-of-fatal-errors.patch @@ -0,0 +1,79 @@ +commit 185c8b182ac6f7fa6a5c69975f9dabdb9af6fce0 +Author: Mauro Carvalho Chehab +Date: Mon Jun 11 13:34:08 2018 -0300 + + 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 + +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); + } diff --git a/xawtv.spec b/xawtv.spec index 7d7f71a..217c425 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,12 +3,13 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.105 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 +Patch0: 0001-fbtv-dont-keep-black-screen-in-case-of-fatal-errors.patch BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libXft-devel, libXinerama-devel @@ -56,6 +57,7 @@ which support teletext. %prep %setup -q +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" @@ -165,6 +167,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Jun 11 2018 Mauro Carvalho Chehab - 3.105-2 +- cleanup FB console if an error happens + * Mon Jun 11 2018 Mauro Carvalho Chehab - 3.105-1 - upgrade to version 3.105 From 8574b3a8fa64ec002401947bc19b87f97bb6f684 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 12 Jun 2018 06:22:46 -0300 Subject: [PATCH 53/84] 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 --- ...a-black-screen-in-case-of-fatal-erro.patch | 35 ++++---- ...ent-writing-outsize-framebuffer-area.patch | 74 ++++++++++++++++ ...aying-texts-over-the-camera-streamin.patch | 85 +++++++++++++++++++ xawtv.spec | 6 +- 4 files changed, 184 insertions(+), 16 deletions(-) rename 0001-fbtv-dont-keep-black-screen-in-case-of-fatal-errors.patch => 0001-fbtv-don-t-keep-a-black-screen-in-case-of-fatal-erro.patch (71%) create mode 100644 0002-fbdev-prevent-writing-outsize-framebuffer-area.patch create mode 100644 0003-fbtv-allow-displaying-texts-over-the-camera-streamin.patch diff --git a/0001-fbtv-dont-keep-black-screen-in-case-of-fatal-errors.patch b/0001-fbtv-don-t-keep-a-black-screen-in-case-of-fatal-erro.patch similarity index 71% rename from 0001-fbtv-dont-keep-black-screen-in-case-of-fatal-errors.patch rename to 0001-fbtv-don-t-keep-a-black-screen-in-case-of-fatal-erro.patch index a547897..4cd6d87 100644 --- a/0001-fbtv-dont-keep-black-screen-in-case-of-fatal-errors.patch +++ b/0001-fbtv-don-t-keep-a-black-screen-in-case-of-fatal-erro.patch @@ -1,19 +1,21 @@ -commit 185c8b182ac6f7fa6a5c69975f9dabdb9af6fce0 -Author: Mauro Carvalho Chehab -Date: Mon Jun 11 13:34:08 2018 -0300 +From 185c8b182ac6f7fa6a5c69975f9dabdb9af6fce0 Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab +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 - 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 +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 +--- + 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 @@ -77,3 +79,6 @@ index aba517e4fc8e..33372385b7c6 100644 fprintf(stderr,"capturing image failed\n"); exit(1); } +-- +2.17.1 + diff --git a/0002-fbdev-prevent-writing-outsize-framebuffer-area.patch b/0002-fbdev-prevent-writing-outsize-framebuffer-area.patch new file mode 100644 index 0000000..c331eea --- /dev/null +++ b/0002-fbdev-prevent-writing-outsize-framebuffer-area.patch @@ -0,0 +1,74 @@ +From bc3b0ec4d5f2af3e9b8e70287b4bdc885111f174 Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab +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 +--- + 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 + diff --git a/0003-fbtv-allow-displaying-texts-over-the-camera-streamin.patch b/0003-fbtv-allow-displaying-texts-over-the-camera-streamin.patch new file mode 100644 index 0000000..3530a5f --- /dev/null +++ b/0003-fbtv-allow-displaying-texts-over-the-camera-streamin.patch @@ -0,0 +1,85 @@ +From a4493b399e45a97b9dd14499f54719cc4095f447 Mon Sep 17 00:00:00 2001 +From: Mauro Carvalho Chehab +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 +--- + 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 + diff --git a/xawtv.spec b/xawtv.spec index 217c425..a03beca 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -9,7 +9,9 @@ License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 -Patch0: 0001-fbtv-dont-keep-black-screen-in-case-of-fatal-errors.patch +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 BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libXft-devel, libXinerama-devel @@ -58,6 +60,8 @@ which support teletext. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" From cd97179701d8a5e001c0e8fc3caed2fb3376c7b4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:53 +0200 Subject: [PATCH 54/84] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- xawtv.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xawtv.spec b/xawtv.spec index a03beca..2373606 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -13,6 +13,7 @@ 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 +BuildRequires: gcc BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libXft-devel, libXinerama-devel BuildRequires: libXpm-devel, libXrandr-devel, libXt-devel From 5995ae4dd5eafb97b8fd35976f3742561a82c1ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:05:54 +0000 Subject: [PATCH 55/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 2373606..f1f787d 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.105 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Multimedia License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -172,6 +172,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.105-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jun 11 2018 Mauro Carvalho Chehab - 3.105-2 - cleanup FB console if an error happens From 487aa2a55fb879832d2fa98d076127e5d0883659 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 27 Jan 2019 13:21:08 +0100 Subject: [PATCH 56/84] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- xawtv.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index f1f787d..e70326b 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -118,20 +118,6 @@ install -p -m 0644 v4l-conf.apps $RPM_BUILD_ROOT%{_sysconfdir}/security/console. mv $RPM_BUILD_ROOT%{_bindir}/v4l-conf $RPM_BUILD_ROOT%{_sbindir}/ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf - -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %files %doc README TODO contrib/frequencies* %license COPYING From 34c6498d573b662d4b528ce9ec9227f2be93537a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 57/84] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xawtv.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index e70326b..c07f91d 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -4,7 +4,6 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.105 Release: 3%{?dist} -Group: Applications/Multimedia License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv From aebfe0f3623771ff998626e112354764d31c6588 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:06:31 +0000 Subject: [PATCH 58/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index c07f91d..244fac1 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.105 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -157,6 +157,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 3.105-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 3.105-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 5a9d90ebe930dc73cafa736048c731c639f6d6df Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 21 Feb 2019 08:26:06 -0300 Subject: [PATCH 59/84] Bump to version 3.106 Signed-off-by: Mauro Carvalho Chehab --- ...a-black-screen-in-case-of-fatal-erro.patch | 84 ------------------ ...ent-writing-outsize-framebuffer-area.patch | 74 ---------------- ...aying-texts-over-the-camera-streamin.patch | 85 ------------------- xawtv.spec | 11 +-- 4 files changed, 4 insertions(+), 250 deletions(-) delete mode 100644 0001-fbtv-don-t-keep-a-black-screen-in-case-of-fatal-erro.patch delete mode 100644 0002-fbdev-prevent-writing-outsize-framebuffer-area.patch delete mode 100644 0003-fbtv-allow-displaying-texts-over-the-camera-streamin.patch diff --git a/0001-fbtv-don-t-keep-a-black-screen-in-case-of-fatal-erro.patch b/0001-fbtv-don-t-keep-a-black-screen-in-case-of-fatal-erro.patch deleted file mode 100644 index 4cd6d87..0000000 --- a/0001-fbtv-don-t-keep-a-black-screen-in-case-of-fatal-erro.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 185c8b182ac6f7fa6a5c69975f9dabdb9af6fce0 Mon Sep 17 00:00:00 2001 -From: Mauro Carvalho Chehab -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 ---- - 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 - diff --git a/0002-fbdev-prevent-writing-outsize-framebuffer-area.patch b/0002-fbdev-prevent-writing-outsize-framebuffer-area.patch deleted file mode 100644 index c331eea..0000000 --- a/0002-fbdev-prevent-writing-outsize-framebuffer-area.patch +++ /dev/null @@ -1,74 +0,0 @@ -From bc3b0ec4d5f2af3e9b8e70287b4bdc885111f174 Mon Sep 17 00:00:00 2001 -From: Mauro Carvalho Chehab -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 ---- - 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 - diff --git a/0003-fbtv-allow-displaying-texts-over-the-camera-streamin.patch b/0003-fbtv-allow-displaying-texts-over-the-camera-streamin.patch deleted file mode 100644 index 3530a5f..0000000 --- a/0003-fbtv-allow-displaying-texts-over-the-camera-streamin.patch +++ /dev/null @@ -1,85 +0,0 @@ -From a4493b399e45a97b9dd14499f54719cc4095f447 Mon Sep 17 00:00:00 2001 -From: Mauro Carvalho Chehab -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 ---- - 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 - diff --git a/xawtv.spec b/xawtv.spec index 244fac1..93c037b 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -2,15 +2,12 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.105 +Version: 3.106 Release: 4%{?dist} License: GPLv2+ 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 BuildRequires: gcc BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel @@ -59,9 +56,6 @@ which support teletext. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" @@ -157,6 +151,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Thu Feb 21 2019 Mauro Carvalho Chehab - 3.106-1 +- upgrade to version 3.106 + * Sun Feb 03 2019 Fedora Release Engineering - 3.105-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From f8017eb993ebb83d6616c5553ecce67bf148162f Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 21 Feb 2019 08:35:45 -0300 Subject: [PATCH 60/84] Update sources for xawtv 3.106 Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cfadd14..2d3bb3e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ xawtv-3.98.tar.bz2 /xawtv-3.101.tar.bz2 /xawtv-3.103.tar.bz2 /xawtv-3.105.tar.bz2 +/xawtv-3.106.tar.bz2 diff --git a/sources b/sources index ac973d4..4beeee7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xawtv-3.105.tar.bz2) = 0c1e2c3a73b3452778762b26a061f5646ef2a34de80027e17777ee9f6ca91ca5370b4790e2bdbe4b5edc864fe9775c9125c52e951fb08c83dc1706afbdf21e55 +SHA512 (xawtv-3.106.tar.bz2) = 79d69455a85626fde130cf60dabab5733b8031200bf998dc3199c3a511cb87e3a07b4d975829b192fafafda052f6fce93a193ba5e0e5728d38ba3022e880d68e From ab9e269d8ce82aab6189f3ee0ec708dda08e0def Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:52:36 +0000 Subject: [PATCH 61/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 93c037b..917783a 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.106 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -151,6 +151,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 3.106-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 21 2019 Mauro Carvalho Chehab - 3.106-1 - upgrade to version 3.106 From af40cc698f5aebdc01bb8cc8fd23b42463466f40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:06:17 +0000 Subject: [PATCH 62/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 917783a..73e2c8e 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.106 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -151,6 +151,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.106-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 3.106-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 0d20a2cee9adb8b941de0ea1ccf7c17a190e6b2d Mon Sep 17 00:00:00 2001 From: buc Date: Sat, 1 Feb 2020 18:20:07 +0300 Subject: [PATCH 63/84] Build with -fcommon --- xawtv.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 73e2c8e..b8c2514 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -58,7 +58,7 @@ which support teletext. %setup -q %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 @@ -153,6 +153,7 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog * Fri Jan 31 2020 Fedora Release Engineering - 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 - 3.106-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 7261b17c4ffbde42cf6416f3282870557fc7f7ab Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 16 May 2020 01:46:01 +0200 Subject: [PATCH 64/84] 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 --- .gitignore | 1 + sources | 2 +- xawtv.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d3bb3e..58e2b37 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ xawtv-3.98.tar.bz2 /xawtv-3.103.tar.bz2 /xawtv-3.105.tar.bz2 /xawtv-3.106.tar.bz2 +/xawtv-3.107.tar.bz2 diff --git a/sources b/sources index 4beeee7..2f64483 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xawtv-3.106.tar.bz2) = 79d69455a85626fde130cf60dabab5733b8031200bf998dc3199c3a511cb87e3a07b4d975829b192fafafda052f6fce93a193ba5e0e5728d38ba3022e880d68e +SHA512 (xawtv-3.107.tar.bz2) = 29935e9265a96223097e6c4ab65d06c45233238992901d63aa3008e6f35cb59d474cebabd4136e47451242ba35df9ef08f9ef762c01ad688833429bc72d61536 diff --git a/xawtv.spec b/xawtv.spec index b8c2514..73c0422 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -2,8 +2,8 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.106 -Release: 6%{?dist} +Version: 3.107 +Release: 1%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -151,6 +151,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat May 16 2020 Mauro Carvalho Chehab - 3.107.1 +- upgrade to version 3.107 + * Fri Jan 31 2020 Fedora Release Engineering - 3.106-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Use gcc -fcommon flag to build From 4b091097da2a8618462c38589ee91af0a7856b51 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Thu, 23 Jul 2020 21:52:05 -0600 Subject: [PATCH 65/84] - Use strsignal, not sys_siglist --- xawtv-strsignal.patch | 47 +++++++++++++++++++++++++++++++++++++++++++ xawtv.spec | 7 ++++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 xawtv-strsignal.patch diff --git a/xawtv-strsignal.patch b/xawtv-strsignal.patch new file mode 100644 index 0000000..72ba8a6 --- /dev/null +++ b/xawtv-strsignal.patch @@ -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); diff --git a/xawtv.spec b/xawtv.spec index 73c0422..e708a24 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,11 +3,12 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 +Patch0: xawtv-strsignal.patch BuildRequires: gcc BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel @@ -56,6 +57,7 @@ which support teletext. %prep %setup -q +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -fcommon" @@ -151,6 +153,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Thu Jul 23 2020 Jeff Law - 3.107.2 +- Use strsignal, not sys_siglist + * Sat May 16 2020 Mauro Carvalho Chehab - 3.107.1 - upgrade to version 3.107 From f4ea78514740cf31f653c5b1c8dfc466294b9758 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:27:27 +0000 Subject: [PATCH 66/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index e708a24..8fd0f6c 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -153,6 +153,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.107-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 23 2020 Jeff Law - 3.107.2 - Use strsignal, not sys_siglist From bb1260368d03534fd0c02a9ae365340a107b3006 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Sat, 26 Sep 2020 15:35:43 +0300 Subject: [PATCH 67/84] . --- xawtv.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index 8fd0f6c..fc33560 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -156,10 +156,10 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf * Wed Jul 29 2020 Fedora Release Engineering - 3.107-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Thu Jul 23 2020 Jeff Law - 3.107.2 +* Thu Jul 23 2020 Jeff Law - 3.107-2 - Use strsignal, not sys_siglist -* Sat May 16 2020 Mauro Carvalho Chehab - 3.107.1 +* Sat May 16 2020 Mauro Carvalho Chehab - 3.107-1 - upgrade to version 3.107 * Fri Jan 31 2020 Fedora Release Engineering - 3.106-6 From e4cf0a354763032ae357cfe85bd53143c3931aef Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:08:14 +0000 Subject: [PATCH 68/84] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xawtv.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xawtv.spec b/xawtv.spec index fc33560..95cd6c8 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -10,6 +10,7 @@ URL: http://linuxtv.org/wiki/index.php/Xawtv Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 Patch0: xawtv-strsignal.patch +BuildRequires: make BuildRequires: gcc BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libXft-devel, libXinerama-devel From ea3dd8d395baf36f57a6b26f37bc84be1e11e787 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:47:49 +0000 Subject: [PATCH 69/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 95cd6c8..234dc18 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.107-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.107-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c72181f9875ab610bfb6e54b17aa03054aa74cc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:16:58 +0000 Subject: [PATCH 70/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 234dc18..c5df4bc 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.107-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 3.107-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d18ea31e7a7fba9578c221380e418b52b2fffd97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:48:34 +0000 Subject: [PATCH 71/84] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index c5df4bc..c99b330 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.107-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 3.107-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8a7f5f3cff16008b0e2fae2ea46350edf6b0ac20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:47:20 +0000 Subject: [PATCH 72/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index c99b330..8dcba86 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.107-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 3.107-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 496626024f016fe8f028d2928a94f534fe74f006 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:09:06 +0000 Subject: [PATCH 73/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 8dcba86..43b75c0 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.107-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 3.107-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From efb101deb2506134cd5ca8de109a414957917f91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:31:24 +0000 Subject: [PATCH 74/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 43b75c0..8074b1d 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.107-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 3.107-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e0b4184086da8b2e2351e9c3f98c6002422bde0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:19:54 +0000 Subject: [PATCH 75/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 8074b1d..62945bc 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.107-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 3.107-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 44737a4de341d54100f605730df0bad3c1ba6526 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Tue, 30 Jan 2024 04:35:57 +0300 Subject: [PATCH 76/84] Fix incompatible pointer types warning (#2261796) --- xawtv-3.107-XawListChange.patch | 28 ++++++++++++++++++++++++++++ xawtv.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 xawtv-3.107-XawListChange.patch diff --git a/xawtv-3.107-XawListChange.patch b/xawtv-3.107-XawListChange.patch new file mode 100644 index 0000000..7e9ae94 --- /dev/null +++ b/xawtv-3.107-XawListChange.patch @@ -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); + } + } + } diff --git a/xawtv.spec b/xawtv.spec index 62945bc..ecbb843 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,12 +3,13 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 Patch0: xawtv-strsignal.patch +Patch1: xawtv-3.107-XawListChange.patch BuildRequires: make BuildRequires: gcc @@ -59,6 +60,7 @@ which support teletext. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -fcommon" @@ -154,6 +156,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Tue Jan 30 2024 Dmitry Butskoy - 3.107-11 +- fix incompatible pointer types warnings (#2261796) + * Sat Jan 27 2024 Fedora Release Engineering - 3.107-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 445fad2a087e54f8dcbdb53592370081e3d2893e Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:50 +0200 Subject: [PATCH 77/84] Eliminate use of obsolete %patchN syntax (#2283636) --- xawtv.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index ecbb843..2b86ad6 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -59,8 +59,8 @@ which support teletext. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -fcommon" From 09b65267ec0ef101c0ced8cdd63c4c247b33f47f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:42:55 +0000 Subject: [PATCH 78/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 2b86ad6..868bbe3 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -156,6 +156,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.107-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jan 30 2024 Dmitry Butskoy - 3.107-11 - fix incompatible pointer types warnings (#2261796) From 6af3948a1e682de3b422c7712975301661a631ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:45:05 +0200 Subject: [PATCH 79/84] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xawtv.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index 868bbe3..a815a8b 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,8 +3,9 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 12%{?dist} -License: GPLv2+ +Release: 13%{?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 @@ -156,6 +157,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Fri Jul 26 2024 Miroslav Suchý - 3.107-13 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 3.107-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 364667d0710133338744595eeb6d797cdba3fcf4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:25:48 +0000 Subject: [PATCH 80/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index a815a8b..45ab4e8 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 13%{?dist} +Release: 14%{?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 @@ -157,6 +157,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.107-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 3.107-13 - convert license to SPDX From 5f0ef07e614a68d0343dad54735807c9fb5eb9a1 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Fri, 24 Jan 2025 09:04:15 +0300 Subject: [PATCH 81/84] Switch to PolicyKit, and no more use /usr/sbin --- xawtv.spec | 69 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 26 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index 45ab4e8..f64e9e3 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 14%{?dist} +Release: 15%{?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 @@ -13,7 +13,7 @@ Patch0: xawtv-strsignal.patch Patch1: xawtv-3.107-XawListChange.patch BuildRequires: make -BuildRequires: gcc +BuildRequires: gcc BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libXft-devel, libXinerama-devel BuildRequires: libXpm-devel, libXrandr-devel, libXt-devel @@ -32,7 +32,7 @@ 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 @@ -93,45 +93,58 @@ 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 <v4l-conf.apps <v4l-conf.sh <v4l-conf.policy < + + + + XawTV Project + %{url} + + + + Run v4l-conf with privileges required + Authentication is required for privileged operations of v4l-conf + + no + no + yes + + %{_libexecdir}/v4l-conf + true + + + +EOF +install -p -m 644 v4l-conf.policy $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/org.fedoraproject.v4l.conf.policy -mv $RPM_BUILD_ROOT%{_bindir}/v4l-conf $RPM_BUILD_ROOT%{_sbindir}/ -ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %files %doc README TODO contrib/frequencies* %license COPYING -%config(noreplace) %{_sysconfdir}/pam.d/v4l-conf -%config(noreplace) %{_sysconfdir}/security/console.apps/v4l-conf %{_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* @@ -157,6 +170,10 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Fri Jan 24 2025 Dmitry Butskoy - 3.107-15 +- switch to PolicyKit (#502723) +- avoid /usr/sbin dir (#2341562) + * Sun Jan 19 2025 Fedora Release Engineering - 3.107-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 90520da929c5806b899eadc84da197dd14e341e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:37:47 +0000 Subject: [PATCH 82/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index f64e9e3..881622e 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 15%{?dist} +Release: 16%{?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 @@ -170,6 +170,9 @@ install -p -m 644 v4l-conf.policy $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/or %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.107-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 24 2025 Dmitry Butskoy - 3.107-15 - switch to PolicyKit (#502723) - avoid /usr/sbin dir (#2341562) From fcfc7f73c02cc7a56f37a6f6054359aec0dc717b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:27:38 +0000 Subject: [PATCH 83/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 881622e..4c7ec4a 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 16%{?dist} +Release: 17%{?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 @@ -170,6 +170,9 @@ install -p -m 644 v4l-conf.policy $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/or %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 3.107-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 3.107-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5539e087c1dd657ebe40a8b9cb5a5600dc018c99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:01:03 +0000 Subject: [PATCH 84/84] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 4c7ec4a..07ae627 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 17%{?dist} +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 @@ -170,6 +170,9 @@ install -p -m 644 v4l-conf.policy $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/or %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.107-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 3.107-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild