[depends] refresh boblight patches

4 files changed, 46 insertions, 49 deletions

diff --git a/tools/depends/target/boblight/01-fix_fpermissive.patch b/tools/depends/target/boblight/01-fix_fpermissive.patch
index 29727a67bb..aab4788620 100644
--- a/tools/depends/target/boblight/01-fix_fpermissive.patch
+++ b/tools/depends/target/boblight/01-fix_fpermissive.patch
@@ -1,5 +1,5 @@
---- src/util/miscorig.cpp	2014-11-27 18:31:54.778680630 +0000
-+++ src/util/misc.cpp	2014-11-27 18:32:21.986680437 +0000
+--- a/src/util/misc.cpp
++++ b/src/util/misc.cpp
 @@ -64,7 +64,7 @@
  //convert . or , to the current locale for correct conversion of ascii float
  void ConvertFloatLocale(std::string& strfloat)
diff --git a/tools/depends/target/boblight/02-fixandroid.patch b/tools/depends/target/boblight/02-fixandroid.patch
index 8ce63e5b12..ff4b5b1077 100644
--- a/tools/depends/target/boblight/02-fixandroid.patch
+++ b/tools/depends/target/boblight/02-fixandroid.patch
@@ -1,20 +1,5 @@
---- src/util/daemonizeorig.cpp	2014-11-27 18:36:30.474678137 +0000
-+++ src/util/daemonize.cpp	2014-11-27 18:36:44.226678082 +0000
-@@ -35,10 +35,12 @@
-   if (setsid() < 0)
-     fprintf(stderr, "setsid(): %s", GetErrno().c_str());
- 
-+#if !defined(__ANDROID__)
-   //route stdout and stderr to /dev/null
-   fclose(stdout);
-   stdout = fopen("/dev/null", "w");
-   fclose(stderr);
-   stderr = fopen("/dev/null", "w");
-+#endif
- }
- 
---- src/lib/boblightorig.h	2014-11-27 18:38:37.174677063 +0000
-+++ src/lib/boblight.h	2014-11-27 18:40:14.810676123 +0000
+--- a/src/lib/boblight.h
++++ b/src/lib/boblight.h
 @@ -61,7 +61,7 @@
      //gets a functionpointer from dlsym, and returns char* from dlerror if it didn't work
      #define BOBLIGHT_FUNCTION(returnvalue, name, arguments) \
@@ -33,3 +18,18 @@
  
        //generate dlsym lines
        #include "boblight-functions.h"
+--- a/src/util/daemonize.cpp
++++ b/src/util/daemonize.cpp
+@@ -35,10 +35,12 @@
+   if (setsid() < 0)
+     fprintf(stderr, "setsid(): %s", GetErrno().c_str());
+ 
++#if !defined(__ANDROID__)
+   //route stdout and stderr to /dev/null
+   fclose(stdout);
+   stdout = fopen("/dev/null", "w");
+   fclose(stderr);
+   stderr = fopen("/dev/null", "w");
++#endif
+ }
+ 
diff --git a/tools/depends/target/boblight/03-fixtvos.patch b/tools/depends/target/boblight/03-fixtvos.patch
index 646abeab9e..13f8025568 100644
--- a/tools/depends/target/boblight/03-fixtvos.patch
+++ b/tools/depends/target/boblight/03-fixtvos.patch
@@ -1,30 +1,5 @@
-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
+--- a/src/device/deviceltbl.cpp
++++ b/src/device/deviceltbl.cpp
 @@ -51,7 +51,7 @@
  
  bool CDeviceLtbl::WriteOutput()
@@ -43,3 +18,25 @@ diff -uPr appletvos9.0_arm64-target/src/device/deviceltbl.cpp works/src/device/d
  
    if (m_isopened)
      return true; //nothing to do here
+--- a/src/util/daemonize.cpp
++++ b/src/util/daemonize.cpp
+@@ -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)
+--- a/src/util/tcpsocket.cpp
++++ b/src/util/tcpsocket.cpp
+@@ -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 --git a/tools/depends/target/boblight/Makefile b/tools/depends/target/boblight/Makefile
index 91d269bc2b..e34ffcc21d 100644
--- a/tools/depends/target/boblight/Makefile
+++ b/tools/depends/target/boblight/Makefile
@@ -26,12 +26,12 @@ $(TARBALLS_LOCATION)/$(ARCHIVE):
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); patch -p0 < ../01-fix_fpermissive.patch
-	cd $(PLATFORM); patch -p0 < ../02-fixandroid.patch
+	cd $(PLATFORM); patch -p1 -i ../01-fix_fpermissive.patch
+	cd $(PLATFORM); patch -p1 -i ../02-fixandroid.patch
 	cd $(PLATFORM); autoreconf -vif
 	cd $(PLATFORM); $(CONFIGURE)
 ifeq ($(CPU),arm64)
-	cd $(PLATFORM); patch -p0 < ../03-fixtvos.patch
+	cd $(PLATFORM); patch -p1 -i ../03-fixtvos.patch
 	cd $(PLATFORM); sed -ie "s|-bind_at_load||" ./libtool
 	cd $(PLATFORM); sed -ie "s|-bind_at_load||" ./ltmain.sh
 endif