[v4l-utils/el6: 32/34] Merge branch 'f20' into el6
mchehab
mchehab at fedoraproject.org
Mon Nov 24 12:56:55 UTC 2014
commit ebdfd3d8b73652240d95e79521d0b0f009081ccf
Merge: b3a0342 63e3449
Author: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
Date: Mon Nov 24 01:51:36 2014 -0200
Merge branch 'f20' into el6
* f20: (30 commits)
Update to version 1.6.2
Fix crash when decoding 1920x1080 jpeg to YUV420
Update to version 1.6.0
Upgrade to version 1.6.0
Update do version 1.4.0
Update do version 1.4.0 and pack libdvbv5 devel manpages
Bump version at .spec
Fix a cut-and-past issue at timestamp
Fix the license for libdvbv5 and remove needless dependency
Add alsa-lib-devel, in order to compile alsa support on qv4l2
remove README.lib-multi-threading from libdvbv5-devel
Bump version to 1.2.1 and add libdvbv5 package
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
New upstream release 1.0.0 final
Add a few libv4l2rds patches from upstream, which bring libv4l2rds to its
New upstream release 0.9.5 (rhbz#970412)
Revert "Minor cleanup"
Minor cleanup
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
...
Conflicts:
.gitignore
sources
v4l-utils.spec
.gitignore | 3 +-
qv4l2.desktop | 12 -----
qv4l2.svg | 31 ------------
sources | 2 +-
v4l-utils.spec | 149 +++++++++++++++++++++++++++++++++++++++++++------------
5 files changed, 118 insertions(+), 79 deletions(-)
---
diff --cc .gitignore
index 75711a8,e51c1df..64e9daf
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,11 +1,1 @@@
--/v4l-utils-0.8.3.tar.bz2
- /v4l-utils-0.9.0.git5f24b816.tar.bz2
-/v4l-utils-0.8.4.tar.bz2
-/v4l-utils-0.8.5.tar.bz2
-/v4l-utils-0.8.7.tar.bz2
-/v4l-utils-0.8.8.tar.bz2
-/v4l-utils-0.9.5.tar.bz2
-/v4l-utils-1.0.0.tar.bz2
-/v4l-utils-1.2.1.tar.bz2
-/v4l-utils-1.4.0.tar.bz2
-/v4l-utils-1.6.0.tar.bz2
+ /v4l-utils-1.6.2.tar.bz2
diff --cc v4l-utils.spec
index 6c31fcc,be5f49c..8d6f8f4
--- a/v4l-utils.spec
+++ b/v4l-utils.spec
@@@ -7,13 -7,11 +7,13 @@@ Group: Applications/Syste
License: GPLv2+ and GPLv2
URL: http://www.linuxtv.org/downloads/v4l-utils/
Source0: http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.bz2
- Source1: qv4l2.desktop
- Source2: qv4l2.svg
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- BuildRequires: qt4-devel kernel-headers desktop-file-utils
+ BuildRequires: libjpeg-devel qt4-devel kernel-headers desktop-file-utils
+ BuildRequires: alsa-lib-devel doxygen
-# For /lib/udev/rules.d ownership
+BuildRequires: autoconf
+# For /etc/udev/rules.d ownership
Requires: udev
+ Requires: libv4l%{?_isa} = %{version}-%{release}
%description
v4l-utils is a collection of various video4linux (V4L) and DVB utilities. The
@@@ -79,22 -140,22 +142,22 @@@ gtk-update-icon-cache %{_datadir}/icons
%files
- %defattr(-,root,root,-)
%doc README
%dir %{_sysconfdir}/rc_keymaps
- %config(noreplace) %{_sysconfdir}/rc_keymaps/*
%config(noreplace) %{_sysconfdir}/rc_maps.cfg
-%{_udevrulesdir}/70-infrared.rules
+%config(noreplace) /lib/udev/rules.d/70-infrared.rules
-
+ %{_prefix}/lib/udev/rc_keymaps/*
%{_bindir}/cx18-ctl
+ %{_bindir}/dvb*
%{_bindir}/ir-keytable
%{_bindir}/ivtv-ctl
+ %{_bindir}/media-ctl
+ %{_bindir}/rds-ctl
%{_bindir}/v4l2-ctl
%{_bindir}/v4l2-sysfs-path
- %{_mandir}/man1/ir-keytable.1*
+ %{_mandir}/man1/*.1*
%files devel-tools
- %defattr(-,root,root,-)
%doc README
%{_bindir}/decode_tm6000
%{_bindir}/v4l2-compliance
@@@ -104,18 -165,101 +167,38 @@@
%doc README
%{_bindir}/qv4l2
%{_datadir}/applications/qv4l2.desktop
- %{_datadir}/icons/hicolor/scalable/apps/qv4l2.svg
- %{_datadir}/icons/hicolor/16x16/apps/qv4l2.png
- %{_datadir}/icons/hicolor/24x24/apps/qv4l2.png
- %{_datadir}/icons/hicolor/32x32/apps/qv4l2.png
- %{_datadir}/icons/hicolor/64x64/apps/qv4l2.png
+ %{_datadir}/icons/hicolor/*/apps/qv4l2.*
+
+ %files -n libv4l
+ %doc COPYING.libv4l COPYING ChangeLog README.libv4l TODO
+ %{_libdir}/libv4l
+ %{_libdir}/libv4l*.so.*
+
+ %files -n libv4l-devel
+ %doc README.lib-multi-threading
+ %{_includedir}/libv4l*.h
+ %{_libdir}/libv4l*.so
+ %{_libdir}/pkgconfig/libv4l*.pc
+
+ %files -n libdvbv5
+ %doc COPYING ChangeLog lib/libdvbv5/README
+ %{_libdir}/libdvbv5*.so.*
+
+ %files -n libdvbv5-devel
+ %{_includedir}/libdvbv5/*.h
+ %{_libdir}/libdvbv5*.so
+ %{_libdir}/pkgconfig/libdvbv5*.pc
+ %{_mandir}/man3/*.3*
+
%changelog
+ * Sat Nov 22 2014 Mauro Carvalho Chehab <mchehab at osg.samsung.com> - 1.6.2-1
+ - Update to version 1.6.2 with contains several bugfixes
+
-* Thu Nov 20 2014 Hans de Goede <hdegoede at redhat.com> - 1.6.0-2
-- Fix crash when decoding 1920x1080 jpeg to YUV420
-
-* Sun Oct 05 2014 Mauro Carvalho Chehab - 1.6.0-1
-- Upgrade to version 1.6.0
-
-* Mon Sep 08 2014 Mauro Carvalho Chehab - 1.4.0-1
-- Upgrade to version 1.4.0
-
-* Fri Aug 22 2014 Mauro Carvalho Chehab - 1.2.1-3
-- Add ALSA support on qv4l2 and fix a couple issues at spec file
-
-* Thu Aug 21 2014 Mauro Carvalho Chehab - 1.2.1-2
-- Update to version 1.2.1 and add package for libdvbv5
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 3 2013 Hans de Goede <hdegoede at redhat.com> - 1.0.0-1
-- New upstream release 1.0.0 final
-- Drop libdvb5 (made private upstream for now)
-
-* Fri Jun 14 2013 Hans de Goede <hdegoede at redhat.com> - 0.9.5-2
-- Add a few libv4l2rds patches from upstream, which bring libv4l2rds to its
- final API / ABI, so that apps build against it won't need a rebuild in the
- future
-
-* Sun Jun 9 2013 Hans de Goede <hdegoede at redhat.com> - 0.9.5-1
-- New upstream release 0.9.5 (rhbz#970412)
-- Modernize specfile a bit
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.8-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 0.8.8-5
-- rebuild due to "jpeg8-ABI" feature drop
-
-* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 0.8.8-4
-- rebuild against new libjpeg
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jul 9 2012 Hans de Goede <hdegoede at redhat.com> - 0.8.8-2
-- Cherry-pick 2 patches from upstream git fixing an exotic crash (rhbz#838279)
-
-* Tue May 22 2012 Hans de Goede <hdegoede at redhat.com> - 0.8.8-1
-- New upstream release 0.8.8
-- Add patches from upstream git to improve Pixart JPEG decoding
-- Add patch from upstream git to fix building with latest kernels (rhbz#823863)
-
-* Mon Apr 9 2012 Hans de Goede <hdegoede at redhat.com> - 0.8.7-1
-- New upstream release 0.8.7
-- Fixes rhbz#807656
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sun Jul 17 2011 Hans de Goede <hdegoede at redhat.com> 0.8.5-1
-- New upstream release 0.8.5
-- Fixes rhbz#711492
-
-* Wed Jun 1 2011 Hans de Goede <hdegoede at redhat.com> 0.8.4-1
-- New upstream release 0.8.4
+* Fri Oct 7 2011 Mauro Carvalho Chehab <mchehab at redhat.com> 0.9.0.git5f24b816
+- Based on git changeset 5f24b816, this version will allow adding a v4l-utils
+ package without compiling the libv4l. This avoids a conflict with the
+ existing libv4l package that is part of the RHEL6 repositories.
* Sat Mar 12 2011 Hans de Goede <hdegoede at redhat.com> 0.8.3-2
- Add a .desktop file for qv4l2
More information about the scm-commits
mailing list