pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/ptlib Update to 2.6.4. Fix build with latest ope...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2fbc9b08c711
branches:  trunk
changeset: 562272:2fbc9b08c711
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jul 23 22:11:47 2009 +0000

description:
Update to 2.6.4. Fix build with latest openssl.

2009-06-05 04:14  rjongbloed

        * [r22828] version.h:
          Update version number for beta v2.6.4

2009-06-12 06:26  rjongbloed

        * [r22848] include/ptclib/vxml.h, src/ptclib/vxml.cxx:
          Fixed deadlock when shutting down VXML. Also "normalised" member
          for vxml channel pointer so cannot get out of sync with
          underlying channel pointer.

2009-06-22 01:46  rjongbloed

        * [r22944] ., src/ptclib/url.cxx:
          Reviewed and fixed the "safe" characters for URI translation as
          per RFC2396

2009-06-24 01:57  rjongbloed

        * [r22960] ., configure, configure.ac, src/ptlib/unix/osutil.cxx:
          Changed PTimer::Tick() from using gettimeofday (if possible) as
          if an
          RTP time sync daemon is used then the return value of
          PTimer::Tick() can
          leap forward or backward causing problems. It should always be
          simple
          monotonic increasing milliseconds from some arbitrary point,
          exactly as
          provided by clock_gettime() using CLOCK_MONOTONIC. So we use that
          if it
          is available.

2009-06-24 02:20  rjongbloed

        * [r22963] src/ptlib/unix/osutil.cxx:
          Fixed incorrect divisor for new clock_gettime version of
          PTimer::Tick()

2009-06-25 13:07  rjongbloed

        * [r22984] ., include/ptclib/threadpool.h,
          src/ptclib/threadpool.cxx:
          Change behaviour of thread pooling if a group ID is specified.
          If a group ID is specified, work is always added to a worker
          thread
          of the same group ID, or a new worker thread is created

2009-06-26 05:56  rjongbloed

        * [r22992] include/ptclib/threadpool.h:
          Reversed out previous change as it fails to be subject to thread
          count limit, cannot just allocate new thread if have new group
          ID.

2009-07-01 00:13  rjongbloed

        * [r23018] plugins/vidinput_v4l2/vidinput_v4l2.cxx,
          src/ptlib/common/sockets.cxx:
          Fixed name conflict.

2009-03-18 03:44  rjongbloed

        * [r22210] version.h:
          Update version number for beta v2.6.2

2009-03-23 00:54  rjongbloed

        * [r22240] ., src/ptlib/msos/ethsock.cxx:
          Patch for compiling without IPv6, thanks Michael Cronenworth

2009-03-23 03:00  rjongbloed

        * [r22242] ., configure.ac:
          Applied patch:
          [ 2685609 ] ptlib: --[enable|disable]-ansi-bool goes to the same
          thanks Mounir Lamouri

2009-03-23 03:09  rjongbloed

        * [r22243] src/ptlib/common/jidctflt.cxx:
          Applied patch ID: 2657924
          ptlib: assembler code fails (jidctflt.cxx) with -O0
          thanks Mounir Lamouri

2009-03-23 04:04  rjongbloed

        * [r22250] ., include/ptclib/podbc.h, src/ptclib/podbc.cxx:
          Applied patch ID: 2656778
          cannot build ptlib 2.6.0
          thanks Götz Waschk

2009-03-25 09:44  rjongbloed

        * [r22284] ., src/ptlib/common/sockets.cxx:
          Applied patch to fix NULL pointer usage under some error
          conditions, thanks elaine.

2009-03-26 00:31  rjongbloed

        * [r22295] make/unix.mak, src/ptclib/pdns.cxx,
          src/ptlib/common/osutils.cxx, src/ptlib/unix/config.cxx,
          src/ptlib/unix/socket.cxx, src/ptlib/unix/svcproc.cxx,
          src/ptlib/unix/tlib.cxx, src/ptlib/unix/tlibthrd.cxx:
          Applied patch ID: 2712498 "NetBSD port", supplied by Jared D.
          McNeill

2009-03-27 03:55  rjongbloed

        * [r22304] src/ptlib/unix/channel.cxx:
          Added extra information to assert on multiple read in different
          threads.

