This commit is contained in:
commit
9bd64877fe
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
1702
alevt-1.6.0-dvb-demux.patch
Normal file
1702
alevt-1.6.0-dvb-demux.patch
Normal file
File diff suppressed because it is too large
Load Diff
30
alevt-1.6.1.dif
Normal file
30
alevt-1.6.1.dif
Normal file
@ -0,0 +1,30 @@
|
||||
--- Makefile
|
||||
+++ Makefile
|
||||
@@ -21,7 +21,7 @@
|
||||
sync
|
||||
|
||||
alevt: $(OBJS)
|
||||
- $(CC) $(OPT) $(OBJS) -o alevt -L/usr/X11R6/lib -lX11 $(EXPLIBS)
|
||||
+ $(CC) $(OPT) $(OBJS) -o alevt -L/usr/X11R6/lib -L/usr/X11R6/lib64 -lX11 $(EXPLIBS)
|
||||
|
||||
alevt-date: $(TOBJS)
|
||||
$(CC) $(OPT) $(TOBJS) -o alevt-date
|
||||
@@ -65,6 +65,8 @@
|
||||
install -m 0644 alevt.1x ${RPM_BUILD_ROOT}/usr/X11R6/man/man1
|
||||
install -m 0644 alevt-date.1 ${RPM_BUILD_ROOT}/usr/X11R6/man/man1
|
||||
install -m 0644 alevt-cap.1 ${RPM_BUILD_ROOT}/usr/X11R6/man/man1
|
||||
+ install -m 0755 -d ${RPM_BUILD_ROOT}/usr/X11R6/include/X11/pixmaps
|
||||
+ install -m 0644 contrib/mini-alevt.xpm ${RPM_BUILD_ROOT}/usr/X11R6/include/X11/pixmaps
|
||||
|
||||
# anything below this line is just for me!
|
||||
|
||||
--- alevt-date.c
|
||||
+++ alevt-date.c
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
+#include <time.h>
|
||||
|
||||
#include "os.h"
|
||||
#include "vt.h"
|
3
alevt-1.6.1.tar.bz2
Normal file
3
alevt-1.6.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:62366267f269e6b7d5edbccfdcac33237423234b97b0d2eef8f88efa13d5ed9f
|
||||
size 97153
|
11
alevt-KnR.patch
Normal file
11
alevt-KnR.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- alevt-1.6.1/bdf2xbm.c.orig 1999-01-27 19:17:42.000000000 +0100
|
||||
+++ alevt-1.6.1/bdf2xbm.c 2006-09-05 14:34:04.000000000 +0200
|
||||
@@ -76,7 +76,7 @@
|
||||
}
|
||||
|
||||
static inline void
|
||||
-setbit(ch, x, y)
|
||||
+setbit(int ch, int x, int y)
|
||||
{
|
||||
|
||||
int yo = ch / 32 * h + y;
|
33
alevt-happy-abuild.diff
Normal file
33
alevt-happy-abuild.diff
Normal file
@ -0,0 +1,33 @@
|
||||
--- alevt-1.6.1/edline.c.orig 1999-10-08 01:36:41.000000000 +0200
|
||||
+++ alevt-1.6.1/edline.c 2005-07-07 20:33:16.044929859 +0200
|
||||
@@ -87,7 +87,7 @@
|
||||
|
||||
while (n-- && el->len < (int)sizeof(el->buf)-1)
|
||||
{
|
||||
- if (*p >= 0x20 && *p <= 0x7e || *p >= 0xa0 && *p <= 0xff)
|
||||
+ if ((*p >= 0x20 && *p <= 0x7e) || *p >= 0xa0) // && *p <= 0xff)
|
||||
el->buf[el->len++] = *p;
|
||||
p++;
|
||||
}
|
||||
--- alevt-1.6.1/misc.h.orig 1999-07-14 21:54:30.000000000 +0200
|
||||
+++ alevt-1.6.1/misc.h 2005-07-07 20:30:42.871745007 +0200
|
||||
@@ -1,6 +1,8 @@
|
||||
#ifndef MISC_H
|
||||
#define MISC_H
|
||||
|
||||
+#include <string.h> /* strcmp */
|
||||
+
|
||||
//////////////////////////
|
||||
// generic macros/typedefs
|
||||
//////////////////////////
|
||||
--- alevt-1.6.1/Makefile.orig 2005-07-07 20:24:30.000000000 +0200
|
||||
+++ alevt-1.6.1/Makefile 2005-07-07 20:32:27.120493633 +0200
|
||||
@@ -40,7 +40,7 @@
|
||||
./bdf2xbm font2 <$(FONT)-latin-2.bdf >font2.xbm
|
||||
|
||||
bdf2xbm: bdf2xbm.c
|
||||
- $(CC) -O -s bdf2xbm.c -o bdf2xbm
|
||||
+ $(CC) $(OPT) bdf2xbm.c -o bdf2xbm
|
||||
|
||||
alevt.1x: alevt.1x.in
|
||||
sed s/VERSION/$(VER)/g <alevt.1x.in >alevt.1x
|
20
alevt-nosync.diff
Normal file
20
alevt-nosync.diff
Normal file
@ -0,0 +1,20 @@
|
||||
--- Makefile.orig 2003-10-13 14:10:55.000000000 +0200
|
||||
+++ Makefile 2003-10-13 14:14:19.000000000 +0200
|
||||
@@ -18,7 +18,7 @@
|
||||
endif
|
||||
|
||||
all: alevt alevt-date alevt-cap alevt.1x alevt-date.1 alevt-cap.1
|
||||
- sync
|
||||
+ : sync
|
||||
|
||||
alevt: $(OBJS)
|
||||
$(CC) $(OPT) $(OBJS) -o alevt -L/usr/X11R6/lib -L/usr/X11R6/lib64 -lX11 $(EXPLIBS)
|
||||
@@ -78,7 +78,7 @@
|
||||
install -m 0644 alevt-date.1 /usr/local/man/man1
|
||||
install -m 0644 alevt-cap.1 /usr/local/man/man1
|
||||
install -m 0644 contrib/mini-alevt.xpm /usr/include/X11/pixmaps
|
||||
- sync
|
||||
+ : sync
|
||||
|
||||
depend:
|
||||
makedepend -Y -- $(CFLAGS_none) -- *.c 2>/dev/null
|
359
alevt-overflow2.diff
Normal file
359
alevt-overflow2.diff
Normal file
@ -0,0 +1,359 @@
|
||||
diff -u alevt-1.6.1-orig/alevt-cap.c alevt-1.6.1/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
|
||||
@@ -216,6 +216,7 @@
|
||||
struct dl_head reqs[2]; // simple linear lists of requests & captures
|
||||
char *progname = NULL;
|
||||
int txtpid = -1;
|
||||
+ char *outfile = NULL;
|
||||
|
||||
setprgname(argv[0]);
|
||||
|
||||
@@ -301,7 +302,7 @@
|
||||
fatal("no pages requested");
|
||||
|
||||
// setup device
|
||||
- if (not(vbi = vbi_open(vbi_name, 0, fine_tune, newbttv, progname, txtpid)))
|
||||
+ if (not(vbi = vbi_open(vbi_name, 0, fine_tune, newbttv, progname, txtpid, outfile)))
|
||||
fatal("cannot open %s", vbi_name);
|
||||
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
|
||||
--- 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
|
||||
@@ -4,7 +4,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
-#include <time.h>
|
||||
|
||||
#include "os.h"
|
||||
#include "vt.h"
|
||||
@@ -149,10 +148,12 @@
|
||||
if (streq(*arg, opts[i].nam) || streq(*arg, opts[i].altnam))
|
||||
{
|
||||
if (opts[i].arg)
|
||||
+ {
|
||||
if (*ind < argc)
|
||||
*arg = argv[(*ind)++];
|
||||
else
|
||||
fatal("option %s requires an argument", *arg);
|
||||
+ }
|
||||
return i+1;
|
||||
}
|
||||
|
||||
@@ -176,11 +177,12 @@
|
||||
char *arg;
|
||||
char *progname = NULL;
|
||||
int txtpid = -1;
|
||||
+ char *outfile = NULL;
|
||||
|
||||
setprgname(argv[0]);
|
||||
|
||||
ind = 1;
|
||||
- while (opt = option(argc, argv, &ind, &arg))
|
||||
+ while ((opt = option(argc, argv, &ind, &arg)))
|
||||
switch (opt)
|
||||
{
|
||||
case 1: // -set
|
||||
@@ -239,7 +241,7 @@
|
||||
alarm(timeout);
|
||||
}
|
||||
|
||||
- vbi = vbi_open(vbi_name, 0, 1, big_buf, progname, txtpid); // open device
|
||||
+ vbi = vbi_open(vbi_name, 0, 1, big_buf, progname, txtpid, outfile); // open device
|
||||
if (not vbi)
|
||||
fatal_ioerror(vbi_name);
|
||||
|
||||
diff -u alevt-1.6.1-orig/alevt.1x.in alevt-1.6.1/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
|
||||
@@ -67,6 +67,15 @@
|
||||
in the selected set are replaced by similar looking symbols.
|
||||
(default: latin-1)
|
||||
.TP
|
||||
+.B \-progname (dvb only)
|
||||
+Selects the station name to display.
|
||||
+.TP
|
||||
+.B \-pid (dvb only)
|
||||
+Selects the station pid to display.
|
||||
+.TP
|
||||
+.B \-outfile (dvb only)
|
||||
+Specifies a file where the available stations are written.
|
||||
+.TP
|
||||
.B \-\-help
|
||||
Show summary of options.
|
||||
.TP
|
||||
@@ -89,6 +98,10 @@
|
||||
options requires a parent window. So, it must be preceeded by a parent
|
||||
or another child window.
|
||||
.PP
|
||||
+To access the DVB interface, use:
|
||||
+.IP
|
||||
+.I alevt -vbi /dev/dvb/adapter0/demux0
|
||||
+.PP
|
||||
When saving pages
|
||||
.B alevt
|
||||
asks for a format string. Look at
|
||||
diff -u alevt-1.6.1-orig/lang.h alevt-1.6.1/lang.h
|
||||
--- alevt-1.6.1-orig/lang.h 1999-06-28 23:08:08.000000000 +0200
|
||||
+++ alevt-1.6.1/lang.h 2005-04-15 20:54:11.000000000 +0200
|
||||
@@ -19,4 +19,4 @@
|
||||
void add_enhance(struct enhance *eh, int dcode, u32 *data);
|
||||
void enhance(struct enhance *eh, struct vt_page *vtp);
|
||||
|
||||
-#endif LANG_H
|
||||
+#endif
|
||||
diff -u alevt-1.6.1-orig/main.c alevt-1.6.1/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
|
||||
@@ -23,6 +23,7 @@
|
||||
static int newbttv = -1;
|
||||
static char *progname;
|
||||
static int txtpid = -1;
|
||||
+static char *outfile;
|
||||
|
||||
static void
|
||||
usage(FILE *fp, int exitval)
|
||||
@@ -43,8 +44,9 @@
|
||||
" -[no]erc\t\t\tenabled\n"
|
||||
" -[no]bell\t\t\tenabled\n"
|
||||
" -charset latin-1/2\t\tlatin-1\n"
|
||||
- " -progname name\n"
|
||||
- " -pid pid\n"
|
||||
+ " -progname <name>\n"
|
||||
+ " -pid <pid>\n"
|
||||
+ " -outfile <path>\n"
|
||||
"\n"
|
||||
" Order is important! Each page number\n"
|
||||
" opens a new window with the previously\n"
|
||||
@@ -65,6 +67,8 @@
|
||||
" The -progname or -pid option specify\n"
|
||||
" the program or teletext PID if using\n"
|
||||
" the DVB interface.\n"
|
||||
+ " The -outfile option specifies a file\n"
|
||||
+ " where the available stations are written\n"
|
||||
);
|
||||
exit(exitval);
|
||||
}
|
||||
@@ -95,7 +99,7 @@
|
||||
start(int argc, char **argv, struct vtwin *parent, int pgno, int subno)
|
||||
{
|
||||
if (vbi == 0)
|
||||
- vbi = vbi_open(vbi_name, cache_open(), fine_tune, newbttv, progname, txtpid);
|
||||
+ vbi = vbi_open(vbi_name, cache_open(), fine_tune, newbttv, progname, txtpid, outfile);
|
||||
if (vbi == 0)
|
||||
fatal("cannot open %s", vbi_name);
|
||||
if (vbi->cache)
|
||||
@@ -137,6 +141,7 @@
|
||||
{ "-charset", "-latin", 1 },
|
||||
{ "-progname", "-pn", 1 },
|
||||
{ "-pid", "--pid", 1 },
|
||||
+ { "-outfile", "-of", 1 },
|
||||
};
|
||||
int i;
|
||||
|
||||
@@ -261,6 +266,9 @@
|
||||
parent = start(argc, argv, 0, pgno, subno);
|
||||
geometry = 0;
|
||||
break;
|
||||
+ case 21:
|
||||
+ outfile = arg;
|
||||
+ break;
|
||||
}
|
||||
|
||||
if (parent == 0)
|
||||
diff -u alevt-1.6.1-orig/main.c.orig alevt-1.6.1/main.c.orig
|
||||
--- alevt-1.6.1-orig/main.c.orig 2002-08-20 05:07:04.000000000 +0200
|
||||
+++ alevt-1.6.1/main.c.orig 2005-04-15 20:54:11.000000000 +0200
|
||||
@@ -21,7 +21,9 @@
|
||||
static int fine_tune = 1; // auto = 999;
|
||||
static int erc = 1;
|
||||
static int newbttv = -1;
|
||||
-
|
||||
+static char *progname;
|
||||
+static int txtpid = -1;
|
||||
+static char *outfile;
|
||||
|
||||
static void
|
||||
usage(FILE *fp, int exitval)
|
||||
@@ -42,6 +44,9 @@
|
||||
" -[no]erc\t\t\tenabled\n"
|
||||
" -[no]bell\t\t\tenabled\n"
|
||||
" -charset latin-1/2\t\tlatin-1\n"
|
||||
+ " -progname name\n"
|
||||
+ " -pid pid\n"
|
||||
+ " -outfile path\n"
|
||||
"\n"
|
||||
" Order is important! Each page number\n"
|
||||
" opens a new window with the previously\n"
|
||||
@@ -55,6 +60,15 @@
|
||||
" The -child option requires a parent\n"
|
||||
" window. So, it must be preceeded by\n"
|
||||
" a parent or another child window.\n"
|
||||
+ "\n"
|
||||
+ " To use the DVB interface, use\n"
|
||||
+ " -vbi /dev/dvb/adapter0/demux0\n"
|
||||
+ "\n"
|
||||
+ " The -progname or -pid option specify\n"
|
||||
+ " the program or teletext PID if using\n"
|
||||
+ " the DVB interface.\n"
|
||||
+ " The -outfile option specifies a file\n"
|
||||
+ " where the available stations are written \n"
|
||||
);
|
||||
exit(exitval);
|
||||
}
|
||||
@@ -85,7 +99,7 @@
|
||||
start(int argc, char **argv, struct vtwin *parent, int pgno, int subno)
|
||||
{
|
||||
if (vbi == 0)
|
||||
- vbi = vbi_open(vbi_name, cache_open(), fine_tune, newbttv);
|
||||
+ vbi = vbi_open(vbi_name, cache_open(), fine_tune, newbttv, progname, txtpid, outfile);
|
||||
if (vbi == 0)
|
||||
fatal("cannot open %s", vbi_name);
|
||||
if (vbi->cache)
|
||||
@@ -125,6 +139,9 @@
|
||||
{ "-bell", "-b", 0 },
|
||||
{ "-nobell", "-nb", 0 },
|
||||
{ "-charset", "-latin", 1 },
|
||||
+ { "-progname", "-pn", 1 },
|
||||
+ { "-pid", "--pid", 1 },
|
||||
+ { "-outfile", "-of", 1 },
|
||||
};
|
||||
int i;
|
||||
|
||||
@@ -237,12 +254,21 @@
|
||||
case 12: // debug
|
||||
debug++;
|
||||
break;
|
||||
+ case 19: // progname
|
||||
+ progname = arg;
|
||||
+ break;
|
||||
+ case 20: // pid
|
||||
+ txtpid = strtoul(arg, NULL, 0);
|
||||
+ break;
|
||||
case 6: // parent
|
||||
case -1: // non-option arg
|
||||
pgno = arg_pgno(arg, &subno);
|
||||
parent = start(argc, argv, 0, pgno, subno);
|
||||
geometry = 0;
|
||||
break;
|
||||
+ case 21:
|
||||
+ outfile = arg;
|
||||
+ break;
|
||||
}
|
||||
|
||||
if (parent == 0)
|
||||
diff -u alevt-1.6.1-orig/vbi.c alevt-1.6.1/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
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "lang.h"
|
||||
|
||||
|
||||
-static int vbi_dvb_open(struct vbi *vbi, const char *vbi_name, const char *progname, int txtpid);
|
||||
+static int vbi_dvb_open(struct vbi *vbi, const char *vbi_name, const char *progname, int txtpid, const char *outfile);
|
||||
static void dvb_handler(struct vbi *vbi, int fd);
|
||||
|
||||
#define FAC (1<<16) // factor for fix-point arithmetic
|
||||
@@ -586,7 +586,7 @@
|
||||
|
||||
|
||||
struct vbi *
|
||||
-vbi_open(char *vbi_name, struct cache *ca, int fine_tune, int big_buf, const char *progname, int txtpid)
|
||||
+vbi_open(char *vbi_name, struct cache *ca, int fine_tune, int big_buf, const char *progname, int txtpid, const char *outfile)
|
||||
{
|
||||
static int inited = 0;
|
||||
struct vbi *vbi;
|
||||
@@ -601,7 +601,7 @@
|
||||
goto fail1;
|
||||
}
|
||||
|
||||
- if (!vbi_dvb_open(vbi, vbi_name, progname, txtpid)) {
|
||||
+ if (!vbi_dvb_open(vbi, vbi_name, progname, txtpid, outfile)) {
|
||||
vbi->cache = ca;
|
||||
|
||||
dl_init(vbi->clients);
|
||||
@@ -627,6 +627,18 @@
|
||||
|
||||
vbi->cache = ca;
|
||||
|
||||
+ if (outfile) {
|
||||
+ FILE * outstr;
|
||||
+ outstr = fopen (outfile,"w");
|
||||
+ if (outstr!=NULL)
|
||||
+ {
|
||||
+ fputs ("This works only with dvb",outstr);
|
||||
+ fclose (outstr);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+
|
||||
dl_init(vbi->clients);
|
||||
vbi->seq = 0;
|
||||
out_of_sync(vbi);
|
||||
@@ -852,7 +864,7 @@
|
||||
memmove(rawbuf, rawbuf + len, rawptr);
|
||||
}
|
||||
|
||||
-static int vbi_dvb_open(struct vbi *vbi, const char *vbi_name, const char *progname, int txtpid)
|
||||
+static int vbi_dvb_open(struct vbi *vbi, const char *vbi_name, const char *progname, int txtpid, const char *outfile)
|
||||
{
|
||||
struct {
|
||||
u_int16_t pmtpid;
|
||||
@@ -904,7 +916,7 @@
|
||||
for (i = 0; i < (unsigned)r; i += 4) {
|
||||
if (progcnt >= sizeof(progtbl)/sizeof(progtbl[0])) {
|
||||
error("Program table overflow");
|
||||
- goto outerr;
|
||||
+ break;
|
||||
}
|
||||
progtbl[progcnt].service_id = (tbl[8 + i] << 8) | tbl[9 + i];
|
||||
if (!progtbl[progcnt].service_id) /* this is the NIT pointer */
|
||||
@@ -1011,6 +1023,21 @@
|
||||
progtbl[i].txttype, progtbl[i].txtmagazine, progtbl[i].txtpage);
|
||||
}
|
||||
|
||||
+
|
||||
+ if (outfile) {
|
||||
+ FILE * outstr;
|
||||
+ outstr = fopen(outfile,"wt");
|
||||
+ for (i = 0; i < progcnt; i++) {
|
||||
+ if (progtbl[i].txtpid != 0x1fff) {
|
||||
+ fprintf (outstr,"Provider: %s ", progtbl[i].service_provider_name);
|
||||
+ fprintf (outstr,"Sender: \t%s ", progtbl[i].service_name);
|
||||
+ fprintf (outstr,"PID: 0x%04x", progtbl[i].txtpid);
|
||||
+ fputs ("\n",outstr);
|
||||
+ }
|
||||
+ }
|
||||
+ fclose(outstr);
|
||||
+ }
|
||||
+
|
||||
progp = NULL;
|
||||
if (progname) {
|
||||
j = strlen(progname);
|
||||
diff -u alevt-1.6.1-orig/vbi.h alevt-1.6.1/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
|
||||
@@ -51,7 +51,7 @@
|
||||
};
|
||||
|
||||
struct vbi *vbi_open(char *vbi_dev_name, struct cache *ca, int fine_tune,
|
||||
- int big_buf, const char *progname, int txtpid);
|
||||
+ int big_buf, const char *progname, int txtpid, const char *outfile);
|
||||
void vbi_close(struct vbi *vbi);
|
||||
void vbi_reset(struct vbi *vbi);
|
||||
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
|
||||
--- 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
|
||||
@@ -379,7 +379,7 @@
|
||||
return;
|
||||
|
||||
strcpy(xw->title, title);
|
||||
- sprintf(buf, "AleVT " VERSION " %s", xw->title);
|
||||
+ sprintf(buf, "AleVT-dvb " VERSION " %s", xw->title);
|
||||
XStoreName(xw->xio->dpy, xw->win, buf);
|
||||
XSetIconName(xw->xio->dpy, xw->win, xw->title);
|
||||
}
|
28
alevt-xio.patch
Normal file
28
alevt-xio.patch
Normal file
@ -0,0 +1,28 @@
|
||||
--- alevt-1.6.1/xio.c.xx 2005-01-23 17:08:25.815613825 +0100
|
||||
+++ alevt-1.6.1/xio.c 2005-01-23 17:08:45.425366954 +0100
|
||||
@@ -31,11 +31,11 @@
|
||||
|
||||
static struct dl_head dpys[1]; /* list of all displays */
|
||||
|
||||
+static void xio_timer();
|
||||
|
||||
static int
|
||||
timer_init(int argc, char **argv)
|
||||
{
|
||||
- static void xio_timer();
|
||||
int p[2], timer_pid, i;
|
||||
|
||||
if (pipe(p) == -1)
|
||||
@@ -156,11 +156,11 @@
|
||||
|
||||
|
||||
|
||||
+static void handle_event(); //forward ref
|
||||
struct xio *
|
||||
xio_open_dpy(char *dpy, int argc, char **argv)
|
||||
{
|
||||
XClassHint classhint[1];
|
||||
- static void handle_event(); //forward ref
|
||||
struct xio *xio;
|
||||
|
||||
if (local_init(argc, argv) == -1)
|
44
alevt-xorg-makefile.diff
Normal file
44
alevt-xorg-makefile.diff
Normal file
@ -0,0 +1,44 @@
|
||||
--- alevt-1.6.1/Makefile.orig 2006-07-28 13:20:39.000000000 +0200
|
||||
+++ alevt-1.6.1/Makefile 2006-07-28 13:21:18.000000000 +0200
|
||||
@@ -7,6 +7,8 @@
|
||||
#FONT=neep9
|
||||
+ USR_X11R6_DIR=/usr/X11R6
|
||||
+ MAN_DIR=man
|
||||
|
||||
-CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I/usr/X11R6/include -I/usr/local/include -W
|
||||
+CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6_DIR)/include -I/usr/local/include -W
|
||||
|
||||
EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o
|
||||
OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS)
|
||||
@@ -22,7 +22,7 @@
|
||||
: sync
|
||||
|
||||
alevt: $(OBJS)
|
||||
- $(CC) $(OPT) $(OBJS) -o alevt -L/usr/X11R6/lib -L/usr/X11R6/lib64 -lX11 $(EXPLIBS)
|
||||
+ $(CC) $(OPT) $(OBJS) -o alevt -L$(USR_X11R6_DIR)/lib -L$(USR_X11R6_DIR)/lib64 -lX11 $(EXPLIBS)
|
||||
|
||||
alevt-date: $(TOBJS)
|
||||
$(CC) $(OPT) $(TOBJS) -o alevt-date
|
||||
@@ -60,14 +60,14 @@
|
||||
rm -f alevt.html
|
||||
|
||||
rpm-install: all
|
||||
- install -m 0755 alevt ${RPM_BUILD_ROOT}/usr/X11R6/bin
|
||||
- install -m 0755 alevt-date ${RPM_BUILD_ROOT}/usr/X11R6/bin
|
||||
- install -m 0755 alevt-cap ${RPM_BUILD_ROOT}/usr/X11R6/bin
|
||||
- install -m 0644 alevt.1x ${RPM_BUILD_ROOT}/usr/X11R6/man/man1
|
||||
- install -m 0644 alevt-date.1 ${RPM_BUILD_ROOT}/usr/X11R6/man/man1
|
||||
- install -m 0644 alevt-cap.1 ${RPM_BUILD_ROOT}/usr/X11R6/man/man1
|
||||
- install -m 0755 -d ${RPM_BUILD_ROOT}/usr/X11R6/include/X11/pixmaps
|
||||
- install -m 0644 contrib/mini-alevt.xpm ${RPM_BUILD_ROOT}/usr/X11R6/include/X11/pixmaps
|
||||
+ install -m 0755 alevt ${RPM_BUILD_ROOT}$(USR_X11R6_DIR)/bin
|
||||
+ install -m 0755 alevt-date ${RPM_BUILD_ROOT}$(USR_X11R6_DIR)/bin
|
||||
+ install -m 0755 alevt-cap ${RPM_BUILD_ROOT}$(USR_X11R6_DIR)/bin
|
||||
+ install -m 0644 alevt.1x ${RPM_BUILD_ROOT}$(USR_X11R6_DIR)/$(MAN_DIR)/man1
|
||||
+ install -m 0644 alevt-date.1 ${RPM_BUILD_ROOT}$(USR_X11R6_DIR)/$(MAN_DIR)/man1
|
||||
+ install -m 0644 alevt-cap.1 ${RPM_BUILD_ROOT}$(USR_X11R6_DIR)/$(MAN_DIR)/man1
|
||||
+ install -m 0755 -d ${RPM_BUILD_ROOT}$(USR_X11R6_DIR)/include/X11/pixmaps
|
||||
+ install -m 0644 contrib/mini-alevt.xpm ${RPM_BUILD_ROOT}$(USR_X11R6_DIR)/include/X11/pixmaps
|
||||
|
||||
# anything below this line is just for me!
|
||||
|
121
alevt.changes
Normal file
121
alevt.changes
Normal file
@ -0,0 +1,121 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 5 14:35:51 CEST 2006 - jw@suse.de
|
||||
|
||||
- fixed #203118, making -Wold-style-definition happy.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 28 13:50:06 CEST 2006 - jw@suse.de
|
||||
|
||||
- made xorg-safe.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 25 21:34:09 CET 2006 - mls@suse.de
|
||||
|
||||
- converted neededforbuild to BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 7 20:34:40 CEST 2005 - jw@suse.de
|
||||
|
||||
- revamped gcc4.diff into happy-abuild.diff
|
||||
Avoid imlicit declarations and add RPM_OPT_FLAGS where needed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 4 12:29:25 CEST 2005 - jw@suse.de
|
||||
|
||||
- added alevt-gcc4.diff, comparison is always true suppression.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 19 14:52:21 CEST 2005 - jw@suse.de
|
||||
|
||||
- changes by tsaupe@suse.de documented in usage and man.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 14 19:16:57 CEST 2005 - jw@suse.de
|
||||
|
||||
- added alevt-overflow.diff by tsaupe@suse.de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 23 17:16:44 CET 2005 - meissner@suse.de
|
||||
|
||||
- use RPM_OPT_FLAGS, fixed compile error with gcc4.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 19 11:30:18 CET 2004 - ro@suse.de
|
||||
|
||||
- include icon in filelist
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 9 18:24:42 CET 2004 - jw@suse.de
|
||||
|
||||
- added http://www.baycom.org/~tom/alevt-dvb-demux.patch
|
||||
suggested by tsaupe@suse.de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 11 11:09:23 CET 2004 - adrian@suse.de
|
||||
|
||||
- build as user
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 13 14:23:37 CEST 2003 - jw@suse.de
|
||||
|
||||
- make shall not sync (#32147)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 16 15:33:50 CEST 2003 - adrian@suse.de
|
||||
|
||||
- install desktop file from kappfinder
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 27 12:02:42 CEST 2003 - coolo@suse.de
|
||||
|
||||
- use BuildRoot
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 19 09:04:11 CEST 2003 - wengel@suse.de
|
||||
|
||||
- update -> 1.6.1 (fixed bug in ui.c and more)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 17 17:34:28 CEST 2002 - ro@suse.de
|
||||
|
||||
- removed bogus self-provides
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 5 20:23:50 CEST 2002 - uli@suse.de
|
||||
|
||||
- update -> 1.6.0 (png export, v4l2 interface & more)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 24 12:48:43 CEST 2002 - uli@suse.de
|
||||
|
||||
- fixed for lib64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 7 12:00:50 CET 2001 - uli@suse.de
|
||||
|
||||
- fixed for glibc 2.2.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 9 17:34:21 MET 2000 - nashif@suse.de
|
||||
|
||||
- sorted group
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 2 10:35:51 CEST 2000 - kukuk@suse.de
|
||||
|
||||
- Use doc macro
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de
|
||||
|
||||
- ran old prepare_spec on spec file to switch to new prepare_spec.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 14 16:45:33 MEST 1999 - uli@suse.de
|
||||
|
||||
- New version 1.4.9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 14 16:32:29 MEST 1999 - uli@suse.de
|
||||
|
||||
- Spec file created from alevt-1.4.9.tar.gz by autospec
|
139
alevt.spec
Normal file
139
alevt.spec
Normal file
@ -0,0 +1,139 @@
|
||||
#
|
||||
# spec file for package alevt (Version 1.6.1)
|
||||
#
|
||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
Name: alevt
|
||||
%{expand:%%global _prefix %(pkg-config --variable prefix x11 || echo /usr/X11R6)}
|
||||
%if "%_prefix" == "/usr/X11R6"
|
||||
%define _man_dir man
|
||||
%else
|
||||
%define _man_dir share/man
|
||||
%endif
|
||||
BuildRequires: libpng-devel pkgconfig update-desktop-files xorg-x11-devel
|
||||
URL: http://www.goron.de/~froese/
|
||||
License: GPL
|
||||
Group: Hardware/TV
|
||||
Autoreqprov: on
|
||||
Summary: Teletext and Videotext Decoder for the BTTV Driver
|
||||
Version: 1.6.1
|
||||
Release: 223
|
||||
Source0: alevt-%version.tar.bz2
|
||||
Patch0: alevt-%version.dif
|
||||
Patch1: alevt-nosync.diff
|
||||
Patch2: alevt-1.6.0-dvb-demux.patch
|
||||
Patch3: alevt-xio.patch
|
||||
Patch4: alevt-overflow2.diff
|
||||
Patch5: alevt-happy-abuild.diff
|
||||
Patch6: alevt-xorg-makefile.diff
|
||||
Patch7: alevt-KnR.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
AleVT is a teletext and videotext decoder and browser for the BTTV
|
||||
driver (/dev/vbi) and the X Window System. It features multiple
|
||||
windows, a page cache, regexp searching, a built-in manual, and more.
|
||||
There is also a program to get the time from teletext.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Edgar Toernig <froese@gmx.de>
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P 0 -E
|
||||
%patch1 -p0
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
|
||||
%build
|
||||
make OPT="$RPM_OPT_FLAGS"
|
||||
|
||||
%install
|
||||
echo "Using _prefix=%{_prefix} _man_dir=%{_man_dir}"
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin $RPM_BUILD_ROOT%{_prefix}/%{_man_dir}/man1
|
||||
make rpm-install USR_X11R6_DIR=%{_prefix} MAN_DIR=%{_man_dir}
|
||||
%suse_update_desktop_file -i alevt AudioVideo TV
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc CHANGELOG COPYRIGHT README
|
||||
%dir %{_prefix}/include/X11/pixmaps
|
||||
/usr/share/applications/*.desktop
|
||||
/usr/share/pixmaps/alevt.png
|
||||
%{_prefix}/bin/alevt
|
||||
%{_prefix}/bin/alevt-cap
|
||||
%{_prefix}/bin/alevt-date
|
||||
%{_prefix}/include/X11/pixmaps/mini-alevt.xpm
|
||||
%doc %{_prefix}/%{_man_dir}/man1/alevt-cap.1.gz
|
||||
%doc %{_prefix}/%{_man_dir}/man1/alevt-date.1.gz
|
||||
%doc %{_prefix}/%{_man_dir}/man1/alevt.1x.gz
|
||||
|
||||
%changelog -n alevt
|
||||
* 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
|
Loading…
x
Reference in New Issue
Block a user