[packages/xawtv] - new Source0 URL, updated to 3.103 - updated home_etc,fullscreen patches - removed obsolete appdefs
qboosh
qboosh at pld-linux.org
Sat Jul 16 20:49:01 CEST 2016
commit 6dc2603058c7dc7bc63e4a24fefa2546c187fb9e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jul 16 20:49:24 2016 +0200
- new Source0 URL, updated to 3.103
- updated home_etc,fullscreen patches
- removed obsolete appdefsdir,gcc4,pagesize,fontconfig patches
xawtv-appdefsdir.patch | 11 --------
xawtv-fontconfig.patch | 17 -------------
xawtv-fullscreen.patch | 18 ++++++-------
xawtv-gcc4.patch | 11 --------
xawtv-home_etc.patch | 52 +++++++++++++++++++------------------
xawtv-pagesize.patch | 36 --------------------------
xawtv.spec | 69 +++++++++++++++++++++++++++++++-------------------
7 files changed, 78 insertions(+), 136 deletions(-)
---
diff --git a/xawtv.spec b/xawtv.spec
index d5af8f2..283621b 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -1,22 +1,24 @@
-# TODO:
-# unpackaged: /usr/share/X11/de_DE.UTF-8/app-defaults/MoTV
#
# Conditional build:
%bcond_without aalib # compile without aalib support
%bcond_without lirc # compile without lirc remote control support
+%bcond_with mmx # MMX support (if enabled, linear-plugin won't work on non-MMX CPU)
#
+%ifarch %{x8664} pentium3 pentium4 athlon
+%define with_mmx 1
+%endif
Summary: Video4Linux Stream Capture Viewer
Summary(pl.UTF-8): Aplikacje video dla Linuksa
Summary(pt_BR.UTF-8): Visualizador de fluxos de imagens obtidas através do Video4Linux
Summary(ru.UTF-8): Просмотр и запись видеопотоков
Summary(uk.UTF-8): Перегляд та запис відеопотоків
Name: xawtv
-Version: 3.95
-Release: 16
+Version: 3.103
+Release: 1
License: GPL
Group: X11/Applications
-Source0: http://dl.bytesex.org/releases/xawtv/%{name}-%{version}.tar.gz
-# Source0-md5: ad25e03f7e128b318e392cb09f52207d
+Source0: https://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2
+# Source0-md5: 18822bb3660540fa9ea8b643a5b30d6b
Source1: Xawtv.ad-pl
Source2: %{name}.desktop
Source3: %{name}-noxv.desktop
@@ -27,27 +29,36 @@ Patch0: %{name}-home_etc.patch
Patch1: %{name}-channels_list-cable_poland_PTK.patch
Patch2: %{name}-fullscreen.patch
Patch3: %{name}-libng_fix.patch
-Patch4: %{name}-appdefsdir.patch
-Patch5: %{name}-path-fix.patch
-Patch6: %{name}-gcc4.patch
-Patch7: %{name}-pagesize.patch
+Patch4: %{name}-path-fix.patch
Patch8: %{name}-fontconfig.patch
URL: http://bytesex.org/xawtv/
BuildRequires: OpenGL-devel
%{?with_aalib:BuildRequires: aalib-devel}
BuildRequires: alsa-lib-devel
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
+BuildRequires: fontconfig-devel
BuildRequires: iconv
+BuildRequires: libdv-devel
BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libv4l-devel
%{?with_lirc:BuildRequires: lirc-devel}
BuildRequires: ncurses-devel >= 5.1
BuildRequires: motif-devel
+BuildRequires: pkgconfig
BuildRequires: xorg-app-bdftopcf
BuildRequires: xorg-app-mkfontdir
BuildRequires: xorg-lib-libFS-devel
+BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXaw-devel
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXft-devel
BuildRequires: xorg-lib-libXinerama-devel
+BuildRequires: xorg-lib-libXmu-devel
+BuildRequires: xorg-lib-libXpm-devel
BuildRequires: xorg-lib-libXrandr-devel
+BuildRequires: xorg-lib-libXrender-devel
+BuildRequires: xorg-lib-libXt-devel
BuildRequires: xorg-lib-libXv-devel
BuildRequires: xorg-lib-libXxf86dga-devel
BuildRequires: xorg-lib-libXxf86vm-devel
@@ -207,32 +218,27 @@ telewizyjnych:
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
%build
%{__autoconf}
-CFLAGS="%{rpmcflags} -I/usr/include/ncurses -I/usr/include/X11/fonts"; export CFLAGS
-# MMX support in linear-blend plugin is chosen at compile time - athlon/p3/p4 only
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
+# -I/usr/include/X11/fonts"
%configure \
%{!?with_aalib:--disable-aalib} \
%{!?with_lirc:--disable-lirc} \
+ --enable-mmx%{!?with_mmx:=no} \
--enable-motif \
--disable-quicktime \
+ --disable-silent-rules \
--enable-xfree-ext \
- --enable-xvideo \
-%ifnarch athlon pentium3 pentium4
- --disable-mmx
-%endif
-%{__make}
+ --enable-xvideo
+%{__make} \
+ verbose=yes
%{__make} -j1 -C %{font_dir}
%install
rm -rf $RPM_BUILD_ROOT
-
install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_fontsdir}/misc} \
$RPM_BUILD_ROOT%{_datadir}/X11/pl/app-defaults
@@ -240,12 +246,16 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_fontsdir}/misc} \
DESTDIR="$RPM_BUILD_ROOT" \
SUID_ROOT=""
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/X11/{de_DE.UTF-8,de}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/X11/{fr_FR.UTF-8,fr}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/X11/{it_IT.UTF-8,it}
install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/pl/app-defaults/Xawtv
install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
install %{SOURCE4} .
-install %{font_dir}/*.gz $RPM_BUILD_ROOT%{_fontsdir}/misc
+cp -p %{font_dir}/*.pcf.gz $RPM_BUILD_ROOT%{_fontsdir}/misc
+cp -p %{font_dir}/fonts.alias $RPM_BUILD_ROOT%{_fontsdir}/misc/fonts.alias.xawtv
%clean
rm -rf $RPM_BUILD_ROOT
@@ -283,7 +293,8 @@ fontpostinst misc
%lang(fr) %{_datadir}/X11/fr/app-defaults/MoTV
%lang(it) %{_datadir}/X11/it/app-defaults/MoTV
-%{_desktopdir}/*.desktop
+%{_desktopdir}/xawtv.desktop
+%{_desktopdir}/xawtv-noxv.desktop
%{_datadir}/%{name}
@@ -348,4 +359,10 @@ fontpostinst misc
%files -n fonts-misc-xawtv
%defattr(644,root,root,755)
-%{_fontsdir}/misc/*
+%{_fontsdir}/misc/caption.pcf.gz
+%{_fontsdir}/misc/captioni.pcf.gz
+%{_fontsdir}/misc/led-iso8859-*.pcf.gz
+%{_fontsdir}/misc/led-iso10646-1.pcf.gz
+%{_fontsdir}/misc/led-koi8-r.pcf.gz
+%{_fontsdir}/misc/teletext*.pcf.gz
+%{_fontsdir}/misc/fonts.alias.xawtv
diff --git a/xawtv-appdefsdir.patch b/xawtv-appdefsdir.patch
deleted file mode 100644
index c22273b..0000000
--- a/xawtv-appdefsdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xawtv-3.95/configure.ac.orig 2008-01-05 17:09:00.295218576 +0100
-+++ xawtv-3.95/configure.ac 2008-01-05 17:09:16.292778046 +0100
-@@ -295,7 +295,7 @@
- AC_SUBST(x11conf)
-
- AC_MSG_CHECKING(for X11 app-defaults directory)
--resdir=/usr/X11R6/lib/X11
-+resdir=/usr/share/X11
- if test -d /etc/X11/app-defaults; then
- resdir=/etc/X11
- fi
diff --git a/xawtv-fontconfig.patch b/xawtv-fontconfig.patch
deleted file mode 100644
index b2b7eb2..0000000
--- a/xawtv-fontconfig.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- xawtv-3.95.org/x11/Subdir.mk 2005-01-05 11:25:03.000000000 +0100
-+++ xawtv-3.95/x11/Subdir.mk 2011-09-11 21:12:38.792312036 +0200
-@@ -98,11 +98,11 @@
- # libraries to link
- x11/xawtv : LDLIBS += \
- $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \
-- $(ATHENA_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm
-+ $(ATHENA_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm -lfontconfig
- x11/motv : LDLIBS += \
- $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \
-- $(MOTIF_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm
--x11/mtt : LDLIBS += $(THREAD_LIBS) $(MOTIF_LIBS) $(VBI_LIBS) -ljpeg
-+ $(MOTIF_LIBS) $(VBI_LIBS) $(GL_LIBS) -ljpeg -lm -lfontconfig
-+x11/mtt : LDLIBS += $(THREAD_LIBS) $(MOTIF_LIBS) $(VBI_LIBS) -ljpeg -lfontconfig
- x11/v4lctl : LDLIBS += $(THREAD_LIBS) $(ATHENA_LIBS) -ljpeg -lm
- x11/pia : LDLIBS += $(ATHENA_LIBS) $(GL_LIBS) -ljpeg -lm
- x11/rootv : LDLIBS += $(ATHENA_LIBS)
diff --git a/xawtv-fullscreen.patch b/xawtv-fullscreen.patch
index 3fd1a6f..5fbe2b8 100644
--- a/xawtv-fullscreen.patch
+++ b/xawtv-fullscreen.patch
@@ -1,6 +1,6 @@
---- xawtv-3.85/x11/wmhooks.c.orig Sun Mar 2 22:27:12 2003
-+++ xawtv-3.85/x11/wmhooks.c Sun Mar 2 22:34:54 2003
-@@ -131,13 +131,14 @@
+--- xawtv-3.103/x11/wmhooks.c.orig 2013-04-02 15:19:10.000000000 +0200
++++ xawtv-3.103/x11/wmhooks.c 2016-07-15 20:51:06.135118930 +0200
+@@ -131,12 +131,13 @@
Window root = DefaultRootWindow(dpy);
/* netwm checks */
@@ -8,18 +8,16 @@
+ if (NULL == wm_fullscreen &&
0 == wm_check_capability(dpy,root,_NET_SUPPORTED,
- _NET_WM_STATE_ABOVE)) {
-+ _NET_WM_STATE_FULLSCREEN)) {
++ _NET_WM_STATE_FULLSCREEN)) {
if (debug)
- fprintf(stderr,"wmhooks: netwm state above\n");
- wm_stay_on_top = netwm_stay_on_top;
-- }
-+ fprintf(stderr,"wmhooks: netwm state fullscreen\n");
-+ wm_fullscreen = netwm_fullscreen;
-+ return 0;
-+ }
++ fprintf(stderr,"wmhooks: netwm state fullscreen\n");
++ wm_fullscreen = netwm_fullscreen;
++ return 0;
+ }
if (NULL == wm_stay_on_top &&
0 == wm_check_capability(dpy,root,_NET_SUPPORTED,
- _NET_WM_STATE_STAYS_ON_TOP)) {
@@ -145,12 +146,13 @@
fprintf(stderr,"wmhooks: netwm state stays_on_top\n");
wm_stay_on_top = netwm_old_stay_on_top;
diff --git a/xawtv-gcc4.patch b/xawtv-gcc4.patch
deleted file mode 100644
index 47fdc93..0000000
--- a/xawtv-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru xawtv-3.94.orig/x11/vbi-gui.c xawtv-3.94/x11/vbi-gui.c
---- xawtv-3.94.orig/x11/vbi-gui.c 2003-04-14 20:06:25.000000000 +0200
-+++ xawtv-3.94/x11/vbi-gui.c 2005-05-11 16:38:39.199803136 +0200
-@@ -44,6 +44,7 @@
- #include "vbi-x11.h"
- #include "vbi-gui.h"
-
-+#include "grab-ng.h"
- #include "channel.h"
-
- static int tt_debug = 1;
diff --git a/xawtv-home_etc.patch b/xawtv-home_etc.patch
index b718b48..98de29a 100644
--- a/xawtv-home_etc.patch
+++ b/xawtv-home_etc.patch
@@ -10,7 +10,7 @@ diff -Nuard xawtv-3.81.orig/common/channel.c xawtv-3.81/common/channel.c
+
+ /* CONFIG_DIR patch */
+ if (getenv("CONFIG_DIR"))
-+ sprintf(filename,"%.*s/%s/%s",(int)sizeof(filename)-8,getenv("HOME"),getenv("CONFIG_DIR"),"xawtv");
++ sprintf(filename,"%.*s/%.16s/%s",(int)sizeof(filename)-24,getenv("HOME"),getenv("CONFIG_DIR"),"xawtv");
+ else
+ sprintf(filename,"%.*s/%s",(int)sizeof(filename)-8,getenv("HOME"),".xawtv");
+
@@ -37,23 +37,18 @@ diff -Nuard xawtv-3.81.orig/common/channel.c xawtv-3.81/common/channel.c
/* delete old backup */
unlink(filename2);
-diff -Nuard xawtv-3.81.orig/console/radio.c xawtv-3.81/console/radio.c
---- xawtv-3.81.orig/console/radio.c Fri Dec 6 11:58:06 2002
-+++ xawtv-3.81/console/radio.c Sat Dec 21 19:09:18 2002
-@@ -167,7 +167,12 @@
+--- xawtv-3.103/console/radio.c.orig 2016-07-06 21:14:56.685762659 +0200
++++ xawtv-3.103/console/radio.c 2016-07-06 21:22:24.230004771 +0200
+@@ -363,6 +363,9 @@
- sprintf(file,"%.225s/.kde/share/config/kradiorc",getenv("HOME"));
+ sprintf(file, "%.225s/.kde/share/config/kradiorc", getenv("HOME"));
if (NULL == (fp = fopen(file,"r"))) {
-- sprintf(file,"%.225s/.radio",getenv("HOME"));
-+
+ if (getenv("CONFIG_DIR"))
-+ sprintf(file,"%.225s/%s/radio",getenv("HOME"),getenv("CONFIG_DIR"));
++ sprintf(file,"%.225s/%.16s/radio",getenv("HOME"),getenv("CONFIG_DIR"));
+ else
-+ sprintf(file,"%.225s/.radio",getenv("HOME"));
-+
+ sprintf(file, "%.225s/.radio", getenv("HOME"));
if (NULL == (fp = fopen(file,"r")))
return;
- }
diff -Nuard xawtv-3.81.orig/console/webcam.c xawtv-3.81/console/webcam.c
--- xawtv-3.81.orig/console/webcam.c Mon Dec 9 17:00:39 2002
+++ xawtv-3.81/console/webcam.c Sat Dec 21 19:10:23 2002
@@ -71,20 +66,27 @@ diff -Nuard xawtv-3.81.orig/console/webcam.c xawtv-3.81/console/webcam.c
}
fprintf(stderr,"reading config file: %s\n",filename);
cfg_parse_file(filename);
-diff -Nuard xawtv-3.81.orig/x11/rootv.c xawtv-3.81/x11/rootv.c
---- xawtv-3.81.orig/x11/rootv.c Thu Nov 14 11:45:53 2002
-+++ xawtv-3.81/x11/rootv.c Sat Dec 21 19:11:10 2002
-@@ -86,8 +86,11 @@
- char filename[100];
+--- xawtv-3.103/x11/rootv.c.orig 2016-07-06 21:14:56.689095974 +0200
++++ xawtv-3.103/x11/rootv.c 2016-07-06 21:26:36.498638113 +0200
+@@ -9,6 +9,7 @@
+ * put a TV image to the root window - requires Xvideo
+ */
+
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -85,9 +86,12 @@
+
+ static void station_list(FILE *fp)
+ {
+- char filename[100];
++ char filename[PATH_MAX];
char **list;
-
-- sprintf(filename,"%.*s/%s",(int)sizeof(filename)-8,
-- getenv("HOME"),".xawtv");
+
+ if (getenv("CONFIG_DIR"))
-+ sprintf(filename,"%.*s/%s/%s",(int)sizeof(filename)-8,getenv("HOME"),getenv("CONFIG_DIR"),"xawtv");
++ sprintf(filename,"%.*s/%.16s/%s",(int)sizeof(filename)-24,getenv("HOME"),getenv("CONFIG_DIR"),"xawtv");
+ else
-+ sprintf(filename,"%.*s/%s",(int)sizeof(filename)-8,getenv("HOME"),".xawtv");
-+
+ sprintf(filename,"%.*s/%s",(int)sizeof(filename)-8,
+ getenv("HOME"),".xawtv");
cfg_parse_file(CONFIGFILE);
- cfg_parse_file(filename);
-
diff --git a/xawtv-pagesize.patch b/xawtv-pagesize.patch
deleted file mode 100644
index 96e3ba3..0000000
--- a/xawtv-pagesize.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -U 3 -H -d -r -N -- xawtv-3.95~/console/fbtools.c xawtv-3.95/console/fbtools.c
---- xawtv-3.95~/console/fbtools.c 2003-02-14 15:14:04.000000000 +0100
-+++ xawtv-3.95/console/fbtools.c 2008-09-01 23:17:24.000000000 +0200
-@@ -21,8 +21,6 @@
- #include <linux/vt.h>
- #include <linux/fb.h>
-
--#include <asm/page.h>
--
- #include "fbtools.h"
-
- /* -------------------------------------------------------------------- */
-diff -U 3 -H -d -r -N -- xawtv-3.95~/console/fbtools.h xawtv-3.95/console/fbtools.h
---- xawtv-3.95~/console/fbtools.h 2003-02-14 15:14:04.000000000 +0100
-+++ xawtv-3.95/console/fbtools.h 2008-09-01 23:16:38.000000000 +0200
-@@ -3,6 +3,9 @@
- #define FB_INACTIVE 2
- #define FB_ACQ_REQ 3
-
-+#define PAGE_SIZE sysconf(_SC_PAGE_SIZE)
-+#define PAGE_MASK (~(PAGE_SIZE - 1))
-+
- /* info about videomode - yes I know, quick & dirty... */
- extern struct fb_fix_screeninfo fb_fix;
- extern struct fb_var_screeninfo fb_var;
-diff -U 3 -H -d -r -N -- xawtv-3.95~/console/matrox.c xawtv-3.95/console/matrox.c
---- xawtv-3.95~/console/matrox.c 2005-02-03 11:40:41.000000000 +0100
-+++ xawtv-3.95/console/matrox.c 2008-09-01 23:17:37.000000000 +0200
-@@ -9,7 +9,6 @@
- #include <sys/ioctl.h>
- #include <sys/mman.h>
-
--#include <asm/page.h> /* PAGE_SIZE */
- #include <linux/fb.h>
-
- #include "byteswap.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xawtv.git/commitdiff/6dc2603058c7dc7bc63e4a24fefa2546c187fb9e
More information about the pld-cvs-commit
mailing list