diff options
author | Roger Hardiman <roger@FreeBSD.org> | 2003-08-31 21:14:00 +0000 |
---|---|---|
committer | Roger Hardiman <roger@FreeBSD.org> | 2003-08-31 21:14:00 +0000 |
commit | 4c76ad7bd2feb8bfe66caedbc9d135328b8105fc (patch) | |
tree | 8232eae48c8971aad85fb80a1f55e2a43af9d335 /net/ekiga | |
parent | 7a5e8bb518eb134ebaf765c49181b03f04d27240 (diff) |
Add two patches which make GM compile on -current
(which does not have the IXJ driver)
Notes
Notes:
svn path=/head/; revision=88212
Diffstat (limited to 'net/ekiga')
-rw-r--r-- | net/ekiga/files/patch-config | 21 | ||||
-rw-r--r-- | net/ekiga/files/patch-gnomemeeting | 14 |
2 files changed, 35 insertions, 0 deletions
diff --git a/net/ekiga/files/patch-config b/net/ekiga/files/patch-config new file mode 100644 index 000000000000..069327203c66 --- /dev/null +++ b/net/ekiga/files/patch-config @@ -0,0 +1,21 @@ +*** src/config.cpp.orig Sun Aug 31 13:00:00 2003 +--- src/config.cpp Sun Aug 31 13:00:31 2003 +*************** audio_mixer_changed_nt (GConfClient *cli +*** 928,935 **** + int vol = 0; + char *mixer = NULL; + GmWindow *gw = NULL; +- #ifdef HAS_IXJ + GMH323EndPoint *endpoint = MyApp->Endpoint (); + GMLid *lid = NULL; + #endif + +--- 928,935 ---- + int vol = 0; + char *mixer = NULL; + GmWindow *gw = NULL; + GMH323EndPoint *endpoint = MyApp->Endpoint (); ++ #ifdef HAS_IXJ + GMLid *lid = NULL; + #endif + diff --git a/net/ekiga/files/patch-gnomemeeting b/net/ekiga/files/patch-gnomemeeting new file mode 100644 index 000000000000..0643a245f6b5 --- /dev/null +++ b/net/ekiga/files/patch-gnomemeeting @@ -0,0 +1,14 @@ +*** src/gnomemeeting.cpp.orig Sun Aug 31 12:42:17 2003 +--- src/gnomemeeting.cpp Sun Aug 31 12:42:30 2003 +*************** GnomeMeeting::~GnomeMeeting() +*** 125,131 **** +--- 125,133 ---- + + endpoint->ClearAllCalls (H323Connection::EndedByLocalUser, TRUE); + endpoint->RemoveVideoGrabber (true); ++ #ifdef HAX_IXJ + endpoint->RemoveLid (); ++ #endif + } + RemoveEndpoint (); + |