1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-18 08:02:48 +00:00

Attempt to fix the PRs below caused by PWLib getting upgraded under our

feet. While here, add a small patch found in Ubuntu and Debian ports.

PR:	ports/121346
PR:	ports/120824
PR:	ports/121401
This commit is contained in:
Mikhail Teterin 2008-03-06 22:59:52 +00:00
parent f3296815f9
commit eeca73f05c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=208541
3 changed files with 55 additions and 1 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= ekiga
PORTVERSION= 2.0.11
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0

View File

@ -0,0 +1,39 @@
Remove the guts from a function, that no longer compiles with
PWLib-1.12. Since the whole file is dealing with the situation,
when there is, in fact, no video -- the user is shown a logo
instead -- it is unclear, what good was this function providing
even when it worked.
Better patches are actively solicited...
-mi
--- src/devices/fakevideoinput.cpp 2007-09-18 05:00:19.000000000 -0400
+++ src/devices/fakevideoinput.cpp 2008-03-06 17:13:47.000000000 -0500
@@ -334,26 +334,4 @@
PVideoInputDevice_Picture::WaitFinishPreviousFrame ()
{
- if (frameTimeError == 0) {
-
- frameTimeError += msBetweenFrames;
- return;
- }
-
- PTime now;
- PTimeInterval delay = now - previousFrameTime;
- frameTimeError += msBetweenFrames;
- frameTimeError -= (int) delay.GetMilliSeconds();
- frameTimeError += 1000 / frameRate;
-
- previousFrameTime = now;
-
- if (frameTimeError > 0) {
- PTRACE(6, "FakeVideo\t Sleep for " << frameTimeError << " milli seconds");
-#ifdef P_LINUX
- usleep(frameTimeError * 1000);
-#else
- PThread::Current()->Sleep(frameTimeError);
-#endif
- }
}

View File

@ -0,0 +1,15 @@
A small patch found among Ubuntu and Debian ports of Ekiga.
-mi
--- lib/gmconf/gmconf-glib.c 2007-09-18 09:00:21.000000000 +0000
+++ lib/gmconf/gmconf-glib.c 2007-10-06 18:34:01.000000000 +0000
@@ -1473,7 +1473,7 @@
}
gboolean
-gm_conf_is_key_writable (gchar *key)
+gm_conf_is_key_writable (const gchar *key)
{
g_return_val_if_fail (key != NULL, FALSE);