[haiku-commits] haiku: hrev49455 - src/servers/index build/jam src/tools/hvif2png

  • From: waddlesplash@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 25 Jul 2015 16:43:38 +0200 (CEST)

hrev49455 adds 2 changesets to branch 'master'
old head: 4a839f2daaeb237f0fb8c5192899c9e0993e762e
new head: ca8ed5ea660fb6275799a3b7f138b201c41a667b
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=ca8ed5ea660f+%5E4a839f2daaeb

----------------------------------------------------------------------------

3860139319a1: hvif2png: Fix build on Mac OS X.

* Add support for macports lib and headers dirs.
* Link libs change for Mac OS X for tool build.

Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>

[ Andrew Lindesay <apl@xxxxxxxxxxxxxx> ]

ca8ed5ea660f: index_server: Fix the build.

Partially based on a patch from Paradoxianer. Thanks!

[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

----------------------------------------------------------------------------

6 files changed, 11 insertions(+), 6 deletions(-)
build/jam/BuildSetup | 5 +++++
src/servers/index/AnalyserDispatcher.h | 2 +-
src/servers/index/IndexServer.cpp | 2 +-
src/servers/index/VolumeWatcher.cpp | 4 ++--
src/servers/index/VolumeWatcher.h | 2 +-
src/tools/hvif2png/Jamfile | 2 +-

############################################################################

Commit: 3860139319a16a1f009bb63e69d9e468b6e28f9d
URL: http://cgit.haiku-os.org/haiku/commit/?id=3860139319a1
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Thu Jul 23 11:00:02 2015 UTC
Committer: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Commit-Date: Sat Jul 25 14:23:24 2015 UTC

hvif2png: Fix build on Mac OS X.

* Add support for macports lib and headers dirs.
* Link libs change for Mac OS X for tool build.

Signed-off-by: Augustin Cavalier <waddlesplash@xxxxxxxxx>

----------------------------------------------------------------------------

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index d917140..d13922a 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -594,6 +594,11 @@ if $(HOST_PLATFORM) = freebsd {

if $(HOST_PLATFORM) = darwin {
HOST_HDRS += [ FDirName $(HAIKU_TOP) src build libgnuregex ] ;
+
+ # Mac OS X users may be using macports libraries, in which case the
headers
+ # and the libs are located in /opt/local/.
+ HOST_HDRS += /opt/local/include ;
+ HOST_LINKFLAGS += -L/opt/local/lib ;
}

HOST_BE_API_HEADERS =
diff --git a/src/tools/hvif2png/Jamfile b/src/tools/hvif2png/Jamfile
index 10b698c..1048fb3 100644
--- a/src/tools/hvif2png/Jamfile
+++ b/src/tools/hvif2png/Jamfile
@@ -7,5 +7,5 @@ USES_BE_API on <build>hvif2png = true ;
BuildPlatformMain <build>hvif2png :
hvif2png.cpp
:
- $(HOST_LIBBE) $(HOST_LIBROOT) png
+ $(HOST_LIBBE) $(HOST_LIBROOT) $(HOST_LIBSUPC++) png
;

############################################################################

Revision: hrev49455
Commit: ca8ed5ea660fb6275799a3b7f138b201c41a667b
URL: http://cgit.haiku-os.org/haiku/commit/?id=ca8ed5ea660f
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Jul 25 14:33:45 2015 UTC

index_server: Fix the build.

Partially based on a patch from Paradoxianer. Thanks!

----------------------------------------------------------------------------

diff --git a/src/servers/index/AnalyserDispatcher.h
b/src/servers/index/AnalyserDispatcher.h
index 95e596b..7da7bae 100644
--- a/src/servers/index/AnalyserDispatcher.h
+++ b/src/servers/index/AnalyserDispatcher.h
@@ -49,7 +49,7 @@ protected:
private:
FileAnalyser* _FindAnalyser(const BString&
name);

- vint32 fStopped;
+ int32 fStopped;
};

#endif // ANALYSER_DISPATCHER
diff --git a/src/servers/index/IndexServer.cpp
b/src/servers/index/IndexServer.cpp
index 9270609..ef73b55 100644
--- a/src/servers/index/IndexServer.cpp
+++ b/src/servers/index/IndexServer.cpp
@@ -317,7 +317,7 @@ IndexServer::_StartWatchingAddOns()
fPulseRunner = new BMessageRunner(&fAddOnMonitorHandler, &pulse,
1000000LL);
// the monitor handler needs a pulse to check if add-ons are
ready

- &fAddOnMonitorHandler->AddAddOnDirectories("index_server");
+ fAddOnMonitorHandler.AddAddOnDirectories("index_server");
}


diff --git a/src/servers/index/VolumeWatcher.cpp
b/src/servers/index/VolumeWatcher.cpp
index a945e17..1576275 100644
--- a/src/servers/index/VolumeWatcher.cpp
+++ b/src/servers/index/VolumeWatcher.cpp
@@ -59,7 +59,7 @@ WatchNameHandler::EntryMoved(const char *name, const char
*fromName,
{
entry_ref ref(device, to_directory, name);
entry_ref refFrom(device, from_directory, fromName);
-
+
fVolumeWatcher->fMovedList.CurrentList()->push_back(ref);
fVolumeWatcher->fMovedFromList.CurrentList()->push_back(refFrom);
fVolumeWatcher->_NewEntriesArrived();
@@ -470,7 +470,7 @@ VolumeWatcher::StartWatching()
void
VolumeWatcher::Stop()
{
-
+
char name[255];
fVolume.GetName(name);

diff --git a/src/servers/index/VolumeWatcher.h
b/src/servers/index/VolumeWatcher.h
index 7131ae3..e17eea0 100644
--- a/src/servers/index/VolumeWatcher.h
+++ b/src/servers/index/VolumeWatcher.h
@@ -71,7 +71,7 @@ private:
void _SetBusy(bool busy =
true);

VolumeWatcher* fVolumeWatcher;
- vint32 fBusy;
+ int32 fBusy;
};




Other related posts:

  • » [haiku-commits] haiku: hrev49455 - src/servers/index build/jam src/tools/hvif2png - waddlesplash