Wed Mar 18 11:57:16 2009 UTC ()
Update ptlib to 2.6.1. Lots of changes, no changelog in sight.

Main features on this new major release branch are:

    * Instant Messaging. Using several different ?standards?: RFC4975, MSRP, T.140, SIP-IM etc etc.
    * Much improved support for SIP event handling (SUBSCRIBE/NOTIFY/PUBLISH) using factories so more event packages can be added easily.
    * Support for SIP ?dialog? event package.
    * Support for Shared Line Appearance (aka Multiple Line Appearance, Bridged Line Appearance or Busy Lamp Field)
    * Significant improvements in IPv6 support (thanks Yuri Kiryanov!)
    * Major enhancements to the video rate controller.
    * Removal of the old H.263 ffmpeg plug in and enhancement of the H.263-1998 plug it to take its place.
    * H.224 support (H.323 only).
    * SBC audio codec plug in.
    * G.722 audio codec plug in.
    * CELT audio codec plug in.
    * SWIG support for use in other languages, Java first.
    * Much improved multi-platform sample GUI client, OpenPhone. Now standard test environment replacing simpleOPAL.


(jmcneill)
diff -r1.6 -r1.7 pkgsrc/devel/ptlib/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/ptlib/distinfo
diff -r1.4 -r1.5 pkgsrc/devel/ptlib/PLIST
diff -r1.5 -r1.6 pkgsrc/devel/ptlib/buildlink3.mk
diff -r1.1.1.1 -r1.2 pkgsrc/devel/ptlib/patches/patch-ac
diff -r1.1.1.1 -r1.2 pkgsrc/devel/ptlib/patches/patch-ad
diff -r1.1.1.1 -r1.2 pkgsrc/devel/ptlib/patches/patch-ae
diff -r1.2 -r1.3 pkgsrc/devel/ptlib/patches/patch-af
diff -r0 -r1.1 pkgsrc/devel/ptlib/patches/patch-ak
cvs diff -r1.6 -r1.7 pkgsrc/devel/ptlib/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ptlib/Attic/Makefile 2009/01/30 08:18:45 1.6
+++ pkgsrc/devel/ptlib/Attic/Makefile 2009/03/18 11:57:15 1.7
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2009/01/30 08:18:45 obache Exp $ 1# $NetBSD: Makefile,v 1.7 2009/03/18 11:57:15 jmcneill Exp $
2 2
3DISTNAME= ptlib-2.4.4 3DISTNAME= ptlib-2.6.1
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ptlib/2.4/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ptlib/2.6/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.ekiga.net/ 9HOMEPAGE= http://www.ekiga.net/
10COMMENT= Portable Windows Libary 10COMMENT= Portable Windows Libary
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14CONFLICTS+= pwlib-[0-9]* 14CONFLICTS+= pwlib-[0-9]*
15 15
16USE_TOOLS+= bison gmake pkg-config 16USE_TOOLS+= bison gmake pkg-config
17BUILD_TARGET= optshared 17BUILD_TARGET= optshared
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
cvs diff -r1.6 -r1.7 pkgsrc/devel/ptlib/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ptlib/Attic/distinfo 2009/01/13 02:19:10 1.6
+++ pkgsrc/devel/ptlib/Attic/distinfo 2009/03/18 11:57:15 1.7
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.6 2009/01/13 02:19:10 jmcneill Exp $ 1$NetBSD: distinfo,v 1.7 2009/03/18 11:57:15 jmcneill Exp $
2 2
3SHA1 (ptlib-2.4.4.tar.bz2) = a6255cc6f2fb337518a9c49d8ce21f1790729ca7 3SHA1 (ptlib-2.6.1.tar.bz2) = b269a20f1bf98130e0088eea6ec5689197cf5521
4RMD160 (ptlib-2.4.4.tar.bz2) = 9a84d463bf203b1619a9df5a67d0fed80b182acd 4RMD160 (ptlib-2.6.1.tar.bz2) = e7bd3f954c871725b269df0ab7561ab0fe6a23ba
5Size (ptlib-2.4.4.tar.bz2) = 3009442 bytes 5Size (ptlib-2.6.1.tar.bz2) = 3296212 bytes
6SHA1 (patch-ac) = b0cb79c86fb0cf3182d08a33ad48a3f9becc9c20 6SHA1 (patch-ac) = b29fa5e9a2e8d4585367ee21ccf17691780f1429
7SHA1 (patch-ad) = 04504e7549709f4936dc2c791b0fbcc425781c08 7SHA1 (patch-ad) = 86f80d2a1dfad6effdd11c4290dc11c1bc56f199
8SHA1 (patch-ae) = 92d140bd9536837186a03a3d3230bbb207df0ae4 8SHA1 (patch-ae) = af3ba745e56aba3c4f35ff4a69918a545466aa7d
9SHA1 (patch-af) = 837cf090245e924397118132bd9529bfc394e0b3 9SHA1 (patch-af) = 3f1271e2b0f84cca82e7b8cbde0ef489d15b7810
10SHA1 (patch-ah) = 5d98d2037c1b389e098d993217f3cefb5050a908 10SHA1 (patch-ah) = 5d98d2037c1b389e098d993217f3cefb5050a908
11SHA1 (patch-ai) = 47a7d53e52f5a28b0f25baaf1782a4152e6c6927 11SHA1 (patch-ai) = 47a7d53e52f5a28b0f25baaf1782a4152e6c6927
12SHA1 (patch-aj) = 4c9548ef40857baf29daacc9acf6ecd68a1e5610 12SHA1 (patch-aj) = 4c9548ef40857baf29daacc9acf6ecd68a1e5610
 13SHA1 (patch-ak) = 996ce5a8a3e99bb3b6f4b559da35849f1f5d14b3
