From Stephan Huber, "* imageio: removed ReaderWriterImageIO_IOS.cpp, refactored ReaderWriterImageIO to work on OS X and IOS

* avfoundation: added support for IOS (CoreVideo-support is still in development, works only for SDK >= 6.0, set IPHONE_SDKVER in cMake accordingly)
* zeroconf: added ZeroConf-device-plugin (Mac/Win only, linux implementation missing) to advertise and discover services via ZeroConf/Bonjour, on windows you'll need the Bonjour SDK from Apple
* osgosc: modified the example to demonstrate the usage of the ZeroConf-plugin (start the example with the command-line-argument --zeroconf)
* SlideShowConstructor: enable/disable CoreVideo via a environment variable (P3D_ENABLE_CORE_VIDEO)
* RestHttp: mouse-motion-events get interpolated
* RestHttp: unhandled http-requests get sent as an user-event to the event-queue, all arguments get attached as user-values to the event
* modified some CMakeModules to work correctly when compiling for IOS
* fixed a compile-error for IOS in GraphicsWindowIOS
* some minor bugfixes"

CMakeModules/FindAVFoundation.cmake

@@ -9,8 +9,6 @@
 #
 # Created by Stephan Maximilian Huber 
 
-# QTKit on OS X looks different than QTKit for Windows,
-# so I am going to case the two.
 
 IF(APPLE)
   FIND_PATH(AV_FOUNDATION_INCLUDE_DIR AVFoundation/AVFoundation.h)
@@ -23,19 +21,22 @@ IF(AV_FOUNDATION_LIBRARY AND AV_FOUNDATION_INCLUDE_DIR)
 ENDIF()
 
 IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
-    # TODO, AVFoundation exists ON iOS, too
-    SET(AV_FOUNDATION_FOUND "NO")
-ENDIF()
-
-IF(APPLE)
-    # AVFoundation exists since 10.7, but only 10.8 has all features necessary for OSG
-    # so check the SDK-setting
-
-    IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8")
-        # nothing special here ;-)
+    # AVFoundation exists ON iOS, too -- good support for SDK 6.0 and greater
+    IF(${IPHONE_SDKVER} LESS "6.0")
+        SET(AV_FOUNDATION_FOUND "NO")
     ELSE()
-        MESSAGE("AVFoundation disabled for SDK < 10.8")
-        SET(AV_FOUNDATION_FOUND "NO")  
+        SET(AV_FOUNDATION_FOUND "YES")
     ENDIF()
-ENDIF()
+ELSE()
+  IF(APPLE)
+      # AVFoundation exists since 10.7, but only 10.8 has all features necessary for OSG
+      # so check the SDK-setting
 
+      IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8")
+          # nothing special here ;-)
+      ELSE()
+          MESSAGE("AVFoundation disabled for SDK < 10.8")
+          SET(AV_FOUNDATION_FOUND "NO")  
+      ENDIF()
+  ENDIF()
+ENDIF()

CMakeModules/FindQuickTime.cmake

@@ -49,24 +49,24 @@ ENDIF()
 
 IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
     SET(QUICKTIME_FOUND "NO")
-ENDIF()
-
-IF(APPLE)
-    #Quicktime is not supported under 64bit OSX build so we need to detect it and disable it.
-    #First check to see if we are running with a native 64-bit compiler (10.6 default) and implicit arch
-    IF(NOT CMAKE_OSX_ARCHITECTURES AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-        SET(QUICKTIME_FOUND "NO")
-    ELSE()
-        #Otherwise check to see if 64-bit is explicitly called for.
-        LIST(FIND CMAKE_OSX_ARCHITECTURES "x86_64" has64Compile)
-        IF(NOT has64Compile EQUAL -1)
-            SET(QUICKTIME_FOUND "NO")
-        ENDIF()
-    ENDIF()
-    # Disable quicktime for >= 10.7, as it's officially deprecated
-    
-    IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.7" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9")
-        MESSAGE("disabling quicktime because it's not supported by the selected SDK ${OSG_OSX_SDK_NAME}")
-        SET(QUICKTIME_FOUND "NO")
-    ENDIF()
+ELSE()
+  IF(APPLE)
+      #Quicktime is not supported under 64bit OSX build so we need to detect it and disable it.
+      #First check to see if we are running with a native 64-bit compiler (10.6 default) and implicit arch
+      IF(NOT CMAKE_OSX_ARCHITECTURES AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+          SET(QUICKTIME_FOUND "NO")
+      ELSE()
+          #Otherwise check to see if 64-bit is explicitly called for.
+          LIST(FIND CMAKE_OSX_ARCHITECTURES "x86_64" has64Compile)
+          IF(NOT has64Compile EQUAL -1)
+              SET(QUICKTIME_FOUND "NO")
+          ENDIF()
+      ENDIF()
+      # Disable quicktime for >= 10.7, as it's officially deprecated
+      
+      IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.7" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9")
+          MESSAGE("disabling quicktime because it's not supported by the selected SDK ${OSG_OSX_SDK_NAME}")
+          SET(QUICKTIME_FOUND "NO")
+      ENDIF()
+  ENDIF()
 ENDIF()

CMakeModules/FindZeroConf.cmake

@@ -0,0 +1,47 @@
+# Locate ZeroConf / Bonjour
+# This module defines
+# ZEROCONF_LIBRARY
+# ZEROCONF_FOUND, if false, do not try to link to gdal 
+# ZEROCONF_INCLUDE_DIR, where to find the headers
+#
+# $ZEROCONF_DIR is an environment variable that would
+# correspond to the ./configure --prefix=$ZEROCONF_DIR
+
+# Created by Stephan Maximilian Huber 
+
+SET(ZEROCONF_FOUND "NO")
+
+IF(APPLE)
+  # bonjour is part of the system on os x / ios
+  SET(ZEROCONF_FOUND "YES")
+ELSE()
+  IF(WIN32)
+    # find the Bonjour SDK
+    FIND_PATH(ZEROCONF_INCLUDE_DIR dnssd.h
+      $ENV{ZEROCONF_DIR}/include
+      $ENV{ZEROCONF_DIR}
+      NO_DEFAULT_PATH
+    )
+    FIND_PATH(ZEROCONF_INCLUDE_DIR dnssd.h
+      PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+      NO_DEFAULT_PATH
+      PATH_SUFFIXES include
+    )
+    FIND_PATH(ZEROCONF_INCLUDE_DIR dnssd.h)
+
+    FIND_LIBRARY(ZEROCONF_LIBRARY dnssd
+      PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+      NO_DEFAULT_PATH
+      PATH_SUFFIXES lib64 lib
+    )
+    FIND_LIBRARY(ZEROCONF_LIBRARY dnssd)
+
+    SET(ZEROCONF_FOUND "NO")
+    IF(ZEROCONF_LIBRARY AND ZEROCONF_INCLUDE_DIR)
+      SET(ZEROCONF_FOUND "YES")
+    ENDIF()
+
+  ELSE()
+  	# TODO find AVAHI on linux
+  ENDIF()
+ENDIF()