From 5d54beb6476b4d76b4afc5776fa7378b61df96f7 Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 24 Mar 2013 16:51:07 +0000 Subject: Fetch is no longer interactive. Allow building on 64bit platforms, even if it is likely not going to run. Fix CONF_FILES. --- net/DarwinStreamingServer/Makefile | 26 +++---- net/DarwinStreamingServer/distinfo | 48 +++++++------ ...APIModules_QTSSAdminModule_AdminElementNode.cpp | 13 ++++ ...SSMP3StreamingModule_QTSSMP3StreamingModule.cpp | 22 ++++++ ...les_QTSSReflectorModule_QTSSReflectorModule.cpp | 13 ++++ .../patch-CommonUtilitiesLib_EventContext.h | 28 ++++++++ .../patches/patch-CommonUtilitiesLib_Task.cpp | 82 ++++++++++++++++++++++ .../patches/patch-CommonUtilitiesLib_Task.h | 13 ++++ ...FileTools_QTBroadcaster.tproj_QTBroadcaster.cpp | 13 ++++ .../patches/patch-Server.tproj_main.cpp | 13 ++++ net/DarwinStreamingServer/patches/patch-ab | 6 +- net/DarwinStreamingServer/patches/patch-ac | 10 +-- net/DarwinStreamingServer/patches/patch-ad | 50 ++++++++++++- net/DarwinStreamingServer/patches/patch-ae | 17 +++-- net/DarwinStreamingServer/patches/patch-af | 10 +-- net/DarwinStreamingServer/patches/patch-ag | 6 +- net/DarwinStreamingServer/patches/patch-ah | 6 +- net/DarwinStreamingServer/patches/patch-ai | 8 +-- net/DarwinStreamingServer/patches/patch-aj | 17 +++-- net/DarwinStreamingServer/patches/patch-al | 38 +++++++++- net/DarwinStreamingServer/patches/patch-am | 8 +-- net/DarwinStreamingServer/patches/patch-an | 52 ++++++++++++-- net/DarwinStreamingServer/patches/patch-ap | 4 +- net/DarwinStreamingServer/patches/patch-aq | 4 +- net/DarwinStreamingServer/patches/patch-ar | 4 +- net/DarwinStreamingServer/patches/patch-as | 4 +- net/DarwinStreamingServer/patches/patch-at | 4 +- net/DarwinStreamingServer/patches/patch-au | 12 ++-- net/DarwinStreamingServer/patches/patch-av | 12 ++-- 29 files changed, 438 insertions(+), 105 deletions(-) create mode 100644 net/DarwinStreamingServer/patches/patch-APIModules_QTSSAdminModule_AdminElementNode.cpp create mode 100644 net/DarwinStreamingServer/patches/patch-APIModules_QTSSMP3StreamingModule_QTSSMP3StreamingModule.cpp create mode 100644 net/DarwinStreamingServer/patches/patch-APIModules_QTSSReflectorModule_QTSSReflectorModule.cpp create mode 100644 net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_EventContext.h create mode 100644 net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_Task.cpp create mode 100644 net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_Task.h create mode 100644 net/DarwinStreamingServer/patches/patch-QTFileTools_QTBroadcaster.tproj_QTBroadcaster.cpp create mode 100644 net/DarwinStreamingServer/patches/patch-Server.tproj_main.cpp diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile index b74502901db..ab4a3f3ba92 100644 --- a/net/DarwinStreamingServer/Makefile +++ b/net/DarwinStreamingServer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/23 17:18:07 asau Exp $ +# $NetBSD: Makefile,v 1.12 2013/03/24 16:51:07 joerg Exp $ DISTNAME= DarwinStreamingSrvr5.5.5-Source PKGNAME= DarwinStreamingServer-5.5.5 @@ -11,6 +11,8 @@ HOMEPAGE= http://dss.macosforge.org/ COMMENT= Open source version of Apple QuickTime Streaming Server LICENSE= apple-public-source-license +MAKE_JOBS_SAFE= no + RESTRICTED= Under APSL (see http://www.opensource.apple.com/apsl/). NO_BIN_ON_CDROM=${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} @@ -20,7 +22,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LANGUAGES= c c++ MAKE_FILE= Makefile.POSIX -MAKE_ENV+= CCOMP=${CC:Q} CPLUS=${CXX:Q} LINKER=${CXX:Q} +MAKE_ENV+= CCOMP=${CC:Q} CPLUS=${CXX:Q}\ -fPIC LINKER=${CXX:Q} MAKE_ENV+= COMPILER_FLAGS=${CFLAGS:Q} INCLUDE_FLAG="-include" MAKE_ENV+= CORE_LINK_LIBS="-pthread -lm -lcrypt -lstdc++" MAKE_ENV+= SHARED="-shared" MODULE_LIBS="-lgcc -lstdc++" @@ -46,6 +48,7 @@ BUILD_DIRS+= QTFileTools/QTSDPGen.tproj BUILD_DIRS+= QTFileTools/QTSampleLister.tproj BUILD_DIRS+= QTFileTools/QTTrackInfo.tproj +INSTALLATION_DIRS+= bin sbin INSTALLATION_DIRS+= libexec/StreamingServerModules INSTALLATION_DIRS+= share/examples/streaming INSTALLATION_DIRS+= share/streaming @@ -60,15 +63,6 @@ PKG_USERS= qtss:qtss PKG_GROUPS= qtss PKG_GECOS.qtss= Darwin Streaming Server user -INTERACTIVE_STAGE= fetch build - -FETCH_MESSAGE= "Darwin Streaming Server is available as a free download" -FETCH_MESSAGE+= "under the APSL. Downloading the source code components" -FETCH_MESSAGE+= "requires APSL registration." -FETCH_MESSAGE+= "You should fetch the source code manually from" -FETCH_MESSAGE+= "${MASTER_SITES}${DISTFILES} and put into" -FETCH_MESSAGE+= "${DISTDIR}/${DISTFILES} directory." - REPLACE_PERL+= WebAdmin/WebAdminHtml/broadcaster_lib.pl REPLACE_PERL+= WebAdmin/WebAdminHtml/parse_xml.cgi REPLACE_PERL+= WebAdmin/WebAdminHtml/playlist-lib.pl @@ -78,11 +72,11 @@ REPLACE_PERL+= WebAdmin/WebAdminHtml/view_broadcast.cgi REPLACE_PERL+= WebAdmin/src/streamingadminserver.pl REPLACE_PERL+= WinNTSupport/WinPasswdAssistant.pl -CONF_FILES= ${PKG_SYSCONFDIR:Q}/streaming/qtgroups ${PKG_SYSCONFDIR:Q}/streaming/qtgroups -CONF_FILES+= ${PKG_SYSCONFDIR:Q}/streaming/qtusers ${PKG_SYSCONFDIR:Q}/streaming/qtusers -CONF_FILES+= ${PKG_SYSCONFDIR:Q}/streaming/relayconfig.xml-Sample ${PKG_SYSCONFDIR:Q}/streaming/relayconfig.xml -CONF_FILES+= ${PKG_SYSCONFDIR:Q}/streaming/streamingloadtool.conf ${PKG_SYSCONFDIR:Q}/streaming/streamingloadtool.conf -CONF_FILES+= ${PKG_SYSCONFDIR:Q}/streaming/streamingserver.xml-POSIX ${PKG_SYSCONFDIR:Q}/streaming/streamingserver.xml +REQUIRE_DIRS+= ${PKG_SYSCONFDIR}/streaming +CONF_FILES= share/examples/streaming/qtgroups ${PKG_SYSCONFDIR}/streaming/qtgroups +CONF_FILES+= share/examples/streaming/qtusers ${PKG_SYSCONFDIR}/streaming/qtusers +CONF_FILES+= share/examples/streaming/relayconfig.xml-Sample ${PKG_SYSCONFDIR}/streaming/relayconfig.xml +CONF_FILES+= share/examples/streaming/streamingserver.xml-POSIX ${PKG_SYSCONFDIR}/streaming/streamingserver.xml SUBST_CLASSES+= makefile SUBST_STAGE.makefile= post-patch diff --git a/net/DarwinStreamingServer/distinfo b/net/DarwinStreamingServer/distinfo index 13e5c61080c..779296bacd1 100644 --- a/net/DarwinStreamingServer/distinfo +++ b/net/DarwinStreamingServer/distinfo @@ -1,26 +1,34 @@ -$NetBSD: distinfo,v 1.3 2007/05/23 07:52:15 adam Exp $ +$NetBSD: distinfo,v 1.4 2013/03/24 16:51:07 joerg Exp $ SHA1 (DarwinStreamingSrvr5.5.5-Source.tar.gz) = ba8419be20e1911f7167dbd48722b2ba5e6f1fe1 RMD160 (DarwinStreamingSrvr5.5.5-Source.tar.gz) = 62996496da51971e384fc26dd336ef2785c2dca7 Size (DarwinStreamingSrvr5.5.5-Source.tar.gz) = 21468268 bytes +SHA1 (patch-APIModules_QTSSAdminModule_AdminElementNode.cpp) = 3138cf323890d3c1789467f29efcc65f6489d5eb +SHA1 (patch-APIModules_QTSSMP3StreamingModule_QTSSMP3StreamingModule.cpp) = 0461ce97cdf2e7dd062d75b0139ee4c29e347218 +SHA1 (patch-APIModules_QTSSReflectorModule_QTSSReflectorModule.cpp) = 52238d46381f3cfe8f0425e4d5e93e8ce8959179 +SHA1 (patch-CommonUtilitiesLib_EventContext.h) = e6d8f19e54670141e35a811df64366ad9983fbd7 +SHA1 (patch-CommonUtilitiesLib_Task.cpp) = 5274c99a1f9239ef5a2096a48e3925a024868615 +SHA1 (patch-CommonUtilitiesLib_Task.h) = 7b231d0f84548c7b11fd392ebad9b96b6764428b +SHA1 (patch-QTFileTools_QTBroadcaster.tproj_QTBroadcaster.cpp) = 2c3efe74e286e3d2cb66448461f0b7b8d278705c +SHA1 (patch-Server.tproj_main.cpp) = d50e581a54609dab6a8146a39faf036de9c39ebf SHA1 (patch-aa) = 2fc84964264f9b6529d031801b36bcca89f591a6 -SHA1 (patch-ab) = a2eb1ed133e3ebdc7e520a14062a48dcce58d9a6 -SHA1 (patch-ac) = be78f45065581e635457f3e345b674e0d720e8c2 -SHA1 (patch-ad) = d31372ce9770e98ad5fba665a32a3be079849a3b -SHA1 (patch-ae) = 2759de18749753cb3243641122a0c2dd9f6d6506 -SHA1 (patch-af) = 043799c14d7c1c1ed8068d161eba820afc33317a -SHA1 (patch-ag) = 3f788ef927e9d4206e73c74a4176213088ae8232 -SHA1 (patch-ah) = bc32a0b4f367d45810b80764c5f7468ef5f71577 -SHA1 (patch-ai) = 91248634b1ab3e1961ce800183d965b45bd686dd -SHA1 (patch-aj) = b6fa42c1550a80d77a10da3c4537a321a858f783 +SHA1 (patch-ab) = cbd5aee473fcdd474fbdb13c0f9a769b544f250c +SHA1 (patch-ac) = a9d9ae530402c0976bcb93386b7d202aea633fab +SHA1 (patch-ad) = c3364ac4f520bae65ef8f63081cd8878c027bd08 +SHA1 (patch-ae) = a0b7cc02576b8488702a4fc280a1a6aa17313974 +SHA1 (patch-af) = 2e96215958104910c17b0abb149fb99551bfd5e8 +SHA1 (patch-ag) = 1d0457166760a3dace57934418912cf82f7f9793 +SHA1 (patch-ah) = fc7cf868dc5c9a01e703532ef81f02d70e07e1da +SHA1 (patch-ai) = 8d48abfe3c8def3de806d05f15a685b79acde3b9 +SHA1 (patch-aj) = c430e97b3c99c31722474801cb3dfa31f8332413 SHA1 (patch-ak) = d573cee55a6097caf36de30cf95ea542c1f7a24f -SHA1 (patch-al) = bd076ddc40df092d92cc18aba319f732287cdb6b -SHA1 (patch-am) = 68de6ee8be78b602a5c615a5ed72c2e97d0eb953 -SHA1 (patch-an) = 9477b41eddeb0496cf8d3326a4e5fb9800efc157 -SHA1 (patch-ap) = 775ea3c983f874c7cda960e0442a749349d76a13 -SHA1 (patch-aq) = 229a6f94e731cbaf2ddcc4dbd6176be03251e2d8 -SHA1 (patch-ar) = 2abf9960c777a976d60b6189cd66696c39dd18de -SHA1 (patch-as) = fd17b346afc4c4ebaa0c7bbf84229a2187860d6b -SHA1 (patch-at) = d1d879ae4c072c7780b524611c5102c6bdad2fb8 -SHA1 (patch-au) = 89fe0648eb3acd83a9138f0b79c12e54086fa2a2 -SHA1 (patch-av) = 6408826975740e2e75a1a1c019516542d44552ed +SHA1 (patch-al) = e8aa206cca186c568569da743344225efbef4c44 +SHA1 (patch-am) = 69f6c214a5922a7803708b35525d212b4bd3cff9 +SHA1 (patch-an) = a87b660201f7c5674634966fab232aabd7467276 +SHA1 (patch-ap) = 6fa5a543b0e20fb94e1695bd422600ade3612ce5 +SHA1 (patch-aq) = ce5e88b4454139c0f7f7b3ae19b9d02e088a3cf4 +SHA1 (patch-ar) = 31681ff6208969a1a44b7161187868b367ea4140 +SHA1 (patch-as) = a149fedb77925063c64cef500e57e7e2fca90622 +SHA1 (patch-at) = ce7db215f0650c1ee558b9c494aa14c30e8fda89 +SHA1 (patch-au) = e8a060399da968e078ec38ff35de9c8928b0ef46 +SHA1 (patch-av) = 9336a4a15f5af43d3b404ade340f7f571782a14a diff --git a/net/DarwinStreamingServer/patches/patch-APIModules_QTSSAdminModule_AdminElementNode.cpp b/net/DarwinStreamingServer/patches/patch-APIModules_QTSSAdminModule_AdminElementNode.cpp new file mode 100644 index 00000000000..c555ddbe473 --- /dev/null +++ b/net/DarwinStreamingServer/patches/patch-APIModules_QTSSAdminModule_AdminElementNode.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-APIModules_QTSSAdminModule_AdminElementNode.cpp,v 1.1 2013/03/24 16:51:07 joerg Exp $ + +--- APIModules/QTSSAdminModule/AdminElementNode.cpp.orig 2003-08-15 23:52:42.000000000 +0000 ++++ APIModules/QTSSAdminModule/AdminElementNode.cpp +@@ -883,7 +883,7 @@ inline SInt32 ElementNode::ResolveSPLKe + if (fElementMap != NULL && keyPtr != NULL && keyPtr->Len > 0) + { osrefptr = fElementMap->Resolve(keyPtr); + if (osrefptr != NULL) +- index = (SInt32) osrefptr->GetObject(); ++ index = (SInt32)(intptr_t) osrefptr->GetObject(); + } + + return index; diff --git a/net/DarwinStreamingServer/patches/patch-APIModules_QTSSMP3StreamingModule_QTSSMP3StreamingModule.cpp b/net/DarwinStreamingServer/patches/patch-APIModules_QTSSMP3StreamingModule_QTSSMP3StreamingModule.cpp new file mode 100644 index 00000000000..84d367fbaa1 --- /dev/null +++ b/net/DarwinStreamingServer/patches/patch-APIModules_QTSSMP3StreamingModule_QTSSMP3StreamingModule.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-APIModules_QTSSMP3StreamingModule_QTSSMP3StreamingModule.cpp,v 1.1 2013/03/24 16:51:07 joerg Exp $ + +--- APIModules/QTSSMP3StreamingModule/QTSSMP3StreamingModule.cpp.orig 2004-12-01 13:05:34.000000000 +0000 ++++ APIModules/QTSSMP3StreamingModule/QTSSMP3StreamingModule.cpp +@@ -1172,7 +1172,7 @@ MP3SessionRefKey::MP3SessionRefKey(MP3Se + { + fMP3Session = fKeyValue->GetMP3Session(); + if (fMP3Session != NULL) +- fHashValue = (SInt32)fMP3Session->GetSession(); ++ fHashValue = (SInt32)(intptr_t)fMP3Session->GetSession(); + } + else + { +@@ -1182,7 +1182,7 @@ MP3SessionRefKey::MP3SessionRefKey(MP3Se + + MP3SessionRefKey::MP3SessionRefKey(QTSS_RTSPSessionObject rtspSessRef) : + fKeyValue(NULL), +- fHashValue((SInt32)rtspSessRef), ++ fHashValue((SInt32)(intptr_t)rtspSessRef), + fMP3Session(NULL) + { + } diff --git a/net/DarwinStreamingServer/patches/patch-APIModules_QTSSReflectorModule_QTSSReflectorModule.cpp b/net/DarwinStreamingServer/patches/patch-APIModules_QTSSReflectorModule_QTSSReflectorModule.cpp new file mode 100644 index 00000000000..dc57c540576 --- /dev/null +++ b/net/DarwinStreamingServer/patches/patch-APIModules_QTSSReflectorModule_QTSSReflectorModule.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-APIModules_QTSSReflectorModule_QTSSReflectorModule.cpp,v 1.1 2013/03/24 16:51:07 joerg Exp $ + +--- APIModules/QTSSReflectorModule/QTSSReflectorModule.cpp.orig 2005-07-31 09:00:31.000000000 +0000 ++++ APIModules/QTSSReflectorModule/QTSSReflectorModule.cpp +@@ -1114,7 +1114,7 @@ void DoDescribeAddRequiredSDPLines(QTSS_ + editedSDP->Put("o=broadcast_sdp "); + char tempBuff[256]= ""; + tempBuff[255] = 0; +- qtss_snprintf(tempBuff,sizeof(tempBuff) - 1, "%lu", (UInt32) theSession); ++ qtss_snprintf(tempBuff,sizeof(tempBuff) - 1, "%lu", (UInt32)(uintptr_t) theSession); + editedSDP->Put(tempBuff); + + editedSDP->Put(" "); diff --git a/net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_EventContext.h b/net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_EventContext.h new file mode 100644 index 00000000000..0ec69200f59 --- /dev/null +++ b/net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_EventContext.h @@ -0,0 +1,28 @@ +$NetBSD: patch-CommonUtilitiesLib_EventContext.h,v 1.1 2013/03/24 16:51:07 joerg Exp $ + +--- CommonUtilitiesLib/EventContext.h.orig 2005-05-18 08:01:14.000000000 +0000 ++++ CommonUtilitiesLib/EventContext.h +@@ -83,9 +83,9 @@ class EventContext + if (EVENTCONTEXT_DEBUG) + { + if (fTask== NULL) +- qtss_printf("EventContext::SetTask context=%lu task= NULL\n", (UInt32) this); ++ qtss_printf("EventContext::SetTask context=%lu task= NULL\n", (UInt32)(uintptr_t) this); + else +- qtss_printf("EventContext::SetTask context=%lu task= %lu name=%s\n",(UInt32) this,(UInt32) fTask, fTask->fTaskName); ++ qtss_printf("EventContext::SetTask context=%lu task= %lu name=%s\n",(UInt32)(uintptr_t) this,(UInt32)(uintptr_t) fTask, fTask->fTaskName); + } + } + +@@ -119,9 +119,9 @@ class EventContext + if (EVENTCONTEXT_DEBUG) + { + if (fTask== NULL) +- qtss_printf("EventContext::ProcessEvent context=%lu task=NULL\n",(UInt32) this); ++ qtss_printf("EventContext::ProcessEvent context=%lu task=NULL\n",(UInt32)(uintptr_t) this); + else +- qtss_printf("EventContext::ProcessEvent context=%lu task=%lu TaskName=%s\n",(UInt32)this,(UInt32) fTask, fTask->fTaskName); ++ qtss_printf("EventContext::ProcessEvent context=%lu task=%lu TaskName=%s\n",(UInt32)(uintptr_t)this,(UInt32)(uintptr_t) fTask, fTask->fTaskName); + } + + if (fTask != NULL) diff --git a/net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_Task.cpp b/net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_Task.cpp new file mode 100644 index 00000000000..5d36902fd6a --- /dev/null +++ b/net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_Task.cpp @@ -0,0 +1,82 @@ +$NetBSD: patch-CommonUtilitiesLib_Task.cpp,v 1.1 2013/03/24 16:51:07 joerg Exp $ + +--- CommonUtilitiesLib/Task.cpp.orig 2005-05-31 10:54:25.000000000 +0000 ++++ CommonUtilitiesLib/Task.cpp +@@ -104,7 +104,7 @@ void Task::Signal(EventFlags events) + // Task needs to be placed on a particular thread. + { + if (TASK_DEBUG) if (fTaskName[0] == 0) ::strcpy(fTaskName, " corrupt task"); +- if (TASK_DEBUG) qtss_printf("Task::Signal enque TaskName=%s fUseThisThread=%lu q elem=%lu enclosing=%lu\n", fTaskName, (UInt32) fUseThisThread, (UInt32) &fTaskQueueElem, (UInt32) this); ++ if (TASK_DEBUG) qtss_printf("Task::Signal enque TaskName=%s fUseThisThread=%lu q elem=%lu enclosing=%lu\n", fTaskName, (UInt32)(uintptr_t) fUseThisThread, (UInt32)(uintptr_t) &fTaskQueueElem, (UInt32)(uintptr_t) this); + fUseThisThread->fTaskQueue.EnQueue(&fTaskQueueElem); + } + else +@@ -113,12 +113,12 @@ void Task::Signal(EventFlags events) + unsigned int theThread = atomic_add(&sThreadPicker, 1); + theThread %= TaskThreadPool::sNumTaskThreads; + if (TASK_DEBUG) if (fTaskName[0] == 0) ::strcpy(fTaskName, " corrupt task"); +- if (TASK_DEBUG) qtss_printf("Task::Signal enque TaskName=%s thread=%lu q elem=%lu enclosing=%lu\n", fTaskName, (UInt32)TaskThreadPool::sTaskThreadArray[theThread],(UInt32) &fTaskQueueElem,(UInt32) this); ++ if (TASK_DEBUG) qtss_printf("Task::Signal enque TaskName=%s thread=%lu q elem=%lu enclosing=%lu\n", fTaskName, (UInt32)(uintptr_t)TaskThreadPool::sTaskThreadArray[theThread],(UInt32)(uintptr_t) &fTaskQueueElem,(UInt32)(uintptr_t) this); + TaskThreadPool::sTaskThreadArray[theThread]->fTaskQueue.EnQueue(&fTaskQueueElem); + } + } + else +- if (TASK_DEBUG) qtss_printf("Task::Signal sent to dead TaskName=%s q elem=%lu enclosing=%lu\n", fTaskName, (UInt32) &fTaskQueueElem, (UInt32) this); ++ if (TASK_DEBUG) qtss_printf("Task::Signal sent to dead TaskName=%s q elem=%lu enclosing=%lu\n", fTaskName, (UInt32)(uintptr_t) &fTaskQueueElem, (UInt32)(uintptr_t) this); + + + } +@@ -165,7 +165,7 @@ void TaskThread::Entry() + if (theTask->fWriteLock) + { + OSMutexWriteLocker mutexLocker(&TaskThreadPool::sMutexRW); +- if (TASK_DEBUG) qtss_printf("TaskThread::Entry run global locked TaskName=%s CurMSec=%.3f thread=%ld task=%ld\n", theTask->fTaskName, OS::StartTimeMilli_Float() ,(SInt32) this,(SInt32) theTask); ++ if (TASK_DEBUG) qtss_printf("TaskThread::Entry run global locked TaskName=%s CurMSec=%.3f thread=%ld task=%ld\n", theTask->fTaskName, OS::StartTimeMilli_Float() ,(SInt32)(uintptr_t) this,(SInt32)(uintptr_t) theTask); + + theTimeout = theTask->Run(); + theTask->fWriteLock = false; +@@ -173,7 +173,7 @@ void TaskThread::Entry() + else + { + OSMutexReadLocker mutexLocker(&TaskThreadPool::sMutexRW); +- if (TASK_DEBUG) qtss_printf("TaskThread::Entry run TaskName=%s CurMSec=%.3f thread=%ld task=%ld\n", theTask->fTaskName, OS::StartTimeMilli_Float(), (SInt32) this,(SInt32) theTask); ++ if (TASK_DEBUG) qtss_printf("TaskThread::Entry run TaskName=%s CurMSec=%.3f thread=%ld task=%ld\n", theTask->fTaskName, OS::StartTimeMilli_Float(), (SInt32)(uintptr_t) this,(SInt32)(uintptr_t) theTask); + + theTimeout = theTask->Run(); + +@@ -187,7 +187,7 @@ void TaskThread::Entry() + { + if (TASK_DEBUG) + { +- qtss_printf("TaskThread::Entry delete TaskName=%s CurMSec=%.3f thread=%ld task=%ld\n", theTask->fTaskName, OS::StartTimeMilli_Float(), (SInt32) this, (SInt32) theTask); ++ qtss_printf("TaskThread::Entry delete TaskName=%s CurMSec=%.3f thread=%ld task=%ld\n", theTask->fTaskName, OS::StartTimeMilli_Float(), (SInt32)(uintptr_t) this, (SInt32)(uintptr_t) theTask); + + theTask->fUseThisThread = NULL; + +@@ -226,7 +226,7 @@ void TaskThread::Entry() + { + //note that if we get here, we don't reset theTask, so it will get passed into + //WaitForTask +- if (TASK_DEBUG) qtss_printf("TaskThread::Entry insert TaskName=%s in timer heap thread=%lu elem=%lu task=%ld timeout=%.2f\n", theTask->fTaskName, (UInt32) this, (UInt32) &theTask->fTimerHeapElem,(SInt32) theTask, (float)theTimeout / (float) 1000); ++ if (TASK_DEBUG) qtss_printf("TaskThread::Entry insert TaskName=%s in timer heap thread=%lu elem=%lu task=%ld timeout=%.2f\n", theTask->fTaskName, (UInt32)(uintptr_t) this, (UInt32)(uintptr_t) &theTask->fTimerHeapElem,(SInt32)(uintptr_t) theTask, (float)theTimeout / (float) 1000); + theTask->fTimerHeapElem.SetValue(OS::Milliseconds() + theTimeout); + fHeap.Insert(&theTask->fTimerHeapElem); + (void)atomic_or(&theTask->fEvents, Task::kIdleEvent); +@@ -264,7 +264,7 @@ Task* TaskThread::WaitForTask() + + if ((fHeap.PeekMin() != NULL) && (fHeap.PeekMin()->GetValue() <= theCurrentTime)) + { +- if (TASK_DEBUG) qtss_printf("TaskThread::WaitForTask found timer-task=%s thread %lu fHeap.CurrentHeapSize(%lu) taskElem = %lu enclose=%lu\n",((Task*)fHeap.PeekMin()->GetEnclosingObject())->fTaskName, (UInt32) this, fHeap.CurrentHeapSize(), (UInt32) fHeap.PeekMin(), (UInt32) fHeap.PeekMin()->GetEnclosingObject()); ++ if (TASK_DEBUG) qtss_printf("TaskThread::WaitForTask found timer-task=%s thread %lu fHeap.CurrentHeapSize(%lu) taskElem = %lu enclose=%lu\n",((Task*)fHeap.PeekMin()->GetEnclosingObject())->fTaskName, (UInt32)(uintptr_t) this, fHeap.CurrentHeapSize(), (UInt32)(uintptr_t) fHeap.PeekMin(), (UInt32)(uintptr_t) fHeap.PeekMin()->GetEnclosingObject()); + return (Task*)fHeap.ExtractMin()->GetEnclosingObject(); + } + +@@ -286,7 +286,7 @@ Task* TaskThread::WaitForTask() + OSQueueElem* theElem = fTaskQueue.DeQueueBlocking(this, (SInt32) theTimeout); + if (theElem != NULL) + { +- if (TASK_DEBUG) qtss_printf("TaskThread::WaitForTask found signal-task=%s thread %lu fTaskQueue.GetLength(%lu) taskElem = %lu enclose=%lu\n", ((Task*)theElem->GetEnclosingObject())->fTaskName, (UInt32) this, fTaskQueue.GetQueue()->GetLength(), (UInt32) theElem, (UInt32)theElem->GetEnclosingObject() ); ++ if (TASK_DEBUG) qtss_printf("TaskThread::WaitForTask found signal-task=%s thread %lu fTaskQueue.GetLength(%lu) taskElem = %lu enclose=%lu\n", ((Task*)theElem->GetEnclosingObject())->fTaskName, (UInt32)(uintptr_t) this, fTaskQueue.GetQueue()->GetLength(), (UInt32)(uintptr_t) theElem, (UInt32)(uintptr_t)theElem->GetEnclosingObject() ); + return (Task*)theElem->GetEnclosingObject(); + } + diff --git a/net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_Task.h b/net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_Task.h new file mode 100644 index 00000000000..54118682a0c --- /dev/null +++ b/net/DarwinStreamingServer/patches/patch-CommonUtilitiesLib_Task.h @@ -0,0 +1,13 @@ +$NetBSD: patch-CommonUtilitiesLib_Task.h,v 1.1 2013/03/24 16:51:07 joerg Exp $ + +--- CommonUtilitiesLib/Task.h.orig 2005-05-27 04:07:59.000000000 +0000 ++++ CommonUtilitiesLib/Task.h +@@ -116,7 +116,7 @@ class Task + fUseThisThread = (TaskThread*)OSThread::GetCurrent(); + Assert(fUseThisThread != NULL); + if (TASK_DEBUG) if (fTaskName[0] == 0) ::strcpy(fTaskName, " corrupt task"); +- if (TASK_DEBUG) qtss_printf("Task::ForceSameThread fUseThisThread %lu task %s enque elem=%lu enclosing %lu\n", (UInt32)fUseThisThread, fTaskName,(UInt32) &fTaskQueueElem,(UInt32) this); ++ if (TASK_DEBUG) qtss_printf("Task::ForceSameThread fUseThisThread %lu task %s enque elem=%lu enclosing %lu\n", (UInt32)(uintptr_t)fUseThisThread, fTaskName,(UInt32)(uintptr_t) &fTaskQueueElem,(UInt32)(uintptr_t) this); + } + SInt64 CallLocked() { ForceSameThread(); + fWriteLock = true; diff --git a/net/DarwinStreamingServer/patches/patch-QTFileTools_QTBroadcaster.tproj_QTBroadcaster.cpp b/net/DarwinStreamingServer/patches/patch-QTFileTools_QTBroadcaster.tproj_QTBroadcaster.cpp new file mode 100644 index 00000000000..04c85f439ee --- /dev/null +++ b/net/DarwinStreamingServer/patches/patch-QTFileTools_QTBroadcaster.tproj_QTBroadcaster.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-QTFileTools_QTBroadcaster.tproj_QTBroadcaster.cpp,v 1.1 2013/03/24 16:51:07 joerg Exp $ + +--- QTFileTools/QTBroadcaster.tproj/QTBroadcaster.cpp.orig 2013-03-24 12:37:12.000000000 +0000 ++++ QTFileTools/QTBroadcaster.tproj/QTBroadcaster.cpp +@@ -201,7 +201,7 @@ int main(int argc, char *argv[]) { + // Send the packet. + memset(&sin, 0, sizeof(struct sockaddr_in)); + sin.sin_family = AF_INET; +- sin.sin_port = htons( (int) RTPFile->GetLastPacketTrack()->Cookie1 ); ++ sin.sin_port = htons( (int)(uintptr_t) RTPFile->GetLastPacketTrack()->Cookie1 ); + sin.sin_addr.s_addr = inet_addr(IPAddress); + sendto(s, Packet, PacketLength, 0, (struct sockaddr *)&sin, sizeof(struct sockaddr)); + } diff --git a/net/DarwinStreamingServer/patches/patch-Server.tproj_main.cpp b/net/DarwinStreamingServer/patches/patch-Server.tproj_main.cpp new file mode 100644 index 00000000000..1170cc0efd0 --- /dev/null +++ b/net/DarwinStreamingServer/patches/patch-Server.tproj_main.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-Server.tproj_main.cpp,v 1.1 2013/03/24 16:51:08 joerg Exp $ + +--- Server.tproj/main.cpp.orig 2005-04-27 12:21:14.000000000 +0000 ++++ Server.tproj/main.cpp +@@ -212,7 +212,7 @@ int main(int argc, char * argv[]) + //(void) ::signal(SIGPIPE, SIG_IGN); + struct sigaction act; + +-#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__) ++#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__) || defined(__NetBSD__) + sigemptyset(&act.sa_mask); + act.sa_flags = 0; + act.sa_handler = (void(*)(int))&sigcatcher; diff --git a/net/DarwinStreamingServer/patches/patch-ab b/net/DarwinStreamingServer/patches/patch-ab index 50fb13b5da4..d8d3ae6fe71 100644 --- a/net/DarwinStreamingServer/patches/patch-ab +++ b/net/DarwinStreamingServer/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2007/03/07 18:22:43 joerg Exp $ ---- Server.tproj/RTSPSession.cpp.orig 2005-04-27 12:17:44.000000000 +0200 -+++ Server.tproj/RTSPSession.cpp 2005-12-17 18:49:56.000000000 +0100 +$NetBSD: patch-ab,v 1.3 2013/03/24 16:51:08 joerg Exp $ +--- Server.tproj/RTSPSession.cpp.orig 2005-04-27 10:17:44.000000000 +0000 ++++ Server.tproj/RTSPSession.cpp @@ -47,7 +47,7 @@ #include "OSArrayObjectDeleter.h" #include "md5digest.h" diff --git a/net/DarwinStreamingServer/patches/patch-ac b/net/DarwinStreamingServer/patches/patch-ac index 9c27ed9e48b..d221e5f78bb 100644 --- a/net/DarwinStreamingServer/patches/patch-ac +++ b/net/DarwinStreamingServer/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2007/03/07 18:22:43 joerg Exp $ ---- RTSPClientLib/ClientSocket.cpp.orig 2003-08-16 01:53:20.000000000 +0200 -+++ RTSPClientLib/ClientSocket.cpp 2005-12-17 22:20:45.000000000 +0100 -@@ -69,7 +69,7 @@ +$NetBSD: patch-ac,v 1.3 2013/03/24 16:51:08 joerg Exp $ +--- RTSPClientLib/ClientSocket.cpp.orig 2003-08-15 23:53:20.000000000 +0000 ++++ RTSPClientLib/ClientSocket.cpp +@@ -69,7 +69,7 @@ OS_Error ClientSocket::Open(TCPSocket* i return theErr; inSocket->NoDelay(); @@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.2 2007/03/07 18:22:43 joerg Exp $ // no KeepAlive -- probably should be off for all platforms. #else inSocket->KeepAlive(); -@@ -162,7 +162,7 @@ +@@ -162,7 +162,7 @@ void TCPClientSocket::SetOptions(int snd err = ::setsockopt(fSocket.GetSocketFD(), SOL_SOCKET, SO_RCVBUF, (char*)&rcvBufSize, sizeof(int)); AssertV(err == 0, OSThread::GetErrno()); diff --git a/net/DarwinStreamingServer/patches/patch-ad b/net/DarwinStreamingServer/patches/patch-ad index 8f1cbd9d846..c49ed217a04 100644 --- a/net/DarwinStreamingServer/patches/patch-ad +++ b/net/DarwinStreamingServer/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.2 2007/03/07 18:22:43 joerg Exp $ ---- PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp.orig 2005-03-12 00:24:54.000000000 +0100 -+++ PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp 2005-12-17 22:20:45.000000000 +0100 +$NetBSD: patch-ad,v 1.3 2013/03/24 16:51:08 joerg Exp $ +--- PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp.orig 2005-03-11 23:24:54.000000000 +0000 ++++ PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp @@ -43,7 +43,9 @@ */ @@ -21,3 +21,47 @@ $NetBSD: patch-ad,v 1.2 2007/03/07 18:22:43 joerg Exp $ #include #endif #endif +@@ -2077,7 +2079,7 @@ static void RegisterEventHandlers() + + struct sigaction act; + +-#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__powerpc__) || defined (__sgi_cc__) || defined(__osf__) || defined(__hpux__) ++#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__powerpc__) || defined (__sgi_cc__) || defined(__osf__) || defined(__hpux__) || defined(__NetBSD__) + sigemptyset(&act.sa_mask); + act.sa_flags = 0; + act.sa_handler = (void(*)(int))&SignalEventHandler; +@@ -2094,14 +2096,14 @@ struct sigaction act; + if ( ::signal(SIGTERM, SIG_IGN) != SIG_IGN) + { // from kill... + if ( ::sigaction(SIGTERM, &act, NULL) != 0 ) +- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR ); ++ { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)(uintptr_t)SIG_ERR ); + } + } + + if ( ::signal(SIGINT, SIG_IGN) != SIG_IGN) + { // ^C signal + if ( ::sigaction(SIGINT, &act, NULL) != 0 ) +- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR ); ++ { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)(uintptr_t)SIG_ERR ); + } + + } +@@ -2109,7 +2111,7 @@ struct sigaction act; + if ( ::signal(SIGPIPE, SIG_IGN) != SIG_IGN) + { // broken pipe probably from a failed RTSP session (the server went down?) + if ( ::sigaction(SIGPIPE, &act, NULL) != 0 ) +- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR ); ++ { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)(uintptr_t)SIG_ERR ); + } + + } +@@ -2117,7 +2119,7 @@ struct sigaction act; + if ( ::signal(SIGHUP, SIG_IGN) != SIG_IGN) + { // broken pipe probably from a failed RTSP session (the server went down?) + if ( ::sigaction(SIGHUP, &act, NULL) != 0) +- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR ); ++ { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)(uintptr_t)SIG_ERR ); + } + + } diff --git a/net/DarwinStreamingServer/patches/patch-ae b/net/DarwinStreamingServer/patches/patch-ae index 05672e8fe7e..a8e6316dbac 100644 --- a/net/DarwinStreamingServer/patches/patch-ae +++ b/net/DarwinStreamingServer/patches/patch-ae @@ -1,16 +1,19 @@ -$NetBSD: patch-ae,v 1.2 2007/03/07 18:22:43 joerg Exp $ ---- PlaylistBroadcaster.tproj/GetLocalIPAddressString.c.orig 2003-08-16 01:53:06.000000000 +0200 -+++ PlaylistBroadcaster.tproj/GetLocalIPAddressString.c 2005-12-17 22:20:45.000000000 +0100 -@@ -82,7 +82,7 @@ +$NetBSD: patch-ae,v 1.3 2013/03/24 16:51:08 joerg Exp $ +--- PlaylistBroadcaster.tproj/GetLocalIPAddressString.c.orig 2003-08-15 23:53:06.000000000 +0000 ++++ PlaylistBroadcaster.tproj/GetLocalIPAddressString.c +@@ -80,9 +80,9 @@ short GetLocalIPAddressString(char *retu + ifc.ifc_len = kMaxAddrBufferSize; + ifc.ifc_buf = buffer; - #if (__linux__ || __MacOSX__ || __MACOS__ || __linuxppc__ || __solaris__ || __sgi__) +-#if (__linux__ || __MacOSX__ || __MACOS__ || __linuxppc__ || __solaris__ || __sgi__) ++#if (__linux__ || __MacOSX__ || __MACOS__ || __linuxppc__ || __solaris__ || __sgi__) || __NetBSD__ err = ioctl(tempSocket, SIOCGIFCONF, (char*)&ifc); -#elif __FreeBSD__ -+#elif __FreeBSD__ || __NetBSD__ || defined(__DragonFly__) ++#elif __FreeBSD__ || defined(__DragonFly__) err = ioctl(tempSocket, OSIOCGIFCONF, (char*)&ifc); #else #error -@@ -90,7 +90,7 @@ +@@ -90,7 +90,7 @@ short GetLocalIPAddressString(char *retu if (err == -1) break; diff --git a/net/DarwinStreamingServer/patches/patch-af b/net/DarwinStreamingServer/patches/patch-af index 243e7973125..65048c20e9e 100644 --- a/net/DarwinStreamingServer/patches/patch-af +++ b/net/DarwinStreamingServer/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.2 2007/03/07 18:22:43 joerg Exp $ ---- PlaylistBroadcaster.tproj/BroadcasterSession.cpp.orig 2004-09-30 16:40:54.000000000 +0200 -+++ PlaylistBroadcaster.tproj/BroadcasterSession.cpp 2005-12-17 22:20:45.000000000 +0100 -@@ -350,7 +350,7 @@ +$NetBSD: patch-af,v 1.3 2013/03/24 16:51:08 joerg Exp $ +--- PlaylistBroadcaster.tproj/BroadcasterSession.cpp.orig 2004-09-30 14:40:54.000000000 +0000 ++++ PlaylistBroadcaster.tproj/BroadcasterSession.cpp +@@ -350,7 +350,7 @@ SInt64 BroadcasterSession::Run() #if BROADCAST_SESSION_DEBUG qtss_printf("Session timing out.\n"); #endif @@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.2 2007/03/07 18:22:43 joerg Exp $ if (fTransportType != kTCPTransportType) { fTimeoutTask.RefreshTimeout(); -@@ -554,7 +554,7 @@ +@@ -554,7 +554,7 @@ SInt64 BroadcasterSession::Run() } break; } diff --git a/net/DarwinStreamingServer/patches/patch-ag b/net/DarwinStreamingServer/patches/patch-ag index 4c091ede675..44878bedd87 100644 --- a/net/DarwinStreamingServer/patches/patch-ag +++ b/net/DarwinStreamingServer/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.2 2007/03/07 18:22:43 joerg Exp $ ---- PlaylistBroadcaster.tproj/BCasterTracker.cpp.orig 2003-08-16 01:53:06.000000000 +0200 -+++ PlaylistBroadcaster.tproj/BCasterTracker.cpp 2005-12-17 22:20:45.000000000 +0100 +$NetBSD: patch-ag,v 1.3 2013/03/24 16:51:08 joerg Exp $ +--- PlaylistBroadcaster.tproj/BCasterTracker.cpp.orig 2003-08-15 23:53:06.000000000 +0000 ++++ PlaylistBroadcaster.tproj/BCasterTracker.cpp @@ -49,8 +49,10 @@ #include #include diff --git a/net/DarwinStreamingServer/patches/patch-ah b/net/DarwinStreamingServer/patches/patch-ah index 4ca2d92e5bf..b86b193510a 100644 --- a/net/DarwinStreamingServer/patches/patch-ah +++ b/net/DarwinStreamingServer/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.2 2007/03/07 18:22:43 joerg Exp $ ---- MP3Broadcaster/MP3Broadcaster.cpp.orig 2003-08-16 01:53:04.000000000 +0200 -+++ MP3Broadcaster/MP3Broadcaster.cpp 2005-02-25 17:03:32.000000000 +0100 +$NetBSD: patch-ah,v 1.3 2013/03/24 16:51:08 joerg Exp $ +--- MP3Broadcaster/MP3Broadcaster.cpp.orig 2005-04-27 10:17:42.000000000 +0000 ++++ MP3Broadcaster/MP3Broadcaster.cpp @@ -38,13 +38,16 @@ #include #endif diff --git a/net/DarwinStreamingServer/patches/patch-ai b/net/DarwinStreamingServer/patches/patch-ai index d0a13a2755a..5eec3f55132 100644 --- a/net/DarwinStreamingServer/patches/patch-ai +++ b/net/DarwinStreamingServer/patches/patch-ai @@ -1,7 +1,7 @@ -$NetBSD: patch-ai,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $ ---- CommonUtilitiesLib/StrPtrLen.h.orig 2003-08-16 01:52:53.000000000 +0200 -+++ CommonUtilitiesLib/StrPtrLen.h 2005-02-25 17:03:31.000000000 +0100 -@@ -66,7 +66,12 @@ +$NetBSD: patch-ai,v 1.2 2013/03/24 16:51:08 joerg Exp $ +--- CommonUtilitiesLib/StrPtrLen.h.orig 2005-05-18 08:01:14.000000000 +0000 ++++ CommonUtilitiesLib/StrPtrLen.h +@@ -66,7 +66,12 @@ class StrPtrLen Bool16 NumEqualIgnoreCase(const char* compare, const UInt32 len) const; void Delete() { delete [] Ptr; Ptr = NULL; Len = 0; } diff --git a/net/DarwinStreamingServer/patches/patch-aj b/net/DarwinStreamingServer/patches/patch-aj index 3174c1779c8..1b54d192759 100644 --- a/net/DarwinStreamingServer/patches/patch-aj +++ b/net/DarwinStreamingServer/patches/patch-aj @@ -1,16 +1,19 @@ -$NetBSD: patch-aj,v 1.2 2007/03/07 18:22:43 joerg Exp $ ---- CommonUtilitiesLib/SocketUtils.cpp.orig 2003-08-16 01:52:53.000000000 +0200 -+++ CommonUtilitiesLib/SocketUtils.cpp 2005-02-25 17:03:31.000000000 +0100 -@@ -342,7 +342,7 @@ +$NetBSD: patch-aj,v 1.3 2013/03/24 16:51:08 joerg Exp $ +--- CommonUtilitiesLib/SocketUtils.cpp.orig 2005-05-18 08:01:14.000000000 +0000 ++++ CommonUtilitiesLib/SocketUtils.cpp +@@ -340,9 +340,9 @@ void SocketUtils::Initialize(Bool16 look + ifc.ifc_len = kMaxAddrBufferSize; + ifc.ifc_buf = buffer; - #if __linux__ || __linuxppc__ || __solaris__ || __MacOSX__ || __sgi__ || __osf__ +-#if __linux__ || __linuxppc__ || __solaris__ || __MacOSX__ || __sgi__ || __osf__ ++#if __linux__ || __linuxppc__ || __solaris__ || __MacOSX__ || __sgi__ || __osf__ || __NetBSD__ int err = ::ioctl(tempSocket, SIOCGIFCONF, (char*)&ifc); -#elif __FreeBSD__ -+#elif __FreeBSD__ || __NetBSD__ || defined(__DragonFly__) ++#elif __FreeBSD__ || defined(__DragonFly__) int err = ::ioctl(tempSocket, OSIOCGIFCONF, (char*)&ifc); #else #error -@@ -350,7 +350,7 @@ +@@ -350,7 +350,7 @@ void SocketUtils::Initialize(Bool16 look if (err == -1) return; diff --git a/net/DarwinStreamingServer/patches/patch-al b/net/DarwinStreamingServer/patches/patch-al index 7d5882426da..5c92804b1ff 100644 --- a/net/DarwinStreamingServer/patches/patch-al +++ b/net/DarwinStreamingServer/patches/patch-al @@ -1,6 +1,6 @@ -$NetBSD: patch-al,v 1.2 2007/03/07 18:22:43 joerg Exp $ ---- CommonUtilitiesLib/OSHeaders.h.orig 2003-08-16 01:52:52.000000000 +0200 -+++ CommonUtilitiesLib/OSHeaders.h 2005-02-25 17:03:31.000000000 +0100 +$NetBSD: patch-al,v 1.3 2013/03/24 16:51:08 joerg Exp $ +--- CommonUtilitiesLib/OSHeaders.h.orig 2005-05-18 08:01:14.000000000 +0000 ++++ CommonUtilitiesLib/OSHeaders.h @@ -48,7 +48,7 @@ @@ -10,3 +10,35 @@ $NetBSD: patch-al,v 1.2 2007/03/07 18:22:43 joerg Exp $ /* Defines */ #define _64BITARG_ "q" +@@ -61,21 +61,22 @@ + + /* Includes */ + #include ++ #include + + /* Constants */ + #define QT_TIME_TO_LOCAL_TIME (-2082844800) + #define QT_PATH_SEPARATOR '/' + + /* Typedefs */ +- typedef unsigned int PointerSizedInt; +- typedef unsigned char UInt8; +- typedef signed char SInt8; +- typedef unsigned short UInt16; +- typedef signed short SInt16; +- typedef unsigned long UInt32; +- typedef signed long SInt32; +- typedef signed long long SInt64; +- typedef unsigned long long UInt64; ++ typedef uintptr_t PointerSizedInt; ++ typedef uint8_t UInt8; ++ typedef int8_t SInt8; ++ typedef uint16_t UInt16; ++ typedef int16_t SInt16; ++ typedef uint32_t UInt32; ++ typedef int32_t SInt32; ++ typedef int64_t SInt64; ++ typedef uint64_t UInt64; + typedef float Float32; + typedef double Float64; + typedef UInt16 Bool16; diff --git a/net/DarwinStreamingServer/patches/patch-am b/net/DarwinStreamingServer/patches/patch-am index 14b31f74929..d586a305537 100644 --- a/net/DarwinStreamingServer/patches/patch-am +++ b/net/DarwinStreamingServer/patches/patch-am @@ -1,7 +1,7 @@ -$NetBSD: patch-am,v 1.2 2007/03/07 18:22:44 joerg Exp $ ---- CommonUtilitiesLib/OSCodeFragment.cpp.orig 2003-08-16 01:52:52.000000000 +0200 -+++ CommonUtilitiesLib/OSCodeFragment.cpp 2005-02-25 17:03:31.000000000 +0100 -@@ -62,6 +62,8 @@ +$NetBSD: patch-am,v 1.3 2013/03/24 16:51:08 joerg Exp $ +--- CommonUtilitiesLib/OSCodeFragment.cpp.orig 2005-05-27 10:17:02.000000000 +0000 ++++ CommonUtilitiesLib/OSCodeFragment.cpp +@@ -62,6 +62,8 @@ OSCodeFragment::OSCodeFragment(const cha fFragmentP = dlopen((char *)inPath, RTLD_NOW | RTLD_GLOBAL); #elif defined(__FreeBSD__) fFragmentP = dlopen(inPath, RTLD_NOW); diff --git a/net/DarwinStreamingServer/patches/patch-an b/net/DarwinStreamingServer/patches/patch-an index cff0ee36d2d..637de9340cb 100644 --- a/net/DarwinStreamingServer/patches/patch-an +++ b/net/DarwinStreamingServer/patches/patch-an @@ -1,7 +1,7 @@ -$NetBSD: patch-an,v 1.2 2007/03/07 18:22:44 joerg Exp $ ---- MP3Broadcaster/BroadcasterMain.cpp.orig 2005-12-11 18:56:36.000000000 +0000 -+++ MP3Broadcaster/BroadcasterMain.cpp 2005-12-11 18:57:08.000000000 +0000 -@@ -216,7 +216,7 @@ +$NetBSD: patch-an,v 1.3 2013/03/24 16:51:08 joerg Exp $ +--- MP3Broadcaster/BroadcasterMain.cpp.orig 2005-03-11 23:24:54.000000000 +0000 ++++ MP3Broadcaster/BroadcasterMain.cpp +@@ -216,7 +216,7 @@ static void RegisterEventHandlers() struct sigaction act; @@ -10,3 +10,47 @@ $NetBSD: patch-an,v 1.2 2007/03/07 18:22:44 joerg Exp $ sigemptyset(&act.sa_mask); act.sa_flags = 0; act.sa_handler = (void(*)(int))&SignalEventHandler; +@@ -229,14 +229,14 @@ struct sigaction act; + if ( ::signal(SIGTERM, SIG_IGN) != SIG_IGN) + { // from kill... + if ( ::sigaction(SIGTERM, &act, NULL) != 0 ) +- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR ); ++ { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)(uintptr_t)SIG_ERR ); + } + } + + if ( ::signal(SIGINT, SIG_IGN) != SIG_IGN) + { // ^C signal + if ( ::sigaction(SIGINT, &act, NULL) != 0 ) +- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR ); ++ { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)(uintptr_t)SIG_ERR ); + } + + } +@@ -244,7 +244,7 @@ struct sigaction act; + if ( ::signal(SIGPIPE, SIG_IGN) != SIG_IGN) + { // broken pipe probably from a failed RTSP session (the server went down?) + if ( ::sigaction(SIGPIPE, &act, NULL) != 0 ) +- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR ); ++ { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)(uintptr_t)SIG_ERR ); + } + + } +@@ -252,7 +252,7 @@ struct sigaction act; + if ( ::signal(SIGHUP, SIG_IGN) != SIG_IGN) + { // catch any SIGHUP + if ( ::sigaction(SIGHUP, &act, NULL) != 0) +- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR ); ++ { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)(uintptr_t)SIG_ERR ); + } + + } +@@ -260,7 +260,7 @@ struct sigaction act; + if ( ::signal(SIGALRM, SIG_IGN) != SIG_IGN) + { // catch any SIGALRM + if ( ::sigaction(SIGALRM, &act, NULL) != 0) +- { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)SIG_ERR ); ++ { qtss_printf( "- PlaylistBroadcaster: System error (%i).\n", (int)(uintptr_t)SIG_ERR ); + } + + } diff --git a/net/DarwinStreamingServer/patches/patch-ap b/net/DarwinStreamingServer/patches/patch-ap index 24e1c194cd8..5f5242b558c 100644 --- a/net/DarwinStreamingServer/patches/patch-ap +++ b/net/DarwinStreamingServer/patches/patch-ap @@ -1,6 +1,6 @@ -$NetBSD: patch-ap,v 1.2 2007/05/23 07:52:15 adam Exp $ +$NetBSD: patch-ap,v 1.3 2013/03/24 16:51:08 joerg Exp $ ---- CommonUtilitiesLib/OSRef.h.orig 2007-02-16 00:13:47.000000000 +0100 +--- CommonUtilitiesLib/OSRef.h.orig 2007-02-15 23:13:47.000000000 +0000 +++ CommonUtilitiesLib/OSRef.h @@ -58,6 +58,9 @@ class OSRefTableUtils friend class OSRefKey; diff --git a/net/DarwinStreamingServer/patches/patch-aq b/net/DarwinStreamingServer/patches/patch-aq index 225d70b36e8..ef7af3122ed 100644 --- a/net/DarwinStreamingServer/patches/patch-aq +++ b/net/DarwinStreamingServer/patches/patch-aq @@ -1,6 +1,6 @@ -$NetBSD: patch-aq,v 1.2 2007/05/23 07:52:15 adam Exp $ +$NetBSD: patch-aq,v 1.3 2013/03/24 16:51:08 joerg Exp $ ---- CommonUtilitiesLib/UDPDemuxer.h.orig 2007-02-16 00:13:47.000000000 +0100 +--- CommonUtilitiesLib/UDPDemuxer.h.orig 2007-02-15 23:13:47.000000000 +0000 +++ CommonUtilitiesLib/UDPDemuxer.h @@ -45,6 +45,8 @@ class UDPDemuxerKey; //IMPLEMENTATION ONLY: diff --git a/net/DarwinStreamingServer/patches/patch-ar b/net/DarwinStreamingServer/patches/patch-ar index 96de13879c2..0821cebb2ba 100644 --- a/net/DarwinStreamingServer/patches/patch-ar +++ b/net/DarwinStreamingServer/patches/patch-ar @@ -1,6 +1,6 @@ -$NetBSD: patch-ar,v 1.2 2007/05/23 07:52:15 adam Exp $ +$NetBSD: patch-ar,v 1.3 2013/03/24 16:51:08 joerg Exp $ ---- Server.tproj/QTSServer.h.orig 2007-02-16 00:13:49.000000000 +0100 +--- Server.tproj/QTSServer.h.orig 2007-02-15 23:13:49.000000000 +0000 +++ Server.tproj/QTSServer.h @@ -115,7 +115,7 @@ class QTSServer : public QTSServerInterf // GLOBAL TASKS diff --git a/net/DarwinStreamingServer/patches/patch-as b/net/DarwinStreamingServer/patches/patch-as index 89d5d4bc90e..38e2649822c 100644 --- a/net/DarwinStreamingServer/patches/patch-as +++ b/net/DarwinStreamingServer/patches/patch-as @@ -1,6 +1,6 @@ -$NetBSD: patch-as,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $ +$NetBSD: patch-as,v 1.2 2013/03/24 16:51:08 joerg Exp $ ---- Server.tproj/RTPSessionInterface.h.orig 2006-12-14 20:37:45.000000000 +0100 +--- Server.tproj/RTPSessionInterface.h.orig 2007-02-15 23:13:49.000000000 +0000 +++ Server.tproj/RTPSessionInterface.h @@ -40,6 +40,7 @@ diff --git a/net/DarwinStreamingServer/patches/patch-at b/net/DarwinStreamingServer/patches/patch-at index 4251672e9a1..9ca5e75e29a 100644 --- a/net/DarwinStreamingServer/patches/patch-at +++ b/net/DarwinStreamingServer/patches/patch-at @@ -1,6 +1,6 @@ -$NetBSD: patch-at,v 1.2 2007/05/23 07:52:16 adam Exp $ +$NetBSD: patch-at,v 1.3 2013/03/24 16:51:08 joerg Exp $ ---- APIModules/QTSSSpamDefenseModule.bproj/QTSSSpamDefenseModule.cpp.orig 2007-02-16 00:13:47.000000000 +0100 +--- APIModules/QTSSSpamDefenseModule.bproj/QTSSSpamDefenseModule.cpp.orig 2007-02-15 23:13:47.000000000 +0000 +++ APIModules/QTSSSpamDefenseModule.bproj/QTSSSpamDefenseModule.cpp @@ -62,6 +62,8 @@ class IPAddrTableElem friend class OSHashTable; diff --git a/net/DarwinStreamingServer/patches/patch-au b/net/DarwinStreamingServer/patches/patch-au index e9c03eb8a7c..e8d4c06270b 100644 --- a/net/DarwinStreamingServer/patches/patch-au +++ b/net/DarwinStreamingServer/patches/patch-au @@ -1,8 +1,8 @@ -$NetBSD: patch-au,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $ +$NetBSD: patch-au,v 1.2 2013/03/24 16:51:08 joerg Exp $ ---- QTFileTools/QTBroadcaster.tproj/Makefile.POSIX.orig 2006-12-14 22:53:14.000000000 +0100 +--- QTFileTools/QTBroadcaster.tproj/Makefile.POSIX.orig 2005-04-27 12:21:14.000000000 +0000 +++ QTFileTools/QTBroadcaster.tproj/Makefile.POSIX -@@ -6,7 +6,7 @@ C++ = $(CPLUS) +@@ -6,10 +6,10 @@ C++ = $(CPLUS) CC = $(CCOMP) LINK = $(LINKER) CCFLAGS += $(COMPILER_FLAGS) $(INCLUDE_FLAG) ../../PlatformHeader.h -g -Wall @@ -10,4 +10,8 @@ $NetBSD: patch-au,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $ +LIBS = $(CORE_LINK_LIBS) -lCommonUtilitiesLib -lQTFileExternalLib ../../CommonUtilitiesLib/libCommonUtilitiesLib.a ../../QTFileLib/libQTFileExternalLib.a #OPTIMIZATION - CCFLAGS += -O3 +-CCFLAGS += -O3 ++CCFLAGS += + + # EACH DIRECTORY WITH HEADERS MUST BE APPENDED IN THIS MANNER TO THE CCFLAGS + diff --git a/net/DarwinStreamingServer/patches/patch-av b/net/DarwinStreamingServer/patches/patch-av index eac0c73b382..14f96eb0273 100644 --- a/net/DarwinStreamingServer/patches/patch-av +++ b/net/DarwinStreamingServer/patches/patch-av @@ -1,8 +1,8 @@ -$NetBSD: patch-av,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $ +$NetBSD: patch-av,v 1.2 2013/03/24 16:51:08 joerg Exp $ ---- QTFileTools/QTFileInfo.tproj/Makefile.POSIX.orig 2006-12-15 09:06:50.000000000 +0100 +--- QTFileTools/QTFileInfo.tproj/Makefile.POSIX.orig 2005-04-27 12:21:14.000000000 +0000 +++ QTFileTools/QTFileInfo.tproj/Makefile.POSIX -@@ -6,7 +6,7 @@ C++ = $(CPLUS) +@@ -6,10 +6,10 @@ C++ = $(CPLUS) CC = $(CCOMP) LINK = $(LINKER) CCFLAGS += $(COMPILER_FLAGS) $(INCLUDE_FLAG) ../../PlatformHeader.h -g -Wall @@ -10,4 +10,8 @@ $NetBSD: patch-av,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $ +LIBS = $(CORE_LINK_LIBS) -lCommonUtilitiesLib -lQTFileExternalLib ../../CommonUtilitiesLib/libCommonUtilitiesLib.a ../../QTFileLib/libQTFileExternalLib.a #OPTIMIZATION - CCFLAGS += -O3 +-CCFLAGS += -O3 ++CCFLAGS += + + # EACH DIRECTORY WITH HEADERS MUST BE APPENDED IN THIS MANNER TO THE CCFLAGS + -- cgit v1.2.3