From 4de7a18dc8401398611245cafe772b316b696ecef41dc0038523be49ce48b2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 26 Jun 2011 19:11:59 +0000 Subject: [PATCH] Accepting request 74569 from home:adra:branches:devel:libraries:c_c++ Update to v0.8.4, Spec file updates, Fixed rpmlint warning wrong-icon-size, Removed the desktop file and icon for qv4l2 (they are provided by the package now), Rebased disable_rds_compilation.patch to apply cleanly OBS-URL: https://build.opensuse.org/request/show/74569 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=2 --- disable_rds_compilation.patch | 8 ++++---- qv4l2.desktop | 9 --------- qv4l2.svg | 31 ------------------------------ v4l-utils-0.8.3.tar.bz2 | 3 --- v4l-utils-0.8.4.tar.bz2 | 3 +++ v4l-utils.changes | 36 +++++++++++++++++++++++++++++++++++ v4l-utils.spec | 34 ++++++++++++++++++++------------- 7 files changed, 64 insertions(+), 60 deletions(-) delete mode 100644 qv4l2.desktop delete mode 100644 qv4l2.svg delete mode 100644 v4l-utils-0.8.3.tar.bz2 create mode 100644 v4l-utils-0.8.4.tar.bz2 diff --git a/disable_rds_compilation.patch b/disable_rds_compilation.patch index 8932e91..04917e6 100644 --- a/disable_rds_compilation.patch +++ b/disable_rds_compilation.patch @@ -1,8 +1,8 @@ ---- utils/Makefile.orig 2011-02-10 00:04:27.000000000 +0200 -+++ utils/Makefile 2011-05-08 20:37:57.115000119 +0300 +--- utils/Makefile.orig 2011-06-01 14:23:03.000000000 +0300 ++++ utils/Makefile 2011-06-08 22:18:09.845000109 +0300 @@ -1,4 +1,4 @@ --SUBDIRS=libv4l2util decode_tm6000 keytable rds v4l2-compliance v4l2-ctl v4l2-dbg xc3028-firmware -+SUBDIRS=libv4l2util decode_tm6000 keytable v4l2-compliance v4l2-ctl v4l2-dbg xc3028-firmware +-SUBDIRS=libv4l2util libmedia_dev decode_tm6000 keytable rds v4l2-compliance v4l2-ctl v4l2-dbg xc3028-firmware ++SUBDIRS=libv4l2util libmedia_dev decode_tm6000 keytable v4l2-compliance v4l2-ctl v4l2-dbg xc3028-firmware all install: @for i in $(SUBDIRS); do \ diff --git a/qv4l2.desktop b/qv4l2.desktop deleted file mode 100644 index 20cbf7a..0000000 --- a/qv4l2.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=QV4l2 -GenericName=V4L2 test Utility -Comment=Allow testing Video4Linux devices -Exec=qv4l2 -Icon=qv4l2 -Terminal=false -Type=Application -Categories=Qt;AudioVideo;Video;TV; diff --git a/qv4l2.svg b/qv4l2.svg deleted file mode 100644 index 28356e5..0000000 --- a/qv4l2.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - \ No newline at end of file diff --git a/v4l-utils-0.8.3.tar.bz2 b/v4l-utils-0.8.3.tar.bz2 deleted file mode 100644 index ab44a23..0000000 --- a/v4l-utils-0.8.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:525ebed7ef6e0f6a4bb68fe10403a3725eb1ec31a4c557c68256079b00e283b5 -size 314347 diff --git a/v4l-utils-0.8.4.tar.bz2 b/v4l-utils-0.8.4.tar.bz2 new file mode 100644 index 0000000..1f409ce --- /dev/null +++ b/v4l-utils-0.8.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20bf73b0c2255dfc6ae82806ec8a663e00ab039df9ee6eadae633466841c0dd7 +size 348601 diff --git a/v4l-utils.changes b/v4l-utils.changes index 23c5541..5c07d78 100644 --- a/v4l-utils.changes +++ b/v4l-utils.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Sun Jun 26 16:52:00 UTC 2011 - asterios.dramis@gmail.com + +- Update to v0.8.4 + Utils changes: + * Various small fixes + * qv4l2: Add support for configuring the framerate for devices which support + this like uvc cams + * parse_tcpdump_log.pl: new parser for tcpdump / wireshark made usbmon dumps + * New lib_media_dev lib, to pair audio devices with video devices (and other + combinations) for now this lives in utils and does not get installed + systemwide, as the API is not stable + libv4l changes: + * Add many more laptop models to the upside down devices table + * Some small bugfixes + * Add vicam cameras to list of cameras need sw auto gain + whitebalance + * Add support for M420 pixelformat + * Add support for Y10B pixelformat + * Add support for JPGL pixelformat + * Modified (rewrote) jpeg decompression code to use libjpeg[-turbo], for + much lower cpu load when doing jpeg decompression + * Detect usb connection speed of devices + * Rewrite src format selection algorithm, taking bandwidth into account and + choosing the format which will give us the lowest CPU load while still + allowing 30 fps + * Intercept S_PARM and redo src format selection based on new fps setting, + potentially switching from JPG to YUYV / M420 when the app lowers the fps, + resulting in a significant lower cpu load +- Spec file updates + * Require libv4l in the libraries. + * Minor other updates. +- Fixed rpmlint warning "wrong-icon-size". +- Removed the desktop file and icon for qv4l2 (they are provided by the + package now). +- Rebased disable_rds_compilation.patch to apply cleanly. + ------------------------------------------------------------------- Sun May 8 17:46:17 UTC 2011 - asterios.dramis@gmail.com diff --git a/v4l-utils.spec b/v4l-utils.spec index 2a86f7d..46673c8 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -19,7 +19,7 @@ Name: v4l-utils -Version: 0.8.3 +Version: 0.8.4 Release: 1 Summary: Utilities for video4linux and DVB devices @@ -28,13 +28,13 @@ License: GPLv2+ and GPLv2 Url: http://linuxtv.org/downloads/v4l-utils/ Group: Hardware/TV Source0: http://linuxtv.org/downloads/v4l-utils/%{name}-%{version}.tar.bz2 -Source1: qv4l2.desktop -Source2: qv4l2.svg Source100: baselibs.conf # PATCH-FIX-OPENSUSE disable_rds_compilation.patch asterios.dramis@gmail.com -- Disable compilation of utils/rds (it isn't installed anyway) as it fails to compile with i2c-dev.h from i2c-tools (needs the one from linux-glibc-devel) Patch0: disable_rds_compilation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +# Only needed to patch broken images in the upstream tarball +BuildRequires: ImageMagick BuildRequires: kernel-headers BuildRequires: libqt4-devel %if 0%{?suse_version} > 1130 @@ -86,6 +86,7 @@ consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2. License: LGPLv2+ Summary: Video4linux support library Group: System/Libraries +Requires: libv4l %description -n libv4l1-0 libv4l1 offers the (deprecated) v4l1 API on top of v4l2 devices, independent @@ -98,6 +99,7 @@ This package contains shared lib for packages that use libv4l1.so.0 License: LGPLv2+ Summary: Video4linux support library Group: System/Libraries +Requires: libv4l %description -n libv4l2-0 libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for the @@ -109,6 +111,7 @@ This package contains shared lib for packages that use libv4l2.so.0 License: LGPLv2+ Summary: Video4linux support library Group: System/Libraries +Requires: libv4l %description -n libv4lconvert0 libv4lconvert offers functions to convert from any (known) pixel-format @@ -147,12 +150,19 @@ make CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags}" %{?_smp_mf %install make install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} -# Install icon -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps -install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps +# Install additional icons +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,24x24,32x32,64x64}/apps +install -pm 0644 utils/qv4l2/qv4l2_16x16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/qv4l2.png +install -pm 0644 utils/qv4l2/qv4l2_24x24.png %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/qv4l2.png +install -pm 0644 utils/qv4l2/qv4l2_32x32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qv4l2.png +install -pm 0644 utils/qv4l2/qv4l2_64x64.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/qv4l2.png + +# Patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size" +mogrify -extent "36x36" -background transparent -gravity "south" %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qv4l2.png +mogrify -scale 32x32 -background transparent %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qv4l2.png %if 0%{?suse_version} -%suse_update_desktop_file -i qv4l2 Qt AudioVideo Video TV +%suse_update_desktop_file -N "QV4l2" -G "V4L2 Test Utility" -r qv4l2 Qt AudioVideo Video TV %endif %clean @@ -176,11 +186,7 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/rc_keymaps %config(noreplace) %{_sysconfdir}/rc_keymaps/* %config(noreplace) %{_sysconfdir}/rc_maps.cfg -%if 0%{?suse_version} == 1120 -%dir %{_sysconfdir}/udev -%dir %{_sysconfdir}/udev/rules.d -%endif -%config(noreplace) %{_sysconfdir}/udev/rules.d/70-infrared.rules +/lib/udev/rules.d/70-infrared.rules %{_bindir}/cx18-ctl %{_bindir}/ir-keytable %{_bindir}/ivtv-ctl @@ -225,8 +231,10 @@ rm -rf %{buildroot} %{_bindir}/qv4l2 %{_datadir}/applications/qv4l2.desktop %dir %{_datadir}/icons/hicolor +%dir %{_datadir}/icons/hicolor/??x?? +%dir %{_datadir}/icons/hicolor/??x??/apps %dir %{_datadir}/icons/hicolor/scalable %dir %{_datadir}/icons/hicolor/scalable/apps -%{_datadir}/icons/hicolor/scalable/apps/qv4l2.svg +%{_datadir}/icons/hicolor/*/apps/qv4l2.* %changelog