[74969] users/ryandesign/ports/devel/libhsplasma
ryandesign at macports.org
ryandesign at macports.org
Sun Jan 9 23:36:17 PST 2011
Revision: 74969
http://trac.macports.org/changeset/74969
Author: ryandesign at macports.org
Date: 2011-01-09 23:36:06 -0800 (Sun, 09 Jan 2011)
Log Message:
-----------
libhsplasma: update to 788 and refresh and reinstate endian patch
Modified Paths:
--------------
users/ryandesign/ports/devel/libhsplasma/Portfile
users/ryandesign/ports/devel/libhsplasma/files/patch-endian.diff
Modified: users/ryandesign/ports/devel/libhsplasma/Portfile
===================================================================
--- users/ryandesign/ports/devel/libhsplasma/Portfile 2011-01-10 06:08:00 UTC (rev 74968)
+++ users/ryandesign/ports/devel/libhsplasma/Portfile 2011-01-10 07:36:06 UTC (rev 74969)
@@ -5,7 +5,7 @@
PortGroup cmake 1.0
name libhsplasma
-version 0.0-756
+version 0.0-788
categories devel
platforms darwin
maintainers ryandesign
@@ -21,15 +21,14 @@
fetch.type hg
hg.url http://uru.zrax.net/hg/libhsplasma
-hg.tag 52fcdb1e4dfd
+hg.tag 91982feffb44
depends_lib port:zlib \
port:jpeg \
port:openssl \
port:python26
-# half of patch-endian doesn't apply anymore following rewritten upstream net code
-#patchfiles patch-endian.diff
+patchfiles patch-endian.diff
configure.args-append -DDISABLE_PYTHON:BOOL=OFF \
-DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python2.6 \
Modified: users/ryandesign/ports/devel/libhsplasma/files/patch-endian.diff
===================================================================
--- users/ryandesign/ports/devel/libhsplasma/files/patch-endian.diff 2011-01-10 06:08:00 UTC (rev 74968)
+++ users/ryandesign/ports/devel/libhsplasma/files/patch-endian.diff 2011-01-10 07:36:06 UTC (rev 74969)
@@ -1,5 +1,5 @@
---- core/Sys/plUuid.cpp.orig 2010-09-26 23:16:46.000000000 -0500
-+++ core/Sys/plUuid.cpp 2010-09-27 07:17:36.000000000 -0500
+--- core/Sys/plUuid.cpp.orig Thu Nov 11 11:14:21 2010 -0800
++++ core/Sys/plUuid.cpp Thu Nov 18 15:52:46 2010 -0600
@@ -69,6 +69,9 @@
fData1 = *(unsigned int* )(buffer );
fData2 = *(unsigned short*)(buffer + 4);
@@ -23,17 +23,17 @@
memcpy(buffer + 8, fData4, 8);
}
---- net/auth/pnAuthClient.cpp.orig 2010-09-26 23:16:46.000000000 -0500
-+++ net/auth/pnAuthClient.cpp 2010-09-27 07:17:36.000000000 -0500
-@@ -66,6 +66,7 @@
- }
+--- net/auth/pnAuthClient.cpp.orig Thu Nov 11 11:14:21 2010 -0800
++++ net/auth/pnAuthClient.cpp Thu Nov 18 15:52:46 2010 -0600
+@@ -64,6 +64,7 @@
+ hsUint16 msgId;
- fSock->recv(&msgId, sizeof(hsUint16));
-+ msgId = LESWAP16(msgId);
- const pnNetMsg* msgDesc = GET_Auth2Cli(msgId);
- if (msgDesc == NULL) {
- plDebug::Error("Got invalid message ID (%u)", msgId);
-@@ -381,13 +382,13 @@
+ sock->recv(&msgId, sizeof(hsUint16));
++ msgId = LESWAP16(msgId);
+ const pnNetMsg* msgDesc = GET_Auth2Cli(msgId);
+ if (msgDesc == NULL) {
+ plDebug::Error("Got invalid message ID (%u)", msgId);
+@@ -385,13 +386,13 @@
hsUbyte connectHeader[51]; // ConnectHeader + AuthConnectHeader
/* Begin ConnectHeader */
*(hsUbyte* )(connectHeader ) = kConnTypeCliToAuth;
@@ -52,7 +52,7 @@
memset(connectHeader + 35, 0, 16);
fSock->send(connectHeader, 51);
-@@ -435,6 +436,7 @@
+@@ -439,6 +440,7 @@
} else if (msg == kNetCliSrv2CliError) {
hsUint32 errorCode;
fSock->recv(&errorCode, sizeof(hsUint32));
@@ -60,9 +60,9 @@
delete fSock;
fSock = NULL;
plDebug::Error("Error connecting to Auth server: %s",
---- net/crypt/pnRC4.cpp.orig 2010-09-26 23:16:46.000000000 -0500
-+++ net/crypt/pnRC4.cpp 2010-09-27 07:17:36.000000000 -0500
-@@ -107,11 +107,11 @@
+--- net/pnSocket.cpp.orig Thu Nov 11 11:14:21 2010 -0800
++++ net/pnSocket.cpp Thu Nov 18 15:52:46 2010 -0600
+@@ -334,11 +334,11 @@
} else if (size == 2) {
hsUint16 v;
sock->recv(&v, sizeof(hsUint16));
@@ -76,7 +76,7 @@
}
#ifdef COMMDEBUG
-@@ -154,10 +154,10 @@
+@@ -381,10 +381,10 @@
*(hsUbyte*)buf = (hsUbyte)data.fUint;
buf += sizeof(hsUbyte);
} else if (size == 2) {
@@ -89,7 +89,7 @@
buf += sizeof(hsUint32);
}
-@@ -208,7 +208,7 @@
+@@ -435,7 +435,7 @@
size_t bufSize = sizeof(hsUint16) + NCMessageSize(data, msg);
unsigned char* buffer = new unsigned char[bufSize];
unsigned char* bp = buffer;
@@ -98,7 +98,7 @@
bp += sizeof(hsUint16);
unsigned int size = 0;
-@@ -223,9 +223,13 @@
+@@ -450,9 +450,13 @@
case kFieldString:
{
hsUint16 len = plwcslen(data[i].fString);
@@ -113,7 +113,7 @@
bp += len * sizeof(pl_wchar_t);
#ifdef COMMDEBUG
plDebug::Debug(" -> Str: %s", plString(data[i].fString, len).cstr());
-@@ -235,7 +239,7 @@
+@@ -462,7 +466,7 @@
case kFieldVarCount:
size = field->fSize;
count = data[i].fUint;
@@ -122,7 +122,7 @@
bp += sizeof(hsUint32);
#ifdef COMMDEBUG
plDebug::Debug(" -> Count: %d", count);
-@@ -309,8 +313,13 @@
+@@ -536,8 +540,13 @@
{
hsUint16 len;
recv(&len, sizeof(hsUint16));
@@ -136,7 +136,7 @@
str[len] = 0;
data[i].fString = str;
#ifdef COMMDEBUG
-@@ -321,7 +330,7 @@
+@@ -548,7 +557,7 @@
case kFieldVarCount:
size = field->fSize;
recv(&count, sizeof(hsUint32));
@@ -145,18 +145,18 @@
#ifdef COMMDEBUG
plDebug::Debug(" <- Count: %d", count);
#endif
---- net/file/pnFileClient.cpp.orig 2010-09-26 23:16:46.000000000 -0500
-+++ net/file/pnFileClient.cpp 2010-09-27 07:17:36.000000000 -0500
-@@ -116,6 +116,8 @@
+--- net/file/pnFileClient.cpp.orig Thu Nov 11 11:14:21 2010 -0800
++++ net/file/pnFileClient.cpp Thu Nov 18 15:52:46 2010 -0600
+@@ -115,6 +115,8 @@
- fSock->recv(&header.fMsgSize, sizeof(header.fMsgSize));
- fSock->recv(&header.fMsgId, sizeof(header.fMsgId));
-+ header.fMsgSize = LESWAP32(header.fMsgSize);
-+ header.fMsgId = LESWAP32(header.fMsgId);
- hsUbyte* msgbuf = new hsUbyte[header.fMsgSize - 8];
- fSock->recv(msgbuf, header.fMsgSize - 8);
-
-@@ -238,13 +240,13 @@
+ sock->recv(&header.fMsgSize, sizeof(header.fMsgSize));
+ sock->recv(&header.fMsgId, sizeof(header.fMsgId));
++ header.fMsgSize = LESWAP32(header.fMsgSize);
++ header.fMsgId = LESWAP32(header.fMsgId);
+ hsUbyte* msgbuf = new hsUbyte[header.fMsgSize - 8];
+ hsUint32 read_data = 0;
+ while (read_data < header.fMsgSize - 8)
+@@ -239,13 +241,13 @@
hsUbyte connectHeader[43]; // ConnectHeader + FileConnectHeader
/* Begin ConnectHeader */
*(hsUbyte* )(connectHeader ) = kConnTypeCliToFile;
@@ -174,7 +174,7 @@
*(hsUint32*)(connectHeader + 35) = 0;
*(hsUint32*)(connectHeader + 39) = 0;
fSock->send(connectHeader, 43);
-@@ -264,9 +266,9 @@
+@@ -269,9 +271,9 @@
void pnFileClient::sendPingRequest(hsUint32 pingTimeMs)
{
hsUbyte msgbuf[12];
@@ -187,7 +187,7 @@
fSock->send(msgbuf, 12);
}
-@@ -274,9 +276,9 @@
+@@ -279,9 +281,9 @@
{
hsUint32 transId = nextTransId();
hsUbyte msgbuf[12];
@@ -200,7 +200,7 @@
fSock->send(msgbuf, 12);
return transId;
}
-@@ -288,12 +290,12 @@
+@@ -293,12 +295,12 @@
hsUint32 transId = nextTransId();
hsUbyte msgbuf[536];
@@ -218,7 +218,7 @@
fSock->send(msgbuf, 536);
return transId;
}
-@@ -305,12 +307,12 @@
+@@ -310,12 +312,12 @@
hsUint32 transId = nextTransId();
hsUbyte msgbuf[536];
@@ -236,7 +236,7 @@
fSock->send(msgbuf, 536);
return transId;
}
-@@ -318,20 +320,20 @@
+@@ -323,20 +325,20 @@
void pnFileClient::sendManifestEntryAck(hsUint32 transId, hsUint32 readerId)
{
hsUbyte msgbuf[16];
@@ -265,16 +265,16 @@
fSock->send(msgbuf, 16);
}
---- net/game/pnGameClient.cpp.orig 2010-09-26 23:16:46.000000000 -0500
-+++ net/game/pnGameClient.cpp 2010-09-27 07:17:36.000000000 -0500
-@@ -36,6 +36,7 @@
- }
+--- net/game/pnGameClient.cpp.orig Thu Nov 11 11:14:21 2010 -0800
++++ net/game/pnGameClient.cpp Thu Nov 18 15:52:46 2010 -0600
+@@ -35,6 +35,7 @@
+ hsUint16 msgId;
- fSock->recv(&msgId, sizeof(hsUint16));
-+ msgId = LESWAP16(msgId);
- const pnNetMsg* msgDesc = GET_Game2Cli(msgId);
- if (msgDesc == NULL) {
- plDebug::Error("Got invalid message ID (%u)", msgId);
+ sock->recv(&msgId, sizeof(hsUint16));
++ msgId = LESWAP16(msgId);
+ const pnNetMsg* msgDesc = GET_Game2Cli(msgId);
+ if (msgDesc == NULL) {
+ plDebug::Error("Got invalid message ID (%u)", msgId);
@@ -153,13 +154,13 @@
hsUbyte connectHeader[67]; // ConnectHeader + GameConnectHeader
/* Begin ConnectHeader */
@@ -302,17 +302,17 @@
delete fSock;
fSock = NULL;
plDebug::Error("Error connecting to Game server: %s",
---- net/gate/pnGateKeeperClient.cpp.orig 2010-09-26 23:16:46.000000000 -0500
-+++ net/gate/pnGateKeeperClient.cpp 2010-09-27 07:17:36.000000000 -0500
-@@ -35,6 +35,7 @@
- }
-
- fSock->recv(&msgId, sizeof(hsUint16));
-+ msgId = LESWAP16(msgId);
- const pnNetMsg* msgDesc = GET_GateKeeper2Cli(msgId);
- if (msgDesc == NULL) {
- plDebug::Error("Got invalid message ID (%u)", msgId);
-@@ -122,13 +123,13 @@
+--- net/gate/pnGateKeeperClient.cpp.orig Thu Nov 11 11:14:21 2010 -0800
++++ net/gate/pnGateKeeperClient.cpp Thu Nov 18 15:52:46 2010 -0600
+@@ -33,6 +33,7 @@
+ {
+ hsUint16 msgId;
+ sock->recv(&msgId, sizeof(hsUint16));
++ msgId = LESWAP16(msgId);
+ const pnNetMsg* msgDesc = GET_GateKeeper2Cli(msgId);
+ if (msgDesc == NULL) {
+ plDebug::Error("Got invalid message ID (%u)", msgId);
+@@ -121,13 +122,13 @@
hsUbyte connectHeader[51]; // ConnectHeader + GateKeeperConnectHeader
/* Begin ConnectHeader */
*(hsUbyte* )(connectHeader ) = kConnTypeCliToGateKeeper;
@@ -331,7 +331,7 @@
memset(connectHeader + 35, 0, 16);
fSock->send(connectHeader, 51);
-@@ -176,6 +177,7 @@
+@@ -175,6 +176,7 @@
} else if (msg == kNetCliSrv2CliError) {
hsUint32 errorCode;
fSock->recv(&errorCode, sizeof(hsUint32));
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110109/1f78aced/attachment.html>
More information about the macports-changes
mailing list