ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

add xawtv. This version uses the new X libs and won't build the way this

Browse Source 
one is built with the old libs. Maybe we should switch now ;)

svn path=/nixpkgs/trunk/; revision=4487
This commit is contained in:
Armijn Hemel 2006-01-03 23:18:20 +00:00
parent f6e4235c6b
commit 483562f267
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/video/xawtv/default.nix Normal file
View File

@ -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];
}

22
pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch Normal file
View File

@ -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

14
pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch Normal file
View File

@ -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@