update to 3.107

Update to 3.105
fix fbtv console font
2020-09-26 15:53:18 +03:00 · 2018-06-19 15:50:35 +03:00 · 2018-06-01 01:21:13 +03:00 · 2016-02-17 03:37:36 +03:00
3 changed files with 120 additions and 269 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-18822bb3660540fa9ea8b643a5b30d6b  xawtv-3.103.tar.bz2
+SHA512 (xawtv-3.107.tar.bz2) = 29935e9265a96223097e6c4ab65d06c45233238992901d63aa3008e6f35cb59d474cebabd4136e47451242ba35df9ef08f9ef762c01ad688833429bc72d61536
--- a/xawtv.desktop
+++ b/xawtv.desktop
@ -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;
--- a/xawtv.spec
+++ b/xawtv.spec
@ -1,33 +1,30 @@
-%bcond_with	motif
 %bcond_with	quicktime

 Summary: TV applications for video4linux compliant devices
 Name: xawtv
-Version: 3.103
+Version: 3.107
 Release: 1%{?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

 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
+BuildRequires: ncurses-devel, coreutils, libjpeg-devel, libpng-devel
 BuildRequires: alsa-lib-devel
 %ifnarch s390 s390x
 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
@ -39,48 +36,53 @@ 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

-
 %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
 %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

@ -123,27 +125,103 @@ 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
+* Sat Sep 26 2020 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.107-1
+- update to 3.107
+
+* Mon Jun 11 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 3.105-2
+- cleanup FB console if an error happens
+
+* Mon Jun 11 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 3.105-1
+- upgrade to version 3.105
+
+* Fri Jun  1 2018 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.103-15
+- fix default console font for fbtv(1) (#1406549)
+
+* Thu Mar 15 2018 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.103-14
+- fileutils no more exists (#1556548)
+- explicitly include sys/sysmacros.h
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.103-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.103-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.103-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Feb 15 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.103-10
+- Add BR: perl (Fix F26BFS).
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.103-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Feb 15 2016 Hans de Goede <hdegoede@redhat.com> - 3.103-8
+- Bring in several bugfix patch from upstream
+- Fix crash with saa7134 driver (rhbz#1305389)
+- Use png instead of xpm for icons
+- 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 <releng@fedoraproject.org> - 3.103-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.103-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun Jan  4 2015 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.103-5
+- add workaround for kernels >= 3.16 (#1155784, patch from Stas Sergeev <stsp@list.ru>)
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.103-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.103-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.103-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Tue Apr  2 2013 Hans de Goede <hdegoede@redhat.com> 3.103-1
 - New upstream version 3.103

@ -188,7 +266,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 <mchehab@redhat.com> 3.99.rc1-1
+* Fri Jan 28 2011 Mauro Carvalho Chehab <mchehab@redhat.com> 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.
@ -265,222 +343,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 <Florian.LaRoche@redhat.de>
- add BuildReq for fontconfig-devel and freetype-devel, these seem
-  to get picked up
-
-* Mon Sep 01 2003 Than Ngo <than@redhat.com> 3.88-5
- Added missing BuildRequires for libpng-devel (bug #103447)
-
-* Tue Jun 17 2003 Than Ngo <than@redhat.com> 3.88-4
- fixed permission problem (bug #90921)
-
-* Tue Jun 17 2003 Than Ngo <than@redhat.com> 3.88-3
- rebuilt
-
-* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt
-
-* Tue May  6 2003 Than Ngo <than@redhat.com> 3.88-1
- 3.88
-
-* Thu Mar  3 2003 Than Ngo <than@redhat.com> 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 <than@redhat.com> 3.81-6
- install correct pam file, #83820
-
-* Mon Jan 27 2003 Than Ngo <than@redhat.com> 3.81-5
- fix #81791
-
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
- rebuilt
-
-* Tue Jan 21 2003 Than Ngo <than@redhat.com> 3.81-3
- fix #81851
-
-* Mon Dec 16 2002 Than Ngo <than@redhat.com> 3.81-2
- rebuild
-
-* Fri Dec 13 2002 Than Ngo <than@redhat.com> 3.81-1
- update 3.81
- move bitmap fonts to bitmap-fonts package
-
-* Tue Nov 12 2002 Nalin Dahyabhai <nalin@redhat.com> 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 <than@redhat.com> 3.78-1
- 3.78
-
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
- automated rebuild
-
-* Thu Jun 20 2002 Than Ngo <than@redhat.com> 3.74-3
- Don't forcibly strip binaries
-
-* Sun May 26 2002 Tim Powers <timp@redhat.com>
- automated rebuild
-
-* Thu May 23 2002 Harald Hoyer <harald@redhat.de>
- 3.74
-
-* Sun Apr 07 2002 han Ngo <than@redhat.com> 3.73-3
- remove motv manpage (#62771)
-
-* Tue Apr  2 2002 Than Ngo <than@redhat.com> 3.73-2
- get rid of openmotif
-
-* Sun Mar 24 2002 Than Ngo <than@redhat.com> 3.73-1
- update
- fix bug #61719
-
-* Fri Mar 22 2002 Tim Powers <timp@redhat.com>
- rebuilt motv against new openmotif-2.2.2
-
-* Tue Feb 26 2002 Than Ngo <than@redhat.com> 3.72-1
- update to 3.72
-
-* Tue Feb 19 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.71-1
- 3.71
-
-* Fri Jan 18 2002 Than Ngo <than@redhat.com> 3.68-1
- update to 3.68
- enable XFree extensions
- fix Url
- add missing plugins
-
-* Wed Dec  5 2001 Than Ngo <than@redhat.com> 3.65-1
- update to 3.65
- fix build on ia64
-
-* Wed Nov 14 2001 Than Ngo <than@redhat.com> 3.64-1
- update to 3.64
-
-* Mon Sep 17 2001 Than Ngo <than@redhat.com> 3.62-1
- update to 3.62 (bug #53711 #52847)
-
-* Tue Aug 28 2001 Than Ngo <than@redhat.com> 3.54-5
- fix spec file bug (Bug #52675)
-
-* Fri Aug 10 2001 Than Ngo <than@redhat.com> 3.54-4
- add requires usermode (bug #51474)
-
-* Sun Aug  5 2001 Nalin Dahyabhai <nalin@redhat.com> 3.54-3
- tweak PAM setup so that v4l-conf can access the display properly
-
-* Tue Jul 10 2001 Elliot Lee <sopwith@redhat.com> 3.54-2
- Rebuild to remove libXv/libXxf86dga deps
-
-* Mon Jul 02 2001 Than Ngo <than@redhat.com>
- update to 3.54
-
-* Fri Jun 22 2001 Than Ngo <than@redhat.com>
- update to 3.53
- add buildprereq
- remove some uneeeded patches
-
-* Tue Jun 19 2001 Karsten Hopp <karsten@redhat.de>
- excludearch s390 s390x
-
-* Wed Jun 13 2001 Than Ngo <than@redhat.com>
- update to 3.51
-
-* Thu Jun 07 2001 Than Ngo <than@redhat.com>
- update to 3.50
-
-* Thu May 31 2001 Than Ngo <than@redhat.com>
- udate to 3.49
-
-* Tue May 22 2001 Than Ngo <than@redhat.com>
- update to 3.48
-
-* Mon May 21 2001 Tim Powers <timp@redhat.com>
- built for the distro
-
-* Wed May 18 2001 Karsten Hopp <karsten@redhat.de>
- make xawtv work with kernel-2.4
-
-* Wed May 16 2001 Than Ngo <than@redhat.com>
- update to 3.47
-
-* Mon May 07 2001 Than Ngo <than@redhat.com>
- update to 3.45
- add missing fonts
-
-* Tue Feb 13 2001 Than Ngo <than@redhat.com>
- update to 3.34
- use consolehelper for v4l-conf
- add excludearch sparc, bdftopcf is broken on sparc
-
-* Wed Jan 24 2001 Than Ngo <than@redhat.com>
- updated to 3.30
- use /dev/video0 instead /dev/video (bug #24871)
- fixed dependencies (Bug #24881)
- 
-* Sun Nov 19 2000 Than Ngo <than@redhat.com>
- update to 3.24
- add missing tools (rootv,scantv)
- add missing prereq on xset and mkfontdir
-
-* Fri Nov 3 2000 Than Ngo <than@redhat.com>
- update to 3.23
-
-* Wed Aug 23 2000 Tim Powers <timp@redhat.com>
- rebuilt against new XFree86 to fix DGA problems
-
-* Mon Aug 21 2000 Than Ngo <than@redhat.com>
- update to 3.18 (Bugfix release)
- option -nodga to disable DGA (Bug #16577, #15702)
- compress fonts with gzip
-
-* Mon Aug 07 2000 Tim Powers <timp@redhat.com>
- fixed bug #15435
-
-* Mon Aug 07 2000 Than Ngo <than@redhat.de>
- 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 <than@redhat.de>
- update to 3.17
-
-* Mon Jul 24 2000 Prospector <prospector@redhat.com>
- rebuilt
-
-* Wed Jul 12 2000 Than Ngo <than@redhat.de>
- FHS fixes
-
-* Mon Jul 03 2000 Prospector <bugzilla@redhat.com>
- automatic rebuild
-
-* Sun May 28 2000 Ngo Than <than@redhat.de>
- 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 <pbrown@redhat.com>
- font fix (#8610) in post and postun
- add missing files in bin
-
-* Sun Jan 16 2000 Preston Brown <pbrown@redhat.com>
- whoops! 3.07 already bugfix release
-
-* Fri Jan 14 2000 Ngo Than <than@redhat.de>
- updated to 3.06
-
-* Mon Jul 26 1999 Tim Powers <timp@redhat.com>
- updated to 2.46
- built for 6.1
-
-* Wed Apr 28 1999 Preston Brown <pbrown@redhat.com>
- initial build for Powertools 6.0
Author	SHA1	Message	Date
Dmitry Butskoy	d15e7a8c9e	update to 3.107	2020-09-26 15:53:18 +03:00
buc	068d48dc19	Update to 3.105	2018-06-19 15:50:35 +03:00
buc	b2c5a8ee82	fix fbtv console font	2018-06-01 01:21:13 +03:00
buc	2fc15b7db3	Update to the latest set of upstream patches	2016-02-17 03:37:36 +03:00