Hello community, here is the log from the commit of package v4l-utils for openSUSE:Factory checked in at 2014-06-16 21:42:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/v4l-utils (Old) and /work/SRC/openSUSE:Factory/.v4l-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "v4l-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/v4l-utils/v4l-utils.changes 2014-04-17 14:43:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.v4l-utils.new/v4l-utils.changes 2014-06-16 21:42:52.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Jun 4 19:51:21 UTC 2014 - [email protected] + +- Update to version 1.0.1: + * Lots of changes: See ChangeLog for details. +- Removed ImageMagick and sysfsutils-devel build requirements (not needed + anymore). +- Added pkg-config build requirement. +- Use desktop-file-utils instead of update-desktop-files for openSUSE > 12.1. + Added desktop-file-utils build requirement for this. +- Removed the following patches: + * disable_rds_compilation.patch (not needed anymore). + * udev-rules-dir.patch (fixed upstream). + * use-openat-if-available.patch (fixed upstream). +- Added a patch "bufferoverflowstrncat.patch" to fix rpm post build check error + "Statement might be overflowing a buffer in strncat". + +------------------------------------------------------------------- Old: ---- disable_rds_compilation.patch udev-rules-dir.patch use-openat-if-available.patch v4l-utils-0.8.9.tar.bz2 New: ---- bufferoverflowstrncat.patch v4l-utils-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ v4l-utils.spec ++++++ --- /var/tmp/diff_new_pack.TTGiPK/_old 2014-06-16 21:42:53.000000000 +0200 +++ /var/tmp/diff_new_pack.TTGiPK/_new 2014-06-16 21:42:53.000000000 +0200 @@ -16,14 +16,11 @@ # -%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 -%define _udevrulesdir /usr/lib/udev/rules.d -%else -%define _udevrulesdir /lib/udev/rules.d -%endif +%define _udevdir %(pkg-config --variable udevdir udev) +%define so_ver 0 Name: v4l-utils -Version: 0.8.9 +Version: 1.0.1 Release: 0 Summary: Utilities for video4linux and DVB devices License: GPL-2.0+ and GPL-2.0 @@ -31,33 +28,24 @@ Url: http://linuxtv.org/downloads/v4l-utils/ Source0: http://linuxtv.org/downloads/v4l-utils/%{name}-%{version}.tar.bz2 Source100: baselibs.conf -# PATCH-FIX-OPENSUSE disable_rds_compilation.patch [email protected] -- 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 -# PATCH-FIX-UPSTREAM udev-rules-dir.patch [email protected] -- allow udev rules directory to be overridden -Patch1: udev-rules-dir.patch -Patch2: use-openat-if-available.patch -# Only needed to patch broken images in the upstream tarball -BuildRequires: ImageMagick +# PATCH-FIX-UPSTREAM bufferoverflowstrncat.patch [email protected] -- Fix rpm post build check error "Statement might be overflowing a buffer in strncat" +Patch0: bufferoverflowstrncat.patch +%if 0%{?suse_version} > 1210 +BuildRequires: desktop-file-utils +%else +BuildRequires: update-desktop-files +%endif BuildRequires: kernel-headers BuildRequires: libjpeg-devel BuildRequires: libqt4-devel -%if 0%{?suse_version} > 1130 -BuildRequires: sysfsutils-devel -%else -BuildRequires: sysfsutils -%endif +BuildRequires: pkg-config BuildRequires: udev -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif Requires: libv4l = %{version} Requires: udev BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -v4l-utils is a collection of various video4linux (V4L) and DVB utilities. The -main v4l-utils package contains cx18-ctl, ir-keytable, ivtv-ctl, v4l2-ctl and -v4l2-sysfs-path. +v4l-utils is a collection of various video4linux (V4L) and DVB utilities. %package devel-tools Summary: Utilities for v4l2 / DVB driver development and debugging @@ -66,8 +54,7 @@ Requires: libv4l = %{version} %description devel-tools -Utilities for v4l2 / DVB driver authors: decode_tm6000, v4l2-compliance and -v4l2-dbg. +Utilities for v4l2 / DVB driver authors. %package -n libv4l Summary: Collection of video4linux support libraries @@ -78,53 +65,65 @@ libv4l is a collection of libraries which adds a thin abstraction layer on top of video4linux2 devices. The purpose of this (thin) layer is to make it easy for application writers to support a wide variety of devices without -having to write separate code for different devices in the same class. libv4l -consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2. +having to write separate code for different devices in the same class. -%package -n libv4l1-0 +%package -n libv4l1-%{so_ver} Summary: Video4linux support library License: LGPL-2.1+ Group: System/Libraries Requires: libv4l -%description -n libv4l1-0 +%description -n libv4l1-%{so_ver} libv4l1 offers the (deprecated) v4l1 API on top of v4l2 devices, independent of the drivers for those devices supporting v4l1 compatibility (which many v4l2 drivers do not). -This package contains shared lib for packages that use libv4l1.so.0 +This package contains shared lib for packages that use libv4l1. -%package -n libv4l2-0 +%package -n libv4l2-%{so_ver} Summary: Video4linux support library License: LGPL-2.1+ Group: System/Libraries Requires: libv4l -%description -n libv4l2-0 +%description -n libv4l2-%{so_ver} libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for the application transparent libv4lconvert conversion where necessary. -This package contains shared lib for packages that use libv4l2.so.0 +This package contains shared lib for packages that use libv4l2. -%package -n libv4lconvert0 +%package -n libv4l2rds%{so_ver} Summary: Video4linux support library License: LGPL-2.1+ Group: System/Libraries Requires: libv4l -%description -n libv4lconvert0 +%description -n libv4l2rds%{so_ver} +libv4l2rds offers decoding raw RDS data from V4L2 Radio devices and simple ways +to access the received RDS information. + +This package contains shared lib for packages that use libv4l2rds. + +%package -n libv4lconvert%{so_ver} +Summary: Video4linux support library +License: LGPL-2.1+ +Group: System/Libraries +Requires: libv4l + +%description -n libv4lconvert%{so_ver} libv4lconvert offers functions to convert from any (known) pixel-format to V4l2_PIX_FMT_BGR24 or V4l2_PIX_FMT_YUV420. -This package contains shared lib for packages that use libv4lconvert.so.0 +This package contains shared lib for packages that use libv4lconvert. %package -n libv4l-devel Summary: Development files for libv4l License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Requires: libv4l1-0 = %{version} -Requires: libv4l2-0 = %{version} -Requires: libv4lconvert0 = %{version} +Requires: libv4l1-%{so_ver} = %{version} +Requires: libv4l2-%{so_ver} = %{version} +Requires: libv4l2rds%{so_ver} = %{version} +Requires: libv4lconvert%{so_ver} = %{version} %description -n libv4l-devel The libv4l-devel package contains libraries and header files for @@ -142,47 +141,59 @@ %prep %setup -q %patch0 -%patch1 -p1 -%patch2 -p1 %build -make PREFIX=%{_prefix} LIBDIR=%{_libdir} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags}" %{?_smp_mflags} +%configure --disable-static --disable-silent-rules --with-udevdir=%{_udevdir} +make %{?_smp_mflags} %install -make install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} UDEVRULESDIR=%{_udevrulesdir} +make DESTDIR=%{buildroot} install + +# Remove libtool config files +find %{buildroot}%{_libdir} -name '*.la' -exec rm -f {} ';' -# 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 +# Not needed (links to plugins in libv4l subdir) +rm %{buildroot}%{_libdir}/{v4l1compat.so,v4l2convert.so} -%if 0%{?suse_version} +%if 0%{?suse_version} > 1210 +desktop-file-edit --set-name="QV4l2" --set-generic-name="V4L2 Test Utility" \ + --add-category=Qt --add-category=Video --add-category=TV %{buildroot}%{_datadir}/applications/qv4l2.desktop +%else %suse_update_desktop_file -N "QV4l2" -G "V4L2 Test Utility" -r qv4l2 Qt AudioVideo Video TV %endif -%post -n libv4l1-0 -p /sbin/ldconfig +%post -n libv4l1-%{so_ver} -p /sbin/ldconfig -%postun -n libv4l1-0 -p /sbin/ldconfig +%postun -n libv4l1-%{so_ver} -p /sbin/ldconfig -%post -n libv4l2-0 -p /sbin/ldconfig +%post -n libv4l2-%{so_ver} -p /sbin/ldconfig -%postun -n libv4l2-0 -p /sbin/ldconfig +%postun -n libv4l2-%{so_ver} -p /sbin/ldconfig -%post -n libv4lconvert0 -p /sbin/ldconfig +%post -n libv4l2rds%{so_ver} -p /sbin/ldconfig -%postun -n libv4lconvert0 -p /sbin/ldconfig +%postun -n libv4l2rds%{so_ver} -p /sbin/ldconfig + +%post -n libv4lconvert%{so_ver} -p /sbin/ldconfig + +%postun -n libv4lconvert%{so_ver} -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING ChangeLog README TODO -%dir %{_sysconfdir}/rc_keymaps -%config(noreplace) %{_sysconfdir}/rc_keymaps/* +%dir %{_sysconfdir}/rc_keymaps/ %config(noreplace) %{_sysconfdir}/rc_maps.cfg -%{_udevrulesdir}/70-infrared.rules +%{_udevdir}/rc_keymaps/ +%if 0%{?suse_version} <= 1310 +%dir %{_udevdir}/rules.d/ +%endif +%{_udevdir}/rules.d/70-infrared.rules %{_bindir}/cx18-ctl %{_bindir}/dvb-* %{_bindir}/dvbv5-* %{_bindir}/ir-keytable %{_bindir}/ivtv-ctl +%{_bindir}/rds-ctl %{_bindir}/v4l2-ctl %{_bindir}/v4l2-sysfs-path %{_mandir}/man1/ir-keytable.1%{ext_man} @@ -196,20 +207,24 @@ %files -n libv4l %defattr(-,root,root,-) -%doc COPYING.LIB ChangeLog README README.lib TODO +%doc COPYING.libv4l ChangeLog README README.libv4l TODO %{_libdir}/libv4l/ -%files -n libv4l1-0 +%files -n libv4l1-%{so_ver} +%defattr(-,root,root,-) +%{_libdir}/libv4l1.so.%{so_ver}* + +%files -n libv4l2-%{so_ver} %defattr(-,root,root,-) -%{_libdir}/libv4l1.so.* +%{_libdir}/libv4l2.so.%{so_ver}* -%files -n libv4l2-0 +%files -n libv4l2rds%{so_ver} %defattr(-,root,root,-) -%{_libdir}/libv4l2.so.* +%{_libdir}/libv4l2rds.so.%{so_ver}* -%files -n libv4lconvert0 +%files -n libv4lconvert%{so_ver} %defattr(-,root,root,-) -%{_libdir}/libv4lconvert.so.* +%{_libdir}/libv4lconvert.so.%{so_ver}* %files -n libv4l-devel %defattr(-,root,root,-) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.TTGiPK/_old 2014-06-16 21:42:53.000000000 +0200 +++ /var/tmp/diff_new_pack.TTGiPK/_new 2014-06-16 21:42:53.000000000 +0200 @@ -1,4 +1,5 @@ libv4l libv4l1-0 libv4l2-0 +libv4l2rds0 libv4lconvert0 ++++++ bufferoverflowstrncat.patch ++++++ --- lib/libdvbv5/descriptors.c.orig 2014-01-13 21:51:46.000000000 +0200 +++ lib/libdvbv5/descriptors.c 2014-06-04 21:49:02.691930747 +0300 @@ -1007,7 +1007,7 @@ { char t[4]; snprintf (t, sizeof(t), "%02x ", (unsigned int) data[i]); - strncat (hex, t, sizeof(hex)); + strncat (hex, t, sizeof(hex) - 1); if (data[i] > 31 && data[i] < 128 ) ascii[j] = data[i]; else ++++++ v4l-utils-0.8.9.tar.bz2 -> v4l-utils-1.0.1.tar.bz2 ++++++ ++++ 114689 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
