Changes of Revision 3
[-] | Changed | dvb.spec |
x 1
2 # 3 -# spec file for package dvb (Version 1.1.0_CVS20051019) 4 +# spec file for package dvb (Version 1.1.0_CVS20080331) 5 # 6 -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. 7 +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. 8 # This file and all modifications and additions to the pristine 9 # package are under the same license as the package itself. 10 # 11
12 # 13 14 # norootforbuild 15 -# usedforbuild aaa_base acl attr audit-libs autoconf automake bash bind-libs bind-utils binutils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db diffutils e2fsprogs file filesystem fillup findutils flex gawk gcc gdbm gdbm-devel gettext gettext-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libcom_err libgcc libnscd libstdc++ libtool libusb libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch perl permissions popt procinfo procps psmisc pwdutils rcs readline resmgr rpm sed strace sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel 16 + 17 18 Name: dvb 19 -BuildRequires: libusb resmgr 20 -%if %suse_version > 810 21 -%define have_proper_libusb 1 22 -%else 23 -%define have_proper_libusb 0 24 -%endif 25 -%if %suse_version > 930 26 +BuildRequires: libusb-devel 27 %define firmwaredir /lib/firmware 28 -%else 29 -%define firmwaredir /usr/lib/hotplug/firmware 30 -%endif 31 -%if 0%{?suse_version} >= 1030 32 -BuildRequires: libusb-devel 33 -%endif 34 -License: GPL 35 +License: GPL v2 or later 36 Group: Hardware/TV 37 -Autoreqprov: on 38 -Prereq: %fillup_prereq %insserv_prereq 39 -Version: 1.1.0_CVS20051019 40 -Release: 17 41 +AutoReqProv: on 42 +PreReq: %fillup_prereq %insserv_prereq 43 +Version: 1.1.0_CVS20080331 44 +Release: 1.48 45 Summary: Tools for Digital (DVB) TV Cards 46 -Source: dvb-apps-20051019.tar.bz2 47 +Source: dvb-apps-20080331.tar.bz2 48 Source1: dvb-README.SuSE 49 Source2: rcdvb 50 Source3: sysconfig.dvb 51 -Source4: http://linuxtv.org/downloads/firmware/dvb-ttpci-01.fw-261f 52 +Source4: http://linuxtv.org/downloads/firmware/dvb-ttpci-01.fw-2622 53 #Source4: http://212.227.36.83/linuxtv/downloads/firmware/dvb-ttpci-01.fw-261d 54 -Patch0: dvb-apps-oldkernel.diff 55 -Patch1: dvb-apps-dvbnet.diff 56 -Patch2: dvb-apps-various.diff 57 -Patch3: dvb-apps-Makefile.diff 58 -Patch4: dvb-apps-femon.diff 59 +Patch: dvb-apps-dvbnet.diff 60 BuildRoot: %{_tmppath}/%{name}-%{version}-build 61 # This package provides the firmware for some cards supported by the 62 # dvb-ttpci.ko module. Add the modalias dependencies for this module: 63 # Modules: dvb-ttpci.ko 64 -Supplements: modalias(pci:v00001131d00007146sv0000110Asd00000000bc*sc*i*) 65 -Supplements: modalias(pci:v00001131d00007146sv000013C2sd0000000[0123468AE]bc*sc*i*) 66 -Supplements: modalias(pci:v00001131d00007146sv000013C2sd00001002bc*sc*i*) 67 +Supplements: modalias(pci:v00001131d00007146sv0000110Asd00000000bc*sc*i*) 68 +Supplements: modalias(pci:v00001131d00007146sv000013C2sd0000000[0123468AE]bc*sc*i*) 69 +Supplements: modalias(pci:v00001131d00007146sv000013C2sd00001002bc*sc*i*) 70 # Generated with: extract-modaliases -i dvb-ttpci kernel-default.rpm 71 72 %description 73
74 Johannes Stezenbach <js@convergence.de> 75 Holger Waechtler <holger@convergence.de> 76 77 -%debug_package 78 %prep 79 %setup -q -n dvb-apps 80 -%patch0 -p1 81 -%patch1 -p1 82 -%patch2 -p0 83 -%patch3 -p0 84 -%patch4 -p0 85 -find -name CVS -type d | xargs rm -rfv 86 +%patch -p1 87 +find -name .hg -type d | xargs rm -rfv 88 find -name .cvsignore -type f | xargs rm -fv 89 find -name '*.orig' -type f | xargs rm -fv 90 91 %build 92 -%if %have_proper_libusb 93 -: 94 -%else 95 -echo "install:" > util/ttusb_dec_reset/Makefile # doesn't build on 8.1 96 -%endif 97 -make CFLAGS="%{optflags} -fno-strict-aliasing" \ 98 +rm -rf include/linux 99 +make CFLAGS="%{optflags} -fno-strict-aliasing -fPIC" \ 100 CC=gcc \ 101 bindir=%{_bindir} \ 102 - datadir=%{_datadir} \ 103 - libdir=%{_libdir} 104 + libdir=%{_libdir} \ 105 + V=1 \ 106 + ttusb_dec_reset=1 107 108 %install 109 export DESTDIR=%{buildroot} 110
111 install -d -m 755 $DESTDIR/usr/{,s}bin $DESTDIR/etc/init.d $DESTDIR/usr/include \ 112 $DESTDIR/var/adm/fillup-templates 113 # 114 -## include files 115 -#glibc-devel already has include/linux/dvb, move these to include/dvb 116 -install -d -m 755 $DESTDIR/usr/include/dvb/linux/include 117 -cp -a include/linux/dvb $DESTDIR/usr/include/dvb/linux/include 118 -# 119 ## docu 120 install -d -m 755 $DESTDIR%{_docdir}/dvb 121 -install -m 644 README TODO $DESTDIR%{_docdir}/dvb 122 +install -m 644 README $DESTDIR%{_docdir}/dvb 123 install -m 644 %{SOURCE1} $DESTDIR%{_docdir}/dvb/README.SuSE 124 # 125 ## 126 make \ 127 bindir=%{_bindir} \ 128 - datadir=%{_datadir} \ 129 libdir=%{_libdir} \ 130 prefix=%{_prefix} \ 131 includedir=%{_includedir} \ 132
133 install 134 install -d -m 755 $DESTDIR/%{_docdir}/%{name}/szap 135 install -m 644 util/szap/README $DESTDIR/%{_docdir}/%{name}/szap 136 -install -m 755 util/ttusb_dec_reset/README $DESTDIR/%{_docdir}/%{name}/README.ttusb_dec_reset 137 -install -m 755 util/av7110_loadkeys/README $DESTDIR/%{_docdir}/%{name}/README.av7110_loadkeys 138 +install -m 644 util/ttusb_dec_reset/README $DESTDIR/%{_docdir}/%{name}/README.ttusb_dec_reset 139 +install -m 644 util/av7110_loadkeys/README $DESTDIR/%{_docdir}/%{name}/README.av7110_loadkeys 140 # 141 # dvbnet 142 -install -m 755 util/dvbnet/net_start.* $DESTDIR/%{_docdir}/%{name}/ 143 +install -m 644 util/dvbnet/net_start.* $DESTDIR/%{_docdir}/%{name}/ 144 ## sysconfig & init 145 install -m 644 %{SOURCE3} $DESTDIR/var/adm/fillup-templates 146 ln -sf /etc/init.d/dvb $DESTDIR/usr/sbin/rcdvb 147
148 break 149 done 150 cd - 151 +# 152 +# noone really uses this so far AFAIK 153 +rm -r %{buildroot}%{_includedir} %{buildroot}%{_libdir}/*.a 154 155 %post 156 %{fillup_and_insserv dvb} 157
158 /var/adm/fillup-templates/sysconfig.dvb 159 %config /etc/init.d/dvb 160 /usr/sbin/rcdvb 161 -%dir /usr/include/dvb 162 -/usr/include/dvb/* 163 /usr/bin/* 164 -%{_libdir}/dvb 165 -%{_libdir}/*.so* 166 -%{_libdir}/*.a 167 -%if %suse_version <= 930 168 -%dir /usr/lib/hotplug 169 -%endif 170 +%if %suse_version <= 1020 171 %dir %{firmwaredir} 172 +%endif 173 +%{_libdir}/*.so 174 %{firmwaredir}/* 175 - 176 -%changelog -n dvb 177 -* Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com> 178 -- import for SLE_10 build 179 -* Fri Mar 10 2006 - lnussel@suse.de 180 +%changelog 181 +* Mon Mar 31 2008 lnussel@suse.de 182 +- update firmware to version 2622 183 +- update to current development snapshot 184 + * mostly scan file updates 185 +* Thu Aug 9 2007 olh@suse.de 186 +- remove private include/linux/ files 187 +* Wed May 16 2007 olh@suse.de 188 +- Buildrequires libusb -> libusb-devel 189 +* Fri Mar 16 2007 lnussel@suse.de 190 +- remove /lib/firmware as it's now in the filesystem package 191 +* Mon Mar 5 2007 lnussel@suse.de 192 +- update to current development snapshot 193 +* Mon Sep 11 2006 lnussel@suse.de 194 +- add -fPIC to CFLAGS 195 +* Fri Sep 8 2006 lnussel@suse.de 196 +- update to current development snapshot 197 +* Fri Mar 10 2006 lnussel@suse.de 198 - add modalias to Supplements (#156864) 199 -* Wed Jan 25 2006 - mls@suse.de 200 +* Wed Jan 25 2006 mls@suse.de 201 |
||
[+] | Deleted | dvb-apps-Makefile.diff ^ |
@@ -1,334 +0,0 @@ ---- lib/libdvbcfg/Makefile 17 Jul 2005 01:03:23 -0000 1.15 -+++ lib/libdvbcfg/Makefile 29 Sep 2005 09:15:37 -0000 -@@ -26,12 +26,16 @@ - - DVBCFG_DEFAULT_DIR = /tmp - --CFLAGS ?= -O2 -g -Wall -Wstrict-prototypes -Wshadow -Wpointer-arith -DDVBCFG_DEFAULT_DIR=$(DVBCFG_DEFAULT_DIR) -+CFLAGS = -O2 -g -Wall -Wstrict-prototypes -Wshadow -Wpointer-arith -+CFLAGS += -DDVBCFG_DEFAULT_DIR=$(DVBCFG_DEFAULT_DIR) - CPPFLAGS = -I. -I../../include - - LIB = libdvbcfg.a - RANLIB = ranlib --INSTDIR=/tmp -+ -+prefix = /usr/local -+libdir = $(prefix)/lib -+includedir = $(prefix)/include - - libdvbcfg.a: $(OBJS) - $(AR) rc $(LIB) $(OBJS) -@@ -41,10 +45,10 @@ - make -C test - - install: $(LIB) $(INCLUDES) -- mkdir -p $(INSTDIR)/lib -- mkdir -p $(INSTDIR)/include -- cp -f $(LIB) $(INSTDIR)/lib -- cp -f $(INCLUDES) $(INSTDIR)/include -+ mkdir -p $(DESTDIR)$(libdir) -+ mkdir -p $(DESTDIR)$(includedir) -+ install -m 755 $(LIB) $(DESTDIR)$(libdir) -+ install -m 644 $(INCLUDES) $(DESTDIR)$(includedir) - - clean: - rm -f *~ *# *.o *.a ---- libs/libdvb2/Makefile 28 Aug 2005 22:33:50 -0000 1.3 -+++ libs/libdvb2/Makefile 29 Sep 2005 09:15:37 -0000 -@@ -27,15 +27,20 @@ - CC = gcc - LD = gcc - --CFLAGS = -Wall -Wformat -Wpointer-arith -g -fPIC -+CFLAGS = -Wall -Wformat -Wpointer-arith -g -+override CFLAGS += -fPIC - CPPFLAGS = -MD -I../../include -I. -I../libsi2 $(DEFS) - LDFLAGS = -shared -lc -lpthread -lrt -ldl - -+# XXX: bad, use soname! - TARGET = libdvb2.so --INSTDIR = /usr/local - DVBLIBS = -Lci -L../libsi2 -lci2 -lsi2 - TESTLIBS = -L. -L../libsi2 -ldvb2 -lsi2 - -+prefix = /usr/local -+libdir = $(prefix)/lib -+includedir = $(prefix)/include -+ - .PHONY: all ci plugins - - all: symlink $(TARGET) ci plugins test -@@ -54,11 +59,11 @@ - $(MAKE) -C ci - - install: $(LIB) $(INC) -- $(MAKE) -C plugins install INSTDIR=$(INSTDIR) -- mkdir -p $(INSTDIR)/lib -- mkdir -p $(INSTDIR)/include/dvb -- cp -f $(TARGET) $(INSTDIR)/lib -- cp -f $(INC) $(INSTDIR)/include/dvb -+ $(MAKE) -C plugins install -+ mkdir -p $(DESTDIR)$(libdir) -+ mkdir -p $(DESTDIR)$(includedir)/dvb -+ install -m 755 $(TARGET) $(DESTDIR)$(libdir) -+ install -m 755 $(INC) $(DESTDIR)$(includedir)/dvb - - test: test.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(TESTLIBS) test.c -o test ---- libs/libdvb2/ci/Makefile 28 Aug 2005 22:33:50 -0000 1.2 -+++ libs/libdvb2/ci/Makefile 29 Sep 2005 09:15:37 -0000 -@@ -14,13 +14,16 @@ - ci_transport.h - - CC = gcc --CFLAGS = -Wall -Wpointer-arith -g -fPIC -+CFLAGS = -Wall -Wpointer-arith -g -+override CFLAGS += -fPIC - CPPFLAGS = -MD -I../../../include -I. -I.. -I../../libsi2 $(DEFS) - LDFLAGS = -r - - TARGET = libci2.a --INSTDIR= /usr/local --DVBLIBS=-lc -Wl,-rpath . -Wl,-rpath si2 -L. -Lsi2 -lsi2 -ldvb2 -+ -+prefix = /usr/local -+libdir = $(prefix)/lib -+includedir = $(prefix)/include - - .PHONY: all - -@@ -30,10 +33,10 @@ - $(LD) $(LDFLAGS) $(OBJS) -o $(TARGET) - - install: $(LIB) $(INCLUDES) -- mkdir -p $(INSTDIR)/lib -- mkdir -p $(INSTDIR)/include -- cp -f $(LIB) $(INSTDIR)/lib -- cp -f $(INCLUDES) $(INSTDIR)/include -+ mkdir -p $(DESTDIR)$(libdir) -+ mkdir -p $(DESTDIR)$(includedir) -+ install -m 644 $(LIB) $(DESTDIR)$(libdir) -+ install -m 755 $(INCLUDES) $(DESTDIR)$(includedir) - - clean: - rm -f *.d *.o $(TARGET) ---- libs/libdvb2/plugins/Makefile 28 Aug 2005 22:33:50 -0000 1.2 -+++ libs/libdvb2/plugins/Makefile 29 Sep 2005 09:15:37 -0000 -@@ -2,12 +2,16 @@ - CC = gcc - LD = gcc - --CFLAGS = -Wall -g -fPIC -+CFLAGS = -Wall -g -+override CFLAGS += -fPIC - CPPFLAGS = -MD -I../../../include -I. -I.. -I../../libsi2 $(DEFS) - LDFLAGS = -lc -L../ -ldvb2 -L../ci -lci2 -shared - PLUGINS = ci_linklayer.so ci_highlevel.so - --INSTDIR = /usr/local -+prefix = /usr/local -+libdir = $(prefix)/lib -+includedir = $(prefix)/include -+ - - .PHONY: all - -@@ -17,8 +21,8 @@ - $(LD) $(LDFLAGS) $< -o $@ - - install: $(PLUGINS) -- mkdir -p $(INSTDIR)/lib/dvb -- cp -f $(PLUGINS) $(INSTDIR)/lib/dvb -+ mkdir -p $(DESTDIR)$(libdir)/dvb -+ install -m 644 $(PLUGINS) $(DESTDIR)$(libdir)/dvb - - clean: - rm -f *.d *.o *.so ---- libs/libdvbcfg/Makefile 28 Aug 2005 22:33:50 -0000 1.8 -+++ libs/libdvbcfg/Makefile 29 Sep 2005 09:15:37 -0000 -@@ -30,15 +30,19 @@ - - DVBCFG_DEFAULT_DIR = /etc/dvb - --CFLAGS ?= -fPIC -O2 -g -Wall -Wstrict-prototypes -Wshadow -Wpointer-arith -DDVBCFG_DEFAULT_DIR=\"$(DVBCFG_DEFAULT_DIR)\" --CPPFLAGS = -I. -I../../include -+CFLAGS = -O2 -g -Wall -Wstrict-prototypes -Wshadow -Wpointer-arith -+override CFLAGS += -fPIC -+CPPFLAGS = -DDVBCFG_DEFAULT_DIR=\"$(DVBCFG_DEFAULT_DIR)\" -I. -I../../include - LDFLAGS = -shared -lc - - STATICLIB = libdvbcfg.a -+# XXX: bad, use soname! - SHAREDLIB = libdvbcfg.so - RANLIB = ranlib --STRIP = strip --INSTDIR=/usr/local -+ -+prefix = /usr/local -+libdir = $(prefix)/lib -+includedir = $(prefix)/include - - all: symlink $(STATICLIB) $(SHAREDLIB) - -@@ -57,12 +61,11 @@ - make -C test - - install: $(STATICLIB) $(SHAREDLIB) $(INCLUDES) -- mkdir -p $(INSTDIR)/lib -- mkdir -p $(INSTDIR)/include/dvb/cfg -- cp -f $(STATICLIB) $(INSTDIR)/lib -- cp -f $(SHAREDLIB) $(INSTDIR)/lib -- $(STRIP) $(INSTDIR)/lib/$(SHAREDLIB) -- cp -f $(INCLUDES) $(INSTDIR)/include/dvb/cfg -+ mkdir -p $(DESTDIR)$(libdir) -+ mkdir -p $(DESTDIR)$(includedir)/dvb/cfg -+ install -m 644 $(STATICLIB) $(DESTDIR)$(libdir) -+ install -m 755 $(SHAREDLIB) $(DESTDIR)$(libdir) -+ install -m 644 $(INCLUDES) $(DESTDIR)$(includedir)/dvb/cfg - - clean: - rm -f *~ *# *.o *.a *.so cfg ---- libs/libsi2/Makefile 22 Jul 2005 20:09:29 -0000 1.8 -+++ libs/libsi2/Makefile 29 Sep 2005 09:15:37 -0000 -@@ -11,14 +11,19 @@ - transport_packet.h - - CC = gcc --CFLAGS = -Wall -Wpointer-arith -g -fPIC -+CFLAGS = -Wall -Wpointer-arith -g | ||
[+] | Deleted | dvb-apps-femon.diff ^ |
@@ -1,41 +0,0 @@ ---- util/szap/femon.c 17 Jan 2004 16:59:46 -0000 1.1 -+++ util/szap/femon.c 29 Sep 2005 09:15:37 -0000 -@@ -44,6 +44,7 @@ - #define FALSE (1==0) - #endif - -+static int humanreadable = 0; - - #define FRONTENDDEVICE "/dev/dvb/adapter%d/frontend%d" - -@@ -74,7 +75,11 @@ - ioctl(fe_fd, FE_READ_BER, &ber); - ioctl(fe_fd, FE_READ_UNCORRECTED_BLOCKS, &uncorrected_blocks); - -- printf ("status %02x | signal %04x | snr %04x | ber %08x | unc %08x | ", -+ if(humanreadable) -+ printf ("status %02x | signal %3hu%% | snr %3hu%% | ber %08x | unc %08x | ", -+ status, signal/655, snr/655, ber, uncorrected_blocks); -+ else -+ printf ("status %02x | signal %04x | snr %04x | ber %08x | unc %08x | ", - status, signal, snr, ber, uncorrected_blocks); - - if (status & FE_HAS_LOCK) -@@ -127,7 +132,7 @@ - unsigned int adapter = 0, frontend = 0; - int opt; - -- while ((opt = getopt(argc, argv, "hlrn:a:f:d:")) != -1) { -+ while ((opt = getopt(argc, argv, "hlrn:a:f:d:H")) != -1) { - switch (opt) - { - case '?': -@@ -139,6 +144,8 @@ - break; - case 'f': - frontend = strtoul(optarg, NULL, 0); -+ case 'H': -+ humanreadable = 1; - } - } - | ||
[+] | Deleted | dvb-apps-oldkernel.diff ^ |
@@ -1,29 +0,0 @@ -Index: dvb-apps/include/linux/dvb/video.h -=================================================================== ---- dvb-apps.orig/include/linux/dvb/video.h -+++ dvb-apps/include/linux/dvb/video.h -@@ -31,6 +31,9 @@ - #else - #include <stdint.h> - #include <time.h> -+#ifndef __user -+#define __user -+#endif - #endif - - -Index: dvb-apps/include/linux/dvb/osd.h -=================================================================== ---- dvb-apps.orig/include/linux/dvb/osd.h -+++ dvb-apps/include/linux/dvb/osd.h -@@ -26,6 +26,10 @@ - - #include <linux/compiler.h> - -+#ifndef __user -+#define __user -+#endif -+ - typedef enum { - // All functions return -2 on "not open" - OSD_Close=1, // () | ||
[+] | Deleted | dvb-apps-various.diff ^ |
@@ -1,96 +0,0 @@ ---- lib/libdvben50221/asn_1.c 22 Jun 2005 15:55:54 -0000 1.1 -+++ lib/libdvben50221/asn_1.c 29 Sep 2005 09:15:37 -0000 -@@ -61,7 +61,7 @@ - - while (temp) { - temp = temp >> 8; -- *asn_1_words++; -+ (*asn_1_words)++; - } - if ((asn_1_array = (uint8_t *) malloc(*asn_1_words * sizeof (uint8_t))) == NULL) { - printf("%s: Memory allocation failed.\n", __FUNCTION__); -@@ -70,7 +70,7 @@ - printf("%s: Allocated %d bytes.\n", __FUNCTION__, *asn_1_words); - - while (length) { -- asn_1_array[*asn_1_words--] = length & 0xff; -+ asn_1_array[(*asn_1_words)--] = length & 0xff; - length = length >> 8; - } - return asn_1_array; ---- lib/libdvben50221/en50221_encode.c 27 Jun 2005 21:36:18 -0000 1.3 -+++ lib/libdvben50221/en50221_encode.c 29 Sep 2005 09:15:37 -0000 -@@ -46,7 +46,7 @@ - uint16_t en50221_encode_descriptor(struct ca_msg * ca_msg, - struct ca_descriptor * desc, uint16_t pos) - { -- uint8_t i; -+ uint8_t i = 0; - uint16_t temp = 0, private_bytes = 0; - temp = pos; - ---- libs/libdvb2/notifier.c 17 Jul 2005 03:16:48 -0000 1.1 -+++ libs/libdvb2/notifier.c 29 Sep 2005 09:15:37 -0000 -@@ -86,15 +86,14 @@ - */ - int dvb_revent(struct dvb * dvb, int fd, short revents) - { -- struct dvb_notifier * notifier; - int i; - - if (revents == 0) - return 0; - - for (i = 0; i <= dvb->nb_notifiers; ++i) { -- if (dvb->notifiers.ptrs[i] == NULL || -- dvb->pollfds[i].fd != fd) -+ struct dvb_notifier * notifier = dvb->notifiers.ptrs[i]; -+ if (notifier == NULL || dvb->pollfds[i].fd != fd) - continue; - - dvb->pollfds[i].revents = revents; ---- libs/libsi2/section_buf.c 22 Jul 2005 19:51:27 -0000 1.3 -+++ libs/libsi2/section_buf.c 29 Sep 2005 09:15:37 -0000 -@@ -103,7 +103,7 @@ - uint8_t* payload, int len, - int pdu_start) - { -- int used; -+ int used = 0; - int tmp; - - /* sanity catch */ ---- test/test_av.c 17 Jan 2004 16:59:46 -0000 1.1 -+++ test/test_av.c 29 Sep 2005 09:15:37 -0000 -@@ -429,7 +429,7 @@ - return 0; - } - -- printf("read: %d bytes\n",read(sifd,sp.iFrame,sp.size)); -+ printf("read: %zd bytes\n",read(sifd,sp.iFrame,sp.size)); - if (ioctl(fd, VIDEO_STILLPICTURE, &sp) == -1) - perror("VIDEO_STILLPICTURE"); - return 0; ---- test/test_stillimage.c 17 Jan 2004 16:59:46 -0000 1.1 -+++ test/test_stillimage.c 29 Sep 2005 09:15:37 -0000 -@@ -82,7 +82,7 @@ - return -1; - } - -- printf ("read: %d bytes\n", read(filefd, sp.iFrame, sp.size)); -+ printf ("read: %zd bytes\n", read(filefd, sp.iFrame, sp.size)); - close(filefd); - - if ((ioctl(fd, VIDEO_STILLPICTURE, &sp) < 0)) { ---- util/scan/diseqc.c 17 Jan 2004 16:59:46 -0000 1.1 -+++ util/scan/diseqc.c 29 Sep 2005 09:15:37 -0000 -@@ -37,9 +37,6 @@ - ; - } - --#define printf(x...) -- -- - int diseqc_send_msg (int fd, fe_sec_voltage_t v, struct diseqc_cmd **cmd, - fe_sec_tone_mode_t t, fe_sec_mini_cmd_t b) - { | ||
Changed | dvb-apps-20080331.tar.bz2 ^ | |
Deleted | dvb-ttpci-01.fw-261f ^ | |
Added | dvb-ttpci-01.fw-2622 ^ | |
[+] | Changed | rcdvb ^ |
@@ -20,7 +20,6 @@ # Required-Stop: # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# X-UnitedLinux-Should-Start: hotplug # Short-Description: (re)loads drivers for DVB cards. # Description: This script is mostly useless nowadays as drivers # are loaded automatically. You may configure vdr to use it |