kodi-server beta2 patch

diff --git a/Makefile.in b/Makefile.in
index 1ce9039..f94f67a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,6 +264,9 @@ TOUCH_SKIN_MEDIA=addons/skin.re-touched/media
 SKIN_DIRS+=$(TOUCH_SKIN_MEDIA)
 endif

+DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
+       $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/main
+
 LIBS=@LIBS@
 CFLAGS=@CFLAGS@
 CXXFLAGS=@CXXFLAGS@
@@ -365,6 +368,12 @@ endif
 xbmc/cores/paplayer/paplayer.a: papcodecs
 $(DVDPLAYER_ARCHIVES)         : dvdpcodecs

+$(NWAOBJSXBMC): force
+       @$(MAKE) $(if $(V),,-s) -C $(@D)
+
+$(DIRECTORY_ARCHIVES): force
+       @$(MAKE) $(if $(V),,-s) -C $(@D)
+
 lib/cpluff/libcpluff/.libs/libcpluff.a: force
        $(MAKE) -C lib/cpluff/libcpluff
 system/libcpluff-@ARCH@.so: lib/cpluff/libcpluff/.libs/libcpluff.a exports
@@ -465,6 +474,8 @@ xcode_depends: \
        lib/libXDAAP/libxdaap.a \
        lib/SlingboxLib/SlingboxLib.a

+OBJSXBMC =$(DIRECTORY_ARCHIVES)
+
 DYNOBJSXBMC= \
        xbmc/linux/linux.a \
        xbmc/network/network.a \
@@ -496,42 +507,35 @@ LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
 $(FFMPEGOBJS): dvdpcodecs
 endif

-ifneq (@USE_LIBXBMC@,1)
-MAINOBJS+=xbmc/main/main.a
-else
-ifeq (@USE_ANDROID@,1)
-MAINOBJS+=xbmc/android/activity/activity.a
-endif # USE_ANDROID
-endif # USE_LIBXBMC
-
-
-OBJSXBMC =$(DIRECTORY_ARCHIVES)
 OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC))

-BIN_DIRS = $(dir $(DIRECTORY_ARCHIVES)) $(dir $(NWAOBJSXBMC)) $(dir $(MAINOBJS))
-
-DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
-       $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/main
-
-$(NWAOBJSXBMC) $(DIRECTORY_ARCHIVES) $(MAINOBJS): force
-       @$(MAKE) $(if $(V),,-s) -C $(@D)
+MAINOBJS=xbmc/xbmc.o
+ifeq (@USE_ANDROID@,1)
+MAINOBJS+=xbmc/android/activity/android_main.o
+endif
+ifneq (@USE_LIBXBMC@,1)
+MAINOBJS+=xbmc/main/main.o
+endif

 # Binary Addon bindings
 include xbmc/addons/addon-bindings.mk

 lib@APP_NAME_LC@.so: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS)
 ifeq ($(findstring osx,@ARCH@), osx)
-       $(SILENT_LD) $(CXX) $(LDFLAGS) -bundle -o $@ $(MAINOBJS) -Wl,-all_load,-ObjC $(MAINOBJS) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -read_only_relocs suppress
+       $(SILENT_LD) $(CXX) $(LDFLAGS) -bundle -o $@ -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -read_only_relocs suppress
 else
-       $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ -Wl,--whole-archive $(MAINOBJS) -Wl,--no-whole-archive,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group -Wl,--no-undefined $(NWAOBJSXBMC) $(LIBS)
+       $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(MAINOBJS) -Wl,--Bsymbolic,--start-group $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group -Wl,--no-undefined $(NWAOBJSXBMC) $(LIBS)
 endif

-@APP_NAME_LC@.bin: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS)
+xbmc/main/main.a: force
+       $(MAKE) -C xbmc/main
+
+@APP_NAME_LC@.bin: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS) xbmc/main/main.a

 ifeq ($(findstring osx,@ARCH@), osx)
-       $(SILENT_LD) $(CXX) $(LDFLAGS) -o @APP_NAME_LC@.bin $(MAINOBJS) -Wl,-all_load,-ObjC $(MAINOBJS) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic
+       $(SILENT_LD) $(CXX) $(LDFLAGS) -o @APP_NAME_LC@.bin xbmc/main/main.a -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic
 else
-       $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o @APP_NAME_LC@.bin $(MAINOBJS) -Wl,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group $(NWAOBJSXBMC) $(LIBS) -rdynamic
+       $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o @APP_NAME_LC@.bin $(MAINOBJS) -Wl,--start-group $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group $(NWAOBJSXBMC) $(LIBS) -rdynamic
 endif

 @APP_NAME_LC@-xrandr: xbmc-xrandr.c
diff --git a/xbmc/network/Network.cpp b/xbmc/network/Network.cpp
index d0c80c0..016fd5d 100644
--- a/xbmc/network/Network.cpp
+++ b/xbmc/network/Network.cpp
@@ -213,15 +213,7 @@ bool CNetwork::HasInterfaceForIP(unsigned long address)

 bool CNetwork::IsAvailable(bool wait /*= false*/)
 {
-  if (wait)
-  {
-    // NOTE: Not implemented in linuxport branch as 99.9% of the time
-    //       we have the network setup already.  Trunk code has a busy
-    //       wait for 5 seconds here.
-  }
-
-  std::vector<CNetworkInterface*>& ifaces = GetInterfaceList();
-  return (ifaces.size() != 0);
+  return true;
 }

 bool CNetwork::IsConnected()
diff --git a/xbmc/network/upnp/UPnPServer.cpp b/xbmc/network/upnp/UPnPServer.cpp
index 20e3bf5..b97424b 100644
--- a/xbmc/network/upnp/UPnPServer.cpp
+++ b/xbmc/network/upnp/UPnPServer.cpp
@@ -1188,6 +1188,11 @@ CUPnPServer::ServeFile(const NPT_HttpRequest&              request,
         return NPT_SUCCESS;
     }

+    if (file_path.Left(13).Compare("image://video", true) == 0 || file_path.Left(13).Compare("image://music", true) == 0) {
+        response.SetStatus(404, "File Not Found");
+        return NPT_SUCCESS;
+    }
+
     if(URIUtils::IsURL((const char*)file_path))
     {
       CStdString disp = "inline; filename=\"" + URIUtils::GetFileName((const char*)file_path) + "\"";