2009-03-27 23:18  rjongbloed

        * [r22311] make/common.mak, make/plugins.mak, src/Makefile,
          src/ptlib/Nucleus++/Makefile:
          Fixed bug ID: 2027650 "$(CFLAGS) include path overrides package
          include
          path", reported by Stefano Sabatini

2009-03-29 23:48  rjongbloed

        * [r22317] src/ptlib/unix/channel.cxx:
          Fixed crash (NULL ptr access) as the "message" part of PAssert is
          not
          protected by the assert condition, so need to put the condition
          outside
          the PAssert macro.

2009-03-30 00:05  rjongbloed

        * [r22320] make/plugins.mak:
          Make sure LDFLAGS are last in linker command line.

2009-03-30 01:31  rjongbloed

        * [r22324] ., src/ptlib/msos/sound_win32.cxx:
          Fixed issue with empty strings for Windows sound devices being
          returned when being used over a Remote Desktop connection.

2009-03-30 23:13  rjongbloed

        * [r22332] ., src/ptclib/pffvdev.cxx:
          Fixed typo in pragma implementation

2009-03-31 00:32  rjongbloed

        * [r22335] ., make/common.mak:
          Fixed bug ID: 2721897 "Still problems with the STDCCFLAGS
          includes", patch supplied by Stefano Sabatini

2009-03-31 06:42  csoutheren

        * [r22345] src/ptlib/common/osutils.cxx,
          src/ptlib/unix/tlibthrd.cxx:
          Backport thread leak fixes and PTRACE changes from trunk

2009-03-31 06:43  csoutheren

        * [r22346] src/ptlib/common/osutils.cxx:
          Remove vestigal code

2009-03-31 23:57  rjongbloed

        * [r22356] include/ptlib/pprocess.h, src/ptlib/common/osutils.cxx,
          src/ptlib/unix/tlib.cxx:
          Do not set Unix signal handlers if PProcess is being loaded as a
          library, leave that up to the enclosing application.

2009-04-07 02:47  rjongbloed

        * [r22375] ., include/ptclib/delaychan.h, include/ptlib/contain.h,
          include/ptlib/indchan.h, include/ptlib/psync.h,
          include/ptlib/videoio.h, src/ptclib/httpsvc.cxx,
          src/ptlib/msos/svcproc.cxx:
          Applied patch ID: 2725084, thanks Giorgio Alfarano

2009-04-07 03:20  rjongbloed

        * [r22378] ., include/ptlib/svcproc.h, src/ptlib/msos/svcproc.cxx:
          Fixed applied patch from patch manager, broke Unix build.

2009-04-07 03:29  rjongbloed

        * [r22380] ., src/ptlib/msos/vidinput_directx.cxx:
          Applied patch ID: 2728435 "directx & YUY2", thanks Giorgio
          Alfarano

2009-04-07 04:16  rjongbloed

        * [r22383] ., include/ptlib/unix/ptlib/pprocess.h,
          src/ptlib/unix/tlibthrd.cxx:
          Possible fix for ID: 2725546 "Crash in PInterfaceMonitor::Stop"

2009-04-07 04:43  rjongbloed

        * [r22392] ., src/ptlib/common/ptime.cxx:
          Applied fix for ID: 2728037 "Win32 linker cannot resolve
          _PTimeParse", thanks Michael Rickmann

2009-04-07 04:53  rjongbloed

        * [r22394] ., configure.ac, include/ptbuildopts.h.in:
          Applied fix for ID: 2735402 "Must check for ATL in configure when
          checking for SAPI", thanks Jan Willamowius

2009-04-07 05:05  rjongbloed

        * [r22396] ., configure.ac:
          Applied fix for ID: 2726070 "ffvdev option needs pipechan
          option", thanks Mounir Lamouri

2009-04-23 23:57  rjongbloed

        * [r22458] src/ptlib/common/vconvert.cxx:
          Applied patch ID: 2778636 "YUY2toYUV420PWithResize fix", thanks
          Giorgio Alfarano

2009-04-24 18:23  csoutheren

        * [r22464] src/ptlib/unix/tlibthrd.cxx:
          Remove potential loophole to delete wrong thread

