|
[-]
[+]
|
Changed |
dvb.spec
|
|
|
|
[-]
[+]
|
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
|
