commit 0a00fa5d7bf4b63e0160a9fb245961b3e3ef94a7
Author: Tomasz Pala <[email protected]>
Date: Sat Aug 27 19:41:06 2016 +0200
allow frequency to be specified in MHz, kHz or as an UHF channel number
dvbtune-frequency.patch | 35 +++++++++++++++++++++++++++++++++++
dvbtune.spec | 4 +++-
2 files changed, 38 insertions(+), 1 deletion(-)
---
diff --git a/dvbtune.spec b/dvbtune.spec
index 62687a7..09370f4 100644
--- a/dvbtune.spec
+++ b/dvbtune.spec
@@ -2,7 +2,7 @@ Summary: Tuning application for DVB cards
Summary(pl.UTF-8): Aplikacja do strojenia kart DVB
Name: dvbtune
Version: 0.5
-Release: 4
+Release: 5
License: GPL v2+
Group: Networking
Source0:
http://downloads.sourceforge.net/dvbtools/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@ Source0:
http://downloads.sourceforge.net/dvbtools/%{name}-%{version}.tar.gz
Patch0: %{name}-dumb31adapters.patch
Patch1: define-int-types.patch
Patch2: %{name}-dvr.patch
+Patch3: %{name}-frequency.patch
URL: http://dvbtools.sourceforge.net/
BuildRequires: libxml2-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -25,6 +26,7 @@ Prosta aplikacja do strojenia kart DVB.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p0
%build
%{__make} %{name} xml2vdr \
diff --git a/dvbtune-frequency.patch b/dvbtune-frequency.patch
new file mode 100644
index 0000000..a0438ee
--- /dev/null
+++ b/dvbtune-frequency.patch
@@ -0,0 +1,35 @@
+--- dvbtune.c_a 2016-08-27 18:03:56.773002109 +0200
++++ dvbtune.c 2016-08-27 19:34:17.950953291 +0200
+@@ -1117,8 +1117,8 @@
+ if (argc==1) {
+ fprintf(stderr,"Usage: dvbtune [OPTIONS]\n\n");
+ fprintf(stderr,"Standard options:\n\n");
+- fprintf(stderr,"-f freq absolute Frequency (DVB-S in Hz or DVB-T in
Hz)\n");
+- fprintf(stderr," or L-band Frequency (DVB-S in Hz or DVB-T in
Hz)\n");
++ fprintf(stderr,"-f freq absolute Frequency (DVB-S in [Mk]Hz or DVB-T
in ([Mk]?)Hz)\n");
++ fprintf(stderr," or L-band Frequency (DVB-S in [Mk]Hz) or
DVB-T UHF channel number\n");
+ fprintf(stderr,"-p [H,V] Polarity (DVB-S only)\n");
+ fprintf(stderr,"-s N Symbol rate (DVB-S or DVB-C)\n");
+ fprintf(stderr,"-v vpid Decode video PID (full cards only)\n");
+@@ -1279,12 +1279,19 @@
+ }
+ }
+
+-#if 0
+- if (!((freq > 100000000) || ((freq > 0) && (pol!=0) && (srate!=0)))) {
++ if (21 <= freq && freq <= 69) {
++ freq=(474+8*(freq-21))*1000000UL;
++ } else if (100 <= freq && freq <= 1000) {
++ freq*=1000000UL;
++ } else if (LOF1 <= freq*1000UL && freq*1000UL <= LOF2+SLOF-LOF1) {
++ freq*=1000UL;
++ }
++ if (!((freq > 100000) || ((freq > 0) && (pol!=0) && (srate!=0)))) {
+ fprintf(stderr,"Invalid parameters\n");
+ exit(-1);
+ }
+
++#if 0
+ if((fd_dvr = open(dvrdev[card],O_RDONLY|O_NONBLOCK)) < 0){
+ fprintf(stderr,"FD %d: ",i);
+ perror("fd_dvr DEMUX DEVICE: ");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dvbtune.git/commitdiff/0a00fa5d7bf4b63e0160a9fb245961b3e3ef94a7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