2009-05-05 01:55  rjongbloed

        * [r22509] include/ptlib/pipechan.h, src/ptlib/msos/pipe.cxx:
          Fixed issues with PPipeChannel reading stdout/stderr from a child
          process on Windows:
          data being buffered before sending in subprocess
          read of stdout with timeout (SetReadTimeout() now works)
          read partial amounts from stdout (ask for 1000 bytes, get the 23
          available)

2009-05-07 08:53  csoutheren

        * [r22552] ., include/ptclib/sockagg.h,
          include/ptclib/threadpool.h, include/ptlib/msos/AUTOEXP.DAT,
          include/ptlib/pfactory.h, include/ptlib/safecoll.h,
          plugins/vidinput_v4l2/Makefile.in, src/Makefile,
          src/ptclib/sockagg.cxx, src/ptclib/threadpool.cxx,
          src/ptlib/common/safecoll.cxx:
          Bulk backport of patches from trunk including RTP SafePtr and
          thread pooling

2009-05-08 04:21  rjongbloed

        * [r22565] src/ptlib/unix/channel.cxx:
          Changed assert for multiple reads on channel to use same hex
          format for thread ID as is used elsewhere in the logging.

2009-05-11 08:31  rjongbloed

        * [r22578] ., src/ptlib/msos/Console.vcproj,
          src/ptlib/msos/Console_2005.vcproj,
          src/ptlib/msos/Console_2008.vcproj:
          Removed sockagg.*

2009-05-11 08:55  rjongbloed

        * [r22579] src/ptlib/msos/Console.vcproj,
          src/ptlib/msos/Console_2005.vcproj,
          src/ptlib/msos/Console_2008.vcproj:
          Added threadpool.*

2009-05-12 06:14  rjongbloed

        * [r22583] configure, configure.ac:
          Make sure P_64BIT is included in pkg-config options so downstream
          compiles get it.

2009-05-12 08:51  rjongbloed

        * [r22587] src/ptlib/msos/pipe.cxx:
          Fixed WinCE compile.

2009-05-12 12:20  rjongbloed

        * [r22591] include/ptlib/msos/ptlib_2005.dtf,
          include/ptlib/msos/ptlib_2005_wm.dtf,
          include/ptlib/msos/ptlib_2005_wm6.dtf,
          include/ptlib/msos/ptlib_2008.dtf,
          include/ptlib/msos/ptlibd_2005.dtf,
          include/ptlib/msos/ptlibd_2005_wm.dtf,
          include/ptlib/msos/ptlibd_2005_wm6.dtf,
          include/ptlib/msos/ptlibd_2008.dtf,
          include/ptlib/msos/ptlibn_2005.dtf,
          include/ptlib/msos/ptlibn_2005_wm.dtf,
          include/ptlib/msos/ptlibn_2005_wm6.dtf,
          include/ptlib/msos/ptlibn_2008.dtf:
          Update symbols

2009-05-12 13:42  rjongbloed

        * [r22592] include/ptlib/msos/ptlib_2008.dtf,
          include/ptlib/msos/ptlibd_2008.dtf,
          include/ptlib/msos/ptlibn_2008.dtf:
          Update symbols

2009-05-13 04:17  rjongbloed

        * [r22598] include/ptlib/safecoll.h:
          Back ported test for multiple instances of an object in a safe
          collection. This is bad, must be prevented.

2009-05-13 14:06  csoutheren

        * [r22601] src/ptlib/common/contain.cxx:
          Use a custom allocator memory pool for PContainerReference
          and PAbstractArray on Linux
          This reduces memory fragmentation and allocation overhead

2009-05-13 14:07  csoutheren

        * [r22602] src/ptlib/common/osutils.cxx:
          Add log message every time timer thread fires

2009-05-14 00:16  rjongbloed

        * [r22611] src/ptlib/common/osutils.cxx:
          Reduced level of new trace log in timers

2009-05-14 01:58  rjongbloed

        * [r22614] ., src/ptlib/common/osutils.cxx:
          Reduced level of new trace log in timers, again. Too noisy!

