- add esound support

- start working on v4l2 support (not there yet)

devel/pwlib/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2008/04/21 15:03:12 merdely Exp $
+# $OpenBSD: Makefile,v 1.8 2008/04/29 11:42:45 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	portable Windows library
 
 V=		1_12_0
 DISTNAME=	ptlib-v${V}
-PKGNAME=	pwlib-${V:S/_/./g}
+PKGNAME=	pwlib-${V:S/_/./g}p0
 CATEGORIES=	devel
 
 EXTRACT_SUFX=	-src.tar.gz
@@ -28,6 +28,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=h323plus/}
 WANTLIB=	crypto expat ossaudio ssl
 
 BUILD_DEPENDS=	::devel/bison
+LIB_DEPENDS=	esd.>=2::audio/esound
 
 WRKDIST=	${WRKDIR}/${DISTNAME:S/-/_/}
 NO_REGRESS=	Yes
@@ -49,6 +50,7 @@ CONFIGURE_ENV=  CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-plugins \
 		--enable-oss \
+		--enable-esd \
 		--enable-bsdvideo \
 		--disable-sunaudio \
 		--disable-alsa \
@@ -56,6 +58,9 @@ CONFIGURE_ARGS=	--enable-plugins \
 		--disable-dc \
 		--disable-odbc
 
+# XXX sys/videoio.h
+CONFIGURE_ARGS+=--disable-v4l2
+
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
 CFLAGS+=	-fPIC
 .endif

devel/pwlib/patches/patch-include_ptlib_unix_ptlib_videoio_h

@@ -0,0 +1,14 @@
+$OpenBSD: patch-include_ptlib_unix_ptlib_videoio_h,v 1.1 2008/04/29 11:42:45 ajacoutot Exp $
+--- include/ptlib/unix/ptlib/videoio.h.orig	Tue Apr 29 10:07:06 2008
++++ include/ptlib/unix/ptlib/videoio.h	Tue Apr 29 10:07:56 2008
+@@ -110,6 +110,10 @@
+ #include <machine/ioctl_meteor.h>
+ #endif
+ 
++#if defined(P_OPENBSD)
++#include <sys/videoio.h>
++#endif
++
+ #if defined(P_OPENBSD) || defined(P_NETBSD)
+ #if P_OPENBSD >= 200105
+ #include <dev/ic/bt8xx.h> 

devel/pwlib/patches/patch-plugins_configure

@@ -1,6 +1,6 @@
-$OpenBSD: patch-plugins_configure,v 1.2 2008/03/15 17:38:07 ajacoutot Exp $
+$OpenBSD: patch-plugins_configure,v 1.3 2008/04/29 11:42:45 ajacoutot Exp $
 --- plugins/configure.orig	Fri Oct 19 08:22:33 2007
-+++ plugins/configure	Fri Jan  4 14:04:45 2008
++++ plugins/configure	Tue Apr 29 09:49:24 2008
 @@ -3479,7 +3479,7 @@ echo "${ECHO_T}$ac_cv_header_sys_soundcard_h" >&6
  else
    # Is the header compilable?
@@ -52,6 +52,15 @@ $OpenBSD: patch-plugins_configure,v 1.2 2008/03/15 17:38:07 ajacoutot Exp $
  if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
+@@ -3979,7 +3979,7 @@ if test "${enable_v4l2}z" = "yesz" ; then
+   if test "${OSTYPE}z" = "solaris2.11z"; then
+     VIDEODEV="sys/videodev2.h"
+   else
+-    VIDEODEV="linux/videodev2.h"
++    VIDEODEV="sys/videoio.h"
+   fi
+   as_ac_Header=`echo "ac_cv_header_$VIDEODEV" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $VIDEODEV" >&5
 @@ -4485,8 +4485,8 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <dev/ic/bt8xx.h>

devel/pwlib/patches/patch-plugins_vidinput_v4l2_vidinput_v4l2_h

@@ -0,0 +1,15 @@
+$OpenBSD: patch-plugins_vidinput_v4l2_vidinput_v4l2_h,v 1.1 2008/04/29 11:42:45 ajacoutot Exp $
+--- plugins/vidinput_v4l2/vidinput_v4l2.h.orig	Tue Apr 29 10:03:51 2008
++++ plugins/vidinput_v4l2/vidinput_v4l2.h	Tue Apr 29 10:05:59 2008
+@@ -81,8 +81,10 @@
+ #include <ptlib/vconvert.h>
+ #include <ptclib/delaychan.h>
+ 
+-#ifdef SOLARIS
++#if defined(SOLARIS)
+ #include <sys/videodev2.h>
++#elif defined(__OpenBSD__)
++#include <sys/videoio.h>
+ #else
+ #include <linux/videodev.h>
+ #endif

devel/pwlib/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2008/03/15 17:38:07 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.3 2008/04/29 11:42:45 ajacoutot Exp $
 bin/ptlib-config
 include/ptbuildopts.h
 include/ptclib/
@@ -168,6 +168,7 @@ include/ptlib/videoio1394dc.h
 lib/pwlib/
 lib/pwlib/devices/
 lib/pwlib/devices/sound/
+lib/pwlib/devices/sound/esd_pwplugin.so
 lib/pwlib/devices/sound/oss_pwplugin.so
 lib/pwlib/devices/videoinput/
 lib/pwlib/devices/videoinput/bsdvideo_pwplugin.so