Date: Sun, 2 Mar 2008 22:52:06 +0800 (CST) From: Rong-En Fan <rafan@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Joerg.Pulz@frm2.tum.de Subject: ports/121290: [PATCH] net/cphone: unbreak with new pwlib/openh323 Message-ID: <200803021452.m22Eq615030779@svm.csie.ntu.edu.tw> Resent-Message-ID: <200803021500.m22F03pf017563@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121290 >Category: ports >Synopsis: [PATCH] net/cphone: unbreak with new pwlib/openh323 >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: Sun Mar 02 15:00:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Rong-En Fan >Release: FreeBSD 6.3-PRERELEASE amd64 >Organization: NTU CSIE >Environment: >Description: - Fix build with new pwlib/openh323 Some patch was taken from ekiga: http://mail.gnome.org/archives/ekiga-list/2007-April/msg00136.html Added file(s): - files/patch-cpendpoint.h - files/patch-options.h - files/patch-qtvid.cxx - files/patch-qtvid.h Port maintainer (Joerg.Pulz@frm2.tum.de) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- cphone-0.3.2.c.20060407_3.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/cphone/Makefile,v retrieving revision 1.19 diff -u -u -r1.19 Makefile --- Makefile 17 Oct 2007 10:12:50 -0000 1.19 +++ Makefile 2 Mar 2008 14:52:18 -0000 @@ -7,7 +7,7 @@ PORTNAME= cphone DISTVERSION= 0.3.2.cvs.20060407 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/ Index: files/patch-cpendpoint.h =================================================================== RCS file: files/patch-cpendpoint.h diff -N files/patch-cpendpoint.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-cpendpoint.h 2 Mar 2008 14:52:19 -0000 @@ -0,0 +1,10 @@ +--- ./cpendpoint.h.orig 2008-03-02 22:47:13.000000000 +0800 ++++ ./cpendpoint.h 2008-03-02 22:47:30.000000000 +0800 +@@ -53,6 +53,7 @@ + #define _CPhone_CPENDPOINT_H + + #include <ptlib.h> ++#include <ptlib/video.h> + #include <h323.h> + #include <qevent.h> + #include "options.h" Index: files/patch-options.h =================================================================== RCS file: files/patch-options.h diff -N files/patch-options.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-options.h 2 Mar 2008 14:52:19 -0000 @@ -0,0 +1,10 @@ +--- ./options.h.orig 2008-03-02 22:44:57.000000000 +0800 ++++ ./options.h 2008-03-02 22:45:04.000000000 +0800 +@@ -48,6 +48,7 @@ + #define _CPhone_OPTIONS_H + + #include <ptlib.h> ++#include <ptlib/sound.h> + + class MainUserInterface; + Index: files/patch-qtvid.cxx =================================================================== RCS file: files/patch-qtvid.cxx diff -N files/patch-qtvid.cxx --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-qtvid.cxx 2 Mar 2008 14:52:19 -0000 @@ -0,0 +1,25 @@ +--- ./qtvid.cxx.orig 2008-03-02 22:45:11.000000000 +0800 ++++ ./qtvid.cxx 2008-03-02 22:45:59.000000000 +0800 +@@ -263,21 +263,7 @@ + + BOOL PTextVideoInputDevice::GetFrameData(BYTE *buffer, PINDEX *bytesReturned) + { +- if(frameRate>0) { +- frameTimeError += msBetweenFrames; +- +- do { +- if ( !GetFrameDataNoDelay(buffer, bytesReturned)) { +- return FALSE; +- } +- PTime now; +- PTimeInterval delay = now - previousFrameTime; +- frameTimeError -= (int)delay.GetMilliSeconds(); +- previousFrameTime = now; +- } while(frameTimeError > 0) ; +- +- return TRUE; +- } ++ m_pacing.Delay(1000/GetFrameRate()); + return GetFrameDataNoDelay(buffer, bytesReturned); + } + Index: files/patch-qtvid.h =================================================================== RCS file: files/patch-qtvid.h diff -N files/patch-qtvid.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-qtvid.h 2 Mar 2008 14:52:19 -0000 @@ -0,0 +1,19 @@ +--- ./qtvid.h.orig 2008-03-02 22:45:09.000000000 +0800 ++++ ./qtvid.h 2008-03-02 22:46:14.000000000 +0800 +@@ -42,6 +42,7 @@ + #define _CPhone_Qt_H + + #include <ptlib.h> ++#include <ptclib/delaychan.h> + #include <qimage.h> + #include "vdisplay.h" + +@@ -319,6 +320,8 @@ + + Rgb32Image *rgbImage; + PMutex bufferMutex; ++ ++ PAdaptiveDelay m_pacing; + }; + + --- cphone-0.3.2.c.20060407_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803021452.m22Eq615030779>