Import boxeebox support from boxeebox-xbmc project

Author: Risca

lib/libsquish/CMakeLists.txt

@@ -2,7 +2,7 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 find_all_sources(. squish_SRCS)
 
-if (NOT TARGET_RPI)
+if (NOT TARGET_RPI AND NOT TARGET_BOXEEBOX)
   if(CMAKE_SSE_CFLAGS)
     add_definitions(-DSQUISH_USE_SSE=2)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_SSE_CFLAGS}")

plex/CMakeModules/CMakeConfig.cmake

@@ -62,6 +62,10 @@ elseif("x${TARGET_PLATFORM}" STREQUAL "xAML")
   set(TARGET_AML 1 CACHE BOOL "Target is AMLogic")
   set(TARGET_COMMON_LINUX 1 CACHE BOOL "Common Linux platforms")
   set(TARGET_POSIX 1 CACHE BOOL "POSIX platform")
+elseif("x${TARGET_PLATFORM}" STREQUAL "xBOXEEBOX")
+  set(TARGET_BOXEEBOX 1 CACHE BOOL "Target is BoxeeBox")
+  set(TARGET_COMMON_LINUX 1 CACHE BOOL "Common Linux platforms")
+  set(TARGET_POSIX 1 CACHE BOOL "POSIX platform")
 elseif("x${TARGET_PLATFORM}" STREQUAL "xIOS")
   set(TARGET_IOS 1 CACHE BOOL "Target is iOS")
   set(TARGET_COMMON_DARWIN 1 CACHE BOOL "Common Darwin platforms")
@@ -120,7 +124,7 @@ endif(ENABLE_DVD_DRIVE)
 
 configure_file(${root}/xbmc/DllPaths_generated.h.in ${CMAKE_BINARY_DIR}/xbmc/DllPaths_generated.h)
 
-if(NOT TARGET_AML)
+if(NOT TARGET_AML AND NOT TARGET_BOXEEBOX)
 find_package(SSE)
 if(NOT TARGET_WIN32)
   if(SSSE3_FOUND)
@@ -133,7 +137,7 @@ if(NOT TARGET_WIN32)
 else(NOT TARGET_WIN32)
   set(CMAKE_SSE_CFLAGS "/arch:SSE2")
 endif(NOT TARGET_WIN32)
-endif(NOT TARGET_AML)
+endif(NOT TARGET_AML AND NOT TARGET_BOXEEBOX)
 
 find_package(Breakpad)
 if(HAVE_BREAKPAD)

plex/CMakeModules/FindDBUS.cmake

@@ -34,6 +34,7 @@ else (DBUS_INCLUDE_DIR AND DBUS_ARCH_INCLUDE_DIR AND DBUS_LIBRARIES)
     /usr/include
     /usr/include/dbus-1.0
     /usr/local/include
