fix build error on latest gcc and linux, gets is deprecated, and raspberry pi build of scons. add mac build of scons

Build/Boot.scons

@@ -1,6 +1,7 @@
 import sys
 import os
 import platform
+import re
 
 EnsureSConsVersion(0,98,1)
 
@@ -16,7 +17,8 @@ PLATFORM_TO_TARGET_MAP = {
     'linux2'      : 'x86-unknown-linux',
     'win32'       : 'x86-microsoft-win32',
     'cygwin'      : 'x86-unknown-cygwin',
-    'darwin'      : 'universal-apple-macosx'
+    'darwin'      : 'universal-apple-macosx',
+    'raspberry-pi-arm' : 'arm-raspberry-pi-linux'
 }
 
 # list all target dirs
@@ -25,17 +27,50 @@ targets_dir = scons_root+'/Build/Targets'
 targets_dirs = os.listdir(targets_dir)
 TARGET_PLATFORMS = [x for x in targets_dirs if os.path.exists(targets_dir +'/'+x+'/Config.scons')]
 
+def pi_version():
+    """Detect the version of the Raspberry Pi.  Returns either 1, 2 or
+    None depending on if it's a Raspberry Pi 1 (model A, B, A+, B+),
+    Raspberry Pi 2 (model B+), or not a Raspberry Pi.
+    """
+    # Check /proc/cpuinfo for the Hardware field value.
+    # 2708 is pi 1
+    # 2709 is pi 2
+    # 2835 is pi 3 on 4.9.x kernel
+    # Anything else is not a pi.
+    with open('/proc/cpuinfo', 'r') as infile:
+        cpuinfo = infile.read()
+    # Match a line like 'Hardware   : BCM2709'
+    match = re.search('^Hardware\s+:\s+(\w+)$', cpuinfo,
+                      flags=re.MULTILINE | re.IGNORECASE)
+    if not match:
+        # Couldn't find the hardware, assume it isn't a pi.
+        return None
+    if match.group(1) == 'BCM2708':
+        # Pi 1
+        return 1
+    elif match.group(1) == 'BCM2709':
+        # Pi 2
+        return 2
+    elif match.group(1) == 'BCM2835':
+        # Pi 3 / Pi on 4.9.x kernel
+        return 3
+    else:
+        # Something else, not a pi.
+        return None
+
 def DefaultTarget():
     platform_id = sys.platform
     if platform.system() == 'Linux':
-        if (platform.machine() == 'i386' or
+        if pi_version() is not None:
+            platform_id = 'raspberry-pi-arm'
+        elif (platform.machine() == 'i386' or
             platform.machine() == 'i486' or
             platform.machine() == 'i586'or
             platform.machine() == 'i686'):
             platform_id = 'linux-i386'
-        if (platform.machine() == 'x86_64'):
+        elif (platform.machine() == 'x86_64'):
             platform_id = 'linux-x86_64'
-        if (platform.machine().startswith('arm')):
+        elif (platform.machine().startswith('arm')):
             platform_id = 'linux-arm'
 
     if PLATFORM_TO_TARGET_MAP.has_key(platform_id):

Build/Build.scons

@@ -114,6 +114,7 @@ class LibraryModule(Module):
 
         # the product is a library
         self.env.AppendUnique(CPPPATH=cpp_path)
+        self.env.AppendUnique(CCFLAGS='-fPIC')
         if shared is False:
             self.product = self.env.Library(target=name, source=sources)
         else:
@@ -145,6 +146,42 @@ def Application(name, dir, deps, install = False):
         if env['build_config'] == 'Release' and env.has_key('STRIP'):
             env.AddPostAction(inst, env['STRIP']+' $TARGETS');
 
+def Swig(name, dir, deps):
+    DeclareBuildDir(dir)
+    cpp_path = GetIncludeDirs(deps)
+
+    inc = '-I' + ' -I'.join([env.GetBuildPath(x) for x in cpp_path])
+
+    def generator(source, target, env, for_signature):
+        return 'swig -python -py3 -threads -c++ {} -o {} {}'.format(inc, target[0], source[0])
+
+    bld = Builder(generator = generator)
+    env.Append(BUILDERS={'Swig' : bld})
+
+    return env.Swig([name + '_wrap.cxx', name + '_wrap.h', name + '.py'], GlobSources(dir, ['*.i']))
+
+def PythonBinding(name, dir, deps):
+    swig_out = Swig(name, dir, deps)
+
+    DeclareBuildDir(dir)
+    cpp_path = GetIncludeDirs(deps) + [GetDirPath(dir)]
+    libs = GetLibraries(deps)
+
+    # the product is a library
+    env_ = env.Clone()
+    env_.AppendUnique(CPPPATH=cpp_path, LIBS=libs)
+    env_.ParseConfig('pkg-config python3 --cflags --libs')
+    product = env_.SharedLibrary(target=name,
+                                 source=GlobSources(dir, ['*.cxx']) + [swig_out[0]],
+                                 SHLIBSUFFIX='.so', SHLIBPREFIX='_')
+    env_.Alias(name, product)
+
+    # copy to Targets folder
+    inst = env.Install(dir=env.GetBuildPath('#/Targets/'+env['target']+'/'+env['build_config']), source=product)
+    if env['build_config'] == 'Release' and env.has_key('STRIP'):
+        env.AddPostAction(inst, env['STRIP']+' $TARGETS');
+
+    env.Install(dir=env.GetBuildPath('#/Targets/'+env['target']+'/'+env['build_config']), source=swig_out[2])
 #######################################################
 # Main Build
 #######################################################
@@ -273,3 +310,7 @@ for tool in ['TextToHeader']:
                 dir     = 'Source/Tools/' + tool,
                 deps    = ['Platinum'],
              	install = True)
