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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alevt?expand=0&rev=3

Browse Source
This commit is contained in:
OBS User unknown 2008-01-30 20:52:29 +00:00 committed by Git OBS Bridge
parent 44373dc227
commit f0c77f0c4c
11 changed files with 50 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
alevt-1.6.1.dif
View File

@ -1,30 +0,0 @@
--- 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
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:62366267f269e6b7d5edbccfdcac33237423234b97b0d2eef8f88efa13d5ed9f
size 97153

3
alevt-1.6.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3e3bdb9a66885dc78a22681b1b3486cf484383052362ffac9b1f5345f1fd21f1
size 115848

11
alevt-KnR.patch
View File

@ -1,11 +0,0 @@
--- 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;

4
alevt-happy-abuild.diff
View File

@ -26,8 +26,8 @@
./bdf2xbm font2 <$(FONT)-latin-2.bdf >font2.xbm
bdf2xbm: bdf2xbm.c
- $(CC) -O -s bdf2xbm.c -o bdf2xbm
+ $(CC) $(OPT) bdf2xbm.c -o bdf2xbm
- $(HOSTCC) bdf2xbm.c -o bdf2xbm
+ $(HOSTCC) $(OPT) bdf2xbm.c -o bdf2xbm
alevt.1x: alevt.1x.in
sed s/VERSION/$(VER)/g <alevt.1x.in >alevt.1x

20
alevt-nosync.diff
View File

@ -1,20 +0,0 @@
--- 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

98
alevt-overflow2.diff
View File

@ -21,14 +21,6 @@ diff -u alevt-1.6.1-orig/alevt-cap.c alevt-1.6.1/alevt-cap.c
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))
{
@ -95,15 +87,6 @@ diff -u alevt-1.6.1-orig/alevt.1x.in alevt-1.6.1/alevt.1x.in
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
@ -159,87 +142,6 @@ diff -u alevt-1.6.1-orig/main.c alevt-1.6.1/main.c
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;
}

28
alevt-xio.patch
View File

@ -1,28 +0,0 @@
--- 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
View File

@ -1,44 +0,0 @@
--- 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!

8
alevt.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jan 30 21:35:12 CET 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 5 12:45:41 CEST 2007 - coolo@suse.de

79
alevt.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package alevt (Version 1.6.1)
# spec file for package alevt (Version 1.6.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 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.
#
@ -18,24 +18,19 @@ Name: alevt
%define _man_dir share/man
%endif
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
Group: Hardware/TV
Autoreqprov: on
AutoReqProv: on
Summary: Teletext and Videotext Decoder for the BTTV Driver
Version: 1.6.1
Release: 281
Version: 1.6.2
Release: 1
Source0: alevt-%version.tar.bz2
Source1: alevt.desktop
Source2: alevt.png
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
@ -52,14 +47,9 @@ Authors:
%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"
@ -68,7 +58,7 @@ make OPT="$RPM_OPT_FLAGS"
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}
make rpm-install USR_X11R6=%{_prefix} MAN=%{_man_dir}
%suse_update_desktop_file -i alevt AudioVideo TV
%clean
@ -89,55 +79,60 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_prefix}/%{_man_dir}/man1/alevt.1x.gz
%changelog
* Thu Jul 05 2007 - coolo@suse.de
* 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
* Tue Sep 05 2006 jw@suse.de
- fixed #203118, making -Wold-style-definition happy.
* Fri Jul 28 2006 - jw@suse.de
* Fri Jul 28 2006 jw@suse.de
- made xorg-safe.
* Wed Jan 25 2006 - mls@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Jul 07 2005 - jw@suse.de
* 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
* Mon Jul 04 2005 jw@suse.de
- added alevt-gcc4.diff, comparison is always true suppression.
* Tue Apr 19 2005 - jw@suse.de
* Tue Apr 19 2005 jw@suse.de
- changes by tsaupe@suse.de documented in usage and man.
* Thu Apr 14 2005 - jw@suse.de
* Thu Apr 14 2005 jw@suse.de
- added alevt-overflow.diff by tsaupe@suse.de
* Sun Jan 23 2005 - meissner@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
* Fri Nov 19 2004 ro@suse.de
- include icon in filelist
* Tue Nov 09 2004 - jw@suse.de
* 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
* Sun Jan 11 2004 adrian@suse.de
- build as user
* Mon Oct 13 2003 - jw@suse.de
* Mon Oct 13 2003 jw@suse.de
- make shall not sync (#32147)
* Sat Aug 16 2003 - adrian@suse.de
* Sat Aug 16 2003 adrian@suse.de
- install desktop file from kappfinder
* Tue May 27 2003 - coolo@suse.de
* Tue May 27 2003 coolo@suse.de
- use BuildRoot
* Mon May 19 2003 - wengel@suse.de
* 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
* Tue Sep 17 2002 ro@suse.de
- removed bogus self-provides
* Wed Jun 05 2002 - uli@suse.de
* Wed Jun 05 2002 uli@suse.de
- update -> 1.6.0 (png export, v4l2 interface & more)
* Wed Apr 24 2002 - uli@suse.de
* Wed Apr 24 2002 uli@suse.de
- fixed for lib64
* Wed Feb 07 2001 - uli@suse.de
* Wed Feb 07 2001 uli@suse.de
- fixed for glibc 2.2.1
* Sat Dec 09 2000 - nashif@suse.de
* Sat Dec 09 2000 nashif@suse.de
- sorted group
* Fri Jun 02 2000 - kukuk@suse.de
* Fri Jun 02 2000 kukuk@suse.de
- Use doc macro
* Mon Sep 13 1999 - bs@suse.de
* 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
* Wed Jul 14 1999 uli@suse.de
- New version 1.4.9
* Wed Jul 14 1999 - uli@suse.de
* Wed Jul 14 1999 uli@suse.de
- Spec file created from alevt-1.4.9.tar.gz by autospec