rpm/alevt
SHA256
1
0
Fork 0
forked from pool/alevt
Code Pull Requests Activity

Accepting request 25110 from multimedia:apps

Browse Source 
Copy from multimedia:apps/alevt based on submit request 25110 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/25110
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alevt?expand=0&rev=7
This commit is contained in:
OBS User autobuild 2009-11-27 15:27:17 +00:00 committed by Git OBS Bridge
parent 964bbfa5c7
commit 70bfd69f0f
5 changed files with 145 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
alevt-1.6.0-dvb-demux.patch
View File

@ -1,6 +1,8 @@
--- alevt-1.6.0/alevt-date.c.dvb Sat Mar 30 10:32:23 2002 Index: alevt-1.6.2/alevt-date.c
+++ alevt-1.6.0/alevt-date.c Sat Mar 30 10:32:23 2002 ===================================================================
@@ -135,6 +135,8 @@ --- alevt-1.6.2.orig/alevt-date.c
+++ alevt-1.6.2/alevt-date.c
@@ -136,6 +136,8 @@ option(int argc, char **argv, int *ind,
{ "--help", "-h", 0 }, { "--help", "-h", 0 },
{ "-newbttv", "-new", 0 }, { "-newbttv", "-new", 0 },
{ "-oldbttv", "-old", 0 }, { "-oldbttv", "-old", 0 },
@ -9,7 +11,7 @@
}; };
int i; int i;
@@ -171,6 +173,8 @@ @@ -172,6 +174,8 @@ main(int argc, char **argv)
struct vbi *vbi; struct vbi *vbi;
int opt, ind; int opt, ind;
char *arg; char *arg;
@ -18,7 +20,7 @@
setprgname(argv[0]); setprgname(argv[0]);
@@ -215,6 +219,12 @@ @@ -216,6 +220,12 @@ main(int argc, char **argv)
case 9: // oldbttv case 9: // oldbttv
big_buf = 0; big_buf = 0;
break; break;
@ -31,7 +33,7 @@
case -1: case -1:
usage(stderr, 1); usage(stderr, 1);
break; break;
@@ -228,7 +238,7 @@ @@ -229,7 +239,7 @@ main(int argc, char **argv)
alarm(timeout); alarm(timeout);
} }
@ -40,9 +42,11 @@
if (not vbi) if (not vbi)
fatal_ioerror(vbi_name); fatal_ioerror(vbi_name);
--- alevt-1.6.0/main.c.dvb Sat Sep 16 23:34:18 2000 Index: alevt-1.6.2/main.c
+++ alevt-1.6.0/main.c Sat Mar 30 16:21:57 2002 ===================================================================
@@ -21,7 +21,8 @@ --- alevt-1.6.2.orig/main.c
+++ alevt-1.6.2/main.c
@@ -22,7 +22,8 @@ static struct vbi *vbi;
static int fine_tune = 1; // auto = 999; static int fine_tune = 1; // auto = 999;
static int erc = 1; static int erc = 1;
static int newbttv = -1; static int newbttv = -1;
@ -52,7 +56,7 @@
static void static void
usage(FILE *fp, int exitval) usage(FILE *fp, int exitval)
@@ -42,6 +43,8 @@ @@ -43,6 +44,8 @@ usage(FILE *fp, int exitval)
" -[no]erc\t\t\tenabled\n" " -[no]erc\t\t\tenabled\n"
" -[no]bell\t\t\tenabled\n" " -[no]bell\t\t\tenabled\n"
" -charset latin-1/2\t\tlatin-1\n" " -charset latin-1/2\t\tlatin-1\n"
@ -61,7 +65,7 @@
"\n" "\n"
" Order is important! Each page number\n" " Order is important! Each page number\n"
" opens a new window with the previously\n" " opens a new window with the previously\n"
@@ -55,6 +58,13 @@ @@ -56,6 +59,13 @@ usage(FILE *fp, int exitval)
" The -child option requires a parent\n" " The -child option requires a parent\n"
" window. So, it must be preceeded by\n" " window. So, it must be preceeded by\n"
" a parent or another child window.\n" " a parent or another child window.\n"
@ -75,16 +79,16 @@
); );
exit(exitval); exit(exitval);
} }
@@ -87,7 +97,7 @@ @@ -86,7 +96,7 @@ static struct vtwin *
struct vtwin *win; start(int argc, char **argv, struct vtwin *parent, int pgno, int subno)
{
if (vbi == 0) if (vbi == 0)
- vbi = vbi_open(vbi_name, cache_open(), fine_tune, newbttv); - vbi = vbi_open(vbi_name, cache_open(), fine_tune, newbttv);
+ vbi = vbi_open(vbi_name, cache_open(), fine_tune, newbttv, progname, txtpid); + vbi = vbi_open(vbi_name, cache_open(), fine_tune, newbttv, progname, txtpid);
if (vbi == 0) if (vbi == 0)
fatal("cannot open %s", vbi_name); fatal("cannot open %s", vbi_name);
if (vbi->cache) if (vbi->cache)
@@ -127,6 +137,8 @@ @@ -126,6 +136,8 @@ option(int argc, char **argv, int *ind,
{ "-bell", "-b", 0 }, { "-bell", "-b", 0 },
{ "-nobell", "-nb", 0 }, { "-nobell", "-nb", 0 },
{ "-charset", "-latin", 1 }, { "-charset", "-latin", 1 },
@ -93,7 +97,7 @@
}; };
int i; int i;
@@ -239,6 +251,12 @@ @@ -238,6 +250,12 @@ main(int argc, char **argv)
case 12: // debug case 12: // debug
debug++; debug++;
break; break;
@ -106,8 +110,10 @@
case 6: // parent case 6: // parent
case -1: // non-option arg case -1: // non-option arg
pgno = arg_pgno(arg, &subno); pgno = arg_pgno(arg, &subno);
--- alevt-1.6.0/vbi.c.dvb Wed Oct 11 19:39:19 2000 Index: alevt-1.6.2/vbi.c
+++ alevt-1.6.0/vbi.c Sat Mar 30 16:31:33 2002 ===================================================================
--- alevt-1.6.2.orig/vbi.c
+++ alevt-1.6.2/vbi.c
@@ -1,9 +1,12 @@ @@ -1,9 +1,12 @@
+#define _GNU_SOURCE +#define _GNU_SOURCE
#include <stdlib.h> #include <stdlib.h>
@ -132,7 +138,7 @@
#define FAC (1<<16) // factor for fix-point arithmetic #define FAC (1<<16) // factor for fix-point arithmetic
static u8 *rawbuf; // one common buffer for raw vbi data. static u8 *rawbuf; // one common buffer for raw vbi data.
@@ -579,7 +586,7 @@ @@ -580,7 +587,7 @@ setup_dev(struct vbi *vbi)
struct vbi * struct vbi *
@ -141,7 +147,7 @@
{ {
static int inited = 0; static int inited = 0;
struct vbi *vbi; struct vbi *vbi;
@@ -594,17 +601,29 @@ @@ -595,17 +602,29 @@ vbi_open(char *vbi_name, struct cache *c
goto fail1; goto fail1;
} }
@ -179,7 +185,7 @@
vbi->cache = ca; vbi->cache = ca;
@@ -662,3 +681,394 @@ @@ -663,3 +682,394 @@ vbi_reset(struct vbi *vbi)
vbi->cache->op->reset(vbi->cache); vbi->cache->op->reset(vbi->cache);
vbi_send(vbi, EV_RESET, 0, 0, 0, 0); vbi_send(vbi, EV_RESET, 0, 0, 0, 0);
} }
@ -574,9 +580,11 @@
+ vbi->fd = -1; + vbi->fd = -1;
+ return -1; + return -1;
+} +}
--- alevt-1.6.0/vbi.h.dvb Thu Sep 21 20:48:13 2000 Index: alevt-1.6.2/vbi.h
+++ alevt-1.6.0/vbi.h Sat Mar 30 16:01:34 2002 ===================================================================
@@ -36,6 +36,11 @@ --- alevt-1.6.2.orig/vbi.h
+++ alevt-1.6.2/vbi.h
@@ -36,6 +36,11 @@ struct vbi
int bpb; // bytes per bit * 2^16 int bpb; // bytes per bit * 2^16
int bp8bl, bp8bh; // bytes per 8-bit low/high int bp8bl, bp8bh; // bytes per 8-bit low/high
int soc, eoc; // start/end of clock run-in int soc, eoc; // start/end of clock run-in
@ -588,7 +596,7 @@
}; };
struct vbi_client struct vbi_client
@@ -46,7 +51,7 @@ @@ -46,7 +51,7 @@ struct vbi_client
}; };
struct vbi *vbi_open(char *vbi_dev_name, struct cache *ca, int fine_tune, struct vbi *vbi_open(char *vbi_dev_name, struct cache *ca, int fine_tune,
@ -597,9 +605,11 @@
void vbi_close(struct vbi *vbi); void vbi_close(struct vbi *vbi);
void vbi_reset(struct vbi *vbi); void vbi_reset(struct vbi *vbi);
int vbi_add_handler(struct vbi *vbi, void *handler, void *data); int vbi_add_handler(struct vbi *vbi, void *handler, void *data);
--- alevt-1.6.0/alevt-cap.c.dvb Sat Sep 16 23:34:32 2000 Index: alevt-1.6.2/alevt-cap.c
+++ alevt-1.6.0/alevt-cap.c Sat Mar 30 16:22:02 2002 ===================================================================
@@ -42,12 +42,21 @@ --- alevt-1.6.2.orig/alevt-cap.c
+++ alevt-1.6.2/alevt-cap.c
@@ -44,12 +44,21 @@ usage(FILE *fp, int exitval)
" -name <filename>\t\tttext-%%s.%%e\n" " -name <filename>\t\tttext-%%s.%%e\n"
" -format <fmt[,options]>\tascii\n" " -format <fmt[,options]>\tascii\n"
" -format help\n" " -format help\n"
@ -621,7 +631,7 @@
); );
exit(exitval); exit(exitval);
} }
@@ -128,6 +137,8 @@ @@ -130,6 +139,8 @@ option(int argc, char **argv, int *ind,
{ "-format", "-fmt", 1 }, { "-format", "-fmt", 1 },
{ "-name", "-o", 1 }, { "-name", "-o", 1 },
{ "-timeout", "-t", 1 }, { "-timeout", "-t", 1 },
@ -630,7 +640,7 @@
}; };
int i; int i;
@@ -203,6 +214,8 @@ @@ -204,6 +215,8 @@ main(int argc, char **argv)
struct vbi *vbi; struct vbi *vbi;
struct req *req; struct req *req;
struct dl_head reqs[2]; // simple linear lists of requests & captures struct dl_head reqs[2]; // simple linear lists of requests & captures
@ -639,7 +649,7 @@
setprgname(argv[0]); setprgname(argv[0]);
@@ -263,6 +276,12 @@ @@ -264,6 +277,12 @@ main(int argc, char **argv)
if (timeout < 1 || timeout > 999999) if (timeout < 1 || timeout > 999999)
fatal("bad timeout value", timeout); fatal("bad timeout value", timeout);
break; break;
@ -652,7 +662,7 @@
case -1: // non-option arg case -1: // non-option arg
if (not fmt) if (not fmt)
fmt = export_open(out_fmt); fmt = export_open(out_fmt);
@@ -282,7 +301,7 @@ @@ -283,7 +302,7 @@ main(int argc, char **argv)
fatal("no pages requested"); fatal("no pages requested");
// setup device // setup device
@ -661,8 +671,10 @@
fatal("cannot open %s", vbi_name); fatal("cannot open %s", vbi_name);
vbi_add_handler(vbi, event, reqs); // register event handler vbi_add_handler(vbi, event, reqs); // register event handler
--- alevt-1.6.0/dvb/audio.h.dvb 1970-01-01 01:00:00.000000000 +0100 Index: alevt-1.6.2/dvb/audio.h
+++ alevt-1.6.0/dvb/audio.h 2002-12-04 00:13:46.000000000 +0100 ===================================================================
--- /dev/null
+++ alevt-1.6.2/dvb/audio.h
@@ -0,0 +1,124 @@ @@ -0,0 +1,124 @@
+/* +/*
+ * audio.h + * audio.h
@ -788,8 +800,10 @@
+ +
+#endif /* _DVBAUDIO_H_ */ +#endif /* _DVBAUDIO_H_ */
+ +
--- alevt-1.6.0/dvb/ca.h.dvb 1970-01-01 01:00:00.000000000 +0100 Index: alevt-1.6.2/dvb/ca.h
+++ alevt-1.6.0/dvb/ca.h 2002-12-04 00:13:46.000000000 +0100 ===================================================================
--- /dev/null
+++ alevt-1.6.2/dvb/ca.h
@@ -0,0 +1,84 @@ @@ -0,0 +1,84 @@
+/* +/*
+ * ca.h + * ca.h
@ -875,8 +889,10 @@
+ +
+#endif +#endif
+ +
--- alevt-1.6.0/dvb/dmx.h.dvb 1970-01-01 01:00:00.000000000 +0100 Index: alevt-1.6.2/dvb/dmx.h
+++ alevt-1.6.0/dvb/dmx.h 2002-12-04 00:13:46.000000000 +0100 ===================================================================
--- /dev/null
+++ alevt-1.6.2/dvb/dmx.h
@@ -0,0 +1,172 @@ @@ -0,0 +1,172 @@
+/* +/*
+ * dmx.h + * dmx.h
@ -1050,8 +1066,10 @@
+ +
+#endif /*_DMX_H_*/ +#endif /*_DMX_H_*/
+ +
--- alevt-1.6.0/dvb/frontend.h.dvb 1970-01-01 01:00:00.000000000 +0100 Index: alevt-1.6.2/dvb/frontend.h
+++ alevt-1.6.0/dvb/frontend.h 2002-12-04 00:13:46.000000000 +0100 ===================================================================
--- /dev/null
+++ alevt-1.6.2/dvb/frontend.h
@@ -0,0 +1,261 @@ @@ -0,0 +1,261 @@
+/* +/*
+ * frontend.h + * frontend.h
@ -1314,8 +1332,10 @@
+ +
+#endif /*_FRONTEND_H_*/ +#endif /*_FRONTEND_H_*/
+ +
--- alevt-1.6.0/dvb/net.h.dvb 1970-01-01 01:00:00.000000000 +0100 Index: alevt-1.6.2/dvb/net.h
+++ alevt-1.6.0/dvb/net.h 2002-12-04 00:13:46.000000000 +0100 ===================================================================
--- /dev/null
+++ alevt-1.6.2/dvb/net.h
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
+/* +/*
+ * net.h + * net.h
@ -1361,8 +1381,10 @@
+ +
+#endif /*_DVBNET_H_*/ +#endif /*_DVBNET_H_*/
+ +
--- alevt-1.6.0/dvb/osd.h.dvb 1970-01-01 01:00:00.000000000 +0100 Index: alevt-1.6.2/dvb/osd.h
+++ alevt-1.6.0/dvb/osd.h 2002-12-04 00:13:46.000000000 +0100 ===================================================================
--- /dev/null
+++ alevt-1.6.2/dvb/osd.h
@@ -0,0 +1,111 @@ @@ -0,0 +1,111 @@
+/* +/*
+ * osd.h + * osd.h
@ -1475,8 +1497,10 @@
+ +
+#endif +#endif
+ +
--- alevt-1.6.0/dvb/version.h.dvb 1970-01-01 01:00:00.000000000 +0100 Index: alevt-1.6.2/dvb/version.h
+++ alevt-1.6.0/dvb/version.h 2002-12-04 00:13:46.000000000 +0100 ===================================================================
--- /dev/null
+++ alevt-1.6.2/dvb/version.h
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
+/* +/*
+ * version.h + * version.h
@ -1507,8 +1531,10 @@
+ +
+#endif /*_VERSION_H_*/ +#endif /*_VERSION_H_*/
+ +
--- alevt-1.6.0/dvb/video.h.dvb 1970-01-01 01:00:00.000000000 +0100 Index: alevt-1.6.2/dvb/video.h
+++ alevt-1.6.0/dvb/video.h 2002-12-04 00:13:46.000000000 +0100 ===================================================================
--- /dev/null
+++ alevt-1.6.2/dvb/video.h
@@ -0,0 +1,190 @@ @@ -0,0 +1,190 @@
+/* +/*
+ * video.h + * video.h

22
alevt-happy-abuild.diff
View File

@ -1,6 +1,8 @@
--- alevt-1.6.1/edline.c.orig 1999-10-08 01:36:41.000000000 +0200 Index: alevt-1.6.2/edline.c
+++ alevt-1.6.1/edline.c 2005-07-07 20:33:16.044929859 +0200 ===================================================================
@@ -87,7 +87,7 @@ --- alevt-1.6.2.orig/edline.c
+++ alevt-1.6.2/edline.c
@@ -87,7 +87,7 @@ ev_handler(struct edline *el, struct vt_
while (n-- && el->len < (int)sizeof(el->buf)-1) while (n-- && el->len < (int)sizeof(el->buf)-1)
{ {
@ -9,8 +11,10 @@
el->buf[el->len++] = *p; el->buf[el->len++] = *p;
p++; p++;
} }
--- alevt-1.6.1/misc.h.orig 1999-07-14 21:54:30.000000000 +0200 Index: alevt-1.6.2/misc.h
+++ alevt-1.6.1/misc.h 2005-07-07 20:30:42.871745007 +0200 ===================================================================
--- alevt-1.6.2.orig/misc.h
+++ alevt-1.6.2/misc.h
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
#ifndef MISC_H #ifndef MISC_H
#define MISC_H #define MISC_H
@ -20,9 +24,11 @@
////////////////////////// //////////////////////////
// generic macros/typedefs // generic macros/typedefs
////////////////////////// //////////////////////////
--- alevt-1.6.1/Makefile.orig 2005-07-07 20:24:30.000000000 +0200 Index: alevt-1.6.2/Makefile
+++ alevt-1.6.1/Makefile 2005-07-07 20:32:27.120493633 +0200 ===================================================================
@@ -40,7 +40,7 @@ --- alevt-1.6.2.orig/Makefile
+++ alevt-1.6.2/Makefile
@@ -44,7 +44,7 @@ font2.xbm: bdf2xbm $(FONT)-latin-2.bdf
./bdf2xbm font2 <$(FONT)-latin-2.bdf >font2.xbm ./bdf2xbm font2 <$(FONT)-latin-2.bdf >font2.xbm
bdf2xbm: bdf2xbm.c bdf2xbm: bdf2xbm.c

93
alevt-overflow2.diff
View File

@ -1,7 +1,8 @@
diff -u alevt-1.6.1-orig/alevt-cap.c alevt-1.6.1/alevt-cap.c Index: alevt-1.6.2/alevt-cap.c
--- alevt-1.6.1-orig/alevt-cap.c 2005-04-15 22:43:29.179452648 +0200 ===================================================================
+++ alevt-1.6.1/alevt-cap.c 2005-04-15 20:52:57.000000000 +0200 --- alevt-1.6.2.orig/alevt-cap.c
@@ -216,6 +216,7 @@ +++ alevt-1.6.2/alevt-cap.c
@@ -217,6 +217,7 @@ main(int argc, char **argv)
struct dl_head reqs[2]; // simple linear lists of requests & captures struct dl_head reqs[2]; // simple linear lists of requests & captures
char *progname = NULL; char *progname = NULL;
int txtpid = -1; int txtpid = -1;
@ -9,7 +10,7 @@ diff -u alevt-1.6.1-orig/alevt-cap.c alevt-1.6.1/alevt-cap.c
setprgname(argv[0]); setprgname(argv[0]);
@@ -301,7 +302,7 @@ @@ -302,7 +303,7 @@ main(int argc, char **argv)
fatal("no pages requested"); fatal("no pages requested");
// setup device // setup device
@ -18,10 +19,11 @@ diff -u alevt-1.6.1-orig/alevt-cap.c alevt-1.6.1/alevt-cap.c
fatal("cannot open %s", vbi_name); fatal("cannot open %s", vbi_name);
vbi_add_handler(vbi, event, reqs); // register event handler vbi_add_handler(vbi, event, reqs); // register event handler
diff -u alevt-1.6.1-orig/alevt-date.c alevt-1.6.1/alevt-date.c Index: alevt-1.6.2/alevt-date.c
--- alevt-1.6.1-orig/alevt-date.c 2005-04-15 22:43:29.170454016 +0200 ===================================================================
+++ alevt-1.6.1/alevt-date.c 2005-04-15 20:52:57.000000000 +0200 --- alevt-1.6.2.orig/alevt-date.c
@@ -149,10 +148,12 @@ +++ alevt-1.6.2/alevt-date.c
@@ -149,10 +149,12 @@ option(int argc, char **argv, int *ind,
if (streq(*arg, opts[i].nam) || streq(*arg, opts[i].altnam)) if (streq(*arg, opts[i].nam) || streq(*arg, opts[i].altnam))
{ {
if (opts[i].arg) if (opts[i].arg)
@ -34,7 +36,7 @@ diff -u alevt-1.6.1-orig/alevt-date.c alevt-1.6.1/alevt-date.c
return i+1; return i+1;
} }
@@ -176,11 +177,12 @@ @@ -176,11 +178,12 @@ main(int argc, char **argv)
char *arg; char *arg;
char *progname = NULL; char *progname = NULL;
int txtpid = -1; int txtpid = -1;
@ -48,7 +50,7 @@ diff -u alevt-1.6.1-orig/alevt-date.c alevt-1.6.1/alevt-date.c
switch (opt) switch (opt)
{ {
case 1: // -set case 1: // -set
@@ -239,7 +241,7 @@ @@ -239,7 +242,7 @@ main(int argc, char **argv)
alarm(timeout); alarm(timeout);
} }
@ -57,10 +59,11 @@ diff -u alevt-1.6.1-orig/alevt-date.c alevt-1.6.1/alevt-date.c
if (not vbi) if (not vbi)
fatal_ioerror(vbi_name); fatal_ioerror(vbi_name);
diff -u alevt-1.6.1-orig/alevt.1x.in alevt-1.6.1/alevt.1x.in Index: alevt-1.6.2/alevt.1x.in
--- alevt-1.6.1-orig/alevt.1x.in 2000-10-11 20:03:29.000000000 +0200 ===================================================================
+++ alevt-1.6.1/alevt.1x.in 2005-04-15 22:56:12.175459624 +0200 --- alevt-1.6.2.orig/alevt.1x.in
@@ -67,6 +67,15 @@ +++ alevt-1.6.2/alevt.1x.in
@@ -67,6 +67,15 @@ Selects the character set to use. Chara
in the selected set are replaced by similar looking symbols. in the selected set are replaced by similar looking symbols.
(default: latin-1) (default: latin-1)
.TP .TP
@ -76,8 +79,8 @@ diff -u alevt-1.6.1-orig/alevt.1x.in alevt-1.6.1/alevt.1x.in
.B \-\-help .B \-\-help
Show summary of options. Show summary of options.
.TP .TP
@@ -89,6 +98,10 @@ @@ -89,6 +98,10 @@ The
options requires a parent window. So, it must be preceeded by a parent options requires a parent window. So, it must be preceded by a parent
or another child window. or another child window.
.PP .PP
+To access the DVB interface, use: +To access the DVB interface, use:
@ -87,10 +90,11 @@ diff -u alevt-1.6.1-orig/alevt.1x.in alevt-1.6.1/alevt.1x.in
When saving pages When saving pages
.B alevt .B alevt
asks for a format string. Look at asks for a format string. Look at
diff -u alevt-1.6.1-orig/main.c alevt-1.6.1/main.c Index: alevt-1.6.2/main.c
--- alevt-1.6.1-orig/main.c 2005-04-15 22:43:29.173453560 +0200 ===================================================================
+++ alevt-1.6.1/main.c 2005-04-15 23:03:45.590530056 +0200 --- alevt-1.6.2.orig/main.c
@@ -23,6 +23,7 @@ +++ alevt-1.6.2/main.c
@@ -24,6 +24,7 @@ static int erc = 1;
static int newbttv = -1; static int newbttv = -1;
static char *progname; static char *progname;
static int txtpid = -1; static int txtpid = -1;
@ -98,7 +102,7 @@ diff -u alevt-1.6.1-orig/main.c alevt-1.6.1/main.c
static void static void
usage(FILE *fp, int exitval) usage(FILE *fp, int exitval)
@@ -43,8 +44,9 @@ @@ -44,8 +45,9 @@ usage(FILE *fp, int exitval)
" -[no]erc\t\t\tenabled\n" " -[no]erc\t\t\tenabled\n"
" -[no]bell\t\t\tenabled\n" " -[no]bell\t\t\tenabled\n"
" -charset latin-1/2\t\tlatin-1\n" " -charset latin-1/2\t\tlatin-1\n"
@ -110,7 +114,7 @@ diff -u alevt-1.6.1-orig/main.c alevt-1.6.1/main.c
"\n" "\n"
" Order is important! Each page number\n" " Order is important! Each page number\n"
" opens a new window with the previously\n" " opens a new window with the previously\n"
@@ -65,6 +67,8 @@ @@ -66,6 +68,8 @@ usage(FILE *fp, int exitval)
" The -progname or -pid option specify\n" " The -progname or -pid option specify\n"
" the program or teletext PID if using\n" " the program or teletext PID if using\n"
" the DVB interface.\n" " the DVB interface.\n"
@ -119,7 +123,7 @@ diff -u alevt-1.6.1-orig/main.c alevt-1.6.1/main.c
); );
exit(exitval); exit(exitval);
} }
@@ -95,7 +99,7 @@ @@ -96,7 +100,7 @@ static struct vtwin *
start(int argc, char **argv, struct vtwin *parent, int pgno, int subno) start(int argc, char **argv, struct vtwin *parent, int pgno, int subno)
{ {
if (vbi == 0) if (vbi == 0)
@ -128,7 +132,7 @@ diff -u alevt-1.6.1-orig/main.c alevt-1.6.1/main.c
if (vbi == 0) if (vbi == 0)
fatal("cannot open %s", vbi_name); fatal("cannot open %s", vbi_name);
if (vbi->cache) if (vbi->cache)
@@ -137,6 +141,7 @@ @@ -138,6 +142,7 @@ option(int argc, char **argv, int *ind,
{ "-charset", "-latin", 1 }, { "-charset", "-latin", 1 },
{ "-progname", "-pn", 1 }, { "-progname", "-pn", 1 },
{ "-pid", "--pid", 1 }, { "-pid", "--pid", 1 },
@ -136,7 +140,7 @@ diff -u alevt-1.6.1-orig/main.c alevt-1.6.1/main.c
}; };
int i; int i;
@@ -261,6 +266,9 @@ @@ -262,6 +267,9 @@ main(int argc, char **argv)
parent = start(argc, argv, 0, pgno, subno); parent = start(argc, argv, 0, pgno, subno);
geometry = 0; geometry = 0;
break; break;
@ -146,9 +150,10 @@ diff -u alevt-1.6.1-orig/main.c alevt-1.6.1/main.c
} }
if (parent == 0) if (parent == 0)
diff -u alevt-1.6.1-orig/vbi.c alevt-1.6.1/vbi.c Index: alevt-1.6.2/vbi.c
--- alevt-1.6.1-orig/vbi.c 2005-04-15 22:43:29.176453104 +0200 ===================================================================
+++ alevt-1.6.1/vbi.c 2005-04-15 20:54:11.000000000 +0200 --- alevt-1.6.2.orig/vbi.c
+++ alevt-1.6.2/vbi.c
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
#include "lang.h" #include "lang.h"
@ -158,7 +163,7 @@ diff -u alevt-1.6.1-orig/vbi.c alevt-1.6.1/vbi.c
static void dvb_handler(struct vbi *vbi, int fd); static void dvb_handler(struct vbi *vbi, int fd);
#define FAC (1<<16) // factor for fix-point arithmetic #define FAC (1<<16) // factor for fix-point arithmetic
@@ -586,7 +586,7 @@ @@ -587,7 +587,7 @@ setup_dev(struct vbi *vbi)
struct vbi * struct vbi *
@ -167,7 +172,7 @@ diff -u alevt-1.6.1-orig/vbi.c alevt-1.6.1/vbi.c
{ {
static int inited = 0; static int inited = 0;
struct vbi *vbi; struct vbi *vbi;
@@ -601,7 +601,7 @@ @@ -602,7 +602,7 @@ vbi_open(char *vbi_name, struct cache *c
goto fail1; goto fail1;
} }
@ -176,7 +181,7 @@ diff -u alevt-1.6.1-orig/vbi.c alevt-1.6.1/vbi.c
vbi->cache = ca; vbi->cache = ca;
dl_init(vbi->clients); dl_init(vbi->clients);
@@ -627,6 +627,18 @@ @@ -628,6 +628,18 @@ vbi_open(char *vbi_name, struct cache *c
vbi->cache = ca; vbi->cache = ca;
@ -195,7 +200,7 @@ diff -u alevt-1.6.1-orig/vbi.c alevt-1.6.1/vbi.c
dl_init(vbi->clients); dl_init(vbi->clients);
vbi->seq = 0; vbi->seq = 0;
out_of_sync(vbi); out_of_sync(vbi);
@@ -852,7 +864,7 @@ @@ -853,7 +865,7 @@ static void dvb_handler(struct vbi *vbi,
memmove(rawbuf, rawbuf + len, rawptr); memmove(rawbuf, rawbuf + len, rawptr);
} }
@ -204,7 +209,7 @@ diff -u alevt-1.6.1-orig/vbi.c alevt-1.6.1/vbi.c
{ {
struct { struct {
u_int16_t pmtpid; u_int16_t pmtpid;
@@ -904,7 +916,7 @@ @@ -905,7 +917,7 @@ static int vbi_dvb_open(struct vbi *vbi,
for (i = 0; i < (unsigned)r; i += 4) { for (i = 0; i < (unsigned)r; i += 4) {
if (progcnt >= sizeof(progtbl)/sizeof(progtbl[0])) { if (progcnt >= sizeof(progtbl)/sizeof(progtbl[0])) {
error("Program table overflow"); error("Program table overflow");
@ -213,7 +218,7 @@ diff -u alevt-1.6.1-orig/vbi.c alevt-1.6.1/vbi.c
} }
progtbl[progcnt].service_id = (tbl[8 + i] << 8) | tbl[9 + i]; progtbl[progcnt].service_id = (tbl[8 + i] << 8) | tbl[9 + i];
if (!progtbl[progcnt].service_id) /* this is the NIT pointer */ if (!progtbl[progcnt].service_id) /* this is the NIT pointer */
@@ -1011,6 +1023,21 @@ @@ -1012,6 +1024,21 @@ static int vbi_dvb_open(struct vbi *vbi,
progtbl[i].txttype, progtbl[i].txtmagazine, progtbl[i].txtpage); progtbl[i].txttype, progtbl[i].txtmagazine, progtbl[i].txtpage);
} }
@ -235,10 +240,11 @@ diff -u alevt-1.6.1-orig/vbi.c alevt-1.6.1/vbi.c
progp = NULL; progp = NULL;
if (progname) { if (progname) {
j = strlen(progname); j = strlen(progname);
diff -u alevt-1.6.1-orig/vbi.h alevt-1.6.1/vbi.h Index: alevt-1.6.2/vbi.h
--- alevt-1.6.1-orig/vbi.h 2005-04-15 22:43:29.177452952 +0200 ===================================================================
+++ alevt-1.6.1/vbi.h 2005-04-15 20:54:11.000000000 +0200 --- alevt-1.6.2.orig/vbi.h
@@ -51,7 +51,7 @@ +++ alevt-1.6.2/vbi.h
@@ -51,7 +51,7 @@ struct vbi_client
}; };
struct vbi *vbi_open(char *vbi_dev_name, struct cache *ca, int fine_tune, struct vbi *vbi_open(char *vbi_dev_name, struct cache *ca, int fine_tune,
@ -247,10 +253,11 @@ diff -u alevt-1.6.1-orig/vbi.h alevt-1.6.1/vbi.h
void vbi_close(struct vbi *vbi); void vbi_close(struct vbi *vbi);
void vbi_reset(struct vbi *vbi); void vbi_reset(struct vbi *vbi);
int vbi_add_handler(struct vbi *vbi, void *handler, void *data); int vbi_add_handler(struct vbi *vbi, void *handler, void *data);
diff -u alevt-1.6.1-orig/xio.c alevt-1.6.1/xio.c Index: alevt-1.6.2/xio.c
--- alevt-1.6.1-orig/xio.c 2002-08-20 05:09:38.000000000 +0200 ===================================================================
+++ alevt-1.6.1/xio.c 2005-04-15 20:54:11.000000000 +0200 --- alevt-1.6.2.orig/xio.c
@@ -379,7 +379,7 @@ +++ alevt-1.6.2/xio.c
@@ -379,7 +379,7 @@ xio_title(struct xio_win *xw, char *titl
return; return;
strcpy(xw->title, title); strcpy(xw->title, title);

5
alevt.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 25 20:18:34 CET 2009 - meissner@suse.de
- fixed fuzzy patches
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 30 21:35:12 CET 2008 - jw@suse.de Wed Jan 30 21:35:12 CET 2008 - jw@suse.de

61
alevt.spec
View File

@ -27,12 +27,12 @@ Name: alevt
%endif %endif
BuildRequires: libpng-devel pkgconfig update-desktop-files xorg-x11-devel BuildRequires: libpng-devel pkgconfig update-desktop-files xorg-x11-devel
Url: http://www.goron.de/~froese/ Url: http://www.goron.de/~froese/
License: GPL v2 or later License: GPLv2+
Group: Hardware/TV Group: Hardware/TV
AutoReqProv: on AutoReqProv: on
Summary: Teletext and Videotext Decoder for the BTTV Driver Summary: Teletext and Videotext Decoder for the BTTV Driver
Version: 1.6.2 Version: 1.6.2
Release: 70 Release: 71
Source0: alevt-%version.tar.bz2 Source0: alevt-%version.tar.bz2
Source1: alevt.desktop Source1: alevt.desktop
Source2: alevt.png Source2: alevt.png
@ -87,60 +87,3 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_prefix}/%{_man_dir}/man1/alevt.1x.gz %doc %{_prefix}/%{_man_dir}/man1/alevt.1x.gz
%changelog %changelog
* Wed Jan 30 2008 jw@suse.de
- updated to 1.6.2
- adapt to current v4l2 api
- some minor fixes collected during the past years
- upstreamed patches removed.
* Thu Jul 05 2007 coolo@suse.de
- put desktop file and icon into the package
* Tue Sep 05 2006 jw@suse.de
- fixed #203118, making -Wold-style-definition happy.
* Fri Jul 28 2006 jw@suse.de
- made xorg-safe.
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Jul 07 2005 jw@suse.de
- revamped gcc4.diff into happy-abuild.diff
Avoid imlicit declarations and add RPM_OPT_FLAGS where needed.
* Mon Jul 04 2005 jw@suse.de
- added alevt-gcc4.diff, comparison is always true suppression.
* Tue Apr 19 2005 jw@suse.de
- changes by tsaupe@suse.de documented in usage and man.
* Thu Apr 14 2005 jw@suse.de
- added alevt-overflow.diff by tsaupe@suse.de
* Sun Jan 23 2005 meissner@suse.de
- use RPM_OPT_FLAGS, fixed compile error with gcc4.
* Fri Nov 19 2004 ro@suse.de
- include icon in filelist
* Tue Nov 09 2004 jw@suse.de
- added http://www.baycom.org/~tom/alevt-dvb-demux.patch
suggested by tsaupe@suse.de
* Sun Jan 11 2004 adrian@suse.de
- build as user
* Mon Oct 13 2003 jw@suse.de
- make shall not sync (#32147)
* Sat Aug 16 2003 adrian@suse.de
- install desktop file from kappfinder
* Tue May 27 2003 coolo@suse.de
- use BuildRoot
* Mon May 19 2003 wengel@suse.de
- update -> 1.6.1 (fixed bug in ui.c and more)
* Tue Sep 17 2002 ro@suse.de
- removed bogus self-provides
* Wed Jun 05 2002 uli@suse.de
- update -> 1.6.0 (png export, v4l2 interface & more)
* Wed Apr 24 2002 uli@suse.de
- fixed for lib64
* Wed Feb 07 2001 uli@suse.de
- fixed for glibc 2.2.1
* Sat Dec 09 2000 nashif@suse.de
- sorted group
* Fri Jun 02 2000 kukuk@suse.de
- Use doc macro
* Mon Sep 13 1999 bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Wed Jul 14 1999 uli@suse.de
- New version 1.4.9
* Wed Jul 14 1999 uli@suse.de
- Spec file created from alevt-1.4.9.tar.gz by autospec