diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2006-01-03 23:18:20 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2006-01-03 23:18:20 +0000 |
| commit | 483562f267f0c2fe4adc78718adf56960525de4d (patch) | |
| tree | 930ec73e6f90d88083b9711b288a0d4950eac493 /pkgs/applications/video/xawtv | |
| parent | f6e4235c6b75135221df7600b3f5419a4a85eb1f (diff) | |
| download | nixlib-483562f267f0c2fe4adc78718adf56960525de4d.tar nixlib-483562f267f0c2fe4adc78718adf56960525de4d.tar.gz nixlib-483562f267f0c2fe4adc78718adf56960525de4d.tar.bz2 nixlib-483562f267f0c2fe4adc78718adf56960525de4d.tar.lz nixlib-483562f267f0c2fe4adc78718adf56960525de4d.tar.xz nixlib-483562f267f0c2fe4adc78718adf56960525de4d.tar.zst nixlib-483562f267f0c2fe4adc78718adf56960525de4d.zip | |
add xawtv. This version uses the new X libs and won't build the way this
one is built with the old libs. Maybe we should switch now ;) svn path=/nixpkgs/trunk/; revision=4487
Diffstat (limited to 'pkgs/applications/video/xawtv')
| -rw-r--r-- | pkgs/applications/video/xawtv/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch | 22 | ||||
| -rw-r--r-- | pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch | 14 |
3 files changed, 48 insertions, 0 deletions
diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix new file mode 100644 index 000000000000..aaa83ccc1449 --- /dev/null +++ b/pkgs/applications/video/xawtv/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, libXft, xproto, libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto}: + +stdenv.mkDerivation { + name = "xawtv-3.95"; + src = fetchurl { + url = http://dl.bytesex.org/releases/xawtv/xawtv-3.95.tar.gz; + md5 = "ad25e03f7e128b318e392cb09f52207d"; + }; + buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS fontsproto libXaw libXpm libXext libSM libICE perl xextproto]; + patches = [./xawtv-3.95-libfs.patch ./xawtv-3.95-makefile.patch]; + +} diff --git a/pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch b/pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch new file mode 100644 index 000000000000..4555f1058672 --- /dev/null +++ b/pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch @@ -0,0 +1,22 @@ +diff -ruN xawtv-3.95/console/fs.h xawtv-3.95.new/console/fs.h +--- xawtv-3.95/console/fs.h 2003-02-14 15:14:04.000000000 +0100 ++++ xawtv-3.95.new/console/fs.h 2006-01-03 22:16:06.000000000 +0100 +@@ -1,5 +1,5 @@ + #ifndef X_DISPLAY_MISSING +-# include <FSlib.h> ++# include <X11/fonts/FSlib.h> + + struct fs_font { + Font font; +diff -ruN xawtv-3.95/console/Subdir.mk xawtv-3.95.new/console/Subdir.mk +--- xawtv-3.95/console/Subdir.mk 2003-02-14 15:14:04.000000000 +0100 ++++ xawtv-3.95.new/console/Subdir.mk 2006-01-03 22:32:38.000000000 +0100 +@@ -74,7 +74,7 @@ + # libraries to link + console/fbtv : LDLIBS += \ + $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \ +- $(FS_LIBS) -ljpeg -lm ++ $(FS_LIBS) -ljpeg -lm -lFS + console/ttv : LDLIBS += $(THREAD_LIBS) $(AA_LIBS) -ljpeg -lm + console/scantv : LDLIBS += $(THREAD_LIBS) $(VBI_LIBS) -ljpeg + console/streamer : LDLIBS += $(THREAD_LIBS) -ljpeg -lm diff --git a/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch b/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch new file mode 100644 index 000000000000..a1d5589b535a --- /dev/null +++ b/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch @@ -0,0 +1,14 @@ +diff -ruN xawtv-3.95/Makefile.in xawtv-3.95.new/Makefile.in +--- xawtv-3.95/Makefile.in 2004-04-22 16:52:29.000000000 +0200 ++++ xawtv-3.95.new/Makefile.in 2006-01-04 00:15:04.000000000 +0100 +@@ -2,8 +2,8 @@ + VPATH := $(srcdir) + + # for package builds (buildroot install + no root privs needed) +-DESTDIR= +-SUID_ROOT=-m4755 -o root ++DESTDIR=$(out) ++SUID_ROOT= + + # install paths + prefix := @prefix@ |