2009-05-18 06:09  rjongbloed

        * [r22629] src/ptclib/url.cxx:
          Fixed "file:" URL handling. While it is never explicitly stated
          anywhere in RFC1798, there is an implication in RFC 1808 that the
          path is absolute unless the relative path rules of that RFC
          apply. We follow that logic.

          Also now follow the convention for Windows drive letters,
          "C|/blah" for "C:\blah".

2009-05-18 06:19  rjongbloed

        * [r22633] src/ptclib/vxml.cxx:
          Fixed loading of VXML file directly (when not via URL)

          Fixed correct playing of silence delay after playing a playable
          object.

          Added and normalised logging.

2009-05-19 05:17  rjongbloed

        * [r22648] include/ptlib/msos/ptlib_2003.dtf,
          include/ptlib/msos/ptlib_2005.dtf,
          include/ptlib/msos/ptlib_2005_wm.dtf,
          include/ptlib/msos/ptlib_2005_wm6.dtf,
          include/ptlib/msos/ptlib_2008.dtf,
          include/ptlib/msos/ptlibd_2003.dtf,
          include/ptlib/msos/ptlibd_2005.dtf,
          include/ptlib/msos/ptlibd_2005_wm.dtf,
          include/ptlib/msos/ptlibd_2005_wm6.dtf,
          include/ptlib/msos/ptlibd_2008.dtf,
          include/ptlib/msos/ptlibn_2003.dtf,
          include/ptlib/msos/ptlibn_2005.dtf,
          include/ptlib/msos/ptlibn_2005_wm.dtf,
          include/ptlib/msos/ptlibn_2005_wm6.dtf,
          include/ptlib/msos/ptlibn_2008.dtf:
          Update DLL symbols

diffstat:

 devel/ptlib/Makefile         |    7 +-
 devel/ptlib/PLIST            |    8 +-
 devel/ptlib/distinfo         |   18 +---
 devel/ptlib/patches/patch-aa |   13 ++++
 devel/ptlib/patches/patch-ad |   24 +++---
 devel/ptlib/patches/patch-ae |   47 --------------
 devel/ptlib/patches/patch-af |   44 -------------
 devel/ptlib/patches/patch-ah |  138 -------------------------------------------
 devel/ptlib/patches/patch-ai |   40 ------------
 devel/ptlib/patches/patch-aj |   22 ------
 devel/ptlib/patches/patch-ak |   15 ----
 11 files changed, 38 insertions(+), 338 deletions(-)

diffs (truncated from 483 to 300 lines):

diff -r 26b568ab220a -r 2fbc9b08c711 devel/ptlib/Makefile
--- a/devel/ptlib/Makefile      Thu Jul 23 21:24:09 2009 +0000
+++ b/devel/ptlib/Makefile      Thu Jul 23 22:11:47 2009 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2009/04/13 18:34:24 cube Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/23 22:11:47 wiz Exp $
 
-DISTNAME=      ptlib-2.6.1
-PKGREVISION=   1
+DISTNAME=      ptlib-2.6.4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/ptlib/2.6/}
 EXTRACT_SUFX=  .tar.bz2
@@ -9,6 +8,8 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.ekiga.net/
 COMMENT=       Portable Windows Libary
+# modified-bsd stands for Spencer's regex license, quite similar
+LICENSE=       mpl-1.0 AND modified-bsd
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
diff -r 26b568ab220a -r 2fbc9b08c711 devel/ptlib/PLIST
--- a/devel/ptlib/PLIST Thu Jul 23 21:24:09 2009 +0000
+++ b/devel/ptlib/PLIST Thu Jul 23 22:11:47 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:49:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/07/23 22:11:47 wiz Exp $
 bin/ptlib-config
 include/ptbuildopts.h
 include/ptclib/asnber.h
@@ -23,8 +23,8 @@
 include/ptclib/modem.h
 include/ptclib/paec.h
 include/ptclib/pasn.h
+include/ptclib/pdns.h
 include/ptclib/pffvdev.h
-include/ptclib/pdns.h
 include/ptclib/pils.h
 include/ptclib/pldap.h
 include/ptclib/pnat.h
@@ -48,9 +48,9 @@
 include/ptclib/rfc1155.h
 include/ptclib/shttpsvc.h
 include/ptclib/snmp.h
