Hello community, here is the log from the commit of package dvb for openSUSE:Factory checked in at 2013-12-16 15:47:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dvb (Old) and /work/SRC/openSUSE:Factory/.dvb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dvb" Changes: -------- --- /work/SRC/openSUSE:Factory/dvb/dvb.changes 2013-01-29 06:43:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dvb.new/dvb.changes 2013-12-16 15:47:39.000000000 +0100 @@ -1,0 +2,39 @@ +Tue Dec 10 09:28:52 CET 2013 - jdelv...@suse.com + +- Remove dvb-ttpci-01.fw-2622 as license is unknown. +- Install COPYING* as %doc. + +------------------------------------------------------------------- +Fri Oct 18 09:10:47 CEST 2013 - jdelv...@suse.com + +- License clarification: the main dvb package also contains + LGPL-2.1+ code. + +------------------------------------------------------------------- +Thu Oct 17 13:53:56 UTC 2013 - jdelv...@suse.com + +- Rename scan to dvbscan/atscscan, to avoid collisions. + +------------------------------------------------------------------- +Tue Oct 1 12:21:41 UTC 2013 - jdelv...@suse.com + +- Make the dvb-devel package description somewhat more verbose, to + make rpmlint happy. + +------------------------------------------------------------------- +Tue Oct 1 12:12:10 UTC 2013 - jdelv...@suse.com + +- dvb-femon-01-status-is-common.patch: femon: Share common code + (bnc#843473). +- dvb-femon-02-SNR-in-dB.patch: femon: Display SNR in dB + (bnc#843473). +- dvb-femon-03-handle-EOPNOTSUPP.patch: femon: Handle -EOPNOTSUPP + (bnc#843474). + +------------------------------------------------------------------- +Tue Oct 1 09:59:55 UTC 2013 - jdelv...@suse.com + +- New subpackage dvb-devel, containing header files needed to build + third-party DVB applications (bnc#832195). + +------------------------------------------------------------------- Old: ---- dvb-ttpci-01.fw-2622 New: ---- dvb-femon-01-status-is-common.patch dvb-femon-02-SNR-in-dB.patch dvb-femon-03-handle-EOPNOTSUPP.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dvb.spec ++++++ --- /var/tmp/diff_new_pack.o7FkUc/_old 2013-12-16 15:47:40.000000000 +0100 +++ /var/tmp/diff_new_pack.o7FkUc/_new 2013-12-16 15:47:40.000000000 +0100 @@ -27,38 +27,46 @@ BuildRequires: libv4l-devel >= 0.8.4 %endif BuildRequires: xz -%define firmwaredir /lib/firmware Url: http://linuxtv.org/ PreReq: %fillup_prereq %insserv_prereq Version: 1.1.1%{?snapver:_%snapver} Release: 0 Summary: Tools for Digital (DVB) TV Cards -License: GPL-2.0+ +License: GPL-2.0+ and LGPL-2.1+ Group: Hardware/TV Source: dvb-apps-%{version}.tar.xz Source2: rcdvb Source3: sysconfig.dvb -Source4: http://linuxtv.org/downloads/firmware/dvb-ttpci-01.fw-2622 -#Source4: http://212.227.36.83/linuxtv/downloads/firmware/dvb-ttpci-01.fw-261d Patch: dvb-apps-dvbnet.diff Patch1: dvb-includes.diff +Patch2: dvb-femon-01-status-is-common.patch +Patch3: dvb-femon-02-SNR-in-dB.patch +Patch4: dvb-femon-03-handle-EOPNOTSUPP.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -# This package provides the firmware for some cards supported by the -# dvb-ttpci.ko module. Add the modalias dependencies for this module: -# Modules: dvb-ttpci.ko -Supplements: modalias(pci:v00001131d00007146sv0000110Asd00000000bc*sc*i*) -Supplements: modalias(pci:v00001131d00007146sv000013C2sd0000000[0123468AE]bc*sc*i*) -Supplements: modalias(pci:v00001131d00007146sv000013C2sd00001002bc*sc*i*) -# Generated with: extract-modaliases -i dvb-ttpci kernel-default.rpm Requires: dtv-scan-tables %description DVB tools and transponder files useful for DVB TV Cards +%package -n dvb-devel +Summary: Development files for DVB-related libraries +License: LGPL-2.1+ +Group: Development/Libraries/C and C++ +Requires: dvb = %{version} +Requires: glibc-devel + +%description -n dvb-devel +Files needed for the development of DVB TV applications and tools. +Header files are included for the following libraries: libdvbapi, +libdvbcfg, libdvben50221, libdvbsec, libesg and libucsi. + %prep %setup -q -n dvb-apps-%{version} %patch %patch1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 find -name .hg -type d | xargs rm -rfv find -name .cvsignore -type f | xargs rm -fv find -name '*.orig' -type f | xargs rm -fv @@ -80,7 +88,7 @@ # ## docu install -d -m 755 $DESTDIR%{_docdir}/dvb -install -m 644 README $DESTDIR%{_docdir}/dvb +install -m 644 README COPYING* $DESTDIR%{_docdir}/dvb # ## make \ @@ -102,20 +110,13 @@ ln -sf /etc/init.d/dvb $DESTDIR/usr/sbin/rcdvb install -m 755 %{SOURCE2} $DESTDIR/etc/init.d/dvb # -## firmware -install -d -m 755 %{buildroot}%{firmwaredir} -install -m 644 %{SOURCE4} %{buildroot}%{firmwaredir} -cd %{buildroot}%{firmwaredir} -for i in dvb-ttpci-01.fw*; do - ln -s $i dvb-ttpci-01.fw - break -done -cd - -# # noone really uses this so far AFAIK -rm -r %{buildroot}%{_includedir} %{buildroot}%{_libdir}/*.a +rm -r %{buildroot}%{_libdir}/*.a # dvbscan is incomplete and defunct rm %{buildroot}%{_bindir}/dvbscan +# scan is too generic a name, rename to dvbscan/atscscan to avoid conflicts +mv %{buildroot}%{_bindir}/scan %{buildroot}%{_bindir}/dvbscan +ln %{buildroot}%{_bindir}/dvbscan %{buildroot}%{_bindir}/atscscan # dvb scan data are provided by dtv-scan-tables rm -r %{buildroot}%{_datadir}/dvb/{atsc,dvb-c,dvb-s,dvb-t} # @@ -133,16 +134,21 @@ %files %defattr(-, root, root) -%{_docdir}/dvb +%doc %{_docdir}/dvb %{_datadir}/dvb /var/adm/fillup-templates/sysconfig.dvb %config /etc/init.d/dvb /usr/sbin/rcdvb /usr/bin/* -%if %suse_version <= 1020 -%dir %{firmwaredir} -%endif %{_libdir}/*.so -%{firmwaredir}/* + +%files -n dvb-devel +%defattr(-, root, root) +%{_includedir}/libdvbapi +%{_includedir}/libdvbcfg +%{_includedir}/libdvben50221 +%{_includedir}/libdvbsec +%{_includedir}/libesg +%{_includedir}/libucsi %changelog ++++++ dvb-femon-01-status-is-common.patch ++++++ From: Jean Delvare <kh...@linux-fr.org> Subject: femon: Share common code Patch-mainline: Submitted, no answer -- http://www.spinics.net/lists/linux-media/msg64368.html The status flags are printed the same in standard output mode and human readable output mode, so use common code. --- util/femon/femon.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) --- dvb-apps-3ee111da5b3a.orig/util/femon/femon.c 2013-06-02 13:56:18.936297146 +0200 +++ dvb-apps-3ee111da5b3a/util/femon/femon.c 2013-06-02 13:59:03.383299584 +0200 @@ -94,25 +94,21 @@ int check_frontend (struct dvbfe_handle } + printf ("status %c%c%c%c%c | ", + fe_info.signal ? 'S' : ' ', + fe_info.carrier ? 'C' : ' ', + fe_info.viterbi ? 'V' : ' ', + fe_info.sync ? 'Y' : ' ', + fe_info.lock ? 'L' : ' '); if (human_readable) { - printf ("status %c%c%c%c%c | signal %3u%% | snr %3u%% | ber %d | unc %d | ", - fe_info.signal ? 'S' : ' ', - fe_info.carrier ? 'C' : ' ', - fe_info.viterbi ? 'V' : ' ', - fe_info.sync ? 'Y' : ' ', - fe_info.lock ? 'L' : ' ', + printf ("signal %3u%% | snr %3u%% | ber %d | unc %d | ", (fe_info.signal_strength * 100) / 0xffff, (fe_info.snr * 100) / 0xffff, fe_info.ber, fe_info.ucblocks); } else { - printf ("status %c%c%c%c%c | signal %04x | snr %04x | ber %08x | unc %08x | ", - fe_info.signal ? 'S' : ' ', - fe_info.carrier ? 'C' : ' ', - fe_info.viterbi ? 'V' : ' ', - fe_info.sync ? 'Y' : ' ', - fe_info.lock ? 'L' : ' ', + printf ("signal %04x | snr %04x | ber %08x | unc %08x | ", fe_info.signal_strength, fe_info.snr, fe_info.ber, ++++++ dvb-femon-02-SNR-in-dB.patch ++++++ From: Jean Delvare <kh...@linux-fr.org> Subject: femon: Display SNR in dB Patch-mainline: Submitted, no answer -- http://www.spinics.net/lists/linux-media/msg64369.html SNR is supposed to be reported by the frontend drivers in dB, so print it that way for drivers which implement it properly. --- util/femon/femon.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) --- dvb-apps-3ee111da5b3a.orig/util/femon/femon.c 2013-06-02 14:05:00.988323437 +0200 +++ dvb-apps-3ee111da5b3a/util/femon/femon.c 2013-06-02 14:05:33.560792474 +0200 @@ -102,11 +102,20 @@ int check_frontend (struct dvbfe_handle fe_info.lock ? 'L' : ' '); if (human_readable) { - printf ("signal %3u%% | snr %3u%% | ber %d | unc %d | ", - (fe_info.signal_strength * 100) / 0xffff, - (fe_info.snr * 100) / 0xffff, - fe_info.ber, - fe_info.ucblocks); + // SNR should be in units of 0.1 dB but some drivers do + // not follow that rule, thus this heuristic. + if (fe_info.snr < 1000) + printf ("signal %3u%% | snr %4.1fdB | ber %d | unc %d | ", + (fe_info.signal_strength * 100) / 0xffff, + fe_info.snr / 10., + fe_info.ber, + fe_info.ucblocks); + else + printf ("signal %3u%% | snr %3u%% | ber %d | unc %d | ", + (fe_info.signal_strength * 100) / 0xffff, + (fe_info.snr * 100) / 0xffff, + fe_info.ber, + fe_info.ucblocks); } else { printf ("signal %04x | snr %04x | ber %08x | unc %08x | ", fe_info.signal_strength, ++++++ dvb-femon-03-handle-EOPNOTSUPP.patch ++++++ From: Jean Delvare <kh...@linux-fr.org> Subject: femon: Handle -EOPNOTSUPP Patch-mainline: Submitted, no answer -- http://www.spinics.net/lists/linux-media/msg64370.html Frontend drivers don't have to implement all monitoring callbacks. So expect -EOPNOTSUPP and handle it properly. --- util/femon/femon.c | 75 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 27 deletions(-) --- dvb-apps-3ee111da5b3a.orig/util/femon/femon.c 2013-06-03 17:22:56.923398598 +0200 +++ dvb-apps-3ee111da5b3a/util/femon/femon.c 2013-06-03 17:23:16.946398895 +0200 @@ -67,6 +67,7 @@ int check_frontend (struct dvbfe_handle struct dvbfe_info fe_info; unsigned int samples = 0; FILE *ttyFile=NULL; + int got_info; // We dont write the "beep"-codes to stdout but to /dev/tty1. // This is neccessary for Thin-Client-Systems or Streaming-Boxes @@ -89,39 +90,59 @@ int check_frontend (struct dvbfe_handle } do { - if (dvbfe_get_info(fe, FE_STATUS_PARAMS, &fe_info, DVBFE_INFO_QUERYTYPE_IMMEDIATE, 0) != FE_STATUS_PARAMS) { + got_info = dvbfe_get_info(fe, FE_STATUS_PARAMS, &fe_info, DVBFE_INFO_QUERYTYPE_IMMEDIATE, 0); + if (got_info & DVBFE_INFO_LOCKSTATUS) { + printf ("status %c%c%c%c%c | ", + fe_info.signal ? 'S' : ' ', + fe_info.carrier ? 'C' : ' ', + fe_info.viterbi ? 'V' : ' ', + fe_info.sync ? 'Y' : ' ', + fe_info.lock ? 'L' : ' '); + } else { fprintf(stderr, "Problem retrieving frontend information: %m\n"); + printf ("status ----- | "); } - printf ("status %c%c%c%c%c | ", - fe_info.signal ? 'S' : ' ', - fe_info.carrier ? 'C' : ' ', - fe_info.viterbi ? 'V' : ' ', - fe_info.sync ? 'Y' : ' ', - fe_info.lock ? 'L' : ' '); - if (human_readable) { - // SNR should be in units of 0.1 dB but some drivers do - // not follow that rule, thus this heuristic. - if (fe_info.snr < 1000) - printf ("signal %3u%% | snr %4.1fdB | ber %d | unc %d | ", - (fe_info.signal_strength * 100) / 0xffff, - fe_info.snr / 10., - fe_info.ber, - fe_info.ucblocks); - else - printf ("signal %3u%% | snr %3u%% | ber %d | unc %d | ", - (fe_info.signal_strength * 100) / 0xffff, - (fe_info.snr * 100) / 0xffff, - fe_info.ber, - fe_info.ucblocks); + if (got_info & DVBFE_INFO_SIGNAL_STRENGTH) + printf ("signal %3u%% | ", (fe_info.signal_strength * 100) / 0xffff); + else + printf ("signal ---%% | "); + if (got_info & DVBFE_INFO_SNR) { + // SNR should be in units of 0.1 dB but some drivers do + // not follow that rule, thus this heuristic. + if (fe_info.snr < 1000) + printf ("snr %4.1fdB | ", fe_info.snr / 10.); + else + printf ("snr %3u%% | ", (fe_info.snr * 100) / 0xffff); + } else + printf ("snr ---- | "); + if (got_info & DVBFE_INFO_BER) + printf ("ber %d | ", fe_info.ber); + else + printf ("ber - | "); + if (got_info & DVBFE_INFO_UNCORRECTED_BLOCKS) + printf ("unc %d | ", fe_info.ucblocks); + else + printf ("unc - | "); } else { - printf ("signal %04x | snr %04x | ber %08x | unc %08x | ", - fe_info.signal_strength, - fe_info.snr, - fe_info.ber, - fe_info.ucblocks); + if (got_info & DVBFE_INFO_SIGNAL_STRENGTH) + printf ("signal %04x | ", fe_info.signal_strength); + else + printf ("signal ---- | "); + if (got_info & DVBFE_INFO_SNR) + printf ("snr %04x | ", fe_info.snr); + else + printf ("snr ---- | "); + if (got_info & DVBFE_INFO_BER) + printf ("ber %08x | ", fe_info.ber); + else + printf ("ber -------- | "); + if (got_info & DVBFE_INFO_UNCORRECTED_BLOCKS) + printf ("unc %08x | ", fe_info.ucblocks); + else + printf ("unc -------- | "); } if (fe_info.lock) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
