Fix build failure on Linux (PR 37544). Approved by wiz@

9 files changed, 62 insertions, 9 deletions

diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 24effbf61b7..48b7d45391d 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2011/07/03 18:16:19 dholland Exp $
+# $NetBSD: Makefile,v 1.29 2011/08/13 04:43:51 cheusov Exp $
 #
 
 DISTNAME=	xawtv-3.95
@@ -43,10 +43,15 @@ PKG_SUPPORTED_OPTIONS=	mmx
 CONFIGURE_ARGS+=	--enable-mmx
 .endif
 
+CFLAGS+=		-I${X11BASE}/include/X11/fonts
+
+MAKE_FLAGS+=		SUID_ROOT= FS_LIBS=-lFS
+
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/Xaw3d/buildlink3.mk"
+.include "../../x11/libFS/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
diff --git a/multimedia/xawtv/PLIST b/multimedia/xawtv/PLIST
index 13a5439c1ae..6bb3438fb4c 100644
--- a/multimedia/xawtv/PLIST
+++ b/multimedia/xawtv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 20:53:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/08/13 04:43:51 cheusov Exp $
 bin/dump-mixers
 bin/ntsc-cc
 bin/pia
@@ -17,7 +17,6 @@ lib/X11/app-defaults/Xawtv
 lib/xawtv/bilinear.so
 lib/xawtv/conv-mjpeg.so
 lib/xawtv/cubic.so
-lib/xawtv/drv0-bsd.so
 lib/xawtv/flt-disor.so
 lib/xawtv/flt-gamma.so
 lib/xawtv/flt-invert.so
diff --git a/multimedia/xawtv/PLIST.Linux b/multimedia/xawtv/PLIST.Linux
new file mode 100644
index 00000000000..6c85ea1cf84
--- /dev/null
+++ b/multimedia/xawtv/PLIST.Linux
@@ -0,0 +1,10 @@
+@comment $NetBSD@
+bin/fbtv
+bin/radio
+bin/v4l-conf
+bin/v4l-info
+lib/xawtv/drv0-v4l2-old.so
+lib/xawtv/drv0-v4l2.so
+lib/xawtv/drv1-v4l.so
+man/es/man1/v4lctl.1
+man/es/man8/v4l-conf.8
diff --git a/multimedia/xawtv/PLIST.NetBSD b/multimedia/xawtv/PLIST.NetBSD
new file mode 100644
index 00000000000..bb58523aec2
--- /dev/null
+++ b/multimedia/xawtv/PLIST.NetBSD
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.1 2011/08/13 04:43:51 cheusov Exp $
+lib/xawtv/drv0-bsd.so
diff --git a/multimedia/xawtv/distinfo b/multimedia/xawtv/distinfo
index 191eabe1ac3..6cf2627a70f 100644
--- a/multimedia/xawtv/distinfo
+++ b/multimedia/xawtv/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.4 2006/01/18 21:03:26 joerg Exp $
+$NetBSD: distinfo,v 1.5 2011/08/13 04:43:51 cheusov Exp $
 
 SHA1 (xawtv-3.95.tar.gz) = 0b0743fc06aae4f1a03c8572bcf2baa9b869ff52
 RMD160 (xawtv-3.95.tar.gz) = 1dc7b564bec0515cc409c723904ec9c6f8dae998
 Size (xawtv-3.95.tar.gz) = 555731 bytes
 SHA1 (patch-aa) = 7d2302727681383de7ca447e60f200bfcae73445
-SHA1 (patch-ab) = bd6e07044155ba7fbfc45c3cab5c4ea2c57ac2e5
+SHA1 (patch-ab) = c296973f8b8a02a8216125ca65176344725a2a7f
 SHA1 (patch-ac) = 7c244761e5174674366aba979506965da7ba9ae6
 SHA1 (patch-ad) = f906ff30449dd7c12883f6ad53d2aa4951a99898
-SHA1 (patch-af) = 0034d4bbc95f1f8a36ce54a37726fe69f53832b7
+SHA1 (patch-af) = a1bf023726ce4d6654631e2f05a4c5cf2600f52f
+SHA1 (patch-console_fbtools.c) = 29efd0d525e455059979a23b58546d90c8bb6256
+SHA1 (patch-console_matrox.c) = f30eddcd78e1ba8c099b10404d544e41a05c5579
diff --git a/multimedia/xawtv/patches/patch-ab b/multimedia/xawtv/patches/patch-ab
index b2d6f3eaa50..a26dadac5a4 100644
--- a/multimedia/xawtv/patches/patch-ab
+++ b/multimedia/xawtv/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 11:39:14 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2011/08/13 04:43:51 cheusov Exp $
 
---- Makefile.in.orig	2003-04-12 20:00:30.000000000 +0200
+--- Makefile.in.orig	2004-04-22 14:52:29.000000000 +0000
 +++ Makefile.in
 @@ -84,7 +84,7 @@ CXXFLAGS := $(CFLAGS)
  %.so : CXXFLAGS += -fPIC
diff --git a/multimedia/xawtv/patches/patch-af b/multimedia/xawtv/patches/patch-af
index e2288e1b725..ed98a70e8cb 100644
--- a/multimedia/xawtv/patches/patch-af
+++ b/multimedia/xawtv/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2006/01/23 14:28:18 joerg Exp $
+$NetBSD: patch-af,v 1.2 2011/08/13 04:43:51 cheusov Exp $
 
 --- libng/devices.c.orig	2006-01-17 22:21:30.000000000 +0100
 +++ libng/devices.c
@@ -12,3 +12,12 @@ $NetBSD: patch-af,v 1.1 2006/01/23 14:28:18 joerg Exp $
  struct ng_device_config ng_dev = {
      video:  "/dev/bktr0",
      radio:  NULL,
+@@ -15,7 +15,7 @@ struct ng_device_config ng_dev = {
+     video:  "/dev/bktr0",
+     radio:  NULL,
+     vbi:    "/dev/vbi0",
+-    dsp:    "/dev/dsp",
++    dsp:    "/dev/audio",
+     mixer:  "/dev/mixer",
+     video_scan: {
+ 	"/dev/bktr0",
diff --git a/multimedia/xawtv/patches/patch-console_fbtools.c b/multimedia/xawtv/patches/patch-console_fbtools.c
new file mode 100644
index 00000000000..8b51180c814
--- /dev/null
+++ b/multimedia/xawtv/patches/patch-console_fbtools.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-console_fbtools.c,v 1.1 2011/08/13 04:43:51 cheusov Exp $
+
+--- console/fbtools.c.orig	2003-02-14 14:14:04.000000000 +0000
++++ console/fbtools.c
+@@ -21,7 +21,7 @@
+ #include <linux/vt.h>
+ #include <linux/fb.h>
+ 
+-#include <asm/page.h>
++#include <sys/user.h>
+ 
+ #include "fbtools.h"
+ 
diff --git a/multimedia/xawtv/patches/patch-console_matrox.c b/multimedia/xawtv/patches/patch-console_matrox.c
new file mode 100644
index 00000000000..cade7d28196
--- /dev/null
+++ b/multimedia/xawtv/patches/patch-console_matrox.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-console_matrox.c,v 1.1 2011/08/13 04:43:51 cheusov Exp $
+
+--- console/matrox.c.orig	2005-02-03 10:40:41.000000000 +0000
++++ console/matrox.c
+@@ -9,7 +9,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ 
+-#include <asm/page.h> /* PAGE_SIZE */
++#include <sys/user.h> /* PAGE_SIZE */
+ #include <linux/fb.h>
+ 
+ #include "byteswap.h"