+
+PythonBinding(name = 'media_renderer',
+     dir = 'binding/python',
+     deps    = ['Platinum', 'PltMediaRenderer'])

Build/Targets/arm-raspberry-pi-linux/Config.scons

@@ -0,0 +1,7 @@
+LoadTool('gcc-generic', env, gcc_cross_prefix='')
+
+### Neptune System Files
+env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullAutoreleasePool.cpp'}
+env['NPT_EXTRA_LIBS']=['pthread']
+
+env['STRIP'] = ''

Build/Targets/universal-apple-macosx/Config.scons

@@ -0,0 +1,5 @@
+LoadTool('gcc-generic', env)
+
+### Neptune System Files
+env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullAutoreleasePool.cpp NptNullSerialPort.cpp'}
+env['NPT_EXTRA_LIBS']=['pthread']

Build/Targets/x86_64-unknown-linux/Config.scons

@@ -0,0 +1,5 @@
+LoadTool('gcc-generic', env)
+
+### Neptune System Files
+env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullAutoreleasePool.cpp NptNullSerialPort.cpp'}
+env['NPT_EXTRA_LIBS']=['pthread']

Source/Apps/FrameStreamer/main.cpp

@@ -235,7 +235,7 @@ main(int argc, char** argv)
         return 1;
 
     char buf[256];
-    while (gets(buf))
+    while (fgets(buf,256,stdin))
     {
         if (*buf == 'q')
         {

Source/Apps/MediaConnect/main.cpp

@@ -118,7 +118,7 @@ main(int argc, char** argv)
         return 1;
 
     char buf[256];
-    while (gets(buf))
+    while (fgets(buf, 256, stdin))
     {
         if (*buf == 'q')
         {

Source/Apps/MediaCrawler/main.cpp

@@ -71,7 +71,7 @@ int main(void)
     ctrlPoint->Discover(NPT_HttpUrl("255.255.255.255", 1900, "*"), "upnp:rootdevice", 1);
 
     char buf[256];
-    while (gets(buf)) {
+    while (fgets(buf, 256, stdin)) {
         if (*buf == 'q')
             break;
     }

Source/Tests/FileMediaServer/FileMediaServerTest.cpp

@@ -148,7 +148,7 @@ main(int /* argc */, char** argv)
     NPT_LOG_INFO("Press 'q' to quit.");
 
     char buf[256];
-    while (gets(buf)) {
+    while (fgets(buf, 256, stdin)) {
         if (*buf == 'q')
             break;
     }

Source/Tests/LightSample/LightSampleTest.cpp

@@ -65,7 +65,7 @@ main(int /* argc */, char** /* argv */)
     upnp.Start();
 
     char buf[256];
-    while (gets(buf)) {
+    while (fgets(buf, 256, stdin)) {
         if (*buf == 'q')
             break;
     }

Source/Tests/MediaRenderer/MediaRendererTest.cpp

@@ -102,7 +102,7 @@ main(int /* argc */, char** argv)
     upnp.Start();
 
     char buf[256];
-    while (gets(buf)) {
+    while (fgets(buf, 256, stdin)) {
         if (*buf == 'q')
             break;