+    /usr/local/include/dbus-1.0
   )
 
   FIND_PATH(DBUS_ARCH_INCLUDE_DIR dbus/dbus-arch-deps.h
@@ -44,6 +45,7 @@ else (DBUS_INCLUDE_DIR AND DBUS_ARCH_INCLUDE_DIR AND DBUS_LIBRARIES)
     /usr/lib64/dbus-1.0/include
     /usr/lib/include
     /usr/lib/dbus-1.0/include
+    /usr/local/lib/dbus-1.0/include
   )
 
   FIND_LIBRARY(DBUS_LIBRARIES NAMES dbus-1 dbus

plex/CMakeModules/FindPython.cmake

@@ -59,7 +59,7 @@ set(PYTHON_EXEC "${PYTHON_EXEC_}" CACHE FILEPATH "Path to Python interpreter")
 string(REGEX REPLACE "/bin/python.*" "" PYTHON_PREFIX "${PYTHON_EXEC_}")
 string(REGEX REPLACE "/bin/python.*" "" PYTHON_PREFIX2 "${PYTHON_EXEC}")
 
-if (TARGET_RPI OR TARGET_AML)
+if (TARGET_RPI OR TARGET_AML OR TARGET_BOXEEBOX)
     string(REGEX REPLACE ".*/bin/python" "" PYTHON_VERSION "${PYTHON_EXEC}") # grab version from executable name
 else()
     execute_process(COMMAND "${PYTHON_EXEC}" "-c"
@@ -84,7 +84,7 @@ find_path(PYTHON_INCLUDE_DIRS "Python.h"
     PATH_SUFFIXES python${PYTHON_VERSION} python${PYTHON_VERSION}m
     DOC "Python include directories" NO_DEFAULT_PATH)
 
-if (TARGET_RPI OR TARGET_AML)
+if (TARGET_RPI OR TARGET_AML OR TARGET_BOXEEBOX)
     set(PYTHON_SITE_MODULES "${PYTHON_PREFIX}/lib/site-packages" CACHE FILEPATH "Path to Python site modules")
 else()
     execute_process(COMMAND "${PYTHON_EXEC}" "-c"
@@ -108,7 +108,7 @@ function(find_python_module module)
     if(NOT PY_${module_upper})
         # A module's location is usually a directory, but for binary modules
         # it's a .so file.
-        if (NOT TARGET_RPI AND NOT TARGET_AML)
+        if (NOT TARGET_RPI AND NOT TARGET_AML AND NOT TARGET_BOXEEBOX)
             execute_process(COMMAND "${PYTHON_EXEC}" "-c"
                 "import re, ${module}; print(re.compile('/__init__.py.*').sub('',${module}.__file__))"
                 RESULT_VARIABLE _${module}_status

plex/CMakeModules/PlatformConfigBOXEEBOX.cmake

@@ -0,0 +1,195 @@
+# vim: setlocal syntax=cmake:
+
+add_definitions(-DTARGET_BOXEEBOX)
+
+message(STATUS "Building for BoxeeBox")
+
+######################### Compiler CFLAGS
+set(EXTRA_CFLAGS "-fPIC -DPIC")
+
+######################### CHECK LIBRARIES / FRAMEWORKS
+option(USE_INTERNAL_FFMPEG "Use internal FFmpeg?" OFF)
+
+set(LINK_PKG
+  Freetype
+  ZLIB
+  JPEG
+  SQLite3
+  PCRE
+  Lzo2
+  FriBiDi
+  Fontconfig
+  YAJL
+  microhttpd
+  Crypto
+  OpenSSL
+  TinyXML
+  Iconv
+  Avahi
+  LibDl
+  LibRt
+  FLAC
+  DBUS
+)
+
+if(NOT USE_INTERNAL_FFMPEG)
+  list(APPEND LINK_PKG FFmpeg)
+else()
+  set(FFMPEG_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/lib/ffmpeg ${CMAKE_BINARY_DIR}/lib/ffmpeg/ffmpeg/src/ffmpeg-build)
+endif()
+
+if(ENABLE_PYTHON)
+   list(APPEND LINK_PKG Python)
+endif(ENABLE_PYTHON)
+
+foreach(l ${LINK_PKG})
+  plex_find_package(${l} 1 1)
+endforeach()
+
+find_package(Boost COMPONENTS thread system REQUIRED)
+if(Boost_FOUND)
+  include_directories(${Boost_INCLUDE_DIRS})
+  list(APPEND CONFIG_PLEX_LINK_LIBRARIES  boost_random ${Boost_LIBRARIES})
+  set(HAVE_BOOST 1)
+endif()
+
+### install libs
+set(INSTALL_LIB
+  CURL
+  PNG
+  TIFF
+  Vorbis
+  Mpeg2
+  Ass
+  RTMP
+  PLIST
+)
+
+foreach(l ${INSTALL_LIB})
+  plex_find_package(${l} 1 0)
+endforeach()
+
+option(ENABLE_SHAIRPLAY "Enable ShairPlay?" ON)
+if(ENABLE_SHAIRPLAY)
+  plex_find_package(ShairPlay 1 0)
+endif()
+
+option(ENABLE_SHAIRPORT "Enable ShairPort?" OFF)
+if(ENABLE_SHAIRPORT AND NOT ENABLE_SHAIRPLAY)
+  plex_find_package(ShairPort 1 0)
+endif()
+
+option(ENABLE_CEC "Enable CEC?" ON)
+if(ENABLE_CEC)
+  plex_find_package(CEC 1 0)
+endif()
+
+plex_find_package(Threads 1 0)
+if(CMAKE_USE_PTHREADS_INIT)
+  message(STATUS "Using pthreads: ${CMAKE_THREAD_LIBS_INIT}")
+  list(APPEND CONFIG_PLEX_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+  set(HAVE_LIBPTHREAD 1)
+endif()
+
+plex_find_package(PulseAudio 0 1)
+if(HAVE_LIBPULSEAUDIO)
+  set(HAVE_LIBPULSE 1)
+endif()
+plex_find_package(Alsa 0 1)
+
+plex_find_package(LibUSB 0 1)
+plex_find_package(LibUDEV 0 1)
+
+if(NOT LIBUSB_FOUND AND NOT LIBUDEV_FOUND)
+  message(WARNING "No USB support")
+endif()
+
+list(APPEND CONFIG_PLEX_LINK_LIBRARIES  util)
+list(APPEND CONFIG_PLEX_LINK_LIBRARIES  gdl ismd_core ismd_viddec ismd_vidpproc ismd_audio ismd_vidrend ismd_demux ismd_bufmon osal platform_config)
+
+plex_get_soname(CURL_SONAME ${CURL_LIBRARY})
+
+####
+if(DEFINED DBUS_FOUND)
+  include_directories(${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})
+  set(HAVE_DBUS 1)
+endif()
+
+#### default lircdevice
+if(NOT DEFINED LIRC_DEVICE)
+  set(LIRC_DEVICE "/run/lirc/lircd")
+endif()
+
+#### on linux we want to use a "easy" name
+set(EXECUTABLE_NAME "plexhometheater")
+
+set(ARCH "i686")
+set(USE_OPENGLES 1)
+set(USE_OMXLIB 0)
+set(USE_OPENMAX 0)
+set(USE_PULSE 0)
+set(DISABLE_PROJECTM 1)
+set(USE_TEXTUREPACKER_NATIVE_ROOT 0)
+
+set(BUILD_DVDCSS 0)
+set(SKIP_CONFIG_DVDCSS 1)
+set(DVDREAD_CFLAGS "-D_XBMC -UHAVE_DVDCSS_DVDCSS_H")
+
+## remove annying useless warnings
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-address")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-aliasing")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sequence-point")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-parentheses")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-value")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pointer-arith")
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i686 -mmmx -msse -msse2 -msse3 -mfpmath=sse")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32 -march=i686 -mmmx -msse -msse2 -msse3 -mfpmath=sse")
+
+plex_find_library(EGL 0 0  system/usr/lib 1)
+plex_find_library(GLESv2 0  0 system/usr/lib 1)
+#plex_find_library(amadec 0  0 system/usr/lib 1)
+#plex_find_library(amavutils 0  0 system/usr/lib 1)
+#plex_find_library(amcodec 0  0 system/usr/lib 1)
+
+#needed for the commandline flag CMAKE_INCLUDE_PATH
+foreach(path ${CMAKE_INCLUDE_PATH})
+    include_directories(${path})
+endforeach()
+
+set(LIBPATH bin)
+set(BINPATH bin)
+set(RESOURCEPATH share/XBMC)
+
+set(PLEX_LINK_WRAPPED "-Wl,--unresolved-symbols=ignore-all -Wl,-wrap,_IO_getc -Wl,-wrap,_IO_getc_unlocked -Wl,-wrap,_IO_putc -Wl,-wrap,__fgets_chk -Wl,-wrap,__fprintf_chk -Wl,-wrap,__fread_chk -Wl,-wrap,__fxstat64 -Wl,-wrap,__lxstat64 -Wl,-wrap,__printf_chk -Wl,-wrap,__read_chk -Wl,-wrap,__vfprintf_chk -Wl,-wrap,__xstat64 -Wl,-wrap,_stat -Wl,-wrap,calloc -Wl,-wrap,clearerr -Wl,-wrap,close -Wl,-wrap,closedir -Wl,-wrap,dlopen -Wl,-wrap,fclose -Wl,-wrap,fdopen -Wl,-wrap,feof -Wl,-wrap,ferror -Wl,-wrap,fflush -Wl,-wrap,fgetc -Wl,-wrap,fgetpos -Wl,-wrap,fgetpos64 -Wl,-wrap,fgets -Wl,-wrap,fileno -Wl,-wrap,flockfile -Wl,-wrap,fopen -Wl,-wrap,fopen64 -Wl,-wrap,fprintf -Wl,-wrap,fputc -Wl,-wrap,fputs -Wl,-wrap,fread -Wl,-wrap,free -Wl,-wrap,freopen -Wl,-wrap,fseek -Wl,-wrap,fseeko64 -Wl,-wrap,fsetpos -Wl,-wrap,fsetpos64 -Wl,-wrap,fstat -Wl,-wrap,ftell -Wl,-wrap,ftello64 -Wl,-wrap,ftrylockfile -Wl,-wrap,funlockfile -Wl,-wrap,fwrite -Wl,-wrap,getc -Wl,-wrap,getc_unlocked -Wl,-wrap,getmntent -Wl,-wrap,ioctl -Wl,-wrap,lseek -Wl,-wrap,lseek64 -Wl,-wrap,malloc -Wl,-wrap,open -Wl,-wrap,open64 -Wl,-wrap,opendir -Wl,-wrap,popen -Wl,-wrap,printf -Wl,-wrap,read -Wl,-wrap,readdir -Wl,-wrap,readdir64 -Wl,-wrap,realloc -Wl,-wrap,rewind -Wl,-wrap,rewinddir -Wl,-wrap,setvbuf -Wl,-wrap,ungetc -Wl,-wrap,vfprintf -Wl,-wrap,write")
+
+set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} system/usr/lib )
+
+set(PLEX_LINK_WHOLEARCHIVE -Wl,--whole-archive)
+set(PLEX_LINK_NOWHOLEARCHIVE -Wl,--no-whole-archive)
+
+option(OPENELEC "Are we building OpenELEC dist?" ON)
+if(OPENELEC)
+  add_definitions(-DTARGET_OPENELEC)
+endif(OPENELEC)
+
+############ Add our definitions
+add_definitions(
+  -DTARGET_LINUX
+  -DTARGET_BOXEE
+  -DHAS_GLES=2
+  -DHAS_INTEL_SMD
+#  -DHAS_BUILTIN_SYNC_ADD_AND_FETCH
+#  -DHAS_BUILTIN_SYNC_SUB_AND_FETCH
+#  -DHAS_BUILTIN_SYNC_VAL_COMPARE_AND_SWAP
+)

