rpms/dvb-apps/F-13 dvb-apps-1.1.1-tzap-auto-574112.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 dvb-apps.spec, 1.24, 1.25 sources, 1.15, 1.16

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/dvb-apps/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3870/F-13

Modified Files:
	.cvsignore dvb-apps.spec sources 
Added Files:
	dvb-apps-1.1.1-tzap-auto-574112.patch 
Log Message:
* Tue Mar 16 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-21
- Apply upstream patch to add tzap AUTO param support (#574112, AUDU Jerome).
- Update tuning files to 20100316.


dvb-apps-1.1.1-tzap-auto-574112.patch:
 tzap.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE dvb-apps-1.1.1-tzap-auto-574112.patch ---
diff -uprN linuxtv-dvb-apps-1.1.1/util/szap/tzap.c linuxtv-dvb-apps-1.1.1-fix/util/szap/tzap.c
--- linuxtv-dvb-apps-1.1.1/util/szap/tzap.c	2004-01-17 17:59:46.000000000 +0100
+++ linuxtv-dvb-apps-1.1.1-fix/util/szap/tzap.c	2010-03-16 12:07:22.673167089 +0100
@@ -68,14 +68,16 @@ static const Param guard_list [] = {
 	{"GUARD_INTERVAL_1_16", GUARD_INTERVAL_1_16},
 	{"GUARD_INTERVAL_1_32", GUARD_INTERVAL_1_32},
 	{"GUARD_INTERVAL_1_4", GUARD_INTERVAL_1_4},
-	{"GUARD_INTERVAL_1_8", GUARD_INTERVAL_1_8}
+	{"GUARD_INTERVAL_1_8", GUARD_INTERVAL_1_8},
+	{"GUARD_INTERVAL_AUTO", GUARD_INTERVAL_AUTO}
 };
 
 static const Param hierarchy_list [] = {
 	{ "HIERARCHY_1", HIERARCHY_1 },
 	{ "HIERARCHY_2", HIERARCHY_2 },
 	{ "HIERARCHY_4", HIERARCHY_4 },
-	{ "HIERARCHY_NONE", HIERARCHY_NONE }
+	{ "HIERARCHY_NONE", HIERARCHY_NONE },
+	{ "HIERARCHY_AUTO", HIERARCHY_AUTO }
 };
 
 static const Param constellation_list [] = {
@@ -84,12 +86,14 @@ static const Param constellation_list []
 	{ "QAM_16", QAM_16 },
 	{ "QAM_256", QAM_256 },
 	{ "QAM_32", QAM_32 },
-	{ "QAM_64", QAM_64 }
+	{ "QAM_64", QAM_64 },
+	{ "QAM_AUTO", QAM_AUTO }
 };
 
 static const Param transmissionmode_list [] = {
 	{ "TRANSMISSION_MODE_2K", TRANSMISSION_MODE_2K },
 	{ "TRANSMISSION_MODE_8K", TRANSMISSION_MODE_8K },
+	{ "TRANSMISSION_MODE_AUTO", TRANSMISSION_MODE_AUTO }
 };
 
 #define LIST_SIZE(x) sizeof(x)/sizeof(Param)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/F-13/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	21 Jan 2010 21:17:56 -0000	1.15
+++ .cvsignore	16 Mar 2010 22:03:21 -0000	1.16
@@ -1,2 +1,2 @@
 linuxtv-dvb-apps-1.1.1.tar.bz2
-dvb-apps-tuningfiles-20100121.tar.bz2
+dvb-apps-tuningfiles-20100316.tar.bz2


Index: dvb-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/F-13/dvb-apps.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- dvb-apps.spec	21 Jan 2010 21:21:17 -0000	1.24
+++ dvb-apps.spec	16 Mar 2010 22:03:21 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           dvb-apps
 Version:        1.1.1
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Utility, demo and test applications using the Linux DVB API
 
 Group:          Applications/Multimedia
@@ -8,12 +8,14 @@ License:        GPLv2+
 URL:            http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps
 Source0:        http://www.linuxtv.org/downloads/linuxtv-dvb-apps-%{version}.tar.bz2
 # Source1 created with Source99
-Source1:        %{name}-tuningfiles-20100121.tar.bz2
+Source1:        %{name}-tuningfiles-20100316.tar.bz2
 Source99:       %{name}-tuningfiles-snapshot.sh
 Patch0:         %{name}-1.1.1-optflags.patch
 Patch1:         %{name}-paths.patch
 Patch2:         %{name}-1.1.1-no-build-test.patch
 Patch3:         %{name}-1.1.1-czap-sscanf-557580.patch
+# http://linuxtv.org/hg/dvb-apps/rev/53ca8b7c9d31
+Patch4:         %{name}-1.1.1-tzap-auto-574112.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel
@@ -29,6 +31,7 @@ BuildRequires:  kernel-headers >= 2.6.16
 %patch1 -p1
 %patch2
 %patch3 -p1
+%patch4 -p1
 
 cd util
 install -pm 644 av7110_loadkeys/README ../README.av7110_loadkeys
@@ -82,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 16 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-21
+- Apply upstream patch to add tzap AUTO param support (#574112, AUDU Jerome).
+- Update tuning files to 20100316.
+
 * Thu Jan 21 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-20
 - Apply patch to fix czap config parsing when built w/gcc 4.4.2 (#557580).
 - Update tuning files to 20100121.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dvb-apps/F-13/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	21 Jan 2010 21:17:56 -0000	1.15
+++ sources	16 Mar 2010 22:03:21 -0000	1.16
@@ -1,2 +1,2 @@
 de958cdb8d00e74792dd69f3c945b037  linuxtv-dvb-apps-1.1.1.tar.bz2
-27beead1c4b812418accc7160921070b  dvb-apps-tuningfiles-20100121.tar.bz2
+e1b28cc8a6db77e0c7b6c0290cccef08  dvb-apps-tuningfiles-20100316.tar.bz2