cvs diff -r1.4 -r1.5 pkgsrc/devel/ptlib/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ptlib/Attic/PLIST 2008/10/25 18:12:34 1.4
+++ pkgsrc/devel/ptlib/Attic/PLIST 2009/03/18 11:57:15 1.5
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1@comment $NetBSD: PLIST,v 1.4 2008/10/25 18:12:34 jmcneill Exp $ 1@comment $NetBSD: PLIST,v 1.5 2009/03/18 11:57:15 jmcneill Exp $
2bin/ptlib-config 2bin/ptlib-config
3include/ptbuildopts.h 3include/ptbuildopts.h
4include/ptclib/asnber.h 4include/ptclib/asnber.h
5include/ptclib/asner.h 5include/ptclib/asner.h
6include/ptclib/asnper.h 6include/ptclib/asnper.h
7include/ptclib/asnxer.h 7include/ptclib/asnxer.h
8include/ptclib/cypher.h 8include/ptclib/cypher.h
9include/ptclib/delaychan.h 9include/ptclib/delaychan.h
10include/ptclib/dtmf.h 10include/ptclib/dtmf.h
11include/ptclib/enum.h 11include/ptclib/enum.h
12include/ptclib/ftp.h 12include/ptclib/ftp.h
13include/ptclib/guid.h 13include/ptclib/guid.h
14include/ptclib/html.h 14include/ptclib/html.h
15include/ptclib/http.h 15include/ptclib/http.h
16include/ptclib/httpform.h 16include/ptclib/httpform.h
17include/ptclib/httpsvc.h 17include/ptclib/httpsvc.h
18include/ptclib/inetmail.h 18include/ptclib/inetmail.h
19include/ptclib/inetprot.h 19include/ptclib/inetprot.h
20include/ptclib/ipacl.h 20include/ptclib/ipacl.h
21include/ptclib/memfile.h 21include/ptclib/memfile.h
22include/ptclib/mime.h 22include/ptclib/mime.h
23include/ptclib/modem.h 23include/ptclib/modem.h
24include/ptclib/paec.h 24include/ptclib/paec.h
25include/ptclib/pasn.h 25include/ptclib/pasn.h
 26include/ptclib/pffvdev.h
26include/ptclib/pdns.h 27include/ptclib/pdns.h
27include/ptclib/pils.h 28include/ptclib/pils.h
28include/ptclib/pldap.h 29include/ptclib/pldap.h
29include/ptclib/pnat.h 30include/ptclib/pnat.h
30include/ptclib/podbc.h 31include/ptclib/podbc.h
31include/ptclib/psasl.h 32include/ptclib/psasl.h
32include/ptclib/psnmp.h 33include/ptclib/psnmp.h
33include/ptclib/psoap.h 34include/ptclib/psoap.h
34include/ptclib/psockbun.h 35include/ptclib/psockbun.h
35include/ptclib/pssl.h 36include/ptclib/pssl.h
36include/ptclib/pstun.h 37include/ptclib/pstun.h
37include/ptclib/ptts.h 38include/ptclib/ptts.h
38include/ptclib/pvfiledev.h 39include/ptclib/pvfiledev.h
@@ -57,27 +58,26 @@ include/ptclib/xmpp.h @@ -57,27 +58,26 @@ include/ptclib/xmpp.h
57include/ptclib/xmpp_c2s.h 58include/ptclib/xmpp_c2s.h
58include/ptclib/xmpp_muc.h 59include/ptclib/xmpp_muc.h
59include/ptclib/xmpp_roster.h 60include/ptclib/xmpp_roster.h
60include/ptlib.h 61include/ptlib.h
61include/ptlib/MacMainIf.h 62include/ptlib/MacMainIf.h
62include/ptlib/args.h 63include/ptlib/args.h
63include/ptlib/array.h 64include/ptlib/array.h
64include/ptlib/channel.h 65include/ptlib/channel.h
65include/ptlib/conchan.h 66include/ptlib/conchan.h
66include/ptlib/config.h 67include/ptlib/config.h
67include/ptlib/contain.h 68include/ptlib/contain.h
68include/ptlib/contain.inl 69include/ptlib/contain.inl
69include/ptlib/critsec.h 70include/ptlib/critsec.h
70include/ptlib/devplugin.h 
71include/ptlib/dict.h 71include/ptlib/dict.h
72include/ptlib/dynalink.h 72include/ptlib/dynalink.h
73include/ptlib/ethsock.h 73include/ptlib/ethsock.h
74include/ptlib/file.h 74include/ptlib/file.h
75include/ptlib/filepath.h 75include/ptlib/filepath.h
76include/ptlib/icmpsock.h 76include/ptlib/icmpsock.h
77include/ptlib/indchan.h 77include/ptlib/indchan.h
78include/ptlib/int64.h 78include/ptlib/int64.h
79include/ptlib/ipdsock.h 79include/ptlib/ipdsock.h
80include/ptlib/ipsock.h 80include/ptlib/ipsock.h
81include/ptlib/ipxsock.h 81include/ptlib/ipxsock.h
82include/ptlib/lists.h 82include/ptlib/lists.h
83include/ptlib/mail.h 83include/ptlib/mail.h
@@ -145,27 +145,26 @@ include/ptlib/unix/ptlib/serchan.h @@ -145,27 +145,26 @@ include/ptlib/unix/ptlib/serchan.h
145include/ptlib/unix/ptlib/sfile.h 145include/ptlib/unix/ptlib/sfile.h
146include/ptlib/unix/ptlib/shmvideo.h 146include/ptlib/unix/ptlib/shmvideo.h
147include/ptlib/unix/ptlib/socket.h 147include/ptlib/unix/ptlib/socket.h
148include/ptlib/unix/ptlib/sound.h 148include/ptlib/unix/ptlib/sound.h
149include/ptlib/unix/ptlib/svcproc.h 149include/ptlib/unix/ptlib/svcproc.h
150include/ptlib/unix/ptlib/syncpoint.h 150include/ptlib/unix/ptlib/syncpoint.h
151include/ptlib/unix/ptlib/tcpsock.h 151include/ptlib/unix/ptlib/tcpsock.h
152include/ptlib/unix/ptlib/textfile.h 152include/ptlib/unix/ptlib/textfile.h
153include/ptlib/unix/ptlib/thread.h 153include/ptlib/unix/ptlib/thread.h
154include/ptlib/unix/ptlib/timeint.h 154include/ptlib/unix/ptlib/timeint.h
155include/ptlib/unix/ptlib/timer.h 155include/ptlib/unix/ptlib/timer.h
156include/ptlib/unix/ptlib/udpsock.h 156include/ptlib/unix/ptlib/udpsock.h
157include/ptlib/unix/ptlib/video.h 157include/ptlib/unix/ptlib/video.h
158include/ptlib/unix/ptlib/videoio.h 
159include/ptlib/vconvert.h 158include/ptlib/vconvert.h
160include/ptlib/video.h 159include/ptlib/video.h
161include/ptlib/videoio.h 160include/ptlib/videoio.h
162include/ptlib/videoio1394dc.h 161include/ptlib/videoio1394dc.h
163lib/libpt.so 162lib/libpt.so
164lib/libpt.so.${PKGVERSION} 163lib/libpt.so.${PKGVERSION}
165lib/libpt_s.a 164lib/libpt_s.a
166lib/pkgconfig/ptlib.pc 165lib/pkgconfig/ptlib.pc
167lib/ptlib-${PKGVERSION}/devices/sound/oss_pwplugin.so 166lib/ptlib-${PKGVERSION}/devices/sound/oss_pwplugin.so
168lib/ptlib-${PKGVERSION}/devices/videoinput/v4l2_pwplugin.so 167lib/ptlib-${PKGVERSION}/devices/videoinput/v4l2_pwplugin.so
169share/ptlib/make/common.mak 168share/ptlib/make/common.mak
170share/ptlib/make/lib.mak 169share/ptlib/make/lib.mak
171share/ptlib/make/plugins.mak 170share/ptlib/make/plugins.mak
cvs diff -r1.5 -r1.6 pkgsrc/devel/ptlib/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/ptlib/Attic/buildlink3.mk 2009/01/30 12:46:23 1.5
+++ pkgsrc/devel/ptlib/Attic/buildlink3.mk 2009/03/18 11:57:15 1.6
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: buildlink3.mk,v 1.5 2009/01/30 12:46:23 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2009/03/18 11:57:15 jmcneill Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4PTLIB_BUILDLINK3_MK:= ${PTLIB_BUILDLINK3_MK}+ 4PTLIB_BUILDLINK3_MK:= ${PTLIB_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= ptlib 7BUILDLINK_DEPENDS+= ptlib
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nptlib} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nptlib}
11BUILDLINK_PACKAGES+= ptlib 11BUILDLINK_PACKAGES+= ptlib
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ptlib 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ptlib
13 13
14.if !empty(PTLIB_BUILDLINK3_MK:M+) 14.if !empty(PTLIB_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.ptlib+= ptlib>=2.4.2 15BUILDLINK_API_DEPENDS.ptlib+= ptlib>=2.6.1
16BUILDLINK_ABI_DEPENDS.ptlib?= ptlib>=2.4.2 16BUILDLINK_ABI_DEPENDS.ptlib?= ptlib>=2.6.1
17BUILDLINK_PKGSRCDIR.ptlib?= ../../devel/ptlib 17BUILDLINK_PKGSRCDIR.ptlib?= ../../devel/ptlib
18.endif # PTLIB_BUILDLINK3_MK 18.endif # PTLIB_BUILDLINK3_MK
19 19
20.include "../../devel/SDL/buildlink3.mk" 20.include "../../devel/SDL/buildlink3.mk"
21.include "../../databases/openldap-client/buildlink3.mk" 21.include "../../databases/openldap-client/buildlink3.mk"
22.include "../../security/openssl/buildlink3.mk" 22.include "../../security/openssl/buildlink3.mk"
23.include "../../textproc/expat/buildlink3.mk" 23.include "../../textproc/expat/buildlink3.mk"
24.include "../../mk/pthread.buildlink3.mk" 24.include "../../mk/pthread.buildlink3.mk"
25 25
26BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 26BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/ptlib/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/ptlib/patches/Attic/patch-ac 2008/09/12 13:18:26 1.1.1.1
+++ pkgsrc/devel/ptlib/patches/Attic/patch-ac 2009/03/18 11:57:16 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ac,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $ 1$NetBSD: patch-ac,v 1.2 2009/03/18 11:57:16 jmcneill Exp $
2 2
3--- src/ptlib/unix/tlib.cxx.orig 2008-09-08 15:34:39.000000000 -0400 3--- src/ptlib/unix/tlib.cxx.orig 2009-03-17 23:43:30.000000000 -0400
4+++ src/ptlib/unix/tlib.cxx 2008-09-08 15:34:54.000000000 -0400 4+++ src/ptlib/unix/tlib.cxx
5@@ -400,7 +400,7 @@ 5@@ -400,7 +400,7 @@ PString PX_GetThreadName(pthread_t id)
6 { 6 {
7 if (PProcessInstance != NULL) { 7 if (PProcessInstance != NULL) {
8 PWaitAndSignal m(PProcessInstance->threadMutex); 8 PWaitAndSignal m(PProcessInstance->activeThreadMutex);
9- PThread & thread = PProcessInstance->activeThreads[(unsigned)id]; 9- PThread & thread = PProcessInstance->activeThreads[(unsigned)id];
10+ PThread & thread = PProcessInstance->activeThreads[(uintptr_t)id]; 10+ PThread & thread = PProcessInstance->activeThreads[(uintptr_t)id];
11 return thread.GetThreadName(); 11 return thread.GetThreadName();
12 } 12 }
13 return psprintf("%08x", id); 13 return psprintf("%08x", id);
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/ptlib/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/ptlib/patches/Attic/patch-ad 2008/09/12 13:18:26 1.1.1.1
+++ pkgsrc/devel/ptlib/patches/Attic/patch-ad 2009/03/18 11:57:16 1.2
@@ -1,49 +1,33 @@ @@ -1,49 +1,33 @@
1$NetBSD: patch-ad,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $ 1$NetBSD: patch-ad,v 1.2 2009/03/18 11:57:16 jmcneill Exp $
2 2
3--- src/ptlib/unix/tlibthrd.cxx.orig 2008-09-08 15:35:17.000000000 -0400 3--- src/ptlib/unix/tlibthrd.cxx.orig 2009-03-17 23:43:30.000000000 -0400
4+++ src/ptlib/unix/tlibthrd.cxx 2008-09-08 15:36:17.000000000 -0400 4+++ src/ptlib/unix/tlibthrd.cxx
5@@ -216,7 +216,7 @@ 5@@ -240,7 +240,7 @@ PBoolean PProcess::PThreadKill(pthread_t
6 { 6 {
7 PWaitAndSignal m(threadMutex); 7 PWaitAndSignal m(activeThreadMutex);
8  8
9- if (!activeThreads.Contains((unsigned)id))  9- if (!activeThreads.Contains((unsigned)id))
10+ if (!activeThreads.Contains((uintptr_t)id))  10+ if (!activeThreads.Contains((uintptr_t)id))
11 return PFalse; 11 return PFalse;
12  12
13 return pthread_kill(id, sig) == 0; 13 return pthread_kill(id, sig) == 0;
14@@ -254,7 +254,7 @@ 14@@ -249,8 +249,8 @@ PBoolean PProcess::PThreadKill(pthread_t
15 #endif 15 void PProcess::PXSetThread(pthread_t id, PThread * thread)
16  
17 ((PProcess *)this)->activeThreads.DisallowDeleteObjects(); 
18- ((PProcess *)this)->activeThreads.SetAt((unsigned)PX_threadId, this); 
19+ ((PProcess *)this)->activeThreads.SetAt((uintptr_t)PX_threadId, this); 
20  
21 PX_firstTimeStart = PFalse; 
22 } 
23@@ -366,7 +366,7 @@ 
24 PAssertPTHREAD(pthread_create, (&PX_threadId, &threadAttr, PX_ThreadStart, this)); 
25  
26 // put the thread into the thread list 
27- process.activeThreads.SetAt((unsigned)PX_threadId, this); 
28+ process.activeThreads.SetAt((uintptr_t)PX_threadId, this); 
29 if (process.activeThreads.GetSize() > highWaterMark) 
30 newHighWaterMark = highWaterMark = process.activeThreads.GetSize(); 
31  
32@@ -689,7 +689,7 @@ 
33 { 16 {
34 PProcess & process = PProcess::Current(); 17 activeThreadMutex.Wait();
35 process.threadMutex.Wait(); 18- PThread * currentThread = activeThreads.GetAt((PINDEX)id);
36- PThread * thread = process.activeThreads.GetAt((unsigned)pthread_self()); 19- activeThreads.SetAt((PINDEX)id, thread);
37+ PThread * thread = process.activeThreads.GetAt((uintptr_t)pthread_self()); 20+ PThread * currentThread = activeThreads.GetAt((uintptr_t)id);
38 process.threadMutex.Signal(); 21+ activeThreads.SetAt((uintptr_t)id, thread);
39 return thread; 22 activeThreadMutex.Signal();
40 } 23
41@@ -830,7 +830,7 @@ 24 if (currentThread != NULL)
42 }  25@@ -891,7 +891,7 @@ void PThread::PX_ThreadEnd(void * arg)
 26 }
43  27
44 // remove this thread from the active thread list 28 // remove this thread from the active thread list
45- process.activeThreads.SetAt((unsigned)id, NULL); 29- process.activeThreads.SetAt((unsigned)id, NULL);
46+ process.activeThreads.SetAt((uintptr_t)id, NULL); 30+ process.activeThreads.SetAt((uintptr_t)id, NULL);
47  31
48 // delete the thread if required, note this is done this way to avoid 32 bool deleteThread = thread->autoDelete; // Get flag before releasing lock
49 // a race condition, the thread ID cannot be zeroed before the if! 33
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/ptlib/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/devel/ptlib/patches/Attic/patch-ae 2008/09/12 13:18:26 1.1.1.1
+++ pkgsrc/devel/ptlib/patches/Attic/patch-ae 2009/03/18 11:57:16 1.2
@@ -1,18 +1,36 @@ @@ -1,18 +1,36 @@
1$NetBSD: patch-ae,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $ 1$NetBSD: patch-ae,v 1.2 2009/03/18 11:57:16 jmcneill Exp $
2 2
3--- src/ptlib/common/osutils.cxx.orig 2008-09-08 15:37:04.000000000 -0400 3--- src/ptlib/common/osutils.cxx.orig 2009-03-17 23:43:33.000000000 -0400
4+++ src/ptlib/common/osutils.cxx 2008-09-08 15:37:31.000000000 -0400 4+++ src/ptlib/common/osutils.cxx
5@@ -2091,21 +2091,21 @@ 5@@ -1548,7 +1548,7 @@ PProcess::PProcess(const char * manuf, c
 6 , m_library(false)
 7 {
 8 activeThreads.DisallowDeleteObjects();
 9- activeThreads.SetAt((PINDEX)GetCurrentThreadId(), this);
 10+ activeThreads.SetAt((uintptr_t)GetCurrentThreadId(), this);
 11
 12 PProcessInstance = this;
 13
 14@@ -1912,7 +1912,7 @@ PThread * PThread::Current()
 15 PProcess & process = PProcess::Current();
 16
 17 process.activeThreadMutex.Wait();
 18- PThread * thread = process.activeThreads.GetAt((unsigned)GetCurrentThreadId());
 19+ PThread * thread = process.activeThreads.GetAt((uintptr_t)GetCurrentThreadId());
 20 process.activeThreadMutex.Signal();
 21
 22 if (thread == NULL)
 23@@ -2210,21 +2210,21 @@ PReadWriteMutex::~PReadWriteMutex()
6 PReadWriteMutex::Nest * PReadWriteMutex::GetNest() const 24 PReadWriteMutex::Nest * PReadWriteMutex::GetNest() const
7 { 25 {
8 PWaitAndSignal mutex(nestingMutex); 26 PWaitAndSignal mutex(nestingMutex);
9- return nestedThreads.GetAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId())); 27- return nestedThreads.GetAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
10+ return nestedThreads.GetAt(POrdinalKey((INT)PThread::GetCurrentThreadId())); 28+ return nestedThreads.GetAt(POrdinalKey((INT)PThread::GetCurrentThreadId()));
11 } 29 }
12  30
13  31
14 void PReadWriteMutex::EndNest() 32 void PReadWriteMutex::EndNest()
15 { 33 {
16 nestingMutex.Wait(); 34 nestingMutex.Wait();
17- nestedThreads.RemoveAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId())); 35- nestedThreads.RemoveAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
18+ nestedThreads.RemoveAt(POrdinalKey((INT)PThread::GetCurrentThreadId())); 36+ nestedThreads.RemoveAt(POrdinalKey((INT)PThread::GetCurrentThreadId()));
cvs diff -r1.2 -r1.3 pkgsrc/devel/ptlib/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/devel/ptlib/patches/Attic/patch-af 2008/09/13 18:09:06 1.2
+++ pkgsrc/devel/ptlib/patches/Attic/patch-af 2009/03/18 11:57:16 1.3
@@ -1,42 +1,44 @@ @@ -1,42 +1,44 @@
1$NetBSD: patch-af,v 1.2 2008/09/13 18:09:06 jmcneill Exp $ 1$NetBSD: patch-af,v 1.3 2009/03/18 11:57:16 jmcneill Exp $
2 2
3--- make/unix.mak.orig 2008-09-07 17:00:16.000000000 -0400 3--- make/unix.mak.orig 2009-03-17 23:43:35.000000000 -0400
4+++ make/unix.mak 2008-09-08 15:40:22.000000000 -0400 4+++ make/unix.mak
5@@ -196,7 +196,7 @@ 5@@ -186,7 +186,7 @@ endif # FreeBSD
6 ifeq ($(OSTYPE),OpenBSD) 6 ifeq ($(OSTYPE),OpenBSD)
7  7
8 ifeq ($(MACHTYPE),x86) 8 ifeq ($(MACHTYPE),x86)
9-STDCCFLAGS += -m486 9-STDCCFLAGS += -m486
10+#STDCCFLAGS += -m486 10+#STDCCFLAGS += -m486
11 endif 11 endif
12  12
13 LDLIBS += -lossaudio 13 LDLIBS += -lossaudio
14@@ -220,6 +220,14 @@ 14@@ -208,9 +208,16 @@ STDCCFLAGS += -mcpu=$(CPUTYPE)
15  15 endif
16 STDCCFLAGS += -I$(UNIX_INC_DIR) -I$(PTLIBDIR)/include 16 endif
17  17
18+ifeq ($(MACHTYPE),x86_64) 18+ifeq ($(MACHTYPE),x86_64)
19+STDCCFLAGS += -DP_64BIT 19+STDCCFLAGS += -DP_64BIT
20+endif 20+endif
21+ 21+
 22 P_USE_RANLIB := 1
 23 #STDCCFLAGS += -DP_USE_PRAGMA # migrated to configure
 24
22+ifndef PROG 25+ifndef PROG
23+STDCCFLAGS += -fPIC -DPIC 26+STDCCFLAGS += -fPIC -DPIC
24+endif # PROG 27+endif # PROG
25+ 28
26 # enable the USE_PTH line to compile using pth 29 endif # NetBSD
27 # enable the USE_NATIVE_THREADS line to compile using native threads 30
28 # enable the USE_UNPROVEN_THREADS line to compile using unproven threads 31@@ -563,11 +570,11 @@ LIB_SUFFIX = $(SHAREDLIBEXT)
29@@ -601,11 +609,11 @@ 
30 LIB_TYPE = 32 LIB_TYPE =
31 else  33 else
32 LIB_SUFFIX = a  34 LIB_SUFFIX = a
33-LIB_TYPE = _s 35-LIB_TYPE = _s
34+LIB_TYPE = 36+LIB_TYPE =
35 endif # P_SHAREDLIB 37 endif # P_SHAREDLIB
36  38
37 ifndef INSTALL_DIR 39 ifndef INSTALL_DIR
38-INSTALL_DIR = /usr/local 40-INSTALL_DIR = /usr/local
39+INSTALL_DIR = ${PREFIX} 41+INSTALL_DIR = ${PREFIX}
40 endif 42 endif
41  43
42 ifndef INSTALLBIN_DIR 44 ifndef INSTALLBIN_DIR
File Added: pkgsrc/devel/ptlib/patches/Attic/patch-ak
$NetBSD: patch-ak,v 1.1 2009/03/18 11:57:16 jmcneill Exp $

--- src/ptlib/unix/config.cxx.orig	2009-03-17 23:43:30.000000000 -0400
+++ src/ptlib/unix/config.cxx
@@ -53,6 +53,10 @@
 #define environ (NULL)
 #endif
 
+#if defined(__NetBSD__)
+extern char **environ;
+#endif
+
 //
 //  a single key/value pair
 //