plex/CMakeModules/PlatformConfigPOSIX.cmake

@@ -44,7 +44,7 @@ else()
   set(HAVE_PTHREAD_SETNAME_NP 1)
 endif()
 
-if(NOT TARGET_RPI AND NOT TARGET_AML)
+if(NOT TARGET_RPI AND NOT TARGET_AML AND NOT TARGET_BOXEEBOX)
   set(HAS_SDL_JOYSTICK 1)
 endif()
 set(HAS_LIBRTMP 1)
@@ -70,4 +70,5 @@ add_definitions(
   -D_LINUX
   -D__STDC_LIMIT_MACROS
   -D__STDC_FORMAT_MACROS
+  -DTIXML_USE_STL
 )

xbmc/cores/AudioEngine/AESinkFactory.cpp

@@ -23,6 +23,8 @@
 #if defined(TARGET_WINDOWS)
   #include "Sinks/AESinkWASAPI.h"
   #include "Sinks/AESinkDirectSound.h"
+#elif defined(TARGET_BOXEE)
+  #include "Sinks/AESinkIntelSMD.h"
 #elif defined(TARGET_ANDROID)
   #include "Sinks/AESinkAUDIOTRACK.h"
 #elif defined(TARGET_RASPBERRY_PI)
@@ -65,6 +67,8 @@ void CAESinkFactory::ParseDevice(std::string &device, std::string &driver)
 #if defined(TARGET_WINDOWS)
         driver == "WASAPI"      ||
         driver == "DIRECTSOUND" ||
