From 974bbcb4d623e3fbc760d90694d8b9457caac2ea Mon Sep 17 00:00:00 2001
From: Dreamcat4 <dreamcat4@gmail.com>
Date: Wed, 30 Jul 2014 15:46:18 +0100
Subject: [PATCH 1/3] FreeBSD 1/X - Fix compiler errors

---
 src/cron.c                              |  4 ++++
 src/httpc.c                             |  5 +++++
 src/input/mpegts/satip/satip.c          |  5 +++++
 src/input/mpegts/satip/satip_frontend.c |  5 +++++
 src/muxer.c                             |  2 ++
 src/upnp.c                              | 11 ++++++++---
 6 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/cron.c b/src/cron.c
index 4290664e..41850dd4 100644
--- a/src/cron.c
+++ b/src/cron.c
@@ -17,13 +17,17 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "build.h"
 #include "cron.h"
 
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#if !defined(PLATFORM_FREEBSD)
 #include <alloca.h>
+#endif
 
 /*
  * Parse value
diff --git a/src/httpc.c b/src/httpc.c
index ed212a67..ac88ba3c 100644
--- a/src/httpc.c
+++ b/src/httpc.c
@@ -28,6 +28,11 @@
 #include <fcntl.h>
 #include <poll.h>
 
+#if defined(PLATFORM_FREEBSD)
+#include <sys/types.h>
+#include <sys/socket.h>
+#endif
+
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
diff --git a/src/input/mpegts/satip/satip.c b/src/input/mpegts/satip/satip.c
index b3126be4..4ad23648 100644
--- a/src/input/mpegts/satip/satip.c
+++ b/src/input/mpegts/satip/satip.c
@@ -28,6 +28,11 @@
 #include <arpa/inet.h>
 #include <openssl/sha.h>
 
+#if defined(PLATFORM_FREEBSD)
+#include <sys/types.h>
+#include <sys/socket.h>
+#endif
+
 static void satip_device_discovery_start( void );
 
 /*
diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
index 218fadfb..7ed424ac 100644
--- a/src/input/mpegts/satip/satip_frontend.c
+++ b/src/input/mpegts/satip/satip_frontend.c
@@ -24,6 +24,11 @@
 #include "http.h"
 #include "satip_private.h"
 
+#if defined(PLATFORM_FREEBSD)
+#include <sys/types.h>
+#include <sys/socket.h>
+#endif
+
 static int
 satip_frontend_tune1
   ( satip_frontend_t *lfe, mpegts_mux_instance_t *mmi );
diff --git a/src/muxer.c b/src/muxer.c
index 33399c7d..a359c748 100644
--- a/src/muxer.c
+++ b/src/muxer.c
@@ -30,6 +30,8 @@
 
 #if defined(PLATFORM_DARWIN)
 #define fdatasync(fd)       fcntl(fd, F_FULLFSYNC)
+#elif defined(PLATFORM_FREEBSD)
+#define fdatasync(fd)       fsync(fd)
 #endif
 
 /**
diff --git a/src/upnp.c b/src/upnp.c
index 8ff4e567..8b3404a1 100644
--- a/src/upnp.c
+++ b/src/upnp.c
@@ -16,6 +16,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "tvheadend.h"
+#include "tvhpoll.h"
+#include "upnp.h"
+
 #include <pthread.h>
 #include <assert.h>
 #include <stdio.h>
@@ -30,9 +34,10 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
-#include "tvheadend.h"
-#include "tvhpoll.h"
-#include "upnp.h"
+#if defined(PLATFORM_FREEBSD)
+#include <sys/types.h>
+#include <sys/socket.h>
+#endif
 
 int              upnp_running;
 static pthread_t upnp_tid;

From 1af984c6680e4015c8744d23217e0fa20e905116 Mon Sep 17 00:00:00 2001
From: Dreamcat4 <dreamcat4@gmail.com>
Date: Wed, 30 Jul 2014 20:14:37 +0100
Subject: [PATCH 2/3] FreeBSD 2/X Fix path for dtv-scan-tables

---
 src/input/mpegts/scanfile.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/input/mpegts/scanfile.c b/src/input/mpegts/scanfile.c
index 56439133..a30f0829 100644
--- a/src/input/mpegts/scanfile.c
+++ b/src/input/mpegts/scanfile.c
@@ -459,6 +459,8 @@ scanfile_init ( void )
   if (!path || !*path)
 #if ENABLE_DVBSCAN
     path = "data/dvb-scan";
+#elif defined(PLATFORM_FREEBSD)
+    path = "/usr/local/share/dtv-scan-tables";
 #else
     path = "/usr/share/dvb";
 #endif

From cb63d4950adbc6fcab10dd8698bf4be6782e0523 Mon Sep 17 00:00:00 2001
From: Dreamcat4 <dreamcat4@gmail.com>
Date: Fri, 1 Aug 2014 10:46:39 +0100
Subject: [PATCH 3/3] Put back project headers. From before to after the global
 includes.

---
 src/upnp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/upnp.c b/src/upnp.c
index 8b3404a1..cdbf3533 100644
--- a/src/upnp.c
+++ b/src/upnp.c
@@ -16,10 +16,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tvheadend.h"
-#include "tvhpoll.h"
-#include "upnp.h"
-
 #include <pthread.h>
 #include <assert.h>
 #include <stdio.h>
@@ -34,6 +30,10 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
+#include "tvheadend.h"
+#include "tvhpoll.h"
+#include "upnp.h"
+
 #if defined(PLATFORM_FREEBSD)
 #include <sys/types.h>
 #include <sys/socket.h>