ports/121320: [PATCH] net/ohphone: fix build with new openh323/pwlib

[Rong-En Fan]

>Number:         121320
>Category:       ports
>Synopsis:       [PATCH] net/ohphone: fix build with new openh323/pwlib
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 03 15:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Rong-En Fan
>Release:        FreeBSD 6.3-PRERELEASE amd64
>Organization:
NTU CSIE
>Environment:
>Description:
- Fix build with latest devel/pwlib and openh323

Added file(s):
- files/patch-main.cxx
- files/patch-xlibvid.cxx

Port maintainer (Joerg.Pulz at frm2.tum.de) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- ohphone-1.4.5_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/ohphone/Makefile /home/rafan/work/FreeBSD/ports/net/ohphone/Makefile
--- /usr/ports/net/ohphone/Makefile	2007-10-18 03:17:16.000000000 +0800
+++ /home/rafan/work/FreeBSD/ports/net/ohphone/Makefile	2008-03-03 23:10:02.000000000 +0800
@@ -7,7 +7,7 @@
 
 PORTNAME=	ohphone
 PORTVERSION=	1.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/
 
diff -ruN --exclude=CVS /usr/ports/net/ohphone/files/patch-main.cxx /home/rafan/work/FreeBSD/ports/net/ohphone/files/patch-main.cxx
--- /usr/ports/net/ohphone/files/patch-main.cxx	1970-01-01 08:00:00.000000000 +0800
+++ /home/rafan/work/FreeBSD/ports/net/ohphone/files/patch-main.cxx	2008-03-03 23:09:35.000000000 +0800
@@ -0,0 +1,47 @@
+--- ./main.cxx.orig	2006-04-07 02:21:49.000000000 +0800
++++ ./main.cxx	2008-03-03 23:07:51.000000000 +0800
+@@ -184,6 +184,8 @@
+  */
+ 
+ #include <ptlib.h>
++#include <ptlib/sound.h>
++#include <ptlib/video.h>
+ #include <ptclib/random.h>
+ 
+ #include "main.h"
+@@ -224,7 +226,7 @@
+ #include "xlibvid.h"
+ #endif
+ 
+-#ifdef P_SDL
++#if P_SDL
+ #include <ptclib/vsdl.h>
+ #endif
+ 
+@@ -554,7 +556,7 @@
+             "                          :      svga256  256 colour VGA (Linux only)\n"
+             "                          :      svga     full colour VGA (Linux only)\n"
+ #endif
+-#ifdef P_SDL
++#if P_SDL
+             "                          :      sdl      Use Simple DirectMedia Library\n"
+ #endif
+ #ifdef HAS_X11
+@@ -855,7 +857,7 @@
+         && !(videoReceiveDevice *= "svga")
+         && !(videoReceiveDevice *= "svga256")
+ #endif
+-#ifdef P_SDL
++#if P_SDL
+         && !(videoReceiveDevice *= "sdl")
+ #endif
+ #ifdef HAS_X11
+@@ -2065,7 +2067,7 @@
+   if ((!isEncoding) || videoLocal)
+     PAssert(!videoReceiveDevice.IsEmpty(), "video display created without device type");
+ 
+-#ifdef P_SDL
++#if P_SDL
+      // Dump received video to SDL 
+     if (videoReceiveDevice *= "sdl") 
+       display = new PSDLVideoDevice();
diff -ruN --exclude=CVS /usr/ports/net/ohphone/files/patch-xlibvid.cxx /home/rafan/work/FreeBSD/ports/net/ohphone/files/patch-xlibvid.cxx
--- /usr/ports/net/ohphone/files/patch-xlibvid.cxx	1970-01-01 08:00:00.000000000 +0800
+++ /home/rafan/work/FreeBSD/ports/net/ohphone/files/patch-xlibvid.cxx	2008-03-03 23:09:35.000000000 +0800
@@ -0,0 +1,10 @@
+--- ./xlibvid.cxx.orig	2008-03-03 23:09:06.000000000 +0800
++++ ./xlibvid.cxx	2008-03-03 23:09:16.000000000 +0800
+@@ -88,6 +88,7 @@
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <ptlib.h>
++#include <ptlib/video.h>
+ #include <string.h>
+ #include "xlibvid.h"
+ 
--- ohphone-1.4.5_3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: