Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/crypto
In directory vz-cvs-3.sog:/tmp/cvs-serv14121
Modified Files:
pwlib1.info pwlib1.patch
Log Message:
remove old SDL Dist restriction and add x86_64 build capability
Index: pwlib1.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/crypto/pwlib1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pwlib1.patch 26 Jan 2012 22:00:43 -0000 1.1
+++ pwlib1.patch 16 Mar 2012 15:58:32 -0000 1.2
@@ -9,3 +9,136 @@
PCREATE_SOUND_PLUGIN(CoreAudio, PSoundChannelCoreAudio);
+@@ -1337,7 +1338,7 @@
+
+ //calculate size of ABL given the last field, assum non-interleaved
+ UInt32 mChannelsPerFrame = hwASBD.mChannelsPerFrame;
+- UInt32 propsize = (UInt32) &(((AudioBufferList
*)0)->mBuffers[mChannelsPerFrame]);
++ UInt32 propsize = sizeof(AudioBuffer) * mChannelsPerFrame +
sizeof(AudioBufferList);
+
+ //malloc buffer lists
+ mInputBufferList = (AudioBufferList *)malloc(propsize);
+@@ -1372,7 +1373,7 @@
+
+ //calculate number of buffers from channels
+ mChannelsPerFrame = pwlibASBD.mChannelsPerFrame;
+- propsize = (UInt32) &(((AudioBufferList *)0)->mBuffers[mChannelsPerFrame]);
++ propsize = sizeof(AudioBuffer) * mChannelsPerFrame +
sizeof(AudioBufferList);
+
+ //malloc buffer lists
+ mOutputBufferList = (AudioBufferList *)malloc(propsize);
+--- a/src/ptlib/unix/svcproc.cxx 2012-03-16 10:44:21.000000000 -0400
++++ b/src/ptlib/unix/svcproc.cxx 2007-10-19 02:22:32.000000000 -0400
+@@ -388,7 +388,7 @@
+ #elif defined(BE_THREADS)
+ thread_id tid = ::find_thread(NULL);
+ #else
+- unsigned tid = (unsigned) pthread_self();
++ unsigned tid = (unsigned long) pthread_self();
+ #endif
+ *out << "ThreadID=0x"
+ << setfill('0') << ::hex
+@@ -938,7 +938,7 @@
+ #elif defined(BE_THREADS)
+ thread_id tid = ::find_thread(NULL);
+ #else
+- unsigned tid = (unsigned) pthread_self();
++ unsigned tid = (unsigned long) pthread_self();
+ #endif
+ PThread * thread_ptr = activeThreads.GetAt(tid);
+
+--- a/src/ptlib/unix/tlibthrd.cxx 2012-03-16 10:44:21.000000000 -0400
++++ b/src/ptlib/unix/tlibthrd.cxx 2007-10-19 02:22:32.000000000 -0400
+@@ -754,7 +754,7 @@
+ {
+ PWaitAndSignal m(threadMutex);
+
+- if (!activeThreads.Contains((unsigned)id))
++ if (!activeThreads.Contains((unsigned long)id))
+ return FALSE;
+
+ return pthread_kill(id, sig) == 0;
+@@ -792,7 +792,7 @@
+ #endif
+
+ ((PProcess *)this)->activeThreads.DisallowDeleteObjects();
+- ((PProcess *)this)->activeThreads.SetAt((unsigned)PX_threadId, this);
++ ((PProcess *)this)->activeThreads.SetAt((unsigned long)PX_threadId, this);
+
+ PX_firstTimeStart = FALSE;
+
+@@ -906,7 +906,7 @@
+ PAssertPTHREAD(pthread_create, (&PX_threadId, &threadAttr, PX_ThreadStart,
this));
+
+ // put the thread into the thread list
+- process.activeThreads.SetAt((unsigned)PX_threadId, this);
++ process.activeThreads.SetAt((unsigned long)PX_threadId, this);
+ if (process.activeThreads.GetSize() > highWaterMark)
+ newHighWaterMark = highWaterMark = process.activeThreads.GetSize();
+
+@@ -1229,7 +1229,7 @@
+ {
+ PProcess & process = PProcess::Current();
+ process.threadMutex.Wait();
+- PThread * thread = process.activeThreads.GetAt((unsigned)pthread_self());
++ PThread * thread = process.activeThreads.GetAt((unsigned
long)pthread_self());
+ process.threadMutex.Signal();
+ return thread;
+ }
+@@ -1362,7 +1362,7 @@
+ }
+
+ // remove this thread from the active thread list
+- process.activeThreads.SetAt((unsigned)id, NULL);
++ process.activeThreads.SetAt((unsigned long)id, NULL);
+
+ // delete the thread if required, note this is done this way to avoid
+ // a race condition, the thread ID cannot be zeroed before the if!
+@@ -1562,7 +1562,7 @@
+
+ PAssertPTHREAD(pthread_mutex_unlock, (&semCreationMutex));
+
+- PAssert(((int)sem != SEM_FAILED), "Couldn't create named semaphore");
++ PAssert((sem != (sem_t *)SEM_FAILED), "Couldn't create named semaphore");
+ return sem;
+ }
+ #endif
+--- a/src/ptlib/common/osutils.cxx 2005-12-04 17:43:30.000000000 -0500
++++ b/src/ptlib/common/osutils.cxx 2012-03-16 11:11:48.000000000 -0400
+@@ -2145,9 +2145,9 @@
+ void PThread::SetThreadName(const PString & name)
+ {
+ if (name.IsEmpty())
+- threadName = psprintf("%s:%08x", GetClass(), (INT)this);
++ threadName = psprintf("%s:%08x", GetClass(), (long INT)this);
+ else
+- threadName = psprintf(name, (INT)this);
++ threadName = psprintf(name, (long INT)this);
+
+ #if defined(_DEBUG) && defined(_MSC_VER)
+ if (threadId) { // make thread name known to debugger
+@@ -2356,21 +2356,21 @@
+ PReadWriteMutex::Nest * PReadWriteMutex::GetNest() const
+ {
+ PWaitAndSignal mutex(nestingMutex);
+- return
nestedThreads.GetAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
++ return nestedThreads.GetAt(POrdinalKey((long
PINDEX)PThread::GetCurrentThreadId()));
+ }
+
+
+ void PReadWriteMutex::EndNest()
+ {
+ nestingMutex.Wait();
+- nestedThreads.RemoveAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
++ nestedThreads.RemoveAt(POrdinalKey((long
PINDEX)PThread::GetCurrentThreadId()));
+ nestingMutex.Signal();
+ }
+
+
+ PReadWriteMutex::Nest & PReadWriteMutex::StartNest()
+ {
+- POrdinalKey threadId = (PINDEX)PThread::GetCurrentThreadId();
++ POrdinalKey threadId = (long PINDEX)PThread::GetCurrentThreadId();
+
+ nestingMutex.Wait();
+
Index: pwlib1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/crypto/pwlib1.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pwlib1.info 26 Jan 2012 22:00:42 -0000 1.2
+++ pwlib1.info 16 Mar 2012 15:58:32 -0000 1.3
@@ -1,7 +1,6 @@
Package: pwlib1
Version: 1.10.10
-Revision: 9
-Distribution: 10.4, 10.5
+Revision: 10
Maintainer: The Gnome Core Team <[email protected]>
GCC: 4.0
BuildDepends: <<
@@ -29,7 +28,7 @@
Source: mirror:gnome:sources/pwlib/1.10/pwlib-%v.tar.bz2
Source-MD5: 2c3bf7e8236a96659728ad139ce30b33
PatchFile: %n.patch
-PatchFile-MD5: ee8a8a1ad4e5de510ad9b8abcadafd87
+PatchFile-MD5: 79bb88877165e2552af6a3e2a6016c38
PatchScript: <<
#!/bin/sh -ev
%{default_script}
@@ -103,7 +102,7 @@
# the next line also adds -fno-exceptions to the CXXFLAGS for opal2 and
openh323-1, through make/ptbuildopts.mak
# (CXXFLAGS is not obeyed by those pkgs) (and -fno-rtti should not be used:
"typeid" used in %p/include/ptlib/pfactory.h)
export CPATH=%p/include; export ESDDIR=%p; export
STDCXXFLAGS="-fno-exceptions"
- if [ %m = i386 ] ; then abbr=x86 ; else abbr=ppc ; fi
+ if [ %m != powerpc ] ; then abbr=x86 ; else abbr=ppc ; fi
./configure %c
mv=`sed -r -e 's,\.[^.]*$,,' <<<"%v"`
Mv=`sed -r -e 's,\.[^.]*$,,' <<<"$mv"`
@@ -144,7 +143,7 @@
Files: lib/libpt_Darwin_*.*.*dylib
Shlibs: <<
( %m = powerpc ) %p/lib/libpt_Darwin_ppc_r.1.dylib 1.10.0 %n (>=
1.10.1-1)
- ( %m = i386 ) %p/lib/libpt_Darwin_x86_r.1.dylib 1.10.0 %n (>=
1.10.1-1)
+ ( %m != powerpc ) %p/lib/libpt_Darwin_x86_r.1.dylib 1.10.0 %n (>=
1.10.1-1)
<<
DocFiles: mpl-1.0.htm ReadMe.txt History.txt
<<
@@ -154,6 +153,13 @@
with current version of ekiga, or else go first back for pwlib to the format
infofile_name = %N-%v.info, so older versions can stay in fink (versioning of
those
pkgs seems completely erratic)
+
+nieder for x86_64 builds:
+maccoreaudio.cxx error: "cast from 'AudioBuffer*' to 'UInt32' loses precision"
error
+http://sourceforge.net/mailarchive/message.php?msg_id=24954122
+
+{svcproc,tlibthrd,osutils}.cxx error: "cast from '...' to '...' loses
precision"
+similarly fixed by changing to 'long'
<<
DescPackaging: <<
Original version by Shawn Hsiao <[email protected]>; version
1.5.2-10 by James Gibbs <[email protected]>
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