-include/ptclib/sockagg.h
 include/ptclib/socks.h
 include/ptclib/telnet.h
+include/ptclib/threadpool.h
 include/ptclib/url.h
 include/ptclib/vsdl.h
 include/ptclib/vxml.h
@@ -78,7 +78,6 @@
 include/ptlib/int64.h
 include/ptlib/ipdsock.h
 include/ptlib/ipsock.h
-include/ptlib/ipxsock.h
 include/ptlib/lists.h
 include/ptlib/mail.h
 include/ptlib/mutex.h
@@ -106,7 +105,6 @@
 include/ptlib/socket.h
 include/ptlib/sockets.h
 include/ptlib/sound.h
-include/ptlib/spxsock.h
 include/ptlib/svcproc.h
 include/ptlib/syncpoint.h
 include/ptlib/syncthrd.h
diff -r 26b568ab220a -r 2fbc9b08c711 devel/ptlib/distinfo
--- a/devel/ptlib/distinfo      Thu Jul 23 21:24:09 2009 +0000
+++ b/devel/ptlib/distinfo      Thu Jul 23 22:11:47 2009 +0000
@@ -1,13 +1,7 @@
-$NetBSD: distinfo,v 1.7 2009/03/18 11:57:15 jmcneill Exp $
+$NetBSD: distinfo,v 1.8 2009/07/23 22:11:47 wiz Exp $
 
