diff options
| -rw-r--r-- | tools/depends/target/Makefile | 3 | ||||
| -rw-r--r-- | tools/depends/target/boblight/03-fixtvos.patch | 45 | ||||
| -rw-r--r-- | tools/depends/target/boblight/Makefile | 12 |
3 files changed, 60 insertions, 0 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index 5af8f481e6..5a9a8510ec 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -28,6 +28,9 @@ endif ifeq ($(OS),ios) EXCLUDED_DEPENDS = libcec libusb +ifeq ($(TARGET_PLATFORM),appletvos) + DEPENDS += boblight +endif endif ifeq ($(OS),osx) diff --git a/tools/depends/target/boblight/03-fixtvos.patch b/tools/depends/target/boblight/03-fixtvos.patch new file mode 100644 index 0000000000..646abeab9e --- /dev/null +++ b/tools/depends/target/boblight/03-fixtvos.patch @@ -0,0 +1,45 @@ +diff -uPr appletvos9.0_arm64-target/src/util/daemonize.cpp works/src/util/daemonize.cpp +--- src/util/daemonize.cpp 2015-12-18 18:20:26.000000000 +0100 ++++ src/util/daemonize.cpp 2015-12-13 16:15:19.000000000 +0100 +@@ -25,7 +25,7 @@ + void Daemonize() + { + //fork a child process +- pid_t pid = fork(); ++ pid_t pid = -1;//fork(); + if (pid == -1) + fprintf(stderr, "fork(): %s", GetErrno().c_str()); + else if (pid > 0) +diff -uPr appletvos9.0_arm64-target/src/util/tcpsocket.cpp works/src/util/tcpsocket.cpp +--- src/util/tcpsocket.cpp 2014-11-27 19:26:33.000000000 +0100 ++++ src/util/tcpsocket.cpp 2015-12-18 18:19:24.000000000 +0100 +@@ -31,8 +31,6 @@ + #include "tcpsocket.h" + #include "misc.h" + +-using namespace std; +- + void CTcpData::SetData(uint8_t* data, int size, bool append) + { + CopyData(reinterpret_cast<char*>(data), size, append); +diff -uPr appletvos9.0_arm64-target/src/device/deviceltbl.cpp works/src/device/deviceltbl.cpp +--- src/device/deviceltbl.cpp 2014-11-27 19:26:33.000000000 +0100 ++++ src/device/deviceltbl.cpp 2015-12-13 16:14:49.000000000 +0100 +@@ -51,7 +51,7 @@ + + bool CDeviceLtbl::WriteOutput() + { +- uint8_t prefix[4] = {0x55, 0xAA, 0x00, m_channels.size()}; ++ uint8_t prefix[4] = {0x55, 0xAA, 0x00, (uint8_t)m_channels.size()}; + + //get the channel values from the clienshandler + int64_t now = GetTimeUs(); +@@ -114,7 +114,7 @@ + uint8_t buff[512]; + uint8_t prefix[2] = {0x55, 0xAA}; + uint8_t open[2] = {0x83, 0x00}; +- uint8_t getvalues[4] = {0x81, 0x02, 0x00, m_channels.size()}; ++ uint8_t getvalues[4] = {0x81, 0x02, 0x00, (uint8_t)m_channels.size()}; + + if (m_isopened) + return true; //nothing to do here diff --git a/tools/depends/target/boblight/Makefile b/tools/depends/target/boblight/Makefile index bd961ec622..a5a0220f29 100644 --- a/tools/depends/target/boblight/Makefile +++ b/tools/depends/target/boblight/Makefile @@ -32,6 +32,11 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) cd $(PLATFORM); patch -p0 < ../02-fixandroid.patch cd $(PLATFORM); autoreconf -vif cd $(PLATFORM); $(CONFIGURE) +ifeq ($(CPU),arm64) + cd $(PLATFORM); patch -p0 < ../03-fixtvos.patch + cd $(PLATFORM); sed -ie "s|-bind_at_load||" ./libtool + cd $(PLATFORM); sed -ie "s|-bind_at_load||" ./ltmain.sh +endif $(LIBDYLIB): $(PLATFORM) $(MAKE) -C $(PLATFORM) @@ -43,7 +48,14 @@ ifeq ($(OS),android) $(RPL) -e "libboblight.so.0" "libboblight.so\x00\x00" $(PLATFORM)/src/.libs/libboblight.so -$(READELF) --dynamic $(PLATFORM)/src/.libs/libboblight.so | grep ibrary endif +ifeq ($(OS),ios) +ifeq ($(TARGET_PLATFORM),appletvos) + #deploy into source tree for tvos - we distribute libboblight with the bundle... + cp $(PLATFORM)/src/.libs/libboblight.0.dylib $(XBMCROOT)/system/libboblight-tvos.0.dylib +endif +else echo "libboblight isn't a dependency of XBMC and won't be installed" +endif touch $@ clean: $(MAKE) -C $(PLATFORM) clean |