+#elif defined(TARGET_BOXEE)
+        driver == "INTELSMD" ||		
 #elif defined(TARGET_ANDROID)
         driver == "AUDIOTRACK"  ||
 #elif defined(TARGET_RASPBERRY_PI)
@@ -109,6 +113,8 @@ IAESink *CAESinkFactory::TrySink(std::string &driver, std::string &device, AEAud
       sink = new CAESinkWASAPI();
     if (driver == "DIRECTSOUND")
       sink = new CAESinkDirectSound();
+#elif defined(TARGET_BOXEE)
+    sink = new CAESinkIntelSMD();
 #elif defined(TARGET_ANDROID)
     sink = new CAESinkAUDIOTRACK();
 #elif defined(TARGET_RASPBERRY_PI)
@@ -197,6 +203,14 @@ void CAESinkFactory::EnumerateEx(AESinkInfoList &list, bool force)
   if(!info.m_deviceInfoList.empty())
     list.push_back(info);
 
+#elif defined(TARGET_BOXEE)
+
+  info.m_deviceInfoList.clear();
+  info.m_sinkName = "INTELSMD";
+  CAESinkIntelSMD::EnumerateDevicesEx(info.m_deviceInfoList, force);
+  if(!info.m_deviceInfoList.empty())
+    list.push_back(info);
+	
 #elif defined(TARGET_ANDROID)
 
   info.m_deviceInfoList.clear();