-SHA1 (ptlib-2.6.1.tar.bz2) = b269a20f1bf98130e0088eea6ec5689197cf5521
-RMD160 (ptlib-2.6.1.tar.bz2) = e7bd3f954c871725b269df0ab7561ab0fe6a23ba
-Size (ptlib-2.6.1.tar.bz2) = 3296212 bytes
-SHA1 (patch-ac) = b29fa5e9a2e8d4585367ee21ccf17691780f1429
-SHA1 (patch-ad) = 86f80d2a1dfad6effdd11c4290dc11c1bc56f199
-SHA1 (patch-ae) = af3ba745e56aba3c4f35ff4a69918a545466aa7d
-SHA1 (patch-af) = 3f1271e2b0f84cca82e7b8cbde0ef489d15b7810
-SHA1 (patch-ah) = 5d98d2037c1b389e098d993217f3cefb5050a908
-SHA1 (patch-ai) = 47a7d53e52f5a28b0f25baaf1782a4152e6c6927
-SHA1 (patch-aj) = 4c9548ef40857baf29daacc9acf6ecd68a1e5610
-SHA1 (patch-ak) = 996ce5a8a3e99bb3b6f4b559da35849f1f5d14b3
+SHA1 (ptlib-2.6.4.tar.bz2) = 2808a7546c354c1b6c140667a91da6f79a98f5c9
+RMD160 (ptlib-2.6.4.tar.bz2) = 53d0ea4b67438f61f86fd0d8b68959ef0aa18342
+Size (ptlib-2.6.4.tar.bz2) = 3302374 bytes
+SHA1 (patch-aa) = 292342da79a9e880b3383f5b7e05fbd0ed2cd02b
+SHA1 (patch-ad) = 092d0758e9b6e46a0b481659c8d7988806f2f39a
diff -r 26b568ab220a -r 2fbc9b08c711 devel/ptlib/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ptlib/patches/patch-aa      Thu Jul 23 22:11:47 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2009/07/23 22:11:48 wiz Exp $
+
+--- src/ptclib/pssl.cxx.orig   2009-07-05 05:52:49.000000000 +0000
++++ src/ptclib/pssl.cxx
+@@ -800,7 +800,7 @@ PSSLContext::PSSLContext(const void * se
+ void PSSLContext::Construct(Method method, const void * sessionId, PINDEX idSize)
+ {
+   // create the new SSL context
+-  SSL_METHOD * meth;
++  const SSL_METHOD * meth;
+ 
+   switch (method) {
+     case SSLv2:
diff -r 26b568ab220a -r 2fbc9b08c711 devel/ptlib/patches/patch-ad
--- a/devel/ptlib/patches/patch-ad      Thu Jul 23 21:24:09 2009 +0000
+++ b/devel/ptlib/patches/patch-ad      Thu Jul 23 22:11:47 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2009/03/18 11:57:16 jmcneill Exp $
+$NetBSD: patch-ad,v 1.3 2009/07/23 22:11:48 wiz Exp $
 
---- src/ptlib/unix/tlibthrd.cxx.orig   2009-03-17 23:43:30.000000000 -0400
+--- src/ptlib/unix/tlibthrd.cxx.orig   2009-07-05 05:52:48.000000000 +0000
 +++ src/ptlib/unix/tlibthrd.cxx
-@@ -240,7 +240,7 @@ PBoolean PProcess::PThreadKill(pthread_t
+@@ -250,7 +250,7 @@ PBoolean PProcess::PThreadKill(pthread_t
  {
    PWaitAndSignal m(activeThreadMutex);
  
@@ -11,7 +11,7 @@
      return PFalse;
  
    return pthread_kill(id, sig) == 0;
-@@ -249,8 +249,8 @@ PBoolean PProcess::PThreadKill(pthread_t
+@@ -259,8 +259,8 @@ PBoolean PProcess::PThreadKill(pthread_t
  void PProcess::PXSetThread(pthread_t id, PThread * thread)
  {
    activeThreadMutex.Wait();
@@ -22,12 +22,12 @@
    activeThreadMutex.Signal();
  
    if (currentThread != NULL) 
-@@ -891,7 +891,7 @@ void PThread::PX_ThreadEnd(void * arg)
-   }
+@@ -393,7 +393,7 @@ PThread::~PThread()
+     if (id != 0) {
+       process.activeThreadMutex.Wait();
+       pthread_detach(id);
+-      process.activeThreads.SetAt((unsigned)id, NULL);
++      process.activeThreads.SetAt((uintptr_t)id, NULL);
+       process.activeThreadMutex.Signal();
+     }
  
-   // remove this thread from the active thread list
--  process.activeThreads.SetAt((unsigned)id, NULL);
-+  process.activeThreads.SetAt((uintptr_t)id, NULL);
- 
-   bool deleteThread = thread->autoDelete; // Get flag before releasing lock
- 
diff -r 26b568ab220a -r 2fbc9b08c711 devel/ptlib/patches/patch-ae
--- a/devel/ptlib/patches/patch-ae      Thu Jul 23 21:24:09 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2009/03/18 11:57:16 jmcneill Exp $
-
---- src/ptlib/common/osutils.cxx.orig  2009-03-17 23:43:33.000000000 -0400
-+++ src/ptlib/common/osutils.cxx
-@@ -1548,7 +1548,7 @@ PProcess::PProcess(const char * manuf, c
-   , m_library(false)
- {
-   activeThreads.DisallowDeleteObjects();
--  activeThreads.SetAt((PINDEX)GetCurrentThreadId(), this);
-+  activeThreads.SetAt((uintptr_t)GetCurrentThreadId(), this);
- 
-   PProcessInstance = this;
- 
-@@ -1912,7 +1912,7 @@ PThread * PThread::Current()
-   PProcess & process = PProcess::Current();
- 
-   process.activeThreadMutex.Wait();
--  PThread * thread = process.activeThreads.GetAt((unsigned)GetCurrentThreadId());
-+  PThread * thread = process.activeThreads.GetAt((uintptr_t)GetCurrentThreadId());
-   process.activeThreadMutex.Signal();
- 
-   if (thread == NULL)
-@@ -2210,21 +2210,21 @@ PReadWriteMutex::~PReadWriteMutex()
- PReadWriteMutex::Nest * PReadWriteMutex::GetNest() const
- {
-   PWaitAndSignal mutex(nestingMutex);
--  return nestedThreads.GetAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
-+  return nestedThreads.GetAt(POrdinalKey((INT)PThread::GetCurrentThreadId()));
- }
- 
- 
- void PReadWriteMutex::EndNest()
- {
-   nestingMutex.Wait();
--  nestedThreads.RemoveAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
-+  nestedThreads.RemoveAt(POrdinalKey((INT)PThread::GetCurrentThreadId()));
-   nestingMutex.Signal();
- }
- 
- 
- PReadWriteMutex::Nest & PReadWriteMutex::StartNest()
- {
--  POrdinalKey threadId = (PINDEX)PThread::GetCurrentThreadId();
-+  POrdinalKey threadId = (INT)PThread::GetCurrentThreadId();
- 
-   nestingMutex.Wait();
- 
diff -r 26b568ab220a -r 2fbc9b08c711 devel/ptlib/patches/patch-af
--- a/devel/ptlib/patches/patch-af      Thu Jul 23 21:24:09 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-af,v 1.3 2009/03/18 11:57:16 jmcneill Exp $
-
---- make/unix.mak.orig 2009-03-17 23:43:35.000000000 -0400
-+++ make/unix.mak
-@@ -186,7 +186,7 @@ endif # FreeBSD
- ifeq ($(OSTYPE),OpenBSD)
- 
- ifeq ($(MACHTYPE),x86)
--STDCCFLAGS    += -m486
-+#STDCCFLAGS   += -m486
- endif
- 
- LDLIBS                += -lossaudio
-@@ -208,9 +208,16 @@ STDCCFLAGS        += -mcpu=$(CPUTYPE)
- endif
- endif
- 
-+ifeq ($(MACHTYPE),x86_64)
-+STDCCFLAGS    += -DP_64BIT
-+endif
-+
- P_USE_RANLIB          := 1
- #STDCCFLAGS      += -DP_USE_PRAGMA            # migrated to configure
- 
-+ifndef PROG
-+STDCCFLAGS    += -fPIC -DPIC
-+endif # PROG
- 
- endif # NetBSD
- 
-@@ -563,11 +570,11 @@ LIB_SUFFIX       = $(SHAREDLIBEXT)
- LIB_TYPE      =
- else   
- LIB_SUFFIX    = a 
--LIB_TYPE      = _s
-+LIB_TYPE      =
- endif # P_SHAREDLIB
- 
- ifndef INSTALL_DIR
--INSTALL_DIR   = /usr/local
-+INSTALL_DIR   = ${PREFIX}
- endif
- 
- ifndef INSTALLBIN_DIR
diff -r 26b568ab220a -r 2fbc9b08c711 devel/ptlib/patches/patch-ah
--- a/devel/ptlib/patches/patch-ah      Thu Jul 23 21:24:09 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2008/10/25 18:12:34 jmcneill Exp $
-
---- src/ptlib/unix/socket.cxx.orig     2008-10-01 03:03:56.000000000 -0400
-+++ src/ptlib/unix/socket.cxx  2008-10-25 13:26:34.000000000 -0400
-@@ -67,6 +67,10 @@
- #include <netinet/if_ether.h>
- #endif
- 
-+#if defined(P_NETBSD)
-+#include <ifaddrs.h>
-+#endif
-+
- #define ROUNDUP(a) \
-         ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
- 
-@@ -471,6 +475,12 @@
-   PBYTEArray buffer;
-   struct ifconf ifConf;
- 
-+#if defined(P_NETBSD)
-+  struct ifaddrs *ifap, *ifa;
-+
-+  PAssert(getifaddrs(&ifap) == 0, "getifaddrs failed");
-+  for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
-+#else
- #ifdef SIOCGIFNUM
-   int ifNum;
-   PAssert(::ioctl(sock.GetHandle(), SIOCGIFNUM, &ifNum) >= 0, "could not do ioctl for ifNum");
-@@ -486,8 +496,14 @@
-     ifreq * ifName = ifConf.ifc_req;
- 
-     while (ifName < ifEndList) {
-+#endif
-       struct ifreq ifReq;
-+#if !defined(P_NETBSD)
-       memcpy(&ifReq, ifName, sizeof(ifreq));
-+#else
-+      memset(&ifReq, 0, sizeof(ifReq));
-+      strncpy(ifReq.ifr_name, ifa->ifa_name, sizeof(ifReq.ifr_name) - 1);
-+#endif
-       
-       if (ioctl(sock.GetHandle(), SIOCGIFFLAGS, &ifReq) >= 0) {
-         int flags = ifReq.ifr_flags;
-@@ -499,14 +515,16 @@



Home | Main Index | Thread Index | Old Index