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
This commit is contained in:
Ismail Dönmez
Git OBS Bridge
parent
457ccfd084
commit
4de7a18dc8
@ -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 \
|
||||
|
||||
@ -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;
|
||||
31
qv4l2.svg
31
qv4l2.svg
@ -1,31 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:version="0.47 r22583" version="1.1" id="svg2839" height="297mm" width="210mm" sodipodi:docname="Novo documento 3">
|
||||
<defs id="defs2841">
|
||||
<linearGradient id="linearGradient2963">
|
||||
<stop style="stop-color: rgb(255, 236, 187); stop-opacity: 1;" offset="0" id="stop2965"/>
|
||||
<stop id="stop2971" offset="1" style="stop-color: rgb(0, 0, 0); stop-opacity: 0.498039;"/>
|
||||
</linearGradient>
|
||||
<inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" id="perspective2847"/>
|
||||
<inkscape:perspective id="perspective2935" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
|
||||
<linearGradient inkscape:collect="always" xlink:href="#linearGradient2963" id="linearGradient2969" x1="-719.14288" y1="494.69958" x2="-324.21902" y2="968.98529" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0512, 0, 0, 1.05137, 651.058, -25.2444)"/>
|
||||
<inkscape:perspective id="perspective2992" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
|
||||
</defs>
|
||||
<sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.7" inkscape:cx="376.9721" inkscape:cy="468.42546" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1513" inkscape:window-height="1044" inkscape:window-x="1941" inkscape:window-y="0" inkscape:window-maximized="0"/>
|
||||
<metadata id="metadata2844">
|
||||
<rdf:RDF>
|
||||
<cc:Work rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
|
||||
<dc:title/>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g inkscape:label="Camada 1" inkscape:groupmode="layer" id="layer1">
|
||||
<rect style="fill: rgb(173, 160, 127); fill-opacity: 1;" id="rect2959" width="498.57132" height="402.52496" x="101.42867" y="345.21906" ry="15.848869"/>
|
||||
<rect style="fill: rgb(214, 207, 189); fill-opacity: 1; fill-rule: evenodd; stroke: rgb(0, 0, 0); stroke-width: 1.09651px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1;" id="rect2955" width="366.37466" height="268.80539" x="172.03215" y="409.8259" ry="24.860613"/>
|
||||
<path style="fill: url("#linearGradient2969") rgb(0, 0, 0); fill-opacity: 1;" d="m 111.92284,745.80915 c -1.7443,-0.70488 -4.61634,-3.11878 -6.38231,-5.3642 l -3.21086,-4.08259 0,-189.14299 c 0,-136.34795 0.46823,-190.05871 1.67748,-192.42365 0.92263,-1.80438 3.11889,-4.44845 4.8806,-5.87571 3.00442,-2.43405 17.98923,-2.5971 241.57759,-2.62843 l 238.37448,-0.0334 4.90427,4.38251 4.90429,4.3825 0.39257,189.41161 c 0.43575,210.24489 1.09242,196.30432 -9.4544,200.71175 -4.34407,1.81535 -40.20923,2.12038 -239.80015,2.0394 -129.08065,-0.0523 -236.11926,-0.67193 -237.86356,-1.37681 z m 413.94314,-69.49552 c 4.39946,-2.22093 7.85143,-5.43895 10.06966,-9.38725 l 3.37535,-6.00784 -0.36571,-118.16973 c -0.36124,-116.72035 -0.4037,-118.22058 -3.46195,-122.31682 -4.69144,-6.28374 -10.15101,-9.79936 -17.39001,-11.19809 -8.54594,-1.65125 -316.90144,-1.65125 -325.4474,0 -7.68,1.48394 -13.16379,5.20817 -17.88452,12.146 l -3.40519,5.00442 0.40173,119.03503 c 0.39878,118.15286 0.42505,119.06645 3.54637,123.27494 1.72955,2.33195 5.7842,5.74954 9.01033,7.59462 l 5.8657,3.35471 164.49565,0.0248 164.49566,0.0246 6.69433,-3.3794 z" id="path2961"/>
|
||||
<rect style="fill: rgb(25, 20, 8); fill-opacity: 1;" id="rect2980" width="63.072273" height="39.050926" x="499.38467" y="744.74005" ry="0"/>
|
||||
<rect style="fill: rgb(25, 20, 8); fill-opacity: 1;" id="rect2980-1" width="63.072273" height="39.050926" x="130.56888" y="744.74005" ry="0"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 4.4 KiB |
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:525ebed7ef6e0f6a4bb68fe10403a3725eb1ec31a4c557c68256079b00e283b5
|
||||
size 314347
|
||||
3
v4l-utils-0.8.4.tar.bz2
Normal file
3
v4l-utils-0.8.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:20bf73b0c2255dfc6ae82806ec8a663e00ab039df9ee6eadae633466841c0dd7
|
||||